xamarin-test-cloud 0.9.22 → 0.9.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4f3e751626b34ef14e12ab8618bfa39b425067b
-  data.tar.gz: 88993fbb8f7668148c038bc93be3dbe65e4748dd
+  metadata.gz: a2d847ea19fc7b8402e99ee9698bf155a0dec15a
+  data.tar.gz: 6bc08e38845d94ce81f47c2966d7e18bb403762e
 SHA512:
-  metadata.gz: 4345fb1d1f2064236fdc98d5ac4accb8129fe20ce2d33213905b9c538f4fdaf05859bda696f2a83dcb5213e5905c1f081e4a0a7099e12d8a1ab475b5b368125a
-  data.tar.gz: 395748f3dacc975d0374d669731cfcd41c57959baf0c7a4dedb99bab584cbecff973370c118d238b7834849b23af2876f278631c22912d9f6ea1a5009f649854
+  metadata.gz: d49b0095708759e6b36ed4dc5daee1797e0be0c68a3f69e7a344ba074c764c727f0f9a58cbc9ad8493f80a4fe2ab78c934f2b011d0a11e76f3f4543118a3d02f
+  data.tar.gz: 8fed008f85eb31f33e1cedcccef81d34f6afef135dd77b7a2552606cf46546b8b4e4eaf865391fa9b0384f536e63d032ecd400259d8214f2ee9c1342cd8502a5

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

@@ -301,7 +301,13 @@ module XamarinTestCloud
         device_selection
       end
 
+      def workspace_gemfile
+        File.join(self.workspace, 'Gemfile')
+      end
 
+      def workspace_gemfile_lock
+        File.join(self.workspace, 'Gemfile.lock')
+      end
 
       def submit_test_job(device_selection_data)
         tmpdir = Dir.mktmpdir
@@ -314,9 +320,10 @@ module XamarinTestCloud
           server = verify_app_and_extract_test_server
 
           log_header('Checking for Gemfile')
-          if File.exist?("Gemfile")
-            FileUtils.cp "Gemfile", tmpdir
-            FileUtils.cp "Gemfile.lock", tmpdir if File.exist?("Gemfile.lock")
+
+          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
@@ -525,13 +532,34 @@ module XamarinTestCloud
       end
 
       def calabash_android_version
-        require 'calabash-android'
-        Calabash::Android::VERSION
+        version = nil
+
+
+        if File.exist?(workspace_gemfile)
+          FileUtils.cd(self.workspace) do
+            version = `bundle exec ruby -e "require 'calabash-android/version'; puts Calabash::Android::VERSION"`
+          end
+        end
+        unless version
+          require 'calabash-android'
+          version = Calabash::Android::VERSION
+        end
+
+        version = version.strip
       end
 
       def calabash_ios_version
-        require 'calabash-cucumber'
-        Calabash::Cucumber::VERSION
+        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"`
+          end
+        end
+        unless version
+          require 'calabash-cucumber'
+          version = Calabash::Cucumber::VERSION
+        end
+        version = version.strip
       end
 
       def test_server_path

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

@@ -1,3 +1,3 @@
 module XamarinTestCloud
-  VERSION = '0.9.22'
+  VERSION = '0.9.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xamarin-test-cloud
 version: !ruby/object:Gem::Version
-  version: 0.9.22
+  version: 0.9.23
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-25 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor