calabash-android 0.4.20.1 → 0.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7b0d84d684430e76dfc27b330c8e567f47cec6c
-  data.tar.gz: 753e03eb7a7f227884b28cd9c6622cd6e23f6d88
+  metadata.gz: 43b8dcda7072c6944d82365d151d11052463b5c4
+  data.tar.gz: da40aff0c461c6bce7011e3d4a7fae1281beeba2
 SHA512:
-  metadata.gz: c97afb2845b6f2215d3c557942cf88128e43e482cf20473e39d519af59795691b2810d4899acf8c0f2ca294eb94926139919281390b9154decc8b882be090a87
-  data.tar.gz: aa63479c8d7800b836966df6930e086c020925122d5050253e3a520e0c36785704458dc44ab7c0d1a1dfd5791339c2d7995b1545c497bf973d573091369fe4ed
+  metadata.gz: 14d7430659fd654c027ae8ff297a3e35ee86dba012c5881cb00ca29f6e6ab2853b3ac3c49d22cb1ebe1ced065efd216b3e337080758f1d6686a0181eff90bf9f
+  data.tar.gz: 40b84d01df98f2f9061e1138258aff22be91f785e4f91ba3b327dc96324e51f4de5b3cb2dd3c43ff5a3d12565c2bd41bc524cdd71e18ad6e01114be915fef94d

data/bin/calabash-android-console.rb

@@ -1,7 +1,9 @@
 def calabash_console(app_path = nil)
   test_server_path = test_server_path(app_path)
 
-  ENV["IRBRC"] = File.join(File.dirname(__FILE__), '..', 'irbrc')
+  unless ENV['IRBRC']
+    ENV['IRBRC'] = File.join(File.dirname(__FILE__), '..', 'irbrc')
+  end
 
   unless ENV["MAIN_ACTIVITY"]
     ENV["MAIN_ACTIVITY"] = main_activity(app_path)

data/calabash-android.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency( "slowhandcuke" )
   s.add_dependency( "rubyzip", "~> 0.9.9" )
   s.add_dependency( "awesome_print" )
-  s.add_dependency( 'httpclient', '~> 2.3')
+  s.add_dependency( 'httpclient', '~> 2.3.2')
   s.add_dependency( 'xamarin-test-cloud', '>= 0.9.23')
   s.add_dependency( 'escape', '~> 0.0.4')
 end

data/lib/calabash-android/helpers.rb

@@ -22,7 +22,7 @@ def main_activity(app)
 end
 
 def aapt_dump(app, key)
-  lines = `#{Env.tools_dir}/aapt dump badging "#{app}"`.lines.collect(&:strip)
+  lines = `"#{Env.tools_dir}/aapt" dump badging "#{app}"`.lines.collect(&:strip)
   lines.select { |l| l.start_with?("#{key}:") }
 end
 
@@ -60,11 +60,11 @@ def resign_apk(app_path)
 end
 
 def unsign_apk(path)
-  files_to_remove = `#{Env.tools_dir}/aapt list "#{path}"`.lines.collect(&:strip).grep(/^META-INF\//)
+  files_to_remove = `"#{Env.tools_dir}/aapt" list "#{path}"`.lines.collect(&:strip).grep(/^META-INF\//)
   if files_to_remove.empty?
     log "App wasn't signed. Will not try to unsign it."
   else
-    system("#{Env.tools_dir}/aapt remove \"#{path}\" #{files_to_remove.join(" ")}")
+    system("\"#{Env.tools_dir}/aapt\" remove \"#{path}\" #{files_to_remove.join(" ")}")
   end
 end
 

data/lib/calabash-android/java_keystore.rb

@@ -3,7 +3,7 @@ class JavaKeystore
   def initialize(location, keystore_alias, password)
     raise "No such file #{location}" unless File.exists?(File.expand_path(location))
 
-    keystore_data = system_with_stdout_on_success(Env.keytool_path, '-list', '-v', '-alias', keystore_alias, '-keystore', location, '-storepass', password, '-J-Dfile.encoding=utf-8')
+    keystore_data = system_with_stdout_on_success(Env.keytool_path, '-list', '-v', '-alias', keystore_alias, '-keystore', location, '-storepass', password, '-J"-Dfile.encoding=utf-8"')
     if keystore_data.nil?
       error = "Could not list certificates in keystore. Probably because the password was incorrect."
       @errors = [{:message => error}]
@@ -65,7 +65,7 @@ class JavaKeystore
       [
         read_keystore_with_default_password_and_alias(File.join(ENV["HOME"], "/.android/debug.keystore")),
         read_keystore_with_default_password_and_alias("debug.keystore"),
-        read_keystore_with_default_password_and_alias(File.join(ENV["HOME"], ".local/share/Xamarin/Mono\ for\ Android/debug.keystore")),
+        read_keystore_with_default_password_and_alias(File.join(ENV["HOME"], ".local/share/Xamarin/Mono\\ for\\ Android/debug.keystore")),
         read_keystore_with_default_password_and_alias(File.join(ENV["HOME"], "AppData/Local/Xamarin/Mono for Android/debug.keystore")),
       ].compact
     end
@@ -86,4 +86,4 @@ class JavaKeystore
     raise "Found .calabash_settings but no #{key} defined." unless map[key]
   end
 
-end
+end

data/lib/calabash-android/operations.rb

@@ -22,7 +22,7 @@ module Operations
   include Calabash::Android::TouchHelpers
 
   def current_activity
-    `#{default_device.adb_command} shell dumpsys window windows`.each_line.grep(/mFocusedApp.+[\.\/]([^.\/\}]+)\}/){$1}.first
+    `#{default_device.adb_command} shell dumpsys window windows`.each_line.grep(/mFocusedApp.+[\.\/]([^.\s\/\}]+)/){$1}.first
   end
 
   def log(message)
@@ -321,7 +321,6 @@ module Operations
 
 
     def make_http_request(options)
-      body = nil
       begin
         unless @http
           @http = init_request(options)
@@ -330,11 +329,14 @@ module Operations
         header["Content-Type"] = "application/json;charset=utf-8"
         options[:header] = header
 
-        if options[:method] == :post
-          body = @http.post(options[:uri], options).body
+
+        response = if options[:method] == :post
+          @http.post(options[:uri], options)
         else
-          body = @http.get(options[:uri], options).body
+          @http.get(options[:uri], options)
         end
+        raise Errno::ECONNREFUSED if response.status_code == 502
+        response.body
       rescue Exception => e
         if @http
           @http.reset_all
@@ -342,7 +344,6 @@ module Operations
         end
         raise e
       end
-      body
     end
 
     def init_request(options)
@@ -553,7 +554,12 @@ module Operations
 
     def shutdown_test_server
       begin
-        http("/kill")
+        begin
+          http("/kill")
+        rescue HTTPClient::KeepAliveDisconnected
+          # Do not react if the server is not responding
+        end
+
         Timeout::timeout(3) do
           sleep 0.3 while app_running?
         end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.20.1"
+    VERSION = "0.4.21"
   end
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.20.1
+  version: 0.4.21
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !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
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: xamarin-test-cloud
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.23
 - !ruby/object:Gem::Dependency
   name: escape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.4
 description: 'calabash-android drives tests for native  and hybrid Android apps. '
@@ -144,7 +144,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".calabash_settings"
+- .calabash_settings
 - CHANGES.txt
 - Gemfile
 - Gemfile.lock
@@ -177,7 +177,6 @@ files:
 - lib/calabash-android/helpers.rb
 - lib/calabash-android/java_keystore.rb
 - lib/calabash-android/lib/AXMLPrinter2.jar
-- lib/calabash-android/lib/TestServer.apk
 - lib/calabash-android/lib/manifest_extractor.jar
 - lib/calabash-android/lib/screenshotTaker.jar
 - lib/calabash-android/management/adb.rb
@@ -207,8 +206,6 @@ files:
 - lib/calabash-android/wait_helpers.rb
 - test-server/AndroidManifest.xml
 - test-server/build.xml
-- test-server/calabash-js/src/calabash.js
-- test-server/calabash-js/src/set_text.js
 - test-server/instrumentation-backend/.classpath
 - test-server/instrumentation-backend/.gitignore
 - test-server/instrumentation-backend/.project
@@ -877,6 +874,9 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/util/TokenBuffer.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/util/VersionUtil.java
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/util/package-info.java
+- test-server/calabash-js/src/calabash.js
+- test-server/calabash-js/src/set_text.js
+- lib/calabash-android/lib/TestServer.apk
 homepage: http://github.com/calabash
 licenses: []
 metadata: {}
@@ -886,19 +886,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Client for calabash-android for automated functional testing on Android
 test_files: []
-has_rdoc: