xamarin-test-cloud 2.0.0.pre2 → 2.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5fb53a5aad5e3006ce408c5bcdc838fc9710b27
-  data.tar.gz: 08f838fe24bacc453b7b6b3479a3a23e467c376e
+  metadata.gz: c5abd84d95ae2a746e1d70bb479542db758b27af
+  data.tar.gz: eadbec669fdee84204a4ce744dc9685ff5979795
 SHA512:
-  metadata.gz: 7715a00158c011e57f6671c25590577113bece273948659f9f01037147ab95a04d65546c7ee81515ad556a05a044412c65eca920598dc9cb6021aa35e87f3ed2
-  data.tar.gz: ff1dcb9dae040573210204b0dad1cc1a5343368b5148bceb477e9a1c9ea797ea836301715b9220d1c5327932ec91a15808524bb9195c62f9f681dcce429a9328
+  metadata.gz: dc8a5c6fab7135a1d7094e2d347068c3c833185df051462c86042a1ffec92129d5a7d2ca8ef1df398fa1f96542c064864dc44ea626c0b5bbc69d94011a299a53
+  data.tar.gz: f5e28ac7df1c1a5dae4a2d7aca10a031d933bf5dc866c9f090ec7161a190f3296143fa1174510db1fa15ad443541569fbae9862f3bdce3ddb26b59c6e3c0860d

data/README.md

@@ -1,6 +1,6 @@
 ## Test Cloud Command Line
 
-[![Build Status](https://magnum.travis-ci.com/xamarin/test-cloud-command-line.svg?token=y4VsoGUG24WhMo7qoBu3&branch=master)](https://magnum.travis-ci.com/xamarin/test-cloud-command-line)
+[![Build Status](https://travis-ci.com/xamarinhq/test-cloud-command-line.svg?token=fsyxqhAht7X7tLURqAAp&branch=master)](https://travis-ci.com/xamarinhq/test-cloud-command-line)
 
 ### Requirements
 

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

@@ -153,7 +153,6 @@ module XamarinTestCloud
                   :required => false,
                   :type => :string
 
-
     def submit(app, api_key)
 
       self.pretty = options[:pretty]
@@ -620,9 +619,59 @@ module XamarinTestCloud
         app.end_with? '.ipa'
       end
 
-      def calabash_android_version
+      def is_calabash_2?
+        detect_calabash_2
+      end
+
+      def get_calabash_version_from_bundler
+        cmd = "bundle exec ruby -e \"begin; require 'calabash/version';puts Calabash::VERSION;rescue LoadError => e; puts '';end\""
+
+        `#{cmd}`.strip
+      end
+
+      def detect_calabash_2
+        @detected_calabash_2 ||= lambda do
+          log "Auto-detecting if Calabash 2.0 testsuite" if debug?
+
+          # Implicitly detect
+          if File.exist?(workspace_gemfile)
+            FileUtils.cd(self.workspace) do
+              version = get_calabash_version_from_bundler
+
+              if version.split('.').first.to_i >= 2
+                log "It is a Calabash 2.0 testsuite" if debug?
+                return true
+              end
+            end
+          end
+
+          false
+        end.call
+      end
+
+      def calabash_2_version
         version = nil
 
+        if File.exist?(workspace_gemfile)
+          FileUtils.cd(self.workspace) do
+            version = get_calabash_version_from_bundler
+          end
+        end
+
+        unless version
+          require 'calabash'
+          version = Calabash::VERSION
+        end
+
+        version.strip
+      end
+
+      def calabash_android_version
+        if is_calabash_2?
+          return calabash_2_version
+        end
+
+        version = nil
 
         if File.exist?(workspace_gemfile)
           FileUtils.cd(self.workspace) do
@@ -630,27 +679,35 @@ module XamarinTestCloud
             version = version && version.strip
           end
         end
+
         unless version
           require 'calabash-android'
           version = Calabash::Android::VERSION
         end
 
-        version = version.strip
+        version.strip
       end
 
       def calabash_ios_version
+        if is_calabash_2?
+          return calabash_2_version
+        end
+
         version = nil
+
         if File.exist?(workspace_gemfile)
           FileUtils.cd(self.workspace) do
            version = `bundle exec ruby -e "require 'calabash-cucumber/version'; puts Calabash::Cucumber::VERSION"`
            version = version && version.strip
           end
         end
+
         unless version
           require 'calabash-cucumber'
           version = Calabash::Cucumber::VERSION
         end
-        version = version.strip
+
+        version.strip
       end
 
       def test_server_path
@@ -838,17 +895,30 @@ module XamarinTestCloud
         end
       end
 
-
       def verify_dependencies(path)
         if is_android?
           abort_unless(File.exist?(test_server_path)) do
-            puts 'No test server found. Please run:'
-            puts "  calabash-android build #{app}"
+            puts "No test server '#{test_server_path}' found. Please run:"
+
+            if is_calabash_2?
+              puts "  calabash build #{app}"
+            else
+              puts "  calabash-android build #{app}"
+            end
           end
-          calabash_gem = Dir.glob("#{path}/vendor/cache/calabash-android-*").first
-          abort_unless(calabash_gem) do
-            puts 'calabash-android was not packaged correct.'
-            puts 'Please tell testcloud@xamarin.com about this bug.'
+
+          if is_calabash_2?
+            calabash_gem = Dir.glob("#{path}/vendor/cache/calabash-*").first
+            abort_unless(calabash_gem) do
+              puts 'calabash was not packaged correct.'
+              puts 'Please tell testcloud@xamarin.com about this bug.'
+            end
+          else
+            calabash_gem = Dir.glob("#{path}/vendor/cache/calabash-android-*").first
+            abort_unless(calabash_gem) do
+              puts 'calabash-android was not packaged correct.'
+              puts 'Please tell testcloud@xamarin.com about this bug.'
+            end
           end
         end
       end

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

@@ -1,3 +1,3 @@
 module XamarinTestCloud
-  VERSION = "2.0.0.pre2"
+  VERSION = "2.0.0.pre4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xamarin-test-cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre2
+  version: 2.0.0.pre4
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -297,9 +297,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Command-line interface to Xamarin Test Cloud
 test_files: []
-has_rdoc: