calabash-android 0.6.1.pre2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08bb9ff234caf41305763096416cc59b342740b4
-  data.tar.gz: 3ae92f07d7ab7f15ee772a43001dae902f114307
+  metadata.gz: 8b3ade59bc8400b324a6dec237662e305d450e29
+  data.tar.gz: e5619b9fa36eae19c2202ba726b7ef3d7f04268e
 SHA512:
-  metadata.gz: 0785a23d49cf7078cb50523cbde97de466992b9a41c09dddb94e02c23e9e353314444c10623fd2d1010e087235a2169881bf3978aecda25053655da471799041
-  data.tar.gz: 35b30d8847c497209079d4546744a32c6a44af8b4f79f044ce43a67bfed393edf6ec6457001f70c4d21cba32b53e3953897f7daf47a13c100ede392210b76089
+  metadata.gz: 37c23641f575d0ff281d61aaea3a60a8fe2e0d3d40f19cdc8ccea6e82256a3b9619ebae0d0f192a357c07f104e45ee31773344f24add9743f064dbc076d77392
+  data.tar.gz: 146b66bb1ad78917230a26cabf627556bb80aae44074bb218d1b39556aefe9d1b7592bdc7d19b4db77a340ea2786daada7ddd934ebf4b66a7e9c5e7190c81d4f

data/bin/calabash-android

@@ -2,15 +2,12 @@
 
 require 'fileutils'
 require 'rbconfig'
-require 'calabash-android/helpers'
-require 'calabash-android/java_keystore'
-require 'calabash-android/env'
 
 # for ruby 1.9.1 and earlier
 unless defined? RbConfig.ruby
-  def RbConfig.ruby
-    File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"])
-  end
+    def RbConfig.ruby
+        File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"])
+    end
 end
 
 
@@ -32,11 +29,6 @@ end
 
 
 require File.join(File.dirname(__FILE__), "calabash-android-helpers")
-require File.join(File.dirname(__FILE__), "calabash-android-generate")
-require File.join(File.dirname(__FILE__), "calabash-android-build")
-require File.join(File.dirname(__FILE__), "calabash-android-run")
-require File.join(File.dirname(__FILE__), "calabash-android-setup")
-require File.join(File.dirname(__FILE__), "calabash-android-console")
 
 @features_dir = File.join(FileUtils.pwd, "features")
 @support_dir = File.join(@features_dir, "support")
@@ -44,79 +36,100 @@ require File.join(File.dirname(__FILE__), "calabash-android-console")
 @script_dir = File.join(File.dirname(__FILE__), '..', 'scripts')
 
 def is_apk_file?(file_path)
-  file_path.end_with? ".apk" and File.exist? file_path
+    file_path.end_with? ".apk" and File.exist? file_path
 end
 
 def relative_to_full_path(file_path)
-  File.expand_path(file_path)
+    File.expand_path(file_path)
 end
 
 if ARGV.length == 0
-  print_usage
+    print_usage
 else
-  cmd = ARGV.shift
-
-  case cmd
-  when 'help'
-    print_help
-  when 'build'
-    Env.exit_if_env_not_set_up
-
-    if ARGV.empty?
-      puts "Please specify the app you want to build a test server for"
-      exit 1
-    elsif !File.exist?(ARGV.first)
-      puts "Could not find file '#{ARGV.first}'"
-      exit 1
-    elsif !is_apk_file?(ARGV.first)
-      puts "'#{ARGV.first}' is not a valid android application"
-      exit 1
-    else
-      while not ARGV.empty? and is_apk_file?(ARGV.first)
-        calabash_build(relative_to_full_path(ARGV.shift))
-      end
-    end
-  when 'run'
-    Env.exit_if_env_not_set_up
-    if ARGV.empty? or not is_apk_file?(ARGV.first)
-      puts "The first parameter must be the path to the apk file."
-      exit 1
-    else
-      exit calabash_run(relative_to_full_path(ARGV.shift))
+    cmd = ARGV.shift
+
+    case cmd
+        when 'help'
+            print_help
+        when 'build'
+            require 'calabash-android/helpers'
+            require 'calabash-android/java_keystore'
+            require 'calabash-android/env'
+            require File.join(File.dirname(__FILE__), "calabash-android-build")
+
+            if ARGV.empty?
+                puts "Please specify the app you want to build a test server for"
+                exit 1
+            elsif !File.exist?(ARGV.first)
+                puts "Could not find file '#{ARGV.first}'"
+                exit 1
+            elsif !is_apk_file?(ARGV.first)
+                puts "'#{ARGV.first}' is not a valid android application"
+                exit 1
+            else
+                while not ARGV.empty? and is_apk_file?(ARGV.first)
+                    calabash_build(relative_to_full_path(ARGV.shift))
+                end
+            end
+        when 'run'
+            require 'calabash-android/helpers'
+            require 'calabash-android/java_keystore'
+            require 'calabash-android/env'
+            require File.join(File.dirname(__FILE__), "calabash-android-run")
+
+            if ARGV.empty? or not is_apk_file?(ARGV.first)
+                puts "The first parameter must be the path to the apk file."
+                exit 1
+            else
+                exit calabash_run(relative_to_full_path(ARGV.shift))
+            end
+        when 'gen'
+            require 'calabash-android/helpers'
+            require 'calabash-android/java_keystore'
+            require 'calabash-android/env'
+            require File.join(File.dirname(__FILE__), "calabash-android-generate")
+
+            calabash_scaffold
+        when 'console'
+            require 'calabash-android/helpers'
+            require 'calabash-android/java_keystore'
+            require 'calabash-android/env'
+            require File.join(File.dirname(__FILE__), "calabash-android-console")
+
+            if ARGV.empty? or not is_apk_file?(ARGV.first)
+                puts "The first parameter must be the path to the apk file."
+                exit 1
+            else
+                calabash_console(relative_to_full_path(ARGV.shift))
+            end
+        when 'setup'
+            require 'calabash-android/helpers'
+            require 'calabash-android/java_keystore'
+            require 'calabash-android/env'
+            require File.join(File.dirname(__FILE__), "calabash-android-setup")
+
+            calabash_setup
+        when 'resign'
+            require 'calabash-android/helpers'
+            require 'calabash-android/java_keystore'
+            require 'calabash-android/env'
+
+            if ARGV.empty?
+                puts "Please specify the app you want to resign"
+                exit 1
+            elsif !File.exist?(ARGV.first)
+                puts "Could not find file '#{ARGV.first}'"
+                exit 1
+            elsif !is_apk_file?(ARGV.first)
+                puts "'#{ARGV.first}' is not a valid android application"
+                exit 1
+            else
+                resign_apk(File.expand_path(ARGV.first))
+            end
+        when 'version'
+            puts Calabash::Android::VERSION
+        else
+            puts "Invalid command '#{cmd}'"
+            print_usage
     end
-  when 'gen'
-    calabash_scaffold
-  when 'console'
-    Env.exit_if_env_not_set_up
-
-    if ARGV.empty? or not is_apk_file?(ARGV.first)
-      puts "The first parameter must be the path to the apk file."
-      exit 1
-    else
-      calabash_console(relative_to_full_path(ARGV.shift))
-    end
-  when 'setup'
-    Env.exit_if_env_not_set_up
-    calabash_setup
-  when 'resign'
-    Env.exit_if_env_not_set_up
-
-    if ARGV.empty?
-      puts "Please specify the app you want to resign"
-      exit 1
-    elsif !File.exist?(ARGV.first)
-      puts "Could not find file '#{ARGV.first}'"
-      exit 1
-    elsif !is_apk_file?(ARGV.first)
-      puts "'#{ARGV.first}' is not a valid android application"
-      exit 1
-    else
-      resign_apk(File.expand_path(ARGV.first))
-    end
-  when 'version'
-    puts Calabash::Android::VERSION
-  else
-    puts "Invalid command '#{cmd}'"
-    print_usage
-  end
 end

data/bin/calabash-android-build.rb

@@ -22,7 +22,7 @@ def calabash_build(app)
 
     puts ""
     puts "Notice that resigning an app might break some functionality."
-    puts "Getting a copy of the certificate used when the app was build will in general be more reliable."
+    puts "Getting a copy of the certificate used when the app was built will in general be more reliable."
 
     exit 1
   end
@@ -47,7 +47,7 @@ def calabash_build(app)
         raise "Could not replace test package name in manifest"
       end
 
-      unless system %Q{"#{Env.tools_dir}/aapt" package -M AndroidManifest.xml  -I "#{android_platform}/android.jar" -F dummy.apk}
+      unless system %Q{"#{Calabash::Android::Dependencies.aapt_path}" package -M AndroidManifest.xml  -I "#{android_platform}/android.jar" -F dummy.apk}
         raise "Could not create dummy.apk"
       end
 

data/lib/calabash-android/dependencies.rb

@@ -0,0 +1,525 @@
+require 'rexml/document'
+require 'luffa'
+require 'timeout'
+
+if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+    require 'win32/registry'
+end
+
+module Calabash
+    module Android
+        module Dependencies
+            private
+
+            class ScanningTimedOutError < RuntimeError; end
+
+            def self.set_android_dependencies(android_dependencies)
+                @@android_dependencies = android_dependencies
+            end
+
+            def self.set_java_dependencies(java_dependencies)
+                @@java_dependencies = java_dependencies
+            end
+
+            def self.android_dependencies(key)
+                setup unless defined?(@@android_dependencies)
+
+                if @@android_dependencies.has_key?(key)
+                    file = @@android_dependencies[key]
+
+                    unless File.exists?(file)
+                        raise "No such file '#{file}'"
+                    end
+
+                    file
+                else
+                    raise "No such dependency '#{key}'"
+                end
+            end
+
+            def self.java_dependencies(key)
+                setup unless defined?(@@java_dependencies)
+
+                if key == :ant_path
+                    ant_executable
+                elsif @@java_dependencies.has_key?(key)
+                    file = @@java_dependencies[key]
+
+                    unless File.exists?(file)
+                        raise "No such file '#{file}'"
+                    end
+
+                    file
+                else
+                    raise "No such dependency '#{key}'"
+                end
+            end
+
+            public
+
+            def self.adb_path
+                android_dependencies(:adb_path)
+            end
+
+            def self.aapt_path
+                android_dependencies(:aapt_path)
+            end
+
+            def self.zipalign_path
+                android_dependencies(:zipalign_path)
+            end
+
+            def self.android_jar_path
+                android_dependencies(:android_jar_path)
+            end
+
+            def self.java_path
+                java_dependencies(:java_path)
+            end
+
+            def self.keytool_path
+                java_dependencies(:keytool_path)
+            end
+
+            def self.jarsigner_path
+                java_dependencies(:jarsigner_path)
+            end
+
+            def self.ant_path
+                java_dependencies(:ant_path)
+            end
+
+            def self.setup
+                if ENV['CI_NO_ANDROID_RUNTIME'] == '1'
+                    @@android_dependencies = {}
+                    @@java_dependencies = {}
+                    return
+                end
+
+                @@halt_scanning = false
+                @@halt_scanning_thread = nil
+
+                if ENV['ANDROID_HOME']
+                    android_sdk_location = ENV['ANDROID_HOME']
+                    Logging.log_debug("Setting Android SDK location to $ANDROID_HOME")
+                else
+                    android_sdk_location = detect_android_sdk_location
+                end
+
+                if android_sdk_location.nil?
+                    Logging.log_error 'Could not find an Android SDK please make sure it is installed.'
+                    Logging.log_error 'You can read about how Calabash is searching for an Android SDK and how you can help here:'
+                    Logging.log_error 'https://github.com/calabash/calabash-android/blob/master/documentation/installation.md#prerequisites'
+
+                    raise 'Could not find an Android SDK'
+                end
+
+                Logging.log_debug("Android SDK location set to '#{android_sdk_location}'")
+
+                @@halt_scanning_thread = Thread.new do
+                    sleep 60
+                    @@halt_scanning = true
+                end
+
+                begin
+                    set_android_dependencies(locate_android_dependencies(android_sdk_location))
+                rescue ScanningTimedOutError => e
+                    Logging.log_error 'Timed out locating Android dependency'
+                    Logging.log_error 'You can read about how Calabash is searching for an Android SDK and how you can help here:'
+                    Logging.log_error 'https://github.com/calabash/calabash-android/blob/master/documentation/installation.md#prerequisites'
+
+                    raise e.message
+                rescue Environment::InvalidEnvironmentError => e
+                    Logging.log_error 'Could not locate Android dependency'
+                    Logging.log_error 'You can read about how Calabash is searching for an Android SDK and how you can help here:'
+                    Logging.log_error 'https://github.com/calabash/calabash-android/blob/master/documentation/installation.md#prerequisites'
+
+                    raise e
+                end
+
+                if ENV['JAVA_HOME']
+                    java_sdk_home = ENV['JAVA_HOME']
+                    Logging.log_debug("Setting Java SDK location to $JAVA_HOME")
+                else
+                    java_sdk_home = detect_java_sdk_location
+                end
+
+                Logging.log_debug("Java SDK location set to '#{java_sdk_home}'")
+
+                Thread.kill(@@halt_scanning_thread) if @@halt_scanning_thread
+                @@halt_scanning = false
+
+                @@halt_scanning_thread = Thread.new do
+                    sleep 60
+                    @@halt_scanning = true
+                end
+
+                begin
+                    set_java_dependencies(locate_java_dependencies(java_sdk_home))
+                rescue ScanningTimedOutError => e
+                    Logging.log_error 'Timed out locating Java dependency'
+                    Logging.log_error "You can read about how Calabash is searching for a JDK and how you can help here:"
+                    Logging.log_error "https://github.com/calabash/calabash-android/blob/master/documentation/installation.md#prerequisites"
+
+                    raise e.message
+                rescue Environment::InvalidJavaSDKHome => e
+                    Logging.log_error "Could not find Java Development Kit please make sure it is installed."
+                    Logging.log_error "You can read about how Calabash is searching for a JDK and how you can help here:"
+                    Logging.log_error "https://github.com/calabash/calabash-android/blob/master/documentation/installation.md#prerequisites"
+
+                    raise e
+                rescue Environment::InvalidEnvironmentError => e
+                    Logging.log_error "Could not find Java dependency"
+                    Logging.log_error "You can read about how Calabash is searching for a JDK and how you can help here:"
+                    Logging.log_error "https://github.com/calabash/calabash-android/blob/master/documentation/installation.md#prerequisites"
+
+                    raise e
+                end
+
+                Thread.kill(@@halt_scanning_thread) if @@halt_scanning_thread
+            end
+
+            private
+
+            def self.tools_directory
+                tools_directories = tools_directories(ENV['ANDROID_HOME'])
+
+                File.join(ENV['ANDROID_HOME'], tools_directories.first)
+            end
+
+            def self.tools_directories(android_sdk_location)
+                build_tools_files = list_files(File.join(android_sdk_location, 'build-tools')).select {|file| File.directory?(file)}
+
+                build_tools_directories =
+                    build_tools_files.select do |dir|
+                        begin
+                            Luffa::Version.new(File.basename(dir))
+                            true
+                        rescue ArgumentError
+                            false
+                        end
+                    end.sort do |a, b|
+                        Luffa::Version.compare(Luffa::Version.new(File.basename(a)), Luffa::Version.new(File.basename(b)))
+                    end.reverse.map{|dir| File.join('build-tools', File.basename(dir))}
+
+                if build_tools_directories.empty?
+                    unless build_tools_files.reverse.first.nil?
+                        build_tools_directories = [File.join('build-tools', File.basename(build_tools_files.reverse.first))]
+                    end
+                end
+
+                build_tools_directories + ['platform-tools', 'tools']
+            end
+
+            def self.platform_directory(android_sdk_location)
+                files = list_files(File.join(android_sdk_location, 'platforms'))
+                            .select {|file| File.directory?(file)}
+
+                sorted_files = files.sort_by {|item| '%08s' % item.split('-').last}.reverse
+
+                File.join('platforms', File.basename(sorted_files.first))
+            end
+
+            def self.locate_android_dependencies(android_sdk_location)
+                adb_path = scan_for_path(android_sdk_location, adb_executable, ['platform-tools'])
+                aapt_path = scan_for_path(android_sdk_location, aapt_executable, tools_directories(android_sdk_location))
+                zipalign_path = scan_for_path(android_sdk_location, zipalign_executable, tools_directories(android_sdk_location))
+
+                if adb_path.nil?
+                    raise Environment::InvalidEnvironmentError,
+                          "Could not find '#{adb_executable}' in '#{android_sdk_location}'"
+                end
+
+                if aapt_path.nil?
+                    raise Environment::InvalidEnvironmentError,
+                          "Could not find '#{aapt_executable}' in '#{android_sdk_location}'"
+                end
+
+                if zipalign_path.nil?
+                    raise Environment::InvalidEnvironmentError,
+                          "Could not find '#{zipalign_executable}' in '#{android_sdk_location}'"
+                end
+
+                Logging.log_debug("Set aapt path to '#{aapt_path}'")
+                Logging.log_debug("Set zipalign path to '#{zipalign_path}'")
+                Logging.log_debug("Set adb path to '#{adb_path}'")
+
+                android_jar_path = scan_for_path(File.join(android_sdk_location, 'platforms'), 'android.jar', [File.basename(platform_directory(android_sdk_location))])
+
+                if android_jar_path.nil?
+                    raise Environment::InvalidEnvironmentError,
+                          "Could not find 'android.jar' in '#{File.join(android_sdk_location, 'platforms')}'"
+                end
+
+                Logging.log_debug("Set android jar path to '#{android_jar_path}'")
+
+                {
+                    aapt_path: aapt_path,
+                    zipalign_path: zipalign_path,
+                    adb_path: adb_path,
+                    android_jar_path: android_jar_path
+                }
+            end
+
+            def self.locate_java_dependencies(java_sdk_location)
+                # For the Java dependencies, we will use the PATH elements of they exist
+                on_path = find_executable_on_path(java_executable)
+
+                if on_path
+                    Logging.log_debug('Found java on PATH')
+                    java_path = on_path
+                else
+                    if java_sdk_location.nil? || java_sdk_location.empty?
+                        raise Environment::InvalidJavaSDKHome,
+                              "Could not locate '#{java_executable}' on path, and Java SDK Home is invalid."
+                    end
+
+                    java_path = scan_for_path(java_sdk_location, java_executable, ['bin'])
+                end
+
+                Logging.log_debug("Set java path to '#{java_path}'")
+
+                on_path = find_executable_on_path(keytool_executable)
+
+                if on_path
+                    Logging.log_debug('Found keytool on PATH')
+                    keytool_path = on_path
+                else
+                    if java_sdk_location.nil? || java_sdk_location.empty?
+                        raise Environment::InvalidJavaSDKHome,
+                              "Could not locate '#{keytool_executable}' on path, and Java SDK Home is invalid."
+                    end
+
+                    keytool_path = scan_for_path(java_sdk_location, keytool_executable, ['bin'])
+                end
+
+                Logging.log_debug("Set keytool path to '#{keytool_path}'")
+
+                on_path = find_executable_on_path(jarsigner_executable)
+
+                if on_path
+                    Logging.log_debug('Found jarsigner on PATH')
+                    jarsigner_path = on_path
+                else
+                    if java_sdk_location.nil? || java_sdk_location.empty?
+                        raise Environment::InvalidJavaSDKHome,
+                              "Could not locate '#{jarsigner_executable}' on path, and Java SDK Home is invalid."
+                    end
+
+                    jarsigner_path = scan_for_path(java_sdk_location, jarsigner_executable, ['bin'])
+                end
+
+                Logging.log_debug("Set jarsigner path to '#{jarsigner_path}'")
+
+                if java_path.nil?
+                    raise Environment::InvalidEnvironmentError,
+                          "Could not find '#{java_executable}' on PATH or in '#{java_sdk_location}'"
+                end
+
+                if keytool_path.nil?
+                    raise Environment::InvalidEnvironmentError,
+                          "Could not find '#{keytool_executable}' on PATH or in '#{java_sdk_location}'"
+                end
+
+                if jarsigner_path.nil?
+                    raise Environment::InvalidEnvironmentError,
+                          "Could not find '#{jarsigner_executable}' on PATH or in '#{java_sdk_location}'"
+                end
+
+                {
+                    java_path: java_path,
+                    keytool_path: keytool_path,
+                    jarsigner_path: jarsigner_path
+                }
+            end
+
+            def self.halt_scanning?
+                @@halt_scanning
+            end
+
+            def self.scan_for_path(path, file_name, expected_sub_folders = nil)
+                if self.halt_scanning?
+                    Logging.log_error("Timed out looking for '#{file_name}', currently looking in '#{path}'")
+                    raise ScanningTimedOutError, "Timed out looking for '#{file_name}'"
+                end
+
+                # Optimization for expected folders
+                if expected_sub_folders && !expected_sub_folders.empty?
+                    expected_sub_folders.each do |expected_sub_folder|
+                        result = scan_for_path(File.join(path, expected_sub_folder), file_name)
+
+                        return result if result
+                    end
+
+                    Logging.log_warn("Did not find '#{file_name}' in any standard directory of '#{path}'. Calabash will therefore take longer to load")
+                    Logging.log_debug(" - Expected to find '#{file_name}' in any of:")
+
+                    expected_sub_folders.each do |expected_sub_folder|
+                        Logging.log_debug(" - #{File.join(path, expected_sub_folder)}")
+                    end
+                end
+
+                files = list_files(path).sort.reverse
+
+                if files.reject{|file| File.directory?(file)}.
+                    map{|file| File.basename(file)}.include?(file_name)
+                    return File.join(path, file_name)
+                else
+                    files.select{|file| File.directory?(file)}.each do |dir|
+                        result = scan_for_path(dir, file_name)
+
+                        return result if result
+                    end
+                end
+
+                nil
+            end
+
+            def self.detect_android_sdk_location
+                if File.exist?(monodroid_config_file)
+                    sdk_location = read_attribute_from_monodroid_config('android-sdk', 'path')
+
+                    if sdk_location
+                        Logging.log_debug("Setting Android SDK location from '#{monodroid_config_file}'")
+
+                        return sdk_location
+                    end
+                end
+
+                if File.exist?('~/Library/Developer/Xamarin/android-sdk-mac_x86/')
+                    return '~/Library/Developer/Xamarin/android-sdk-mac_x86/'
+                end
+
+                if File.exist?('C:\\Android\\android-sdk')
+                    return 'C:\\Android\\android-sdk'
+                end
+
+                if is_windows?
+                    from_registry = read_registry(::Win32::Registry::HKEY_CURRENT_USER, "Software\\Novell\\Mono for Android", 'AndroidSdkDirectory')
+
+                    if from_registry && File.exist?(from_registry)
+                        Logging.log_debug("Setting Android SDK location from HKEY_CURRENT_USER Software\\Novell\\Mono for Android")
+                        return from_registry
+                    end
+
+                    from_registry = read_registry(::Win32::Registry::HKEY_LOCAL_MACHINE, 'Software\\Android SDK Tools', 'Path')
+
+                    if from_registry && File.exist?(from_registry)
+                        Logging.log_debug("Setting Android SDK location from HKEY_LOCAL_MACHINE Software\\Android SDK Tools")
+                        return from_registry
+                    end
+                end
+
+                nil
+            end
+
+            def self.detect_java_sdk_location
+                if File.exist?(monodroid_config_file)
+                    sdk_location = read_attribute_from_monodroid_config('java-sdk', 'path')
+
+                    if sdk_location
+                        Logging.log_debug("Setting Java SDK location from '#{monodroid_config_file}'")
+
+                        return sdk_location
+                    end
+                end
+
+                java_versions = ['1.9', '1.8', '1.7', '1.6']
+
+                if is_windows?
+                    java_versions.each do |java_version|
+                        key = "SOFTWARE\\JavaSoft\\Java Development Kit\\#{java_version}"
+                        from_registry = read_registry(::Win32::Registry::HKEY_LOCAL_MACHINE, key, 'JavaHome')
+
+                        if from_registry && File.exist?(from_registry)
+                            Logging.log_debug("Setting Java SDK location from HKEY_LOCAL_MACHINE #{key}")
+                            return from_registry
+                        end
+                    end
+                end
+
+                nil
+            end
+
+            def self.monodroid_config_file
+                File.expand_path('~/.config/xbuild/monodroid-config.xml')
+            end
+
+            def self.read_attribute_from_monodroid_config(element, attribute)
+                element = REXML::Document.new(IO.read(monodroid_config_file)).elements["//#{element}"]
+
+                if element
+                    element.attributes[attribute]
+                else
+                    nil
+                end
+            end
+
+            def self.find_executable_on_path(executable)
+                path_elements.each do |x|
+                    f = File.join(x, executable)
+                    return f if File.exists?(f)
+                end
+
+                nil
+            end
+
+            def self.path_elements
+                return [] unless ENV['PATH']
+                ENV['PATH'].split (/[:;]/)
+            end
+
+            def self.zipalign_executable
+                is_windows? ? 'zipalign.exe' : 'zipalign'
+            end
+
+            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'
+            end
+
+            def self.adb_executable
+                is_windows? ? 'adb.exe' : 'adb'
+            end
+
+            def self.aapt_executable
+                is_windows? ? 'aapt.exe' : 'aapt'
+            end
+
+            def self.ant_executable
+                is_windows? ? 'ant.exe' : 'ant'
+            end
+
+            def self.is_windows?
+                (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+            end
+
+            def self.read_registry(root_key, key, value)
+                begin
+                    root_key.open(key)[value]
+                rescue
+                    nil
+                end
+            end
+
+            def self.list_files(path)
+                # Dir.glob does not accept backslashes, even on windows. We have to
+                # substitute all backwards slashes to forward.
+                # C:\foo becomes C:/foo
+
+                if is_windows?
+                    Dir.glob(File.join(path, '*').gsub('\\', '/'))
+                else
+                    Dir.glob(File.join(path, '*'))
+                end
+            end
+        end
+    end
+end

data/lib/calabash-android/environment.rb

@@ -1,8 +1,11 @@
 module Calabash
   module Android
-
     # @!visibility private
     class Environment
+      # @!visibility private
+      class InvalidEnvironmentError < RuntimeError; end
+      # @!visibility private
+      class InvalidJavaSDKHome < RuntimeError; end
 
     # @!visibility private
       # Returns true if running on Windows

data/lib/calabash-android/helpers.rb

@@ -4,6 +4,10 @@ require 'tempfile'
 require 'escape'
 require 'rbconfig'
 require 'calabash-android/java_keystore'
+require 'calabash-android/environment'
+require 'calabash-android/logging'
+require 'calabash-android/dependencies'
+require 'calabash-android/version'
 
 def package_name(app)
   unless File.exist?(app)
@@ -33,7 +37,7 @@ def main_activity(app)
   rescue => e
     log("Could not find launchable activity, trying to parse raw AndroidManifest. #{e.message}")
 
-    manifest_data = `"#{Env.tools_dir}/aapt" dump xmltree "#{app}" AndroidManifest.xml`
+    manifest_data = `"#{Calabash::Android::Dependencies.aapt_path}" dump xmltree "#{app}" AndroidManifest.xml`
     regex = /^\s*A:[\s*]android:name\(\w+\)\=\"android.intent.category.LAUNCHER\"/
     lines = manifest_data.lines.collect(&:strip)
     indicator_line = nil
@@ -77,7 +81,7 @@ def main_activity(app)
 end
 
 def aapt_dump(app, key)
-  lines = `"#{Env.tools_dir}/aapt" dump badging "#{app}"`.lines.collect(&:strip)
+  lines = `"#{Calabash::Android::Dependencies.aapt_path}" dump badging "#{app}"`.lines.collect(&:strip)
   lines.select { |l| l.start_with?("#{key}:") }
 end
 
@@ -97,6 +101,8 @@ def build_test_server_if_needed(app_path)
       exit 1
     else
       puts "No test server found for this combination of app and calabash version. Recreating test server."
+      require 'calabash-android/operations'
+      require File.join(File.dirname(__FILE__), '..', '..', 'bin', 'calabash-android-build')
       calabash_build(app_path)
     end
   end
@@ -115,7 +121,7 @@ def resign_apk(app_path)
 end
 
 def unsign_apk(path)
-  meta_files = `"#{Env.tools_dir}/aapt" list "#{path}"`.lines.collect(&:strip).grep(/^META-INF\//)
+  meta_files = `"#{Calabash::Android::Dependencies.aapt_path}" list "#{path}"`.lines.collect(&:strip).grep(/^META-INF\//)
 
   signing_file_names = ['.mf', '.rsa', '.dsa', '.ec', '.sf']
 
@@ -137,12 +143,12 @@ def unsign_apk(path)
   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("\"#{Calabash::Android::Dependencies.aapt_path}\" remove \"#{path}\" #{files_to_remove.join(" ")}")
   end
 end
 
 def zipalign_apk(inpath, outpath)
-  cmd = %Q("#{Env.zipalign_path}" -f 4 "#{inpath}" "#{outpath}")
+  cmd = %Q("#{Calabash::Android::Dependencies.zipalign_path}" -f 4 "#{inpath}" "#{outpath}")
   log "Zipaligning using: #{cmd}"
   system(cmd)
 end
@@ -177,7 +183,7 @@ def fingerprint_from_apk(app_path)
       raise "No signature files found in META-INF. Cannot proceed." if signature_files.empty?
       raise "More than one signature file (DSA or RSA) found in META-INF. Cannot proceed." if signature_files.length > 1
 
-      cmd = "#{Env.keytool_path} -v -printcert -J\"-Dfile.encoding=utf-8\" -file \"#{signature_files.first}\""
+      cmd = "#{Calabash::Android::Dependencies.keytool_path} -v -printcert -J\"-Dfile.encoding=utf-8\" -file \"#{signature_files.first}\""
       log cmd
       fingerprints = `#{cmd}`
       md5_fingerprint = extract_md5_fingerprint(fingerprints)

data/lib/calabash-android/java_keystore.rb

@@ -6,13 +6,13 @@ class JavaKeystore
     raise "No such keystore file '#{location}'" unless File.exists?(File.expand_path(location))
     log "Reading keystore data from keystore file '#{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"', '-J"-Duser.language=en-US"')
+    keystore_data = system_with_stdout_on_success(Calabash::Android::Dependencies.keytool_path, '-list', '-v', '-alias', keystore_alias, '-keystore', location, '-storepass', password, '-J"-Dfile.encoding=utf-8"', '-J"-Duser.language=en-US"')
 
     if keystore_data.nil?
       if keystore_alias.empty?
         log "Could not obtain keystore data. Will try to extract alias automatically"
 
-        keystore_data = system_with_stdout_on_success(Env.keytool_path, '-list', '-v', '-keystore', location, '-storepass', password, '-J"-Dfile.encoding=utf-8"', '-J"-Duser.language=en-US"')
+        keystore_data = system_with_stdout_on_success(Calabash::Android::Dependencies.keytool_path, '-list', '-v', '-keystore', location, '-storepass', password, '-J"-Dfile.encoding=utf-8"', '-J"-Duser.language=en-US"')
         aliases = keystore_data.scan(/Alias name\:\s*(.*)/).flatten
 
         if aliases.length == 0
@@ -56,7 +56,7 @@ class JavaKeystore
     log "Signing using the signature algorithm: '#{signing_algorithm}'"
     log "Signing using the digest algorithm: '#{digest_algorithm}'"
 
-    unless system_with_stdout_on_success(Env.jarsigner_path, '-sigfile', 'CERT', '-sigalg', signing_algorithm, '-digestalg', digest_algorithm, '-signedjar', dest_path, '-storepass', password, '-keystore',  location, apk_path, keystore_alias)
+    unless system_with_stdout_on_success(Calabash::Android::Dependencies.jarsigner_path, '-sigfile', 'CERT', '-sigalg', signing_algorithm, '-digestalg', digest_algorithm, '-signedjar', dest_path, '-storepass', password, '-keystore',  location, apk_path, keystore_alias)
       raise "Could not sign app: #{apk_path}"
     end
   end

data/lib/calabash-android/operations.rb

@@ -20,12 +20,14 @@ require 'calabash-android/dot_dir'
 require 'calabash-android/logging'
 require 'calabash-android/store/preferences'
 require 'calabash-android/usage_tracker'
+require 'calabash-android/dependencies'
 require 'retriable'
 require 'cucumber'
 require 'date'
 require 'time'
 require 'shellwords'
 
+Calabash::Android::Dependencies.setup
 
 module Calabash module Android
 
@@ -558,7 +560,7 @@ module Calabash module Android
       end
 
       def adb_command
-        "#{Env.adb_path} -s #{serial}"
+        "\"#{Calabash::Android::Dependencies.adb_path}\" -s #{serial}"
       end
 
       def default_serial
@@ -595,7 +597,7 @@ module Calabash module Android
       end
 
       def connected_devices
-        lines = `#{Env.adb_path} devices`.split("\n")
+        lines = `"#{Calabash::Android::Dependencies.adb_path}" devices`.split("\n")
         start_index = lines.index{ |x| x =~ /List of devices attached/ } + 1
         lines[start_index..-1].collect { |l| l.split("\t").first }
       end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.6.1.pre2"
+    VERSION = "0.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.6.1.pre2
+  version: 0.7.0
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -134,6 +134,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: luffa
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +332,7 @@ files:
 - lib/calabash-android/color_helper.rb
 - lib/calabash-android/cucumber.rb
 - lib/calabash-android/defaults.rb
+- lib/calabash-android/dependencies.rb
 - lib/calabash-android/deprecated_actions.map
 - lib/calabash-android/dot_dir.rb
 - lib/calabash-android/drag_helpers.rb
@@ -374,9 +389,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.4.5.1