lib/stf/client.rb in stf-client-neofreko-0.1.7 vs lib/stf/client.rb in stf-client-neofreko-0.1.8

- old
+ new

@@ -15,76 +15,81 @@ @token = token end def get_devices response = execute '/api/v1/devices', Net::HTTP::Get - return response.devices + response.devices end def get_device(serial) response = execute "/api/v1/devices/#{serial}", Net::HTTP::Get - return response.device + response.device end def get_user response = execute '/api/v1/user', Net::HTTP::Get - return response.user + response.user end def get_user_devices response = execute '/api/v1/user/devices', Net::HTTP::Get - return response.devices + response.devices end def add_device(serial) - response = execute '/api/v1/user/devices', Net::HTTP::Post, {serial: serial}.to_json - return response.success + response = execute '/api/v1/user/devices', Net::HTTP::Post, { serial: serial }.to_json + response.success end + def add_adb_public_key(adbkeypub) + response = execute '/api/v1/user/adbPublicKeys', Net::HTTP::Post, { publickey: adbkeypub }.to_json + response.success + end + def remove_device(serial) response = execute "/api/v1/user/devices/#{serial}", Net::HTTP::Delete - return response.success + response.success end def start_debug(serial) response = execute "/api/v1/user/devices/#{serial}/remoteConnect", Net::HTTP::Post - return response + response end def stop_debug(serial) response = execute "/api/v1/user/devices/#{serial}/remoteConnect", Net::HTTP::Delete - return response.success + response.success end private - def execute(relative_url, type, body='') - return execute_absolute @base_url + relative_url, type, body + def execute(relative_url, type, body = '') + execute_absolute @base_url + relative_url, type, body end - def execute_absolute(url, type, body='', limit = 10) - raise ArgumentError, 'too many HTTP redirects' if limit == 0 + def execute_absolute(url, type, body = '', limit = 10) + raise ArgumentError, 'too many HTTP redirects' if limit.zero? uri = URI.parse(url) http = Net::HTTP.new(uri.host, uri.port) http.use_ssl = true if uri.scheme == 'https' request = type.new(uri, 'Authorization' => "Bearer #{@token}", 'Content-Type' => 'application/json') request.body = body response = http.request(request) case response - when Net::HTTPSuccess then - json = JSON.parse(response.body, object_class: OpenStruct) + when Net::HTTPSuccess then + json = JSON.parse(response.body, object_class: OpenStruct) - logger.debug "API returned #{json}" - when Net::HTTPRedirection then - location = response['location'] - logger.debug "redirected to #{location}" - return execute_absolute(location, type, body, limit - 1) - else - logger.error "API returned #{response.value}" + logger.debug "API returned #{json}" + when Net::HTTPRedirection then + location = response['location'] + logger.debug "redirected to #{location}" + return execute_absolute(location, type, body, limit - 1) + else + logger.error "API returned #{response.value}" end - return json + json end end -end \ No newline at end of file +end