calabash-android 0.4.10.pre2 → 0.4.10.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eca1c2b618f5e1a0eae2efd4ac343c4cd116c093
-  data.tar.gz: b629099127e76a694fcb385dac08be6025cbb82d
+  metadata.gz: bf41c00cbb592aeebf19da60bc9004282ae08ad3
+  data.tar.gz: ad1ac78a2ac3635c53656632170dbaa7f42249f8
 SHA512:
-  metadata.gz: 012c85a07ca6cff09116b3cef62f2db210fed15fa2e1b313515749e3b6370c84024c854db4646337313b31c2321bb1571fe64a8902638fe13ff6e448b00fa3fe
-  data.tar.gz: e24c6c300b64f1335dfc8c82e1ce9727c93c161ab524ed3d51af1b7dbf845c8fcf4851630e3e985db5fb5f616cc7b36fde766fad4a044cdd9ead672270d5bc49
+  metadata.gz: 8181fef5a6c3e0fdcfcd4f4ec3dfb14508c76aa9ce26f9897a70eab912233b626ab5e6c012fe87cdd873c0009854d7edb343356d434d41609674434f49fc6d6e
+  data.tar.gz: fb06704063ae204280d9ce35d4c4cf915f20634aab13dfc573b7c7bc8718107f26bb04a8c83f2205dd0c1a1108ceada5b292032f2ca97e19534710a45ec1a7a7

data/Rakefile

@@ -1,5 +1,4 @@
 require 'bundler'
-load 'lib/calabash-android/helpers.rb'
 load 'lib/calabash-android/env.rb'
 
 def build
@@ -15,7 +14,7 @@ def build
       "clean",
       "package",
       "-debug",
-      "-Dtools.dir=\"#{tools_dir}\"",
+      "-Dtools.dir=\"#{Env.tools_dir}\"",
       "-Dandroid.api.level=17",
       "-Dversion=#{Calabash::Android::VERSION}",
     ]

data/bin/calabash-android

@@ -51,27 +51,27 @@ def relative_to_full_path(file_path)
   File.expand_path(file_path)
 end
 
-def raise_if_android_home_not_set
-  raise "Please set the ANDROID_HOME environment variable" unless ENV["ANDROID_HOME"]
+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
-  exit 0
 end
 cmd = ARGV.shift
 if cmd == 'help'
   print_help
-  exit 0
 elsif cmd == 'build'
-  raise_if_android_home_not_set
+  exit_if_android_sdk_not_found
   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
-  exit 0
 elsif cmd == 'run'
-  raise_if_android_home_not_set
+  exit_if_android_sdk_not_found
   if ARGV.empty? or not is_apk_file?(ARGV.first)
     exit calabash_run()
   else
@@ -79,7 +79,6 @@ elsif cmd == 'run'
   end
 elsif cmd == 'gen'
   calabash_scaffold
-  exit 0
 elsif cmd == 'console'
   if ARGV.empty?
     puts "Please specify an app"
@@ -90,10 +89,9 @@ elsif cmd == 'console'
     exit 1
   end
   calabash_console(relative_to_full_path(ARGV.shift))
-  exit 0
 elsif cmd == 'setup'
+  exit_if_android_sdk_not_found
   calabash_setup
-  exit 0
 elsif cmd == 'extract-manifest'
   if ARGV.empty?
     puts "Please specify an app"
@@ -105,7 +103,6 @@ elsif cmd == 'extract-manifest'
   end
 
   puts manifest ARGV.first
-  exit 0
 elsif cmd == 'resign'
   unless File.exist?(File.expand_path(ARGV.first))
     puts "No such file #{ARGV.first}"
@@ -115,7 +112,6 @@ elsif cmd == 'resign'
 
 elsif cmd == 'version'
   puts Calabash::Android::VERSION
-  exit 0
 else
   print_usage
 end

data/bin/calabash-android-build.rb

@@ -26,9 +26,8 @@ def calabash_build(app)
   FileUtils.mkdir_p File.dirname(test_server_file_name) unless File.exist? File.dirname(test_server_file_name)
 
   unsigned_test_apk = File.join(File.dirname(__FILE__), '..', 'lib/calabash-android/lib/TestServer.apk')
-  platforms = Dir["#{android_home_path}/platforms/android-*"].sort_by { |item| '%08s' % item.split('-').last }
-  android_platform = platforms.last
-  raise "No Android SDK found in #{ENV["ANDROID_HOME"].gsub("\\", "/")}/platforms/" unless android_platform
+
+  android_platform = Env.android_platform_path
   Dir.mktmpdir do |workspace_dir|
     Dir.chdir(workspace_dir) do
       FileUtils.cp(unsigned_test_apk, "TestServer.apk")
