calabash-android 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ae8b62c4272f7b9020684225f343bb896f354a8
-  data.tar.gz: f596a210e3ad40656783d0174482ac17fafd2b09
+  metadata.gz: ea33bf7b6030fbe284b0767a1c2ccde479b6e205
+  data.tar.gz: c791819581eb688c720d9e2bfb9435ff7bc8b4ed
 SHA512:
-  metadata.gz: 66430400d7d116d285aa533536920b2dab21defe398ee90a739ef700de8c04e6620a629395aff05f92fab022b330ee3de062761f2df2c9b6ac21fada5318f5fd
-  data.tar.gz: d6401fdd17e1b785f9febc9b3c4afc319dd1e81d34b7f63767e22bef99a2898530bdc17ab60dc945d2da8ef2763ee44d1a70d0f3e85a72e0e55bc14488ff8a63
+  metadata.gz: 35b79d51f4e4402a2979df09eec441aa7edabaa8a5be505d75e7f8bbdd1a126aab888334730876d47075d86e36ce86a6afedc11f64edf8265308511a7b0fb826
+  data.tar.gz: c4c75abf90229fbe0f2cbc084a34ff75d8938fa656a13a59ac4b5e9e9469103cfcaf98d2c1266ccbf5ed01456fc3e6e3ec0762a054fe989bd1ffcb2bdb33e104

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    calabash-android (0.4.10.pre4)
+    calabash-android (0.4.12)
       awesome_print
       cucumber
       escape (~> 0.0.4)
       httpclient (~> 2.3.2)
       json
-      retriable
+      retriable (~> 1.3.3.1)
       rubyzip (~> 0.9.9)
       slowhandcuke
       xamarin-test-cloud (>= 0.9.23)
@@ -15,7 +15,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    awesome_print (1.1.0)
+    awesome_print (1.2.0)
     builder (3.2.2)
     cucumber (1.3.8)
       builder (>= 2.1.2)
@@ -40,7 +40,7 @@ GEM
     slowhandcuke (0.0.3)
       cucumber
     thor (0.18.1)
-    xamarin-test-cloud (0.9.23)
+    xamarin-test-cloud (0.9.25)
       bundler (>= 1.3.0, < 2.0)
       json
       rest-client (~> 1.6.7)

data/bin/calabash-android

@@ -51,13 +51,6 @@ def relative_to_full_path(file_path)
   File.expand_path(file_path)
 end
 
-def exit_if_android_sdk_not_found
-  unless File.exists?(Env.android_home_path || "")
-    puts "Please set ANDROID_HOME to point to the Android SDK"
-    exit 1
-  end
-end
-
 if (ARGV.length == 0)
   print_usage
 end
@@ -65,13 +58,13 @@ cmd = ARGV.shift
 if cmd == 'help'
   print_help
 elsif cmd == 'build'
-  exit_if_android_sdk_not_found
+  Env.exit_if_env_not_set_up
   puts "Please specify the app you want to build a test server for" if (ARGV.empty? or not is_apk_file?(ARGV.first))
   while not ARGV.empty? and is_apk_file?(ARGV.first)
     calabash_build(relative_to_full_path(ARGV.shift))
   end
 elsif cmd == 'run'
-  exit_if_android_sdk_not_found
+  Env.exit_if_env_not_set_up
   if ARGV.empty? or not is_apk_file?(ARGV.first)
     exit calabash_run()
   else
@@ -80,6 +73,7 @@ elsif cmd == 'run'
 elsif cmd == 'gen'
   calabash_scaffold
 elsif cmd == 'console'
+  Env.exit_if_env_not_set_up
   if ARGV.empty?
     puts "Please specify an app"
     exit 1
@@ -90,9 +84,10 @@ elsif cmd == 'console'
   end
   calabash_console(relative_to_full_path(ARGV.shift))
 elsif cmd == 'setup'
-  exit_if_android_sdk_not_found
+  Env.exit_if_env_not_set_up
   calabash_setup
 elsif cmd == 'extract-manifest'
+  Env.exit_if_env_not_set_up
   if ARGV.empty?
     puts "Please specify an app"
     exit 1

data/lib/calabash-android/env.rb

@@ -1,21 +1,89 @@
+
 class Env
+  require 'win32/registry' if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+
+  def self.exit_if_env_not_set_up
+    exit_unless_jdk_is_available
+    exit_unless_android_sdk_is_available
+  end
+
+  def self.exit_unless_android_sdk_is_available
+    if android_home_path
+      log "Android SDK found at: #{android_home_path}"
+      return
+    end
+    puts "Could not find an Android SDK please make sure it is installed."
+    puts "You can read about how Calabash-Android is searching for an Android SDK and how you can help here:"
+    puts "https://github.com/calabash/calabash-android/blob/master/documentation/installation.md#prerequisites"
+    exit 1
+  end
 
   def self.keytool_path
