testdroid-api-client 0.2.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7d86102d4aac9035ffcd04e5b0d355807fb90452
-  data.tar.gz: f841eb8742a2e46ae51b51aba77fa616720dac05
+SHA256:
+  metadata.gz: 1602073cb6328a9c2b0896a2cb6fd7a4ea55020b7f4b56fba3105c7040df67e9
+  data.tar.gz: 512d7c0359a780a73286ebad2723927d5ba0620c584ca19889f0c2513f62a3ed
 SHA512:
-  metadata.gz: 6f85f360258df234b25ea50719ddbaae878d40d4681073f28523d6fda17a8be014ab413de0432df50caeacdb293f892b52c09b4bf0b407688299c1062fca6ef9
-  data.tar.gz: 26c909e798f09712b3e3f726dd75cdccec5c155f6dad0fa3909a29e47019b4a7fd51046f2c6f64302ea85020b99d94457e714318bb353aeef4402e74b353d90b
+  metadata.gz: 2035e8b4bc7011bb5e21beda9230effc74575728fe408d2919e6567094fb33fdeb18e70bc62f86973686853a239170124e3d7fcac29e153b8eedc419183b88ad
+  data.tar.gz: a400bed6ad4e1d725533006fef57d9741038b7f6810e77c7ef0bf1621fb8cbcc9b0758dd4ea2bb1f4e2e36eb35ee58dad6e2ffc7784a4658cd6284b50530b9e5

data/.gitignore

@@ -12,8 +12,13 @@ test/tmp
 test/version_tmp
 tmp
 
+sample/results
+
 # YARD artifacts
 .yardoc
 _yardoc
 doc/
 .DS_Store
+
+# IDE
+.idea

data/.travis.yml

@@ -0,0 +1,11 @@
+before_install:
+  - yes | gem update --system --force
+  - gem install bundler
+deploy:
+  provider: rubygems
+  api_key:
+    secure: ZFKOZzwgB1s4/vD9BDb7lFWCO7xXP3ikG2DBZSdASii5iHM46X9ox2wt8h2XZd9RFKe9pyenJP9RsXmRVGanFgZ0wGu+oveWfA7oIKp6Eb6pNOBPs8MG0ZifAGUc7Ih1JUMuvNuOPRJ+QGc5FwPsu0EoxZn3gQCZNqdMNBRe17o=
+  on:
+    tags: true
+  gem: testdroid-api-client
+script: bundle exec rspec

data/Gemfile.lock

@@ -1,62 +1,90 @@
 PATH
   remote: .
   specs:
-    testdroid-api-client (0.2.0)
-      faraday (~> 0.8.8, >= 0.8.8)
-      oauth2 (~> 0.9)
+    testdroid-api-client (0.5.0)
+      deep_merge (~> 1.2)
+      faraday (~> 0.17, >= 0.17)
+      oauth2 (~> 1.4)
+      rest-client (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.6)
-    bump (0.5.1)
-    crack (0.4.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    bump (0.8.0)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
+    deep_merge (1.2.1)
     diff-lcs (1.2.5)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    jwt (1.2.0)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    oauth2 (0.9.4)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    faraday (0.17.3)
+      multipart-post (>= 1.2, < 3)
+    hashdiff (1.0.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    jwt (2.2.1)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.0512)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    netrc (0.11.0)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.4.0)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
+      rack (>= 1.2, < 3)
+    public_suffix (4.0.1)
+    rack (2.2.3)
+    rake (12.3.3)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
     rspec-collection_matchers (1.1.2)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    safe_yaml (1.0.4)
-    vcr (2.9.3)
-    webmock (1.20.4)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    safe_yaml (1.0.5)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
+    vcr (5.0.0)
+    webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    yard (0.8.7.6)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    yard (0.9.20)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bump (~> 0.5)
+  bump (~> 0.8)
   rake
   rspec
   rspec-collection_matchers
   testdroid-api-client!
-  vcr (~> 2.9)
-  webmock (~> 1.9)
-  yard (~> 0.8)
+  vcr (~> 5.0)
+  webmock (~> 3.7)
+  yard (~> 0.9.20)
+
+BUNDLED WITH
+   2.0.2

data/README.md

@@ -1,6 +1,9 @@
-Testdroid API Client for Ruby
-=========================
+[![Gem Version](https://badge.fury.io/rb/testdroid-api-client.svg)](https://badge.fury.io/rb/testdroid-api-client)
+[![Build Status](https://travis-ci.org/bitbar/testdroid-api-client-ruby.svg?branch=master)](https://travis-ci.org/bitbar/testdroid-api-client-ruby)
+
 
+Testdroid API Client for Ruby
+=============================
 
 ## Installation
 
@@ -12,17 +15,20 @@ gem "testdroid-api-client"
 ```bash
 > bundle install
 ```
+
 ## Sample client usage - Authenticate
 ```ruby
 require 'testdroid-api-client'
 
 client = TestdroidAPI::Client.new('admin@localhost', 'admin')
 ```
+
 ## Sample usage - get projects
 ```ruby
  @user = client.authorize
  projects = @user.projects.list
 ```
+
 ## Get project by id
 ```ruby
 project_id = 123
@@ -33,61 +39,44 @@ p "Project name #{project123.name}"
 
 ## Get project by name
 ```ruby
-android_project = @user.projects.list.detect {|project| project.name.casecmp("Android Project") == 0 }
+project = @user.projects.list({:filter => "s_name_eq_MyProject"})[0]
 ```
 
-
-## Start project
+## Get available frameworks
 ```ruby
-test_run = project123.run
+frameworks = @user.available_frameworks.list
 ```
 
-## Check test run status
-```ruby
-p "Project state #{test_run.state}"
-
-```
-## Download all logs from test run
+## Find specific framework
 ```ruby
-test_run.device_runs.list({:params => {:limit => 100}}).each { |drun| drun.download_logs("#{drun.id}_log") }
+framework = @user.available_frameworks.list({:filter => "s_osType_eq_ANDROID;s_name_like_%Instrumentation"})[0]
 ```
 
-## Using device labels
+## Upload files
 ```ruby
-#Get label for android os version 2.1
-lg_android_version_2_1 = client.label_groups.list.detect {|lg| lg.display_name.casecmp("android version") == 0 }
-
-os_v2_1 =  client.label_groups.get(lg_android_versions.id).labels.list.detect {|l| l.display_name.casecmp("2.1") == 0 }
-        
- #get all devices with android os level 2.1
- devices = client.label_groups.get(lg_android_versions.id).labels.get(os_v2_1.id).devices
-#get spefici device from devices list        
-lenovo_a820 = devices.list.detect {|d| d.display_name == "Lenovo A820"}
-       
+file_app = @user.files.upload(File.join(File.dirname(__FILE__), "BitbarSampleApp.apk"))
+file_test = @user.files.upload(File.join(File.dirname(__FILE__), "BitbarSampleAppTest.apk"))
 ```
 
-
-Device Sessions
-----
+## Start test run
 ```ruby
-#create a new device session: 
-device_session = @user.device_sessions.create({:params =>  {'deviceModelId' => '1'}})
-
-#release device session: 
-device_session.release()
+test_run = @user.runs.create("{\"osType\": \"ANDROID\", \"projectId\": #{project.id}, \"frameworkId\":#{framework_id},
+  \"deviceIds\": #{id_list}, \"files\": [{\"id\": #{file_app.id}, \"action\": \"INSTALL\" },
+  {\"id\": #{file_test.id}, \"action\": \"RUN_TEST\" }]}")
 
+#See full list of params: https://docs.bitbar.com/testing/api/tests/index.html#details-about-the-configuration-fields
 ```
 
-
-Project configuration
-----
+## Download all files from test run
 ```ruby
-#get project and update project configuration
-android_project = @user.projects.list.detect {|project| project.name.casecmp("Android Project") == 0 }
-android_project.config.update({:params => {'instrumentationRunner' => 'abc'}})
-#See full list of params: http://docs.testdroid.com/_pages/client.html#update-project-config
-
+test_run.device_sessions.list({:limit => 0}).each { |ds| ds.download_all_files("YOUR_PATH") }
 ```
 
+## Get all input files
+```ruby
+files = @user.files
+files.list({:limit => 40,:filter => "s_direction_eq_INPUT"}).each { 
+    |f| puts "File id: #{f.id} name: #{f.name}" }
+```
 
-See https://cloud.testdroid.com/swagger/index.html for more details about API V2
+See https://cloud.bitbar.com/cloud/swagger-ui.html for more details about API V2

data/lib/testdroid-api-client.rb

@@ -1,20 +1,36 @@
 #!/usr/bin/ruby
 require 'json'
+require 'logger'
+require 'rest-client'
+require 'deep_merge'
+require 'oauth2'
+require 'timeout'
+require 'set'
+
 require 'testdroid_api/client'
+require 'testdroid_api/apikey_client'
+
 require 'testdroid_api/cloud_resource'
 require 'testdroid_api/cloud_list_resource'
+
 require 'testdroid_api/user'
-require 'testdroid_api/device_groups'
+require 'testdroid_api/frameworks'
 require 'testdroid_api/projects'
 require 'testdroid_api/runs'
-require 'testdroid_api/device_runs'
-require 'testdroid_api/label_groups'
-require 'testdroid_api/labels'
-require 'testdroid_api/files'
 require 'testdroid_api/devices'
+require 'testdroid_api/device_groups'
 require 'testdroid_api/device_sessions'
-require 'testdroid_api/file_sets'
-require 'testdroid_api/config'
+require 'testdroid_api/device_session_connections'
+require 'testdroid_api/labels'
+require 'testdroid_api/label_groups'
+require 'testdroid_api/files'
+require 'testdroid_api/properties'
+require 'testdroid_api/services'
 
-require 'oauth2'
-require 'logger'
+require 'testdroid_api/admin'
+require 'testdroid_api/admin_devices'
+require 'testdroid_api/admin_device_models'
+require 'testdroid_api/admin_device_statuses'
+require 'testdroid_api/admin_device_problems'
+
+require 'testdroid-api-filter-builder'

data/lib/testdroid-api-filter-builder.rb

@@ -0,0 +1,145 @@
+module TestdroidAPI
+  class FilterBuilder
+
+    def initialize
+      @filters = []
+    end
+
+    private
+    def check_type(subject)
+      if !!subject == subject # check if it's boolean
+        return 'b'
+      elsif (/^[0-9]{13}$/ =~ subject) != nil  # check if it's timestamp
+        return 'd'
+      elsif (/^[0-9]+(?:\.[0-9]+)?$/ =~ subject) != nil  # check if it's number
+        return 'n'
+      else
+        return 's'
+      end
+    end
+
+    def add(name, value, operand, type, check_nil=false)
+      unless value.is_a? Array
+        value = [value]
+      end
+
+      if value.length == 0
+        return self
+      end
+
+      # auto-convert
+      value.each_with_index do |val, index|
+        if val.is_a? Time
+          value[index] = val.to_i.to_s
+        elsif val.is_a? Fixnum
+          value[index] = val.to_s
+        end
+      end
+
+      # auto-check type
+      if type.nil?
+        value.each do |val|
+          next if val.nil?
+          type = check_type(val)
+          break
+        end
+
+        if operand == 'in'
+          type = 'l'+type
+        end
+      end
+
+      # check nil existence
+      if check_nil
+        is_nil = false
+        value.each do |val|
+          next unless val.nil?
+          is_nil = true
+        end
+
+        if is_nil
+          value = value.select { |item| !item.nil? }
+          operand += 'ornull'
+        end
+      end
+
+      # add filter
+      @filters.push(FilterItem.new(name, value, operand, type))
+    end
+
+    public
+    def gt(name, value)
+      add(name, value, 'gt', 'n')
+    end
+
+    def lt(name, value)
+      add(name, value, 'lt', 'n')
+    end
+
+    def after(name, value)
+      add(name, value, 'after', 'd', true)
+    end
+
+    def before(name, value)
+      add(name, value, 'before', 'd', true)
+    end
+
+    def on(name, value)
+      add(name, value, 'on', 'd')
+    end
+
+    def eq(name, value)
+      add(name, value, 'eq', nil)
+    end
+
+    def contains(name, value)
+      add(name, value, 'contains', 's')
+    end
+
+    def like(name, value)
+      nil # TODO (waiting for BE support)
+    end
+
+    def empty(name, value)
+      nil # TODO (waiting for BE support)
+    end
+
+    def isnull(name, operand)
+      add(name, nil, 'isnull', operand)
+    end
+
+    def in(name, value)
+      add(name, value, 'in', nil, true)
+    end
+
+
+    def to_s
+      parts = []
+      @filters.each do |filter|
+        val = ''
+        if filter.value.length > 1 or not filter.value.nil?
+          val = '_' + filter.values
+        end
+        parts.push( filter.to_s + val )
+      end
+      parts.join(';')
+    end
+
+  end
+
+  class FilterItem
+    attr_accessor :name, :value, :operand, :type
+
+    def initialize(name, value, operand, type)
+      @name, @value, @operand, @type = name, value, operand, type
+    end
+
+    def values
+      @value.join('|')
+    end
+
+    def to_s
+      "#{@type}_#{@name}_#{@operand}"
+    end
+  end
+end