calabash-android 0.8.4 → 0.9.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b16768904abfc9f45b44ee8cd664e99ea7ec365f
-  data.tar.gz: cf07f1a01782c50d3bffdeefc75e597da66ce675
+  metadata.gz: edc88bc8eeb9c7dc9dea37c99103d2071e70b67b
+  data.tar.gz: 7101653b3282165fe7ff093af7bf9a3ecbfb4525
 SHA512:
-  metadata.gz: 5b97485571e71463cc4d2d4f57330f73c337e3d58fede230f74a9907cf6ec22e7abe1f335479b5b3e6cf937aabef1afa24b966971ef64e41d0fb5e5462b99d3d
-  data.tar.gz: ad1d3d6bdfef0aa635d9e32a3d50fa0d6b038f9b22ab196bb78b3d0ddef16cc492e5bb7bfe2d1b27deffc5af3287193890fe21731aebdf851199463ba572f9a6
+  metadata.gz: 72acb203da0cb7a76a5bc03f23378b1849588bc10bc92dfe2403b231e9989ecf1fc18f11def1c6d3a090d6406ef01b9a4320388f600fdeed617da12f1babc3aa
+  data.tar.gz: f80bf8ce279a0bfed373d5ed89e21cd5bd24e49510099085ca145f2554c71ab4340e83f60bc6df691f8f55241143a2403830d81f64690bc70c2caf7a8cdc3da8

data/features-skeleton/support/app_installation_hooks.rb

@@ -15,9 +15,8 @@ Before do |scenario|
       log 'First scenario in feature - reinstalling apps'
     end
 
-    uninstall_apps
-    install_app(ENV['TEST_APP_PATH'])
-    install_app(ENV['APP_PATH'])
+    ensure_app_installed
+    clear_app_data
     FeatureMemory.feature = feature
     FeatureMemory.invocation = 1
   else

data/lib/calabash-android/dependencies.rb

@@ -391,17 +391,17 @@ module Calabash
                     end
                 end
 
-                if File.exist?('~/Library/Developer/Xamarin/android-sdk-mac_x86/')
-                    return '~/Library/Developer/Xamarin/android-sdk-mac_x86/'
+                if File.exist?(File.expand_path('~/Library/Developer/Xamarin/android-sdk-mac_x86/'))
+                    return File.expand_path('~/Library/Developer/Xamarin/android-sdk-mac_x86/')
                 end
                 
-                if File.exist?('~/Library/Developer/Xamarin/android-sdk-macosx/')
-                    return '~/Library/Developer/Xamarin/android-sdk-macosx/'
+                if File.exist?(File.expand_path('~/Library/Developer/Xamarin/android-sdk-macosx/'))
+                    return File.expand_path('~/Library/Developer/Xamarin/android-sdk-macosx/')
                 end
                 
                 # Default location when installing with Android Studio
-                if File.exist?('~/Library/Android/sdk/')
-                    return '~/Library/Android/sdk/'
+                if File.exist?(File.expand_path('~/Library/Android/sdk/'))
+                    return File.expand_path('~/Library/Android/sdk/')
                 end
                 
                 if File.exist?('C:\\Android\\android-sdk')

data/lib/calabash-android/helpers.rb

@@ -8,6 +8,7 @@ require 'calabash-android/environment'
 require 'calabash-android/logging'
 require 'calabash-android/dependencies'
 require 'calabash-android/version'
+require 'calabash-android/utils'
 
 def package_name(app)
   unless File.exist?(app)
@@ -190,8 +191,8 @@ def fingerprint_from_apk(app_path)
       cmd = "\"#{Calabash::Android::Dependencies.keytool_path}\" -v -printcert -J\"-Dfile.encoding=utf-8\" -file \"#{signature_files.first}\""
       log cmd
       fingerprints = `#{cmd}`
-      md5_fingerprint = extract_md5_fingerprint(fingerprints)
-      log "MD5 fingerprint for signing cert (#{app_path}): #{md5_fingerprint}"
+      md5_fingerprint = extract_sha1_fingerprint(fingerprints)
+      log "SHA1 fingerprint for signing cert (#{app_path}): #{md5_fingerprint}"
       md5_fingerprint
     end
   end
@@ -203,6 +204,12 @@ def extract_md5_fingerprint(fingerprints)
   m.first
 end
 
+def extract_sha1_fingerprint(fingerprints)
+  m = fingerprints.scan(/SHA1.*((?:[a-fA-F\d]{2}:){15}[a-fA-F\d]{2})/).flatten
+  raise "No SHA1 fingerprint found:\n #{fingerprints}" if m.empty?
+  m.first
+end
+
 def extract_signature_algorithm_name(fingerprints)
   m = fingerprints.scan(/Signature algorithm name: (.*)/).flatten
   raise "No signature algorithm names found:\n #{fingerprints}" if m.empty?
@@ -210,5 +217,7 @@ def extract_signature_algorithm_name(fingerprints)
 end
 
 def log(message, error = false)
-  $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (error or ARGV.include? "-v" or ARGV.include? "--verbose")
+  if error or ARGV.include? "-v" or ARGV.include? "--verbose" or ENV["DEBUG"] == "1"
+    $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}"
+  end
 end

data/lib/calabash-android/java_keystore.rb

@@ -38,7 +38,7 @@ class JavaKeystore
     @password = password
     log "Key store data:"
     log keystore_data
-    @fingerprint = extract_md5_fingerprint(keystore_data)
+    @fingerprint = extract_sha1_fingerprint(keystore_data)
     @signature_algorithm_name = extract_signature_algorithm_name(keystore_data)
     log "Fingerprint: #{fingerprint}"
     log "Signature algorithm name: #{signature_algorithm_name}"

data/lib/calabash-android/operations.rb

@@ -26,6 +26,7 @@ require 'cucumber'
 require 'date'
 require 'time'
 require 'shellwords'
+require 'digest'
 
 Calabash::Android::Dependencies.setup
 
@@ -54,7 +55,7 @@ module Calabash module Android
     end
 
     def log(message)
-      $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (ARGV.include? "-v" or ARGV.include? "--verbose")
+      $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (ARGV.include? "-v" or ARGV.include? "--verbose" or ENV["DEBUG"] == "1")
     end
 
     def macro(txt)
@@ -106,6 +107,14 @@ module Calabash module Android
       default_device.reinstall_apps
     end
 
+    # Ensures that the application and the test-server are installed.
+    #
+    # If the application has already been installed, it does nothing.
+    # If the test-server has already been installed, it does nothing.
+    def ensure_app_installed
+      default_device.ensure_apps_installed
+    end
+
     def reinstall_test_server
       default_device.reinstall_test_server
     end
@@ -333,6 +342,24 @@ module Calabash module Android
         install_app(@test_server_path)
       end
 
+      @@installed_apps ||= {}
+
+      def ensure_apps_installed
+        apps = [@app_path, @test_server_path]
+
+        apps.each do |app|
+          package = package_name(app)
+          md5 = Digest::MD5.file(File.expand_path(app))
+
+          if !application_installed?(package) || (!@@installed_apps.keys.include?(package) || @@installed_apps[package] != md5)
+            log "MD5 checksum for app '#{app}' (#{package}): #{md5}"
+            uninstall_app(package)
+            install_app(app)
+            @@installed_apps[package] = md5
+          end
+        end
+      end
+
       def install_app(app_path)
         if _sdk_version >= 23
           cmd = "#{adb_command} install -g \"#{app_path}\""
@@ -384,7 +411,7 @@ module Calabash module Android
         log "Uninstalling: #{package_name}"
         log `#{adb_command} uninstall #{package_name}`
 
-        succeeded = !(`#{adb_command} shell pm list packages`.lines.map{|line| line.chomp.sub("package:", "")}.include?(package_name))
+        succeeded = !application_installed?(package_name)
 
         unless succeeded
           ::Cucumber.wants_to_quit = true
@@ -392,6 +419,10 @@ module Calabash module Android
         end
       end
 
+      def application_installed?(package_name)
+        (`#{adb_command} shell pm list packages`.lines.map{|line| line.chomp.sub("package:", "")}.include?(package_name))
+      end
+
       def app_running?
         begin
           http("/ping") == "pong"
@@ -625,6 +656,9 @@ module Calabash module Android
       end
 
       def connected_devices
+        # Run empty ADB command to remove eventual first-run messages
+        `"#{Calabash::Android::Dependencies.adb_path}" devices`
+
         lines = `"#{Calabash::Android::Dependencies.adb_path}" devices`.split("\n")
         start_index = lines.index{ |x| x =~ /List of devices attached/ } + 1
         lines[start_index..-1].collect { |l| l.split("\t").first }
@@ -642,8 +676,21 @@ module Calabash module Android
       end
 
       def clear_app_data
-        cmd = "#{adb_command} shell am instrument #{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.ClearAppData"
+        unless application_installed?(package_name(@app_path))
+          raise "Cannot clear data, application #{package_name(@app_path)} is not installed"
+        end
+
+        unless application_installed?(package_name(@test_server_path))
+          raise "Cannot clear data, test-server #{package_name(@test_server_path)} is not installed"
+        end
+
+        cmd = "#{adb_command} shell am instrument #{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.ClearAppData2"
         raise "Could not clear data" unless system(cmd)
+
+        # Wait for the cleanup activity to finish. This is a hard sleep for now
+        sleep 2
+
+        true
       end
 
       def pull(remote, local)

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.8.4"
+    VERSION = "0.9.0.pre1"
   end
 end

data/lib/calabash-android/wait_helpers.rb

@@ -18,12 +18,12 @@ module Calabash
 
       def wait_for(options_or_timeout=DEFAULT_OPTS, &block)
         #note Hash is preferred, number acceptable for backwards compat
-        default_timeout = 30
         timeout = options_or_timeout || default_timeout
-        post_timeout=0
-        retry_frequency=0.3
-        timeout_message = nil
-        screenshot_on_error = true
+        default_timeout = DEFAULT_OPTS[:timeout]
+        post_timeout = DEFAULT_OPTS[:post_timeout]
+        retry_frequency = DEFAULT_OPTS[:retry_frequency]
+        timeout_message = DEFAULT_OPTS[:timeout_message]
+        screenshot_on_error = DEFAULT_OPTS[:screenshot_on_error]
 
         if options_or_timeout.is_a?(Hash)
           timeout = options_or_timeout[:timeout] || default_timeout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0.pre1
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -385,9 +385,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1