testdroid-api-client 0.2.2 → 0.5.0

data/lib/testdroid_api/cloud_list_resource.rb

@@ -1,83 +1,82 @@
-
 module TestdroidAPI
-	class CloudListResource
+  class CloudListResource
+
+    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'
+    end
 
-		def initialize(uri, client)
-			@uri, @client = uri, client
-			resource_name = self.class.name.split('::')[-1]
-			@instance_class = TestdroidAPI.const_get resource_name.chop
-			@list_key, @instance_id_key = resource_name.gsub!(/\b\w/) { $&.downcase } , 'id'
-		end
-		def get(resource_id)
-			@instance_class.new( "#{@uri}/#{resource_id}", @client)
-		end
-		def total
+    def get(resource_id)
+      @instance_class.new("#{@uri}/#{resource_id}", @client)
+    end
 
-			@client.get(@uri)['total']
-		end
-		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
-		end
-		def list_all()
-			raise "Can't get a resource list without a REST Client" unless @client
+    def total
+      @client.get(@uri)['total']
+    end
 
-			response = @client.get("#{@uri}?limit=355043550", {})
+    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
+    end
 
-			if response['data'].is_a?(Array)
-				client = @client
-				class_list = []
-				list_class = self.class
-				instance_uri =  @uri
-				response['data'].each do |val|
+    def list_all()
+      raise "Can't get a resource list without a REST Client" unless @client
 
-					class_list << @instance_class.new( "#{instance_uri}/#{val[@instance_id_key]}", @client, val)
-				end
-			end
-			class_list
-		end
-		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, {:limit => 0})
 
-			response = @client.get(@uri, params)
+      class_list = []
+      if response['data'].is_a?(Array)
+        instance_uri = @uri
+        response['data'].each do |val|
+          class_list << @instance_class.new("#{instance_uri}/#{val[@instance_id_key]}", @client, val)
+        end
+      end
+      class_list
+    end
 
-			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|
+    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
+        list_class = self.class
+        instance_uri = full_uri ? @uri.split('?')[0] : @uri
+        response['data'].each do |val|
 
-					class_list << @instance_class.new( "#{instance_uri}/#{val[@instance_id_key]}", @client, val)
-				end
-				class_list.instance_eval do
-					eigenclass = class << self; self; end
+          class_list << @instance_class.new("#{instance_uri}/#{val[@instance_id_key]}", @client, val)
+        end
+        class_list.instance_eval do
+          eigenclass = class << self;
+            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, :next_page, &lambda {
-						if response['next']
+          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']
 
-							list_class.new(response['next'], client).list({}, true)
-						else
-							[]
-						end
-					}
-					eigenclass.send :define_method, :previous_page, &lambda {
-						if response['previous']
+              list_class.new(response['next'], client).list({}, true)
+            else
+              []
+            end
+          }
+          eigenclass.send :define_method, :previous_page, &lambda {
+            if response['previous']
 
-							list_class.new(response['previous'], client).list({}, true)
-						else
-							[]
-						end
-					}
-				end
-			end
-			class_list
-		end
-	end
+              list_class.new(response['previous'], client).list({}, true)
+            else
+              []
+            end
+          }
+        end
+      end
+      class_list
+    end
+  end
 end

data/lib/testdroid_api/cloud_resource.rb

@@ -1,77 +1,89 @@
-
 module TestdroidAPI
-	class CloudResource
-		def initialize(uri, client,  resource_name=nil, params= {})
+  class CloudResource
+    def initialize(uri, client, resource_name = nil, params = {})
+
+      @uri, @client, @resource_name = uri, client, resource_name
+      set_up_properties_from(params)
+    end
+
+    def inspect # :nodoc:
+      "<#{self.class} @uri=#{@uri}>"
+    end
+
+    def sub_items(*items)
+      items.each do |item|
+        resource = camel_case_it item
+        uri = "#{@uri}/#{item.to_s.gsub('_', '-') }"
+        resource_class = TestdroidAPI.const_get resource
+        new_class = resource_class.new(uri, @client)
+        instance_variable_set("@#{item}", new_class)
+      end
+      self.class.instance_eval {attr_reader *items}
+    end
+
+    def method_missing(method, *args)
+      super if @updated
+      set_up_properties_from(@client.get(@uri))
+      self.send method, *args
+    end
+
+    def update(params = {})
+      raise "Can't update a resource without a REST Client" unless @client
+      set_up_properties_from(@client.post(@uri, params))
+      self
+    end
+
+    def set_up_properties_from(hash)
+
+      eigenclass = class << self;
+        self;
+      end
+      hash.each do |p, v|
+        property = snake_case_it p
+
+        unless ['uri', 'client', 'updated'].include? property
+          eigenclass.send :define_method, property.to_sym, &lambda {v}
+        end
+      end
+      @updated = !hash.keys.empty?
+    end
+
+    def refresh
+      raise "Can't refresh a resource without a REST Client" unless @client
+      @updated = false
+      set_up_properties_from(@client.get(@uri))
+      self
+    end
+
+    alias_method :load, :refresh
 
-			@uri, @client, @resource_name = uri, client, resource_name
-			set_up_properties_from( params )
-		end
-		def inspect # :nodoc:
-			"<#{self.class} @uri=#{@uri}>"
-		end
-		def sub_items(*items)
-			items.each do |item|
-				resource = camel_case_it item
-				uri = "#{@uri}/#{item.to_s.gsub('_', '-') }"
-				resource_class = TestdroidAPI.const_get resource
-				new_class = resource_class.new(uri, @client)
-				instance_variable_set( "@#{item}", new_class )
-			end
-			self.class.instance_eval {attr_reader *items}
-		end
-		def method_missing(method, *args)
-			super if @updated
-			set_up_properties_from(@client.get(@uri))
-			self.send method, *args
-		end
-		def update(params = {})
-        	raise "Can't update a resource without a REST Client" unless @client
-        	set_up_properties_from(@client.post(@uri, params))
-        	self
-      	end
-		def set_up_properties_from(hash)
+    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)
+    end
 
