xamarin-test-cloud 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 609e340deda5841de2d5f4af2540b81139c84038
-  data.tar.gz: 9eaf06e9ffa2d06955f4eae4216b32a3d17f5272
+  metadata.gz: 3bb3083c76ac65cf97cf48cb078a0fbaf4ca3c89
+  data.tar.gz: 37c34ea52400e49a5cfa3625cf9e46bd5b51ead3
 SHA512:
-  metadata.gz: afe140c2211ee35a3b082a320b74f2605133deac43c803fd4f34b9ea2006fa55676a7a166dd086d239b918b7f40a141659f3b715a29303ef1811c7178077e359
-  data.tar.gz: 13a4790d5f06c889cc819267d07d41850606f12bccde2798dcc24d8dce3bc0a99bed86a71b4873ad91da12c78903e72f3bcc52ef843b98fba77b90037ecb396d
+  metadata.gz: 55eaef0687df106aac48f41f00f8fee3d3bd1319b50e06368ee77787fd85be0fe08e0f99ed64f2a955d4fde7258bff3de35f566b2a00cf1f5f767fffc4a2eb16
+  data.tar.gz: ec10ec80d8bdb23942941d1627346c1a14d02b0a04e879d0a6bfb3250ee325a8eba534886053c1e7c10ba17713587180233873d19cd8f8d538881ce113d98e68

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 2.0.2
+
+* Use otool-classic to check for the CalabashServer whenever it is
+  available #78
+
 ### 2.0.1
 
 * Fix method arity for HTTPClient#set\_auth - use nil domain #74

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

@@ -875,24 +875,13 @@ and try submitting again.
           raise ValidationError, "Unzipping #{ipa} to #{dir} failed: Did not find a Payload directory (invalid .ipa)."
         end
         app_dir = Dir.foreach("#{dir}/Payload").find { |d| /\.app$/.match(d) }
-        res = `otool "#{File.expand_path(dir)}/Payload/#{app_dir}/"* -o 2> /dev/null | grep CalabashServer`
+        res = check_for_calabash_server(dir, app_dir)
 
         if /CalabashServer/.match(res)
           puts "ipa: #{ipa} *contains* calabash.framework"
           result = :calabash
         end
 
-        unless result
-          res = `otool "#{File.expand_path(dir)}/Payload/#{app_dir}/"* -o 2> /dev/null | grep FrankServer`
-          if /FrankServer/.match(res)
-            puts "ipa: #{ipa} *contains* FrankServer"
-            raise ValidationError, 'Frank not supported just yet'
-          else
-            puts "ipa: #{ipa} *does not contain* calabash.framework"
-            result = false
-          end
-        end
-
         result
       end
 
@@ -1167,6 +1156,15 @@ Check your local Gemfile and and the remote Gemfile at:
         system(command, *arguments)
         $?.exitstatus == 0
       end
+
+      def check_for_calabash_server(dir, app_dir)
+        if system("xcrun --find otool-classic &> /dev/null")
+          otool_cmd = "xcrun otool-classic"
+        else
+          otool_cmd = "xcrun otool"
+        end
+        `#{otool_cmd} "#{File.expand_path(dir)}/Payload/#{app_dir}/"* -o 2> /dev/null | grep CalabashServer`
+      end
     end
   end
 end

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

@@ -1,3 +1,3 @@
 module XamarinTestCloud
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xamarin-test-cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -344,8 +344,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Command-line interface to Xamarin Test Cloud
 test_files: []
+has_rdoc: