testdroid-api-client 0.3.0 → 0.4.0

data/lib/testdroid_api/client.rb

@@ -1,13 +1,12 @@
 module TestdroidAPI
 
-class Client
+  class Client
     attr_reader :config
     attr_accessor :logger
     attr_reader :token
 
     API_VERSION = 'api/v2'
-    CLOUD_ENDPOINT='https://cloud.testdroid.com'
-    ACCEPT_HEADERS={'Accept' => 'application/json'}
+    CLOUD_ENDPOINT = 'https://cloud.bitbar.com'
 
     def initialize(username, password, cloud_url = CLOUD_ENDPOINT, logger = nil)
       # Instance variables
@@ -21,106 +20,99 @@ class Client
         @logger.info("Logger is not defined => output to STDOUT")
       end
     end
-    def label_groups
-      label_groups = TestdroidAPI::LabelGroups.new( "/#{API_VERSION}/label-groups", self )
-      label_groups.list
-      label_groups
-    end
-    def devices
-      devices = TestdroidAPI::Devices.new( "/#{API_VERSION}/devices", self )
-      devices.list
-      devices
-    end
-    def authorize
 
-      @client = OAuth2::Client.new('testdroid-cloud-api', nil, :site => @cloud_url, :authorize_url    => 'oauth/authorize',
-      :token_url        => 'oauth/token',  :headers => ACCEPT_HEADERS)  do |faraday|
-        faraday.request  :multipart
-        faraday.request  :url_encoded
+    def authorize
+      @client = OAuth2::Client.new(
+          'testdroid-cloud-api', nil, :site => @cloud_url, :token_url => 'oauth/token') do |faraday|
+        faraday.request :multipart
+        faraday.request :url_encoded
         faraday.response :logger, @logger
-        faraday.adapter  Faraday.default_adapter
+        faraday.adapter Faraday.default_adapter
       end
 
-      @token = @client.password.get_token(@username, @password, :headers => ACCEPT_HEADERS)
+      @token = @client.password.get_token(@username, @password)
 
-      if (@cloud_user.nil?)
-        @cloud_user = TestdroidAPI::User.new( "/#{API_VERSION}/me", self ).refresh
-        @cloud_user = TestdroidAPI::User.new( "/#{API_VERSION}/users/#{@cloud_user.id}", self ).refresh
+      if @cloud_user.nil?
+        @cloud_user = TestdroidAPI::User.new("/#{API_VERSION}/me", self).refresh
+        @cloud_user = TestdroidAPI::User.new("/#{API_VERSION}/users/#{@cloud_user.id}", self).refresh
 
       end
       @cloud_user
     end
 
     def mime_for(path)
-        mime = MIME::Types.type_for path
-        mime.empty? ? 'text/plain' : mime[0].content_type
+      mime = MIME::Types.type_for path
+      mime.empty? ? 'text/plain' : mime[0].content_type
     end
 
     def upload(uri, filename)
       begin
-        @token = @token.refresh!(:headers => ACCEPT_HEADERS) if @token.expired?
+        @token = @token.refresh! if @token.expired?
         connection = @token.client.connection
-        payload = {:file  => Faraday::UploadIO.new(filename, mime_for(filename)) }
-        headers = ACCEPT_HEADERS.merge(@token.headers)
-        response = connection.post(@cloud_url+"#{uri}",payload, headers)
+        payload = {:file => Faraday::UploadIO.new(filename, mime_for(filename))}
+        response = connection.post(@cloud_url + "#{uri}", payload, @token.headers)
       rescue => e
         @logger.error e
         return nil
       end
       JSON.parse(response.body)
     end
-    def post(uri, params)
 
-      @token = @token.refresh!(:headers => ACCEPT_HEADERS) if  @token.expired?
+    def post(uri, params = {})
+
+      @token = @token.refresh! if @token.expired?
 
       begin
-        resp = @token.post("#{@cloud_url}#{uri}", params.merge(:headers => ACCEPT_HEADERS))
+        resp = @token.post("#{@cloud_url}#{uri}", params)
       rescue => e
         @logger.error "Failed to post resource #{uri} #{e}"
         return nil
       end
-      
+
       if resp.body.nil? || resp.body.length == 0
         return nil
       end
-      
+
       JSON.parse(resp.body)
     end