@@ -42,7 +41,7 @@ def calabash_build(app)
         raise "Could not replace test package name in manifest"
       end
 
-      unless system %Q{"#{tools_dir}/aapt" package -M AndroidManifest.xml  -I "#{android_platform}/android.jar" -F dummy.apk}
+      unless system %Q{"#{Env.tools_dir}/aapt" package -M AndroidManifest.xml  -I "#{android_platform}/android.jar" -F dummy.apk}
         raise "Could not create dummy.apk"
       end
 

data/bin/calabash-android-setup.rb

@@ -1,10 +1,6 @@
 require "calabash-android/version"
 
 def calabash_setup
-  unless File.exists?(ENV["ANDROID_HOME"] || "")
-    puts "Please set ANDROID_HOME to point to the Android SDK"
-    exit 1
-  end
   @settings = {}
 
   puts "Please enter keystore information to use a custom keystore instead of the default"
@@ -22,8 +18,4 @@ end
 def ask_for_setting(key, msg)
   puts msg
   @settings[key] = STDIN.gets.chomp
-end
-
-def platform_versions
-  Dir["#{ENV["ANDROID_HOME"]}/platforms/android-*"].collect{|platform| platform.split("-").last.to_i}.sort
 end

data/lib/calabash-android/env.rb

@@ -1,4 +1,3 @@
-
 class Env
 
   def self.keytool_path
@@ -24,4 +23,29 @@ class Env
   def self.is_windows?
     (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
   end
+
+  def self.tools_dir
+    Dir.chdir(android_home_path) do
+      dirs = Dir["build-tools/*"] + Dir["platform-tools"]
+      raise "Could not find tools directory in #{android_home_path}" if dirs.empty?
+      File.expand_path(dirs.first)
+    end
+  end
+
+  def self.adb
+    %Q("#{android_home_path}/platform-tools/adb")
+  end
+
+  def self.android_home_path
+    ENV["ANDROID_HOME"]
+  end
+
+  def self.android_platform_path
+    Dir.chdir(android_home_path) do
+      platforms = Dir["platforms/android-*"].sort_by { |item| '%08s' % item.split('-').last }
+      raise "No Android SDK found in #{android_home_path}/platforms/" if platforms.empty?
+      File.expand_path(platforms.last)
+    end
+  end
+
 end

data/lib/calabash-android/helpers.rb

@@ -90,16 +90,6 @@ def sign_apk(app_path, dest_path)
   java_keystore.sign_apk(app_path, dest_path)
 end
 
-def tools_dir
-  dirs = Dir["#{android_home_path}/build-tools/*/"] + Dir["#{android_home_path}/platform-tools/"]
-  raise "Could not find tools directory in ANDROID_HOME" if dirs.empty?
-  dirs.first
-end
-
-def android_home_path
-  ENV["ANDROID_HOME"].gsub("\\", "/")
-end
-
 def fingerprint_from_apk(app_path)
   app_path = File.expand_path(app_path)
   Dir.mktmpdir do |tmp_dir|

data/lib/calabash-android/operations.rb

@@ -402,15 +402,7 @@ module Operations
     end
 
     def adb_command
-      "#{adb} -s #{serial}"
-    end
-
-    def adb
-      if Env.is_windows?
-        %Q("#{ENV["ANDROID_HOME"]}\\platform-tools\\adb.exe")
-      else
-        %Q("#{ENV["ANDROID_HOME"]}/platform-tools/adb")
-      end
+      "#{Env.adb} -s #{serial}"
     end
 
     def default_serial
@@ -447,7 +439,7 @@ module Operations
     end
 
     def connected_devices
-      lines = `#{adb} devices`.split("\n")
+      lines = `#{Env.adb} 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.10.pre2"
+    VERSION = "0.4.10.pre3"
   end
 end

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/Actions.java

@@ -20,13 +20,11 @@ public class Actions {
     public static Instrumentation parentInstrumentation;
     public static InstrumentationTestCase parentTestCase;
     private Context context;
-    private Context targetContext;
-    
+
     public Actions(Instrumentation parentInstrumentation, InstrumentationTestCase parentTestCase) {
         Actions.parentInstrumentation = parentInstrumentation;
         Actions.parentTestCase = parentTestCase;
         this.context = parentInstrumentation.getContext();
-        this.targetContext = parentInstrumentation.getTargetContext();
         loadActions();
     }
     

metadata

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