calabash-android 0.4.14 → 0.4.15.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 686ce444b80c0168765d702520f076e25095a850
-  data.tar.gz: 8c3bad5660092c992bdd8518fcd16ee26527d06d
+  metadata.gz: d5eae7958aa42bb890bce213080b57a787677f4b
+  data.tar.gz: 6c053a02a4974b3b87738453e9f516a9ea4927e4
 SHA512:
-  metadata.gz: 52c6a0381bf2359c784a8ec11413153badb6eb830a66665f275438f1c5b9253c3efe6ca0bfef4a34ee1e8c9f44600d27d76135980a123d4e594892e960a1355b
-  data.tar.gz: e73d5547c021d178dae00c4fb7aaef7aa200175527d5f62fcb419d57b395624239401c713180e19246fdc9640f00eb2a14bdd3e34ef3fbb784c784e9a4c49158
+  metadata.gz: a53197a47f6009f6cf5b1f6017df9065396bd4aad5e5c97dcac0dcb5fe03dfb81513202a4c9ebf1049f0a54f8a938c7ce256a44c9f51ca54ab7b7a87e4fc82d0
+  data.tar.gz: 19dfb707600e501ff59abb80f8fb0cbb881d32658b376cbe4be6fe9f912c75a903c0f969b16f7130f5cd3bc1c24ce25e7108977e33a4f23d24cc3e644eebe80c

data/bin/calabash-android

@@ -99,6 +99,7 @@ elsif cmd == 'extract-manifest'
 
   puts manifest ARGV.first
 elsif cmd == 'resign'
+  Env.exit_if_env_not_set_up
   unless File.exist?(File.expand_path(ARGV.first))
     puts "No such file #{ARGV.first}"
     exit 1

data/lib/calabash-android/env.rb

@@ -41,13 +41,18 @@ class Env
     "\"#{jdk_path}/bin/#{jarsigner_executable}\""
   end
 
+  def self.java_path
+    find_executable_on_path(java_executable) ||
+    "\"#{jdk_path}/bin/#{java_executable}\""
+  end
+
   def self.jdk_path
     path_if_jdk(ENV['JAVA_HOME']) ||
     if is_windows?
       path_if_jdk(read_registry(::Win32::Registry::HKEY_LOCAL_MACHINE, 'SOFTWARE\\JavaSoft\\Java Development Kit\\1.7', 'JavaHome')) ||
       path_if_jdk(read_registry(::Win32::Registry::HKEY_LOCAL_MACHINE, 'SOFTWARE\\JavaSoft\\Java Development Kit\\1.6', 'JavaHome'))
     else
-      path_if_android_home(read_attribute_from_monodroid_config('java-sdk', 'path'))
+      path_if_jdk(read_attribute_from_monodroid_config('java-sdk', 'path'))
     end
   end
 
@@ -76,6 +81,10 @@ class Env
   def self.jarsigner_executable
     is_windows? ? 'jarsigner.exe' : 'jarsigner'
   end
+
+  def self.java_executable
+    is_windows? ? 'java.exe' : 'java'
+  end
   
   def self.keytool_executable
     is_windows? ? 'keytool.exe' : 'keytool'

data/lib/calabash-android/helpers.rb

@@ -34,7 +34,7 @@ def manifest(app)
   manifest_file = File.join(out_path, 'AndroidManifest.xml')
   unless File.size?(manifest_file)
     manifest_extractor = File.join(File.expand_path(File.dirname(__FILE__)),'lib', 'apktool-cli-1.5.3-SNAPSHOT.jar')
-    output = `java -jar "#{manifest_extractor}" d -s --frame-path "#{framework_path(app)}" -f "#{app}" #{out_path} 2>&1`
+    output = `#{Env.java_path} -jar "#{manifest_extractor}" d -s --frame-path "#{framework_path(app)}" -f "#{app}" #{out_path} 2>&1`
     raise "Unable to extract manifest: #{output}" unless File.size?(manifest_file)
     # Tidy up a bit. It would be nice if apktool could just dump the manifest alone.
     FileUtils.rm_rf(%w{res assets classes.dex}.map {|f| File.join(out_path, f) })
@@ -78,7 +78,7 @@ def resign_apk(app_path)
     unsigned_path = File.join(tmp_dir, 'unsigned.apk')
     FileUtils.cp(app_path, unsigned_path)
 
-    `java -jar "#{File.dirname(__FILE__)}/lib/unsign.jar" "#{unsigned_path}"`
+    `#{Env.java_path} -jar "#{File.dirname(__FILE__)}/lib/unsign.jar" "#{unsigned_path}"`
 
     sign_apk(unsigned_path, app_path)
   end

data/lib/calabash-android/java_keystore.rb

@@ -29,7 +29,8 @@ class JavaKeystore
   end
 
   def system_with_stdout_on_success(cmd, *args)
-    cmd = "#{cmd} #{Escape.shell_command(args)}"
+    a = Escape.shell_command(args)
+    cmd = "#{cmd} #{a.gsub("'", '"')}"
     log cmd
     out = `#{cmd}`
     if $?.exitstatus == 0

data/lib/calabash-android/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.15.pre1
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -891,12 +891,12 @@ 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.0.5
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Client for calabash-android for automated functional testing on Android