calabash-android 0.8.3.pre1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97aa1dc145aa4f9b5f9779e4ae5158f6a5b56d67
-  data.tar.gz: ee6b5bc3397b291bacfb4b5833f1b13eb35d6485
+  metadata.gz: ca873f3c4e04e5159b56bf21503fdaf167d7614c
+  data.tar.gz: cb0157cefcf4aafd01489113c0958d58efc07a62
 SHA512:
-  metadata.gz: b734dde4121260d8ca34fb278ad7fb2cb47de78b9d88086829aa0da73cb693caf2faff0d355b807fe9d8cf66618f492626b5fbb35e63eea348054f1efb4b85b9
-  data.tar.gz: afe3a8e5a0bdc21abc3c33d221b75a4be20b92e0575ca64a5a1db22eab0b47b11b3d67a586249d90be38bc751f90df20ef230f1baab805b82376d4e4eb0a9d26
+  metadata.gz: 5c77edda67a7f6fd6d38afb3840ded78f8bbc53d6edf97069a1d43d98fee4d3f351fd79edf181ddeef6cf7c0003afd3f771e9558e21f3f3f5647044771541745
+  data.tar.gz: 5d846e747e8cea8a9511bb1cc19e216c9174eb151222f6d023165bc36d4f1cf60bdb9d097c62ad376fe9977995cb7446db537b2eb7005d48876b3996068f28ad

data/bin/calabash-android

@@ -53,6 +53,7 @@ else
             print_help
         when 'build'
             require 'calabash-android/helpers'
+            require 'calabash-android/utils'
             require 'calabash-android/java_keystore'
             require 'calabash-android/env'
             require File.join(File.dirname(__FILE__), "calabash-android-build")

data/bin/calabash-android-build.rb

@@ -50,20 +50,22 @@ def calabash_build(app)
         raise "Could not create dummy.apk"
       end
 
-      Zip::File.new("dummy.apk").extract("AndroidManifest.xml","customAndroidManifest.xml")
-      Zip::File.open("TestServer.apk") do |zip_file|
-        begin
-          check_file("AndroidManifest.xml")
-          manifest_exists = true
-        rescue
-          manifest_exists = false
-        end
+      Calabash::Utils.with_silent_zip do
+        Zip::File.new("dummy.apk").extract("AndroidManifest.xml","customAndroidManifest.xml")
+        Zip::File.open("TestServer.apk") do |zip_file|
+          begin
+            check_file("AndroidManifest.xml")
+            manifest_exists = true
+          rescue
+            manifest_exists = false
+          end
 
-        if manifest_exists
-          zip_file.remove("AndroidManifest.xml")
-        end
+          if manifest_exists
+            zip_file.remove("AndroidManifest.xml")
+          end
 
-        zip_file.add("AndroidManifest.xml", "customAndroidManifest.xml")
+          zip_file.add("AndroidManifest.xml", "customAndroidManifest.xml")
+        end
       end
     end
     keystore.sign_apk("#{workspace_dir}/TestServer.apk", test_server_file_name)

data/lib/calabash-android.rb

@@ -1,3 +1,4 @@
+require 'calabash-android/utils'
 require 'calabash-android/defaults'
 require 'calabash-android/environment'
 require 'calabash-android/dot_dir'

data/lib/calabash-android/helpers.rb

@@ -169,9 +169,13 @@ def fingerprint_from_apk(app_path)
     Dir.chdir(tmp_dir) do
       FileUtils.cp(app_path, "app.apk")
       FileUtils.mkdir("META-INF")
-      Zip::File.foreach("app.apk") do |z|
-        z.extract if /^META-INF\/\w+.(rsa|dsa)/i =~ z.name
+
+      Calabash::Utils.with_silent_zip do
+        Zip::File.foreach("app.apk") do |z|
+          z.extract if /^META-INF\/\w+.(rsa|dsa)/i =~ z.name
+        end
       end
+
       signature_files = Dir["#{tmp_dir}/META-INF/*"]
 
       log 'Signature files:'

data/lib/calabash-android/utils.rb

@@ -0,0 +1,25 @@
+require 'zip'
+
+module Calabash
+  module Utils
+    def self.with_silent_zip(&block)
+      previous_value = false
+
+      if Zip.respond_to?(:warn_invalid_date)
+        previous_value = Zip.warn_invalid_date
+      end
+
+      if Zip.respond_to?(:warn_invalid_date=)
+        Zip.warn_invalid_date = false
+      end
+
+      r = block.call
+
+      if Zip.respond_to?(:warn_invalid_date=)
+        Zip.warn_invalid_date = previous_value
+      end
+
+      r
+    end
+  end
+end

data/lib/calabash-android/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.8.3.pre1
+  version: 0.8.3
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-29 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -367,6 +367,7 @@ files:
 - lib/calabash-android/text_helpers.rb
 - lib/calabash-android/touch_helpers.rb
 - lib/calabash-android/usage_tracker.rb
+- lib/calabash-android/utils.rb
 - lib/calabash-android/version.rb
 - lib/calabash-android/wait_helpers.rb
 homepage: http://github.com/calabash
@@ -384,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1