xamarin-test-cloud 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb0063f60324d962136569cbb02a120355c4a9b3
-  data.tar.gz: c3f3a4eafe87aa4ee3a2e750cdd92144ac50b86c
+  metadata.gz: bcc1d67245cc734b67086c96703d069549c48dbd
+  data.tar.gz: 33c280e29f37595c5870117c32ff4d2870641898
 SHA512:
-  metadata.gz: 94064d3747ab099c6f042106f6bb93ad69d4bb1bba70cdef9223be64539d48334bf1a66aac47d4457963823d09990e36e6b04df7d38c1ea4c0a4d1652d20fa7f
-  data.tar.gz: f0c598d9d96dc52303cb2b3e52425aa3bc1cf3b794fd7f3abbf5ee9a89c022ee143da830abef93711eb3b85b27bacad34976419a9221de3bda3fa17310712e7a
+  metadata.gz: 4002ded8bd75b5658ddf220a76b34446bf0771f5c6b342481d3f01a99f45ddeee2eab4089bacd2ca493cef9d8f90126f022f3a613c87cf460cbdf4e16acbeb16
+  data.tar.gz: b27466f586ce31d407819af816551441be698111fd761a1a221b8671862c16df12d36dd7a9cd7d0275efa1fe82aaa4531ced3c8365ef2637acc97ad34b5cdd98

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

@@ -17,7 +17,8 @@ module XamarinTestCloud
   class CLI < Thor
     include Thor::Actions
 
-    attr_accessor :host, :app, :api_key, :appname, :workspace, :config, :profile, :features_zip, :skip_check, :dry_run, :device_selection
+    attr_accessor :host, :app, :api_key, :appname, :app_explorer, :test_parameters,
+                  :workspace, :config, :profile, :features_zip, :skip_check, :dry_run, :device_selection
     attr_accessor :pretty
     attr_accessor :endpoint_path
 
@@ -37,6 +38,7 @@ 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,
@@ -45,7 +47,7 @@ module XamarinTestCloud
     method_option 'app-name',
                   :desc => 'App name to create or add test to',
                   :aliases => '-a',
-                  :required => true,
+                  :required => false,
                   :type => :string
 
     method_option 'device-selection',
@@ -54,11 +56,17 @@ module XamarinTestCloud
                   :required => true,
                   :type => :string
 
-    method_option :workspace,
-                  :desc => 'Workspace containing Gemfile and features',
-                  :aliases => '-w',
-                  :type => :string,
-                  :default => File.expand_path('.')
+    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',
+                  :type => :hash
+
 
     method_option :features,
                   :desc => 'Zip file with features, step definitions, etc...',
@@ -86,7 +94,7 @@ module XamarinTestCloud
 
     method_option 'dry-run',
                   :desc => "Sanity check only, don't upload",
-                  :aliases => '-d',
+                  :aliases => '-s',
                   :type => :boolean,
                   :default => false #do upload by default
 
@@ -107,16 +115,22 @@ module XamarinTestCloud
 
       self.api_key = api_key
 
-      self.appname = options['app-name']
+      self.test_parameters = options['test-parameters'] || {}
+
+      self.appname = options['app-name'] || File.basename(app, File.extname(app))
 
       self.device_selection = options['device-selection']
-      unless File.exist?(device_selection)
-        raise ValidationError, "Device selection is not a file: #{device_selection}"
-      end
+
+      device_selection_data = validate_device_selection
+
+      self.app_explorer = options['app-explorer']
 
       self.skip_check = options['skip-check']
 
-      parse_and_set_config_and_profile
+      unless app_explorer
+        parse_and_set_config_and_profile
+      end
+
 
       workspace_path = options[:workspace] || File.expand_path('.')
 
@@ -127,7 +141,7 @@ module XamarinTestCloud
 
       features_path = options[:features]
 
-      unless features_path.nil?
+      unless features_path.nil? || self.app_explorer
         if File.exist?(features_path)
           self.features_zip = File.expand_path(features_path)
         else
@@ -139,6 +153,8 @@ module XamarinTestCloud
         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}"
         puts "Workspace = #{self.workspace}"