-    def get(uri, params={})
 
-      @token = @token.refresh!(:headers => ACCEPT_HEADERS) if  @token.expired?
+    def get(uri, params = {})
+
+      @token = @token.refresh! if @token.expired?
 
       begin
-        resp = @token.get(@cloud_url+"#{uri}", params.merge(:headers => ACCEPT_HEADERS))
+        resp = @token.get(@cloud_url + "#{uri}", :params => params)
       rescue => e
         @logger.error "Failed to get resource #{uri} #{e}"
         return nil
       end
       JSON.parse(resp.body)
     end
+
     def delete(uri)
 
-      @token = @token.refresh!(:headers => ACCEPT_HEADERS) if  @token.expired?
+      @token = @token.refresh! if @token.expired?
 
       begin
-        resp = @token.delete(@cloud_url+"#{uri}",  :headers => ACCEPT_HEADERS )
+        resp = @token.delete(@cloud_url + "#{uri}")
       rescue => e
         @logger.error "Failed to delete resource #{uri} #{e}"
         return nil
       end
 
-      if (resp.status != 204)
+      if resp.status != 204
         @logger.error "Failed to delete resource #{uri} #{e}"
-        return nil
       else
         @logger.info "response: #{resp.status}"
       end
     end
+
     def download(uri, file_name)
       begin
-        @token = @token.refresh!(:headers => ACCEPT_HEADERS) if  @token.expired?
-        File.open(file_name, "w+b") do |file|
-          resp = @token.get("#{@cloud_url}/#{uri}", :headers => ACCEPT_HEADERS)
+        @token = @token.refresh! if @token.expired?
+        ::File.open(file_name, "w+b") do |file|
+          full_uri = uri.start_with?(@cloud_url) ? uri : @cloud_url + uri
+          resp = @token.get(full_uri)
           file.write(resp.body)
         end
       rescue => e
@@ -131,7 +123,7 @@ class Client
 
 # Resources
 
-    # public read-only
+# public read-only
 
     def info
       TestdroidAPI::CloudResource.new("/#{API_VERSION}/info", self, "info")
@@ -145,7 +137,7 @@ class Client
       TestdroidAPI::LabelGroups.new("/#{API_VERSION}/label-groups", self)
     end
 
-    # user read-write
+# user read-write
 
     def me
       TestdroidAPI::User.new("/#{API_VERSION}/me", self).load
@@ -159,7 +151,7 @@ class Client
       TestdroidAPI::DeviceSessionConnections.new("/#{API_VERSION}/device-session-connections", self)
     end
 
-    # admin only
+# admin only
 
     def admin
       TestdroidAPI::Admin.new("/#{API_VERSION}/admin", self)

data/lib/testdroid_api/cloud_list_resource.rb

@@ -1,11 +1,11 @@
 module TestdroidAPI
   class CloudListResource
 
-    def initialize(uri, client, instance_class=nil)
+    def initialize(uri, client, instance_class = nil)
       @uri, @client = uri, client
       resource_name = self.class.name.split('::')[-1]
-      @instance_class = TestdroidAPI.const_get( instance_class.nil? ? resource_name.chop : instance_class )
-      @list_key, @instance_id_key = resource_name.gsub!(/\b\w/) { $&.downcase }, 'id'
+      @instance_class = TestdroidAPI.const_get(instance_class.nil? ? resource_name.chop : instance_class)
+      @list_key, @instance_id_key = resource_name.gsub!(/\b\w/) {$&.downcase}, 'id'
     end
 
     def get(resource_id)
@@ -13,15 +13,13 @@ module TestdroidAPI
     end
 
     def total
-
       @client.get(@uri)['total']
     end
 
-    def create(params={}, http_params={})
+    def create(params = {})
       raise "Can't create a resource without a REST Client" unless @client
       response = @client.post @uri, params
-      @instance_class.new "#{@uri}/#{response[@instance_id_key]}", @client,
-                          response
+      @instance_class.new "#{@uri}/#{response[@instance_id_key]}", @client, response
     end
 
     def list_all()
@@ -29,8 +27,8 @@ module TestdroidAPI
 
       response = @client.get(@uri, {:limit => 0})
 
+      class_list = []
       if response['data'].is_a?(Array)
-        class_list = []
         instance_uri = @uri
         response['data'].each do |val|
           class_list << @instance_class.new("#{instance_uri}/#{val[@instance_id_key]}", @client, val)
@@ -39,15 +37,13 @@ module TestdroidAPI
       class_list
     end
 
-    def list(params={}, full_uri=false)
+    def list(params = {}, full_uri = false)
       raise "Can't get a resource list without a REST Client" unless @client
       @uri = full_uri ? @uri.split(@client.instance_variable_get(:@cloud_url))[1] : @uri
-
       response = @client.get(@uri, params)
-
+      class_list = []
       if response['data'].is_a?(Array)
         client = @client
-        class_list = []
         list_class = self.class
         instance_uri = full_uri ? @uri.split('?')[0] : @uri
         response['data'].each do |val|
@@ -59,9 +55,9 @@ module TestdroidAPI
             self;
           end
 
-          eigenclass.send :define_method, :offset, &lambda { response['offset'] }
-          eigenclass.send :define_method, :limit, &lambda { response['limit'] }
-          eigenclass.send :define_method, :total, &lambda { response['total'] }
+          eigenclass.send :define_method, :offset, &lambda {response['offset']}
+          eigenclass.send :define_method, :limit, &lambda {response['limit']}
+          eigenclass.send :define_method, :total, &lambda {response['total']}
           eigenclass.send :define_method, :next_page, &lambda {
             if response['next']
 

data/lib/testdroid_api/cloud_resource.rb

@@ -1,6 +1,6 @@
 module TestdroidAPI
   class CloudResource
-    def initialize(uri, client, resource_name=nil, params= {})
+    def initialize(uri, client, resource_name = nil, params = {})
 
       @uri, @client, @resource_name = uri, client, resource_name
       set_up_properties_from(params)
@@ -18,7 +18,7 @@ module TestdroidAPI
         new_class = resource_class.new(uri, @client)
         instance_variable_set("@#{item}", new_class)
       end
-      self.class.instance_eval { attr_reader *items }
+      self.class.instance_eval {attr_reader *items}
     end
 
     def method_missing(method, *args)
@@ -42,7 +42,7 @@ module TestdroidAPI
         property = snake_case_it p
 
         unless ['uri', 'client', 'updated'].include? property
-          eigenclass.send :define_method, property.to_sym, &lambda { v }
+          eigenclass.send :define_method, property.to_sym, &lambda {v}
         end
       end
       @updated = !hash.keys.empty?
@@ -57,7 +57,7 @@ module TestdroidAPI
 
     alias_method :load, :refresh
 
-    def download_file(file_resource_name, target_file_name=nil)
+    def download_file(file_resource_name, target_file_name = nil)
       raise "Can't refresh a resource without a REST Client" unless @client
       target_file_name = file_resource_name unless target_file_name
       @client.download("#{@uri}/#{file_resource_name}", target_file_name)
@@ -65,7 +65,7 @@ module TestdroidAPI
 
     def camel_case_it(something)
       if something.is_a? Hash
-        Hash[*something.to_a.map { |a| [camel_case_it(a[0]).to_sym, a[1]] }.flatten]
+        Hash[*something.to_a.map {|a| [camel_case_it(a[0]).to_sym, a[1]]}.flatten]
       else
         something.to_s.split('_').map do |s|
           [s[0, 1].capitalize, s[1..-1]].join
@@ -75,9 +75,9 @@ module TestdroidAPI
 
     def snake_case_it(something)
       if something.is_a? Hash
-        Hash[*something.to_a.map { |pair| [snake_case_it(pair[0]).to_sym, pair[1]] }.flatten]
+        Hash[*something.to_a.map {|pair| [snake_case_it(pair[0]).to_sym, pair[1]]}.flatten]
       else
-        something.to_s.gsub(/[A-Z][a-z]*/) { |s| "_#{s.downcase}" }.gsub(/^_/, '')
+        something.to_s.gsub(/[A-Z][a-z]*/) {|s| "_#{s.downcase}"}.gsub(/^_/, '')
       end
     end
 

data/lib/testdroid_api/device_groups.rb

@@ -2,9 +2,10 @@ module TestdroidAPI
   class DeviceGroups < CloudListResource
   end
   class DeviceGroup < CloudResource
-    def initialize(uri, client, params= {})
+    def initialize(uri, client, params = {})
       super uri, client, "deviceGroup", params
       @uri, @client = uri, client
+      sub_items :devices
     end
 
   end

data/lib/testdroid_api/device_session_connections.rb

@@ -2,7 +2,7 @@ module TestdroidAPI
   class DeviceSessionConnections < CloudListResource
   end
   class DeviceSessionConnection < CloudResource
-    def initialize(uri, client, params= {})
+    def initialize(uri, client, params = {})
       super uri, client, "DeviceSessionConnection", params
       @uri, @client = uri, client
     end

data/lib/testdroid_api/device_sessions.rb

@@ -2,13 +2,22 @@ module TestdroidAPI
   class DeviceSessions < CloudListResource
   end
   class DeviceSession < CloudResource
-    def initialize(uri, client, params= {})
+    def initialize(uri, client, params = {})
       super uri, client, "deviceSession", params
       @uri, @client = uri, client
     end
 
     def release
-      resp = @client.post("#{@uri}/release", params= {})
+      @client.post("#{@uri}/release", params = {})
     end
+
+    def download_all_files(path)
+      Dir.mkdir(path) unless Dir.exist?(path)
+      files = @client.get("#{@uri}/output-file-set/files")
+      files['data'].each do |file|
+        @client.download(file['directUrl'], ::File.join(path, "#{file['id']}-#{file['name']}"))
+      end
+    end
+
   end
 end

data/lib/testdroid_api/devices.rb

@@ -2,7 +2,7 @@ module TestdroidAPI
   class Devices < CloudListResource
   end
   class Device < CloudResource
-    def initialize(uri, client, params= {})
+    def initialize(uri, client, params = {})
       super uri, client, "device", params
       @uri, @client = uri, client
     end

data/lib/testdroid_api/files.rb

@@ -1,59 +1,20 @@
 module TestdroidAPI
-  class Files < CloudResource
-    def initialize(uri, client, params= {})
-      super uri, client, "files", params
-      @uri, @client = uri, client
-    end
-
-    def uploadApplication(filename)
-      if !File.exist?(filename)
-        @client.logger.error("Invalid filename")
-        return
-      end
-      reply = @client.upload("#{@uri}/application", filename)
+  class Files < CloudListResource
 
-      Application.new(nil, nil, reply)
-    end
-
-    def uploadData(filename)
-      if !File.exist?(filename)
+    def upload(filename)
+      unless ::File.exist?(filename)
         @client.logger.error("Invalid filename")
         return
       end
-      reply = @client.upload("#{@uri}/data", filename)
-
-      Data.new(nil, nil, reply)
+      file = @client.upload("#{@uri}", filename)
+      File.new("#{@uri}/#{file['id']}", @client, file)
     end
 
-    def uploadTest(filename)
-      if !File.exist?(filename)
-        @client.logger.error("Invalid filename")
-        return
-      end
-      reply = @client.upload("#{@uri}/test", filename)
-
-      Test.new(nil, nil, reply)
-    end
-  end
-  class Application < CloudResource
-    def initialize(uri, client, params= {})
-      super uri, client, "app", params
-      @uri, @client = uri, client
-
-    end
   end
-  class Test < CloudResource
-    def initialize(uri, client, params= {})
-      super uri, client, "test", params
+  class File < CloudResource
+    def initialize(uri, client, params = {})
+      super uri, client, "file", params
       @uri, @client = uri, client
-
-    end
-  end
-  class Data < CloudResource
-    def initialize(uri, client, params= {})
-      super uri, client, "data", params
-      @uri, @client = uri, client
-
     end
   end
 end

data/lib/testdroid_api/frameworks.rb

@@ -0,0 +1,11 @@
+module TestdroidAPI
+  class Frameworks < CloudListResource
+  end
+  class Framework < CloudResource
+    def initialize(uri, client, params = {})
+      super uri, client, "Framework", params
+      @uri, @client = uri, client
+    end
+
+  end
+end

data/lib/testdroid_api/label_groups.rb

@@ -2,7 +2,7 @@ module TestdroidAPI
   class LabelGroups < CloudListResource
   end
   class LabelGroup < CloudResource
-    def initialize(uri, client, params= {})
+    def initialize(uri, client, params = {})
       super uri, client, "labelGroup", params
       @uri, @client = uri, client
       sub_items :labels