xamarin-test-cloud 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0cec22a46900529476eefcfd387d5dc97dedbbc
-  data.tar.gz: 7b7bb6d17156291186b684fcd83c5349047f966d
+  metadata.gz: 17f8c6ea03350ae24d3607f63bff1dfd571da5c9
+  data.tar.gz: 60ee93aec5aaaecb1423640398a62c1494a8108c
 SHA512:
-  metadata.gz: 75b50f5a7d3d502f59f1380aedc19df50d3e35cc2b987c3625e45588f0a1ef3822ab618d56d41c70706793b0f23ce02143a094314c2e8c096c0da7205369ca27
-  data.tar.gz: d54020a9a94b3920ead7dd866ce490688eeb1f76970e2b7cdecbc52bd7bcfdc127ca5ae7b0517396fbc75bba1c80227620b9eafc83f86b043d3c664367d647a4
+  metadata.gz: a3fbc8ce41b25019819ed4684c8a5d7edea38b4709f9c88d7463ebf0979ccfcc851973469f2933a8935cd6846870b0e8d232348a74a076de23bacb76c77a47d8
+  data.tar.gz: d6f5ada84fcd0143b49369f28c041a7466786308d11c6e90d6f25b7789571b46d6602fc7e4ac1b89c40c78eab4a7f28aa11710ba8d74819e1d72044725e58a45

data/README.md

@@ -1 +1,12 @@
-Run ``rake -T`` to see the available Rake tasks.
+## Test Cloud Command Line
+
+### Testing
+
+```
+$ bundle update
+$ rake test         # All tests.
+$ rake unit         # Unit tests.
+$ rake integration  # Integration tests.
+$ rake spec         # rspec tests
+```
+

data/lib/xamarin-test-cloud/cli.rb

@@ -11,7 +11,10 @@ require 'tmpdir'
 require 'fileutils'
 require 'retriable'
 require 'xamarin-test-cloud/version'
+require 'xamarin-test-cloud/retriable_options'
 require 'securerandom'
+require 'open3'
+
 
 trap "SIGINT" do
   puts "Exiting"
@@ -28,7 +31,7 @@ module XamarinTestCloud
 
     attr_accessor :app, :api_key, :appname, :test_parameters, :user,
                   :workspace, :config, :profile, :skip_config_check, :dry_run,
-                  :device_selection, :pretty, :async, :priority, :endpoint_path,
+                  :device_selection, :pretty, :async, :async_json, :priority, :endpoint_path,
                   :locale, :series,
                   :dsym, :session_id
 
@@ -113,6 +116,11 @@ module XamarinTestCloud
                   :type => :boolean,
                   :default => false
 
+    method_option 'async-json',
+                  :desc => "Don't block waiting for test results. Output results in json format.",
+                  :type => :boolean,
+                  :default => false
+
     method_option :priority,
                   :desc => "Run as priority test execution. Please note: This is only available for some tiers, and priority test executions cost double.",
                   :type => :boolean,
@@ -145,10 +153,23 @@ module XamarinTestCloud
                   :type => :string
 
 
-
     def submit(app, api_key)
 
       self.pretty = options[:pretty]
+      self.async_json = options['async-json']
+      self.async = options[:async] || self.async_json
+
+      # Async mode wraps all console output in a json object
+      # So we need to intercept all writes to $stdout
+      if self.async_json
+        @async_log = StringIO.new
+        @async_result = {
+          test_run_id: nil,
+          error_messages: [],
+          log: []
+        }
+        $stdout = @async_log
+      end
 
       app_path = File.expand_path(app)
       unless File.exist?(app_path)
@@ -173,8 +194,6 @@ module XamarinTestCloud
 
       self.user = options['user']
 
-      self.async = options[:async]
-
       self.dry_run = options['dry-run']
 
       self.api_key = api_key
@@ -211,7 +230,7 @@ module XamarinTestCloud
 
       workspace_basename = File.basename(workspace_path)
       if workspace_basename.downcase == 'features'
-        self.workspace = File.expand_path(File.join(workspace_path,'..'))
+        self.workspace = File.expand_path(File.join(workspace_path, '..'))
         puts "Deriving workspace #{self.workspace} from features folder #{workspace_basename}"
       else
         self.workspace = File.expand_path(workspace_path)
@@ -230,7 +249,7 @@ module XamarinTestCloud
 
       parse_and_set_config_and_profile
       unless self.skip_config_check
-        default_config = File.join(self.workspace,'config','cucumber.yml')
+        default_config = File.join(self.workspace, 'config', 'cucumber.yml')
         if File.exist?(default_config) && self.config.nil?
           log_header 'Warning: Detected cucumber.yml config file, but no --config specified'
           puts "Please specify --config #{default_config}"
@@ -275,7 +294,7 @@ module XamarinTestCloud
       rejected_devices = json['rejected_devices']
       if rejected_devices && rejected_devices.size > 0
         puts 'Skipping devices (you can update your selections via https://testcloud.xamarin.com)'
-        rejected_devices.each {|d| puts d}
+        rejected_devices.each { |d| puts d }
       end
       puts ''
 
@@ -290,10 +309,25 @@ module XamarinTestCloud
         wait_for_job(json['id'])
       else
         log 'Async mode: not awaiting test results'
+        @async_result[:test_run_id] = json['id'] if self.async_json
       end
 
+    rescue XamarinTestCloud::ValidationError => e
+      if self.async_json
+        @async_result[:error_messages] << e.message
+      else
+        raise
     end
 
+    ensure
+      $stdout = STDOUT
+      if self.async_json
+        process_async_log
+        puts @async_result.to_json
+      end
+    end
+
+
     default_task :submit
 
     no_tasks do
@@ -302,13 +336,20 @@ module XamarinTestCloud
         ENV['DEBUG'] == '1'
       end
 