+    find_executable_on_path(keytool_executable) ||
+    "\"#{jdk_path}/bin/#{keytool_executable}\""
+  end
+
+  def self.exit_unless_jdk_is_available
+    jdk = jdk_path
+    if find_executable_on_path(keytool_executable) || jdk
+      log "JDK found on PATH." if find_executable_on_path(keytool_executable)
+      log "JDK found at: #{jdk}" if jdk
+      return
+    end
+    puts "Could not find Java Development Kit please make sure it is installed."
+    puts "You can read about how Calabash-Android is searching for a JDK and how you can help here:"
+    puts "https://github.com/calabash/calabash-android/blob/master/documentation/installation.md#prerequisites"
+    exit 1
+  end
+
+  def self.jarsigner_path
+    find_executable_on_path(jarsigner_executable) ||
+    "\"#{jdk_path}/bin/#{jarsigner_executable}\""
+  end
+
+  def self.jdk_path
+    path_if_jdk(ENV['JAVA_HOME']) ||
     if is_windows?
-      "\"#{ENV["JAVA_HOME"]}/bin/keytool.exe\""
+      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
-      "keytool"
+      path_if_android_home(read_attribute_from_monodroid_config('java-sdk', 'path'))
     end
   end
 
-  def self.jarsigner_path
+  def self.android_home_path
+    path_if_android_home(ENV["ANDROID_HOME"]) ||
     if is_windows?
-      "\"#{ENV["JAVA_HOME"]}/bin/jarsigner.exe\""
+      path_if_android_home(read_registry(::Win32::Registry::HKEY_LOCAL_MACHINE, 'SOFTWARE\\Android SDK Tools', 'Path')) ||
+      path_if_android_home("C:\\Android\\android-sdk")
     else
-      "jarsigner"
+      path_if_android_home(read_attribute_from_monodroid_config('android-sdk', 'path'))
     end
   end
 
+  def self.find_executable_on_path(executable)
+    path = path_elements.each do |x|
+      f = File.join(x, executable)
+      return "\"#{f}\"" if File.exists?(f)
+    end
+  end
+
+  def self.path_if_jdk(path)
+    path if path && File.exists?(File.join(path, 'bin', jarsigner_executable))
+  end
+
+  def self.jarsigner_executable
+    is_windows? ? 'jarsigner.exe' : 'jarsigner'
+  end
+  
+  def self.keytool_executable
+    is_windows? ? 'keytool.exe' : 'keytool'
+  end
+
+  def self.adb_executable
+    is_windows? ? 'adb.exe' : 'adb'
+  end
+
   def self.ant_path
     is_windows? ? "ant.bat" : "ant"
   end
@@ -32,21 +100,28 @@ class Env
     end
   end
 
-  def self.adb
-    %Q("#{android_home_path}/platform-tools/adb")
+  def self.adb_path
+    %Q("#{android_home_path}/platform-tools/#{adb_executable}")
+  end  
+
+  def self.path_if_android_home(path)
+    path if path && File.exists?(File.join(path, 'platform-tools', adb_executable))
   end
 
-  def self.android_home_path
-    return ENV["ANDROID_HOME"] if ENV["ANDROID_HOME"]
+  def self.path_elements
+    return [] unless ENV['PATH']
+    ENV['PATH'].split (/[:;]/)
+  end
+
+  def self.read_attribute_from_monodroid_config(element, attribute)
     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"]
+        return REXML::Document.new(IO.read(monodroid_config_file)).elements["//#{element}"].attributes[attribute]
       rescue
       end
     end
-    nil
   end
 
   def self.android_platform_path
@@ -57,4 +132,12 @@ class Env
     end
   end
 
+  def self.read_registry(root_key, key, value)
+    begin
+      root_key.open(key)[value]
+    rescue
+      nil
+    end
+  end
+
 end

data/lib/calabash-android/operations.rb

@@ -402,7 +402,7 @@ module Operations
     end
 
     def adb_command
-      "#{Env.adb} -s #{serial}"
+      "#{Env.adb_path} -s #{serial}"
     end
 
     def default_serial
@@ -439,7 +439,7 @@ module Operations
     end
 
     def connected_devices
-      lines = `#{Env.adb} devices`.split("\n")
+      lines = `#{Env.adb_path} devices`.split("\n")
       lines.shift
       lines.collect { |l| l.split("\t").first}
     end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.11"
+    VERSION = "0.4.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber