testdroid-api-client 0.2.3 → 0.3.0

data/lib/testdroid_api/config.rb

@@ -1,9 +1,9 @@
 module TestdroidAPI
-	class Config < CloudResource
-		def initialize(uri, client, params={})
-			super uri, client,"config", params
-			@uri, @client = uri, client
-			sub_items :parameters
-		end
-	end
+  class Config < CloudResource
+    def initialize(uri, client, params={})
+      super uri, client, "config", params
+      @uri, @client = uri, client
+      sub_items :parameters
+    end
+  end
 end

data/lib/testdroid_api/device_groups.rb

@@ -1,12 +1,11 @@
-
 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
+    end
 
-	end
+  end
 end

data/lib/testdroid_api/device_runs.rb

@@ -1,18 +1,20 @@
-
 module TestdroidAPI
   class DeviceRuns < CloudListResource
   end
   class DeviceRun < CloudResource
     def initialize(uri, client, params= {})
-      super uri, client,"deviceRun", params
+      super uri, client, "deviceRun", params
       @uri, @client = uri, client
     end
+
     def download_performance(file_name="performance_data.txt")
       @client.download("#{@uri}/performance", file_name)
     end
+
     def download_junit(file_name="junit.xml")
       @client.download("#{@uri}/junit.xml", file_name)
     end
+
     def download_logs(file_name="log.txt")
       @client.download("#{@uri}/logs", file_name)
     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,14 @@
-
 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
+      resp = @client.post("#{@uri}/release", params= {})
+    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/file_sets.rb

@@ -1,12 +1,11 @@
-
 module TestdroidAPI
-	class FileSets < CloudListResource
+  class FileSets < CloudListResource
+  end
+  class FileSet < CloudResource
+    def initialize(uri, client, params= {})
+      super uri, client, "fileSet", params
+      @uri, @client = uri, client
+      sub_items :files
     end
-	class FileSet < CloudResource
-		def	initialize(uri, client, params= {})
-			super uri, client,"fileSet", params
-			@uri, @client = uri, client
-			sub_items :files
-		end
-	end
+  end
 end

data/lib/testdroid_api/files.rb

@@ -1,60 +1,59 @@
-
 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 < 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)
+
+      Application.new(nil, nil, reply)
+    end
+
+    def uploadData(filename)
+      if !File.exist?(filename)
+        @client.logger.error("Invalid filename")
+        return
+      end
+      reply = @client.upload("#{@uri}/data", filename)
+
+      Data.new(nil, nil, reply)
+    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
+      @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/label_groups.rb

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

data/lib/testdroid_api/labels.rb

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

data/lib/testdroid_api/parameters.rb

@@ -1,11 +1,10 @@
-
 module TestdroidAPI
-	class Parameters < CloudListResource
-	end
-	class Parameter < CloudResource
-		def	initialize(uri, client, params= {})
-			super uri, client,"parameter", params
-		end
+  class Parameters < CloudListResource
+  end
+  class Parameter < CloudResource
+    def initialize(uri, client, params= {})
+      super uri, client, "parameter", params
+    end
 
-	end
+  end
 end

data/lib/testdroid_api/projects.rb

@@ -1,21 +1,19 @@
-
 module TestdroidAPI
-    class Projects < CloudListResource
-    end
+  class Projects < CloudListResource
+  end
 
-    class Project < CloudResource
+  class Project < CloudResource
 
-         def initialize(uri, client, params= {})
-            super uri, client,"project", params
-            @uri, @client = uri, client
-            sub_items :runs, :files, :config
-        end      
-        #Start a new test run
-        #run_parameters - example {:params =>  {'name' => 'test'}} 
-        def run(run_parameters={:params => {}})
-            resp = @client.post("#{@uri}/runs", run_parameters)
-            Run.new("#{@uri}/runs/#{resp['id']}", @client, resp)
-        end
+    def initialize(uri, client, params= {})
+      super uri, client, "project", params
+      @uri, @client = uri, client
+      sub_items :runs, :files, :config
+    end
 
+    def run(run_parameters = {})
+      resp = @client.post("#{@uri}/runs", run_parameters)
+      Run.new("#{@uri}/runs/#{resp['id']}", @client, resp)
     end
+
+  end
 end

data/lib/testdroid_api/properties.rb

@@ -0,0 +1,13 @@
+module TestdroidAPI
+  class Properties < CloudListResource
+    def initialize(uri, client)
+      super uri, client, "Property"
+    end
+  end
+  class Property < CloudResource
+    def initialize(uri, client, params= {})
+      super uri, client, "property", params
+    end
+
+  end
+end

data/lib/testdroid_api/runs.rb

@@ -1,14 +1,15 @@
 module TestdroidAPI
-	class Runs < CloudListResource
-	end
-	class Run < CloudResource
-		def	initialize(uri, client, params= {})
-			super uri, client,"run", params
-			@uri, @client = uri, client
-			sub_items :device_runs
-		end
-		def abort()
-      		resp = @client.post("#{@uri}/abort", params= {})
-	    end
-	end
+  class Runs < CloudListResource
+  end
+  class Run < CloudResource
+    def initialize(uri, client, params= {})
+      super uri, client, "run", params
+      @uri, @client = uri, client
+      sub_items :device_runs
+    end
+
+    def abort()
+      @client.post("#{@uri}/abort", params= {})
+    end
+  end
 end

data/lib/testdroid_api/services.rb

@@ -0,0 +1,18 @@
+module TestdroidAPI
+  class Services < CloudListResource
+  end
+  class Service < CloudResource
+    def initialize(uri, client, params= {})
+      super uri, client, "service", params
+    end
+
+    def get_available
+      @client.get("#{@uri}/available")
+    end
+
+    def get_purchased
+      @client.get("#{@uri}/purchased")
+    end
+
+  end
+end

data/lib/testdroid_api/user.rb

@@ -1,8 +1,8 @@
 module TestdroidAPI
-	class User < CloudResource
-		def initialize(uri, client, params={})
-			super uri, client,"users", params
-			sub_items :projects, :device_groups, :device_sessions, :file_sets
-		end
-	end
+  class User < CloudResource
+    def initialize(uri, client, params={})
+      super uri, client, "users", params
+      sub_items :projects, :device_groups, :device_sessions, :file_sets
+    end
+  end
 end

data/sample/sample.rb

@@ -1,26 +1,26 @@
 require 'testdroid-api-client'
 
-client = TestdroidAPI::Client.new('admin@localhost', 'admin')
+#client = TestdroidAPI::Client.new(ENV['TESTDROID_USERNAME'],ENV['TESTDROID_PASSWORD'])
+#or using api key:
+client = TestdroidAPI::ApikeyClient.new(ENV['TESTDROID_APIKEY'])
 #to use private cloud specify cloud url as:
-#client = TestdroidAPI::Client.new('my@host.com', 'hostpass', 'https://customer.testdroid.com/cloud')
-#oauth
+#client = TestdroidAPI::Client.new('API_KEY', 'https://customer.testdroid.com')
 user = client.authorize
 
 # Create Android project
-android_project = user.projects.create({:params => {:name => "Android robotium", :type => "ANDROID"}})
+android_project = user.projects.create({:name => "Android robotium", :type => "ANDROID"})
 
 # Create iOS project
-ios_project = user.projects.create({:params => {:name => "iOS project", :type => "IOS"}})
+ios_project = user.projects.create({:name => "iOS project", :type => "IOS"})
 
 #Android applicaiton
-android_project.files.uploadApplication("BitbarSampleApp.apk")
+file_app = android_project.files.uploadApplication("BitbarSampleApp.apk")
 
 #instrumentation package
-android_project.files.uploadTest("BitbarSampleAppTests.apk")
-
+file_test = android_project.files.uploadTest("BitbarSampleAppTest.apk")
 
 #Set custom runner and set mode for instrumentaiton test
-android_project.config.update({:params => {'instrumentationRunner' => 'com.testrunners.MyRunner', :mode=> 'FULL_RUN'}})
+android_project.config.update({'instrumentationRunner' => 'com.testrunners.MyRunner', :mode=> 'FULL_RUN'})
 
 #get all the Android devices
 android_devices = client.devices.list.select {|device| device.os_type.casecmp("ANDROID") == 0 }
@@ -28,7 +28,12 @@ android_devices = client.devices.list.select {|device| device.os_type.casecmp("A
 #get IDs of the android devices
 id_list = android_devices.collect{|device| device.id } 
 
-run_parameters = {:params => {:name => 'Test run 1', "usedDeviceIds[]" => id_list.join(',') }}
+run_parameters = {
+    :name => 'Test run 1',
+    "usedDeviceIds[]" => id_list.join(','),
+    :appFileId => file_app.id,
+    :testFileId => file_test.id
+}
 #Run project using the parameters
 android_project.run(run_parameters)
 
@@ -36,4 +41,4 @@ android_project.run(run_parameters)
 sleep 20 until android_project.runs.list.first.state == "FINISHED"
 
 #download junit xml from the all device runs
-android_project.runs.list.first.device_runs.list({:params => {:limit => 0}}).each { |device_run| device_run.download_junit("#{device_run.id}_junit.xml") }
+android_project.runs.list.first.device_runs.list({:limit => 0}).each { |device_run| device_run.download_junit("#{device_run.id}_junit.xml") }