xamarin-test-cloud 0.9.38 → 0.10.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abcb70f026155c146d290a041b9cd7342fe23dde
-  data.tar.gz: dc881fdb928b738262dc9a75938e53ecc7811a85
+  metadata.gz: d7e86b25f55da1aec8b4504629b006f925762f04
+  data.tar.gz: 8a161091309905209563051db183d9ea35075a52
 SHA512:
-  metadata.gz: 715630681e945d5edb6c268420e8aaf5a11ea4eee11b92972cb9cb5ff2d36b8913b87890c67e571a535d4fb31842cadb178041a70a3d78385a64add36f879067
-  data.tar.gz: 7cf78a4c8f993eceddca5337d0abfe89566076f40f0d233eb4e887e25495e44052c01bd4b25c514c34edefdd72ceec39e7848d4300f6351b27485ce63641ca26
+  metadata.gz: 7c8d729ac9bcac1faa00092cf01311eb240b877bb5e6d62ff87ba727c5d62b932fe1245890902f7f12d546cd3fa38ccf6c99d9ab8ff7ce03440c85aabd26e0b5
+  data.tar.gz: e8950226872229fdff8d0646cf5f226aea24cc85b83af2da7ab06eb7e9d232d46ac871aa4543dfcda38fae108ee1424512ed24c0d7dff719a77e3d0725b48a78

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

@@ -11,7 +11,12 @@ require 'tmpdir'
 require 'fileutils'
 require 'retriable'
 require 'xamarin-test-cloud/version'
+require 'securerandom'
 
+trap "SIGINT" do
+  puts "Exiting"
+  exit 10
+end
 
 module XamarinTestCloud
 
@@ -21,11 +26,28 @@ module XamarinTestCloud
   class CLI < Thor
     include Thor::Actions
 
-    attr_accessor :host, :app, :api_key, :appname, :app_explorer, :test_parameters,
+    attr_accessor :app, :api_key, :appname, :test_parameters,
                   :workspace, :config, :profile, :skip_config_check, :dry_run,
                   :device_selection, :pretty, :async, :priority, :endpoint_path,
                   :locale, :series,
-                  :dsym
+                  :dsym, :session_id
+
+    def self.exit_on_failure?
+      true
+    end
+
+    def initialize(*args)
+      self.session_id = SecureRandom.hex
+      begin
+        r = JSON.parse(http_post("check_version", {args: ARGV}))
+        if r["error_message"]
+          puts r["error_message"]
+          exit 1
+        end
+      rescue
+      end
+      super(*args)
+    end
 
     FILE_UPLOAD_ENDPOINT = 'upload2'
     FORM_URL_ENCODED_ENDPOINT = 'upload'
@@ -44,11 +66,6 @@ module XamarinTestCloud
     desc 'submit <APP> <API_KEY>', 'Submits your app and test suite to Xamarin Test Cloud'
 
 
-    method_option :host,
-                  :desc => 'Test Cloud host to submit to',
-                  :aliases => '-h', :type => :string,
-                  :default => (ENV['XTC_ENDPOINT'] || 'https://testcloud.xamarin.com/ci')
-
     method_option 'app-name',
                   :desc => 'App name to create or add test to',
                   :aliases => '-a',
@@ -61,12 +78,6 @@ module XamarinTestCloud
                   :required => true,
                   :type => :string
 
-    method_option 'app-explorer',
-                  :desc => 'Explore using AppExplorer only (no Calabash)',
-                  :aliases => '-e',
-                  :type => :boolean,
-                  :default => false
-
     method_option 'test-parameters',
                   :desc => 'Test parameters (e.g., -params username:nat@xamarin.com password:xamarin)',
                   :aliases => '-params',
@@ -131,8 +142,6 @@ module XamarinTestCloud
 
     def submit(app, api_key)
 
-      self.host = options[:host]
-
       self.pretty = options[:pretty]
 
       app_path = File.expand_path(app)
@@ -170,8 +179,6 @@ module XamarinTestCloud
 
       device_selection_data = validate_device_selection
 
-      self.app_explorer = options['app-explorer']
-
       self.locale = options['locale']
 
       self.series = options['series']
@@ -188,17 +195,12 @@ module XamarinTestCloud
         end
       end
 
-
       workspace_path = options[:workspace] || File.expand_path('.')
 
-      unless self.app_explorer
-        unless File.directory?(workspace_path)
-          raise ValidationError, "Provided workspace: #{workspace_path} is not a directory."
-        end
+      unless File.directory?(workspace_path)
+        raise ValidationError, "Provided workspace: #{workspace_path} is not a directory."
       end
 
-
-
       workspace_basename = File.basename(workspace_path)
       if workspace_basename.downcase == 'features'
         self.workspace = File.expand_path(File.join(workspace_path,'..'))
@@ -210,37 +212,31 @@ module XamarinTestCloud
       self.workspace = File.join(self.workspace, File::Separator)
 
 
-      unless self.app_explorer
-        unless File.directory?(File.join(self.workspace, 'features'))
-          log_header "Did not find features folder in workspace #{self.workspace}"
-          puts "Either run the test-cloud command from the directory containing your features"
-          puts "or use the --workspace option to refer to this directory"
-          puts "See also test-cloud help submit"
-          raise ValidationError, "Unable to find features folder in #{self.workspace}"
-        end
+      unless File.directory?(File.join(self.workspace, 'features'))
+        log_header "Did not find features folder in workspace #{self.workspace}"
+        puts "Either run the test-cloud command from the directory containing your features"
+        puts "or use the --workspace option to refer to this directory"
+        puts "See also test-cloud help submit"
+        raise ValidationError, "Unable to find features folder in #{self.workspace}"
       end
 
-      unless app_explorer
-        parse_and_set_config_and_profile
-        unless self.skip_config_check
-          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}"
-            puts 'and specify a profile via --profile'
-            puts 'If you know what you are doing you can skip this check with'
-            puts '--skip-config-check'
-            raise ValidationError, "#{default_config} detected but no profile selected."
-          end
+      parse_and_set_config_and_profile
+      unless self.skip_config_check
+        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}"
+          puts 'and specify a profile via --profile'
+          puts 'If you know what you are doing you can skip this check with'
+          puts '--skip-config-check'
+          raise ValidationError, "#{default_config} detected but no profile selected."
         end
       end
 
-
       if debug?
         puts "Host = #{self.host}"
         puts "App = #{self.app}"
         puts "App Name = #{self.app}"
-        puts "AppExplorer = #{self.app_explorer}"
         puts "TestParams = #{self.test_parameters}"
         puts "API Key = #{self.api_key}"
         puts "Device Selection = #{self.device_selection}"
@@ -303,50 +299,23 @@ module XamarinTestCloud
       def wait_for_job(id)
         while(true)
           status_json = retriable :tries => 60, :interval => 10 do
-            JSON.parse(http_post("status", {'id' => id, 'api_key' => api_key}))
+            JSON.parse(http_post("status_v3", {'id' => id, 'api_key' => api_key}))
           end
 
-          log  "Status: #{status_json["status_description"]}"
-          if status_json["status"] == "finished"
-            puts "Done!"
-            if debug?
-              log "Status JSON result"
-              puts status_json
-            end
-            log_header "Test Summary"
-            calabash_data = status_json["calabash_data"]
-
-            if calabash_data
-              failed = calabash_data["scenarios"]["failed"].to_i
-              puts "Total scenarios: #{calabash_data["scenarios"]["total"]}"
-              puts "#{calabash_data["scenarios"]["passed"]} passed"
-              puts "#{failed} failed"
-              puts "Total steps: #{calabash_data["steps"]["total"]}"
-
-              puts ""
-              puts "Test Report:"
-              puts status_json['share_link']
-              if failed > 0
-                exit 1
-              end
-            end
-            exit 0
+          if debug?
+            log "Status JSON result:"
+            puts status_json
           end
 
-          if ["cancelled", "invalid"].include?(status_json["status"])
-            puts "Failed!"
-            if status_json['reason']
-              puts "Reason: #{status_json['status']}"
-              puts "Details:"
-              puts status_json['reason']
-            end
-            exit 1
-          end
-          if debug?
-            sleep 1
-          else
-            sleep 10
+          wait_time = (Integer status_json["wait_time"] rescue nil) || 10
+          wait_time = 1 if debug?
+          log status_json["message"]
+
+          if status_json["exit_code"]
+            exit Integer status_json["exit_code"]
           end
+
+          sleep wait_time
         end
       end
 
@@ -373,30 +342,27 @@ module XamarinTestCloud
         end
         start_at = Time.now
 
-        unless self.app_explorer
-          server = verify_app_and_extract_test_server
+        server = verify_app_and_extract_test_server
 
-          log_header('Checking for Gemfile')
+        log_header('Checking for Gemfile')
 
-          if File.exist?(workspace_gemfile)
-            FileUtils.cp workspace_gemfile, tmpdir
-            FileUtils.cp workspace_gemfile_lock, tmpdir if File.exist?(workspace_gemfile_lock)
-          else
-            copy_default_gemfile(File.join(tmpdir, "Gemfile"), server)
-          end
+        if File.exist?(workspace_gemfile)
+          FileUtils.cp workspace_gemfile, tmpdir
+          FileUtils.cp workspace_gemfile_lock, tmpdir if File.exist?(workspace_gemfile_lock)
+        else
+          copy_default_gemfile(File.join(tmpdir, "Gemfile"), server)
+        end
 
-          log_header('Packaging')
+        log_header('Packaging')
 
-          ENV['BUNDLE_GEMFILE'] = File.join(tmpdir, "Gemfile")
-          FileUtils.cd(self.workspace) do
-            unless system('bundle package --all')
-              log_and_abort 'Bundler failed. Please check command: bundle package'
-            end
+        ENV['BUNDLE_GEMFILE'] = File.join(tmpdir, "Gemfile")
+        FileUtils.cd(self.workspace) do
+          unless system('bundle package --all')
+            log_and_abort 'Bundler failed. Please check command: bundle package'
           end
-          log_header('Verifying dependencies')
-          verify_dependencies(tmpdir)
         end
-
+        log_header('Verifying dependencies')
+        verify_dependencies(tmpdir)
 
         if dry_run
           log_header('Dry run only')
@@ -415,7 +381,6 @@ module XamarinTestCloud
                        'device_selection' => device_selection_data,
                        'app' => self.appname,
                        'test_parameters' => self.test_parameters,
-                       'app_explorer' => self.app_explorer,
                        'locale' => self.locale,
                        'series' => self.series,
                        'api_key' => api_key,
@@ -659,30 +624,25 @@ module XamarinTestCloud
       def all_files(tmpdir)
         dir = workspace
 
-        if self.app_explorer
-          files = []
-        else
-          files = Dir.glob(File.join("#{dir}features", '**', '*'))
-
-          if File.directory?("#{dir}playback")
-            files += Dir.glob(File.join("#{dir}playback", '*'))
-          end
+        files = Dir.glob(File.join("#{dir}features", '**', '*'))
 
-          if config
-            files << config
-          end
+        if File.directory?("#{dir}playback")
+          files += Dir.glob(File.join("#{dir}playback", '*'))
+        end
 
-          files += Dir.glob(File.join(tmpdir,"vendor", 'cache', '*'))
+        if config
+          files << config
+        end
 
-          if workspace and workspace.strip != ''
-            files += Dir.glob("#{workspace}Gemfile")
-            files += Dir.glob("#{workspace}Gemfile.lock")
-          end
+        files += Dir.glob(File.join(tmpdir,"vendor", 'cache', '*'))
 
-          if is_android?
-            files << test_server_path
-          end
+        if workspace and workspace.strip != ''
+          files += Dir.glob("#{workspace}Gemfile")
+          files += Dir.glob("#{workspace}Gemfile.lock")
+        end
 
+        if is_android?
+          files << test_server_path
         end
 
         {:feature_prefix => dir, :workspace_prefix => workspace, :files => files.find_all { |file_or_dir| File.file? file_or_dir }}
@@ -694,8 +654,13 @@ module XamarinTestCloud
         end
       end
 
+      def host
+        ENV['XTC_ENDPOINT'] || 'https://testcloud.xamarin.com/ci'
+      end
+
       def http_post(address, args = {}, &block)
         args['uploader_version'] = XamarinTestCloud::VERSION
+        args['session_id'] = session_id
         exec_options = {}
         if ENV['XTC_USERNAME'] && ENV['XTC_PASSWORD']
           exec_options[:user] = ENV['XTC_USERNAME']
@@ -758,8 +723,12 @@ module XamarinTestCloud
 
 
       def log(message)
-        puts "#{Time.now } #{message}"
-        $stdout.flush
+        if message.is_a? Array
+          message.each{ |m| log(m)}
+        else
+          puts "#{Time.now } #{message}"
+          $stdout.flush
+        end
       end
 
       def log_header(message)

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

@@ -1,3 +1,3 @@
 module XamarinTestCloud
-  VERSION = '0.9.38'
+  VERSION = '0.10.0.pre1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xamarin-test-cloud
 version: !ruby/object:Gem::Version
-  version: 0.9.38
+  version: 0.10.0.pre1
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -164,12 +164,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Command-line interface to Xamarin Test Cloud