-			eigenclass = class << self; self; end
-			hash.each do |p,v|
-				property = snake_case_it p
+    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]
+      else
+        something.to_s.split('_').map do |s|
+          [s[0, 1].capitalize, s[1..-1]].join
+        end.join
+      end
+    end
 
-				unless ['uri', 'client', 'updated'].include? property
-					eigenclass.send :define_method, property.to_sym, &lambda {v}
-				end
-			end
-			@updated = !hash.keys.empty?
-		end
+    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]
+      else
+        something.to_s.gsub(/[A-Z][a-z]*/) {|s| "_#{s.downcase}"}.gsub(/^_/, '')
+      end
+    end
 
-		def refresh
-			raise "Can't refresh a resource without a REST Client" unless @client
-			@updated = false
-			set_up_properties_from(@client.get(@uri))
-			self
-		end
-		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)
-		end
-		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]
-			else
-				something.to_s.split('_').map do |s|
-					[s[0,1].capitalize, s[1..-1]].join
-				end.join
-			end
-		end
-		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]
-			else
-				something.to_s.gsub(/[A-Z][a-z]*/) {|s| "_#{s.downcase}"}.gsub(/^_/, '')
-			end
-		end
-		def delete
-			raise "Can't delete a resource without a REST Client" unless @client
-			@client.delete(@uri)
-		end
-	end
+    def delete
+      raise "Can't delete a resource without a REST Client" unless @client
+      @client.delete(@uri)
+    end
+  end
 end

data/lib/testdroid_api/device_groups.rb

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

data/lib/testdroid_api/device_session_connections.rb

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

data/lib/testdroid_api/device_sessions.rb

@@ -1,14 +1,23 @@
-
 module TestdroidAPI
-	class DeviceSessions < CloudListResource
-	end
-	class DeviceSession < CloudResource
-		def	initialize(uri, client, params= {})
-			super uri, client,"deviceSession", params
-			@uri, @client = uri, client
-		end
-		def release
-			resp = @client.post("#{@uri}/release", params= {})
-		end
-	end
+  class DeviceSessions < CloudListResource
+  end
+  class DeviceSession < CloudResource
+    def initialize(uri, client, params = {})
+      super uri, client, "deviceSession", params
+      @uri, @client = uri, client
+    end
+
+    def release
+      @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

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

data/lib/testdroid_api/files.rb

@@ -1,60 +1,62 @@
-
 module TestdroidAPI
-	class Files < CloudResource
-		def	initialize(uri, client, params= {})
-
-			super uri, client,"files", params
-			@uri, @client = uri, client
-
-		end
-
-		def uploadApplication(filename, mime_type = "application/vnd.android.package-archive")
-			if !File.exist?(filename)
-				@client.logger.error( "Invalid filename")
-				return
-			end
-			reply = @client.upload("#{@uri}/application", filename, mime_type)
-
-			Application.new(nil, nil, reply)
-		end
-		def uploadData(filename, mime_type = "application/zip")
-			if !File.exist?(filename)
-				@client.logger.error( "Invalid filename")
-				return
-			end
-			reply = @client.upload("#{@uri}/data", filename, mime_type)
-
-			Data.new(nil, nil, reply)
-		end
-		def uploadTest(filename, mime_type = "application/vnd.android.package-archive")
-			if !File.exist?(filename)
-				@client.logger.error( "Invalid filename")
-				return
-			end
-			reply = @client.upload("#{@uri}/test", filename, mime_type)
-
-			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
-			@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
+  class Files < CloudListResource
+
+    ACCEPTED_VIRUS_SCAN_STATUSES = Set['safe', 'disabled', nil]
+
+    def upload(filename, skip_scan_wait=false)
+      unless ::File.exist?(filename)
+        @client.logger.error("Invalid filename")
+        return
+      end
+      file = @client.upload("#{@uri}", filename)
+      result = File.new("#{@uri}/#{file['id']}", @client, file)
+      if !skip_scan_wait
+        wait_for_virus_scan(Array(result))
+      end
+      return result
+    end
+
+    def wait_for_virus_scan(api_files, timeout=300)
+      all_safe = false
+      begin
+        Timeout.timeout(timeout) do
+          while !all_safe do
+            statuses = Set.new
+            api_files.each do |file|
+              current_status = get_virus_scan_status(file)
+              if ACCEPTED_VIRUS_SCAN_STATUSES.include?(current_status)
+                statuses.add(current_status)
+              else
+                sleep(1)
+                file.refresh
+                statuses.add(get_virus_scan_status(file))
+              end
+            end
+            if statuses.include?('infected')
+              raise 'File rejected by virus scan'
+            end
+            if ACCEPTED_VIRUS_SCAN_STATUSES.superset?(statuses)
+              all_safe = true
+            end
+          end
+        end
+      rescue Timeout::Error
+        @client.logger.error("Waiting for virus scan timed out")
+        raise
+      end
+    end
+
+    private
+
+    def get_virus_scan_status(file)
+      return file.file_properties.find{ |item| item['key'] == "virus_scan_status" }['value']
+    end
+  end
+
+  class File < CloudResource
+    def initialize(uri, client, params = {})
+      super uri, client, "file", params
+      @uri, @client = uri, client
+    end
+  end
 end