calabash-android 0.4.10.pre4 → 0.4.10.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2016ab45c236a69628ab4c101eedf7cccf52f426
-  data.tar.gz: 4b7901137d75df7b77d261b1e2e08875c89caf6d
+  metadata.gz: 017f52b14925f58529882401113f92b0afc693fa
+  data.tar.gz: 9066c76aaf892a2943a2d6b74e2e74a3b6195330
 SHA512:
-  metadata.gz: f617ea30eecbd662873fdfdba9b054d7ce6e2f1f1633e58b7b45c85543b6b5e6c6b87df8462f823811a7790e74653bfc1cc2397a31468683bb33b656872568df
-  data.tar.gz: f27a5f2d7e9956a0e15c97e8a38190df854d0de9d9d92d650f6629d8a1492c0a6ea3db2511a52756203bcf5790a891c5868e99125342cf716cf07159f3174588
+  metadata.gz: 19e6c4a8c15d4b751af388a461608ab78856e636070cf6bf26bb7ec1e006d8934429bde9fc292bc89908b7d28607e25e661279567c90bc3bf5f7321103cf1534
+  data.tar.gz: 1266df306d47f531dfb4e89008cfa151ea09db787bbe7b12049024524851cd5d3ce5fb158b2ff4e842fa3125de08a3727b233b5aa3105af316cb5099b4353114

data/lib/calabash-android/env.rb

@@ -37,7 +37,16 @@ class Env
   end
 
   def self.android_home_path
-    ENV["ANDROID_HOME"]
+    return ENV["ANDROID_HOME"] if ENV["ANDROID_HOME"]
+    monodroid_config_file = File.expand_path("~/.config/xbuild/monodroid-config.xml")
+    if File.exists?(monodroid_config_file)
+      require 'rexml/document'
+      begin
+        return REXML::Document.new(IO.read(monodroid_config_file)).elements["//android-sdk"].attributes["path"]
+      rescue
+      end
+    end
+    nil
   end
 
   def self.android_platform_path

data/lib/calabash-android/helpers.rb

@@ -3,7 +3,6 @@ require 'rexml/document'
 require 'rexml/xpath'
 require 'zip/zip'
 require 'tempfile'
-require 'open3'
 require 'escape'
 require 'rbconfig'
 require 'calabash-android/java_keystore'

data/lib/calabash-android/java_keystore.rb

@@ -26,17 +26,10 @@ class JavaKeystore
   end
 
   def system_with_stdout_on_success(cmd, *args)
-    args = args.clone.unshift cmd
-
-    out, err = nil, nil
-    cmd = Escape.shell_command(args)
-    log "Command: #{cmd}"
-    status = Open3::popen3(cmd) do |stdin, stdout, stderr, wait_thread|
-      out = stdout.read
-      err = stderr.read
-      wait_thread.value
-    end
-    if status == 0
+    cmd = "#{cmd} #{Escape.shell_command(args)}"
+    log cmd
+    out = `#{cmd}`
+    if $?.exitstatus == 0
       out
     else
       nil

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.10.pre4"
+    VERSION = "0.4.10.pre5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.10.pre4
+  version: 0.4.10.pre5
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber