xamarin-test-cloud 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 063dc6c1f0f6aae197be5187d21083ad0cad1326
-  data.tar.gz: 85b2d5b0c2618dfe973ec3801e5af7b18b85f9d4
+  metadata.gz: ac895fdc1e30ab3e7b0654ef0e3a1cd88de1e49a
+  data.tar.gz: 923a14dfacafa421f4aab1b0e2f723e4a17c261d
 SHA512:
-  metadata.gz: 51d3e40e7e1c527a3ab552236ddc1d8b4fec70a194efc91acdc35aef6b28f5ac688e24939b95e28c711418350228271b0aac374e4ba061a0295588a488d18ba6
-  data.tar.gz: 6dcb219503ba03c14b02fd4f736e5b5e51fdbd6d215ea49549f1820420aca49e1645cdf1e69a587b6d499a64c45a486a6d9391a5a1c4496ae66c72ab9aef687d
+  metadata.gz: 549d55352e0184cebe5eb00d565abeddb43623cbf92adc0eef394d2e100e8a1bb071718c5ad8718f2b9bbfa5c9a5ee782e4df8c19adca7254269e95863c61b8b
+  data.tar.gz: 0f8b68eaae72c5a6a41c2e510edd16528e542ed4326d702b8fb41a13f2c9993303fc2a6f2359742d8aeb996a6f77e5f98b4fb450203182705a989b2a870e41da

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

@@ -114,6 +114,14 @@ module XamarinTestCloud
         raise ValidationError, "App is not a file: #{app_path}"
       end
 
+      if shared_runtime?(app_path)
+        puts "Xamarin Test Cloud doesn't yet support shared runtime apps."
+        puts "To test your app it needs to be compiled for release."
+        puts "You can learn how to compile you app for release here:"
+        puts "http://docs.xamarin.com/guides/android/deployment%2C_testing%2C_and_metrics/publishing_an_application/part_1_-_preparing_an_application_for_release"
+        raise ValidationError, "Aborting"
+      end
+
       app_extension = File.extname(app_path)
       unless /ipa/i.match(app_extension) || /apk/i.match(app_extension)
         raise ValidationError, "App #{app_path} must be an .ipa or .apk file"
@@ -216,8 +224,10 @@ module XamarinTestCloud
       end
 
       def wait_for_job(id)
-        while(true)          
-          status_json = JSON.parse(http_post("status", {'id' => id, 'api_key' => api_key}))
+        while(true)
+          status_json = retriable :tries => 60, :interval => 10 do
+            JSON.parse(http_post("status", {'id' => id, 'api_key' => api_key}))
+          end
 
           log  "Status: #{status_json["status_description"]}"
           if status_json["status"] == "finished"
@@ -231,10 +241,8 @@ module XamarinTestCloud
 
             if calabash_data
               puts "Total scenarios: #{calabash_data["scenarios"]["total"]}"
-
               puts "#{calabash_data["scenarios"]["passed"]} passed"
               puts "#{calabash_data["scenarios"]["failed"]} failed"
-
               puts "Total steps: #{calabash_data["steps"]["total"]}"
             end
             exit 0
@@ -267,27 +275,32 @@ module XamarinTestCloud
 
 
       def submit_test_job(device_selection_data)
+        tmpdir = Dir.mktmpdir
+        if ENV['DEBUG']
+          log "Packaging gems in: #{tmpdir}"
+        end
         start_at = Time.now
 
         unless self.app_explorer
           server = verify_app_and_extract_test_server
 
           log_header('Checking for Gemfile')
-          gemfile_path = File.join(self.workspace, 'Gemfile')
-          unless File.exist?(gemfile_path)
-            copy_default_gemfile(gemfile_path, server)
+          if File.exist?("Gemfile")
+            FileUtils.cp "Gemfile", tmpdir
+            FileUtils.cp "Gemfile.lock", tmpdir if File.exist?("Gemfile.lock")
+          else
+            copy_default_gemfile(File.join(tmpdir, "Gemfile"), server)
           end
 
           log_header('Packaging')
+
           FileUtils.cd(self.workspace) do
-            unless system('bundle package --all')
+            unless system("BUNDLE_GEMFILE=#{File.join(tmpdir, "Gemfile")} bundle package --all")
               log_and_abort 'Bundler failed. Please check command: bundle package'
             end
           end
-
-
           log_header('Verifying dependencies')
-          verify_dependencies
+          verify_dependencies(tmpdir)
         end
 
 
@@ -297,7 +310,7 @@ module XamarinTestCloud
           return
         end
 
-        app_file, files, paths = gather_files_and_paths_to_upload(all_files)
+        app_file, files, paths = gather_files_and_paths_to_upload(all_files(tmpdir), tmpdir)
 
 
         log_header('Uploading negotiated files')
@@ -361,6 +374,7 @@ module XamarinTestCloud
         end
 
         return :status => response.code, :body => JSON.parse(response)
+        
       end
 
 
@@ -373,32 +387,25 @@ module XamarinTestCloud
         log('')
         log('Warning proceeding with default Gemfile.')
         log('It is strongly recommended that you create a custom Gemfile.')
-        tgt = nil
-        if is_android?
-          log('Creating Gemfile for Android')
-          tgt = File.join(CLI.source_root, 'GemfileAndroid')
-        elsif is_ios?
-          log('Creating Gemfile for iOS')
-          gemfile = 'GemfileIOS'
-          if server == :frank
-            raise ValidationError, 'Frank not supported just yet'
+        
+        File.open(gemfile_path, "w") do |f|
+          f.puts "source 'http://rubygems.org'"
+          if is_android?
+            f.puts "gem 'calabash-android', '#{calabash_android_version}'"
+          elsif is_ios?
+            f.puts "gem 'calabash-cucumber', '#{calabash_ios_version}'"
+          else
+            raise ValidationError, 'Your app must be an ipa or apk file.'
           end
-          tgt = File.join(CLI.source_root, gemfile)
-        else
-          raise ValidationError, 'Your app must be an ipa or apk file.'
         end
         log("Proceeding with Gemfile: #{gemfile_path}")
 
-
-        FileUtils.cp(File.expand_path(tgt), gemfile_path)
-
         puts(File.read(gemfile_path))
 
         log('')
-
       end
 
-      def gather_files_and_paths_to_upload(collected_files)
+      def gather_files_and_paths_to_upload(collected_files, tmpdir)
 
         log_header('Calculating digests')
 
@@ -434,7 +441,7 @@ module XamarinTestCloud
           else
             prefix = workspace_prefix
           end
-          paths << file.sub(prefix, '')
+          paths << file.sub(prefix, '').sub("#{tmpdir}/", '')
         end
 
         if config
@@ -466,12 +473,18 @@ module XamarinTestCloud
         app.end_with? '.apk'
       end
 
+      def is_ios?
+        app.end_with? '.ipa'
+      end
+
       def calabash_android_version
-        `bundle exec calabash-android version`.strip
+        require 'calabash-android'
+        Calabash::Android::VERSION
       end
 
-      def is_ios?
-        app.end_with? '.ipa'
+      def calabash_ios_version
+        require 'calabash-cucumber'
+        Calabash::Cucumber::VERSION
       end
 
       def test_server_path
@@ -480,7 +493,7 @@ module XamarinTestCloud
         File.join('test_servers', "#{digest}_#{calabash_android_version}.apk")
       end
 
-      def all_files
+      def all_files(tmpdir)
         dir = workspace
         if features_zip
           dir = Dir.mktmpdir
@@ -502,7 +515,7 @@ module XamarinTestCloud
           end
 
 
-          files += Dir.glob(File.join("#{workspace}vendor", 'cache', '*'))
+          files += Dir.glob(File.join(tmpdir,"vendor", 'cache', '*'))
 
           if workspace and workspace.strip != ''
             files += Dir.glob("#{workspace}Gemfile")
@@ -570,7 +583,7 @@ module XamarinTestCloud
           res = `otool "#{File.expand_path(dir)}/Payload/#{app_dir}/#{app}" -o 2> /dev/null | grep FrankServer`
           if /FrankServer/.match(res)
             puts "ipa: #{ipa} *contains* FrankServer"
-            result = :frank
+            raise ValidationError, 'Frank not supported just yet'
           else
             puts "ipa: #{ipa} *does not contain* calabash.framework"
             result = false
@@ -635,14 +648,30 @@ module XamarinTestCloud
       end
 
 
-      def verify_dependencies
+      def shared_runtime?(app_path)
+        files(app_path).any? do |file|
+          file[:filename].end_with?("libmonodroid.so") && file[:size] < 120 * 1024
+        end
+      end
+
+      def files(app)
+        require 'zip/zipfilesystem'
+        Zip::ZipFile.open(app) do |zip_file|
+          zip_file.collect do |entry|
+            {filename: entry.to_s, size: entry.size }
+          end
+        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}"
           end
-
-          calabash_gem = Dir.glob('vendor/cache/calabash-android-*').first
+          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.'

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

@@ -1,3 +1,3 @@
 module XamarinTestCloud
-  VERSION = '0.9.10'
+  VERSION = '0.9.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xamarin-test-cloud
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -87,6 +87,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.7
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3.1
 description: Xamarin Test Cloud let's you automatically test your app on hundreds
   of mobile devices
 email:
@@ -98,8 +112,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/test-cloud
-- lib/GemfileAndroid
-- lib/GemfileIOS
 - lib/xamarin-test-cloud/cli.rb
 - lib/xamarin-test-cloud/version.rb
 - README.md
@@ -129,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Command-line interface to Xamarin Test Cloud
@@ -140,4 +152,3 @@ test_files:
 - test/ipa/features/support/hooks.rb
 - test/ipa/features/support/launch.rb
 - test/test_parser.rb
-has_rdoc: 

data/lib/GemfileAndroid

@@ -1,3 +0,0 @@
-source 'http://rubygems.org'
-gem 'calabash-android'
-

data/lib/GemfileIOS

@@ -1,3 +0,0 @@
-source 'http://rubygems.org'
-gem 'calabash-cucumber'
-