+      def process_async_log
+        @async_result[:log] = @async_log.string
+                                .split(/\n/).map { |string| string.gsub(/\e\[(\d+)m/, '').strip }
+                                .select { |string| string.length > 0 }
+      end
+
       def exit_on_failure?
         true
       end
 
       def wait_for_job(id)
+        retry_opts = XamarinTestCloud::RetriableOptions.tries_and_interval(60, 10)
         while(true)
-          status_json = Retriable.retriable :tries => 60, :interval => 10 do
+          status_json = Retriable.retriable(retry_opts) do
             JSON.parse(http_post("status_v3", {'id' => id, 'api_key' => api_key, 'user' => user}))
           end
 
@@ -367,7 +408,14 @@ module XamarinTestCloud
 
         ENV['BUNDLE_GEMFILE'] = File.join(tmpdir, "Gemfile")
         FileUtils.cd(self.workspace) do
-          unless system('bundle package --all')
+          if self.async_json
+            bundle_log, status = Open3.capture2e('bundle package --all')
+            puts bundle_log
+          else
+            system('bundle package --all')
+            status = $?
+          end
+          if status != 0
             log_and_abort 'Bundler failed. Please check command: bundle package'
           end
         end
@@ -434,36 +482,17 @@ module XamarinTestCloud
             when 200..202
               response
             when 400
-              abort do
-                puts 'Bad request'
-                puts response.body
-              end
+              error_message = JSON.parse(response.body)['error_message'] rescue 'Bad request'
+              log_and_abort(error_message)
             when 403
-              abort do
-                puts 'Forbidden'
-                puts JSON.parse(response.body)['message']
-              end
+              error_message = JSON.parse(response.body)['message'] rescue 'Forbidden'
+              log_and_abort(error_message)
             when 413
-              abort do
-                puts 'Files too large'
-              end
+              error_message = 'Files are too large'
+              log_and_abort(error_message)
             else
-              begin
-                r = JSON.parse(response)
-                if r["invalid_platform"]
-                  abort do
-                    if r["invalid_platform"] == "android"
-                      log "#{app} cannot be tested on Android devices. Please create a new device selection on the Xamarin Test Cloud website."
-                    else
-                      log "#{app} cannot be tested on iOS devices. Please create a new device selection on the Xamarin Test Cloud website."
-                    end
-                  end
-                end
-              rescue
-              end
-              abort do
-                log 'Unexpected Error. Please contact support at testcloud@xamarin.com.'
-              end
+              error_message = 'Unexpected Error. Please contact support at testcloud@xamarin.com.'
+              log_and_abort(error_message)
           end
         end
 
@@ -520,8 +549,8 @@ module XamarinTestCloud
 
         dsym_digest= nil
         if dsym
-          FileUtils.cp_r(dsym,tmpdir)
-          files_in_dwarf = Dir.glob(File.join(tmpdir, File.basename(dsym), 'Contents','Resources','DWARF','*'))
+          FileUtils.cp_r(dsym, tmpdir)
+          files_in_dwarf = Dir.glob(File.join(tmpdir, File.basename(dsym), 'Contents', 'Resources', 'DWARF', '*'))
           unless files_in_dwarf.count == 1
             raise ValidationError, "dSym #{dsym} contains more than one file in Contents/Resources/DWARF: #{files_in_dwarf}"
           end
@@ -645,7 +674,7 @@ module XamarinTestCloud
           files << config
         end
 
-        files += Dir.glob(File.join(tmpdir,"vendor", 'cache', '*'))
+        files += Dir.glob(File.join(tmpdir, "vendor", 'cache', '*'))
 
         if workspace and workspace.strip != ''
           files += Dir.glob("#{workspace}Gemfile")
@@ -735,7 +764,7 @@ module XamarinTestCloud
 
       def log(message)
         if message.is_a? Array
-          message.each{ |m| log(m)}
+          message.each { |m| log(m) }
         else
           puts "#{Time.now } #{message}"
           $stdout.flush
@@ -784,7 +813,9 @@ module XamarinTestCloud
       end
 
       def log_and_abort(message)
+        raise XamarinTestCloud::ValidationError.new(message) if self.async_json
         abort do
+          print 'Error: '
           puts message
         end
       end
@@ -795,7 +826,7 @@ module XamarinTestCloud
         f.any? do |file|
           filename = file[:filename]
           if filename.end_with?("libmonodroid.so")
-            file[:size] < 120 * 1024 && f.none?{ |x| x[:filename] == filename.sub("libmonodroid.so", "libmonosgen-2.0.so")}
+            file[:size] < 120 * 1024 && f.none? { |x| x[:filename] == filename.sub("libmonodroid.so", "libmonosgen-2.0.so") }
           end
         end
       end
@@ -803,7 +834,7 @@ module XamarinTestCloud
       def files(app)
         Zip::File.open(app) do |zip_file|
           zip_file.collect do |entry|
-            {:filename => entry.to_s, :size => entry.size }
+            {:filename => entry.to_s, :size => entry.size}
           end
         end
       end

data/lib/xamarin-test-cloud/retriable_options.rb

@@ -0,0 +1,26 @@
+require 'retriable'
+
+module XamarinTestCloud
+  # A class to bridge the gap between retriable 1.x and 2.0.
+  class RetriableOptions
+
+    def self.retriable_version
+      parts = Retriable::VERSION.split('.')
+      {
+            :major => parts[0] ? parts[0].to_i : nil,
+            :minor => parts[1] ? parts[1].to_i : nil,
+            :patch => parts[2] ? parts[2].to_i : nil
+      }
+    end
+
+    def self.tries_and_interval(tries, interval)
+      version = self.retriable_version[:major]
+      if version >= 2
+        {:intervals => Array.new(tries, interval)}
+      else
+        {:tries => tries, :interval => interval}
+      end
+    end
+  end
+end
+

data/lib/xamarin-test-cloud/version.rb

@@ -1,3 +1,3 @@
 module XamarinTestCloud
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xamarin-test-cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -18,6 +18,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.18.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.18.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +116,7 @@ dependencies:
         version: 1.3.3.1
     - - <
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -120,7 +126,7 @@ dependencies:
         version: 1.3.3.1
     - - <
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +155,110 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.9
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: stub_env
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Xamarin Test Cloud lets you automatically test your app on hundreds of
   mobile devices
 email:
@@ -163,6 +273,7 @@ files:
 - README.md
 - bin/test-cloud
 - lib/xamarin-test-cloud/cli.rb
+- lib/xamarin-test-cloud/retriable_options.rb
 - lib/xamarin-test-cloud/version.rb
 - test/ipa/features/step_definitions/calabash_steps.rb
 - test/ipa/features/step_definitions/my_first_steps.rb