@@ -148,8 +164,15 @@ module XamarinTestCloud
         puts "Skip Check = #{self.skip_check}"
       end
 
+
       #Argument parsing done
-      json = submit_test_job[:body]
+
+      test_jon_data = submit_test_job(device_selection_data)
+      if self.dry_run
+        return
+      end
+      json = test_jon_data[:body]
+
       log_header("Test enqueued")
       puts "User: #{json["user_email"]}"
 
@@ -190,29 +213,38 @@ module XamarinTestCloud
         end
       end
 
+      def validate_device_selection
+        unless /^\h{8,12}$/ =~ device_selection
+          raise ValidationError, 'Device selection is not in the proper format. Please generate a new one on the Xamarin Test Cloud website.'
+        end
+        device_selection
+      end
 
-      def submit_test_job
-        start_at = Time.now
 
-        server = verify_app_and_extract_test_server
 
+      def submit_test_job(device_selection_data)
+        start_at = Time.now
 
-        log_header('Checking for Gemfile')
-        gemfile_path = File.join(self.workspace, 'Gemfile')
-        unless File.exist?(gemfile_path)
-          copy_default_gemfile(gemfile_path, server)
-        end
+        unless self.app_explorer
+          server = verify_app_and_extract_test_server
 
-        log_header('Packaging')
-        FileUtils.cd(self.workspace) do
-          unless system('bundle package --all')
-            log_and_abort 'Bundler failed. Please check command: bundle package'
+          log_header('Checking for Gemfile')
+          gemfile_path = File.join(self.workspace, 'Gemfile')
+          unless File.exist?(gemfile_path)
+            copy_default_gemfile(gemfile_path, server)
+          end
+
+          log_header('Packaging')
+          FileUtils.cd(self.workspace) do
+            unless system('bundle package --all')
+              log_and_abort 'Bundler failed. Please check command: bundle package'
+            end
           end
-        end
 
 
-        log_header('Verifying dependencies')
-        verify_dependencies
+          log_header('Verifying dependencies')
+          verify_dependencies
+        end
 
 
         if dry_run
@@ -229,8 +261,10 @@ module XamarinTestCloud
         upload_data = {'files' => files,
                        'paths' => paths,
                        'app_file' => app_file,
-                       'device_selection' => IO.read(device_selection),
+                       'device_selection' => device_selection_data,
                        'app' => self.appname,
+                       'test_parameters' => self.test_parameters,
+                       'app_explorer' => self.app_explorer,
                        'api_key' => api_key,
                        'app_filename' => File.basename(app)}
 
@@ -262,6 +296,7 @@ module XamarinTestCloud
           if ENV['DEBUG']
             puts "Request url: #{request.url}"
             puts "Response code: #{response.code}"
+            puts "Response body: #{response.body}"
           end
           case response.code
             when 200..202
@@ -409,27 +444,31 @@ module XamarinTestCloud
           dir = File.join(dir, File::Separator)
         end
 
+        if self.app_explorer
+          files = []
+        else
+          files = Dir.glob(File.join("#{dir}features", '**', '*'))
 
-        files = Dir.glob(File.join("#{dir}features", '**', '*'))
+          if File.directory?("#{dir}playback")
+            files += Dir.glob(File.join("#{dir}playback", '*'))
+          end
 
-        if File.directory?("#{dir}playback")
-          files += Dir.glob(File.join("#{dir}playback", '*'))
-        end
+          if config
+            files << config
+          end
 
-        if config
-          files << config
-        end
 
+          files += Dir.glob(File.join("#{workspace}vendor", 'cache', '*'))
 
-        files += Dir.glob(File.join("#{workspace}vendor", 'cache', '*'))
+          if workspace and workspace.strip != ''
+            files += Dir.glob("#{workspace}Gemfile")
+            files += Dir.glob("#{workspace}Gemfile.lock")
+          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
 
-        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 }}

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

@@ -1,3 +1,3 @@
 module XamarinTestCloud
-  VERSION = '0.9.1'
+  VERSION = '0.9.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xamarin-test-cloud
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor