calabash-android 0.4.9 → 0.4.10.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ab10641f1654a9184460287b3acd39c18a7e554
-  data.tar.gz: c53ea565299a3b2cb84c0c0b4d2a5202e05a06b6
+  metadata.gz: 1d3a23228157e56e511aa96bdbdb7947d65d4ca5
+  data.tar.gz: 19d05bb6a38811caeb1dba9faadbe259cf64f681
 SHA512:
-  metadata.gz: 0d8aeabcb184cea1d57ad76088c9f35b9dfa195343433ba434cf229dcbd956d19aa59b52ddb54805858ee8ab341260d5d7f15b7a8d466daaf842ca27c4a05e85
-  data.tar.gz: 6990b2abc8e1fe6239d9427cf3d073431900a0c2f8db5c6a15b8ea9fd800d6db87a310e4fd6a49a25a6ee203e9bb49f5497ff8432cc91b9a15701e60455e0c92
+  metadata.gz: 50c4753229d9d7ad0ca8341289c084af3557d772acc9c7d6b3558c271bfd9029ffddcc010578550668e37e82324f69c7a8add8fd56e89e31a47505afcde65866
+  data.tar.gz: 5b0b9a43deb710ab276af9db66a52437022d6bf49d295b9012eea65f5cf0f07166c7447bd0243402c928fac72878cc8191d54ad0ec3db3a20349c42e171c83dc

data/Gemfile

@@ -2,3 +2,4 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in calabash-android.gemspec
 gemspec
+gem 'rake', '10.1.0'

data/Gemfile.lock

@@ -0,0 +1,62 @@
+PATH
+  remote: .
+  specs:
+    calabash-android (0.4.10.pre1)
+      awesome_print
+      cucumber
+      escape (~> 0.0.4)
+      httpclient (~> 2.3.2)
+      json
+      popen4 (~> 0.1.2)
+      retriable
+      rubyzip (~> 0.9.9)
+      slowhandcuke
+      xamarin-test-cloud (>= 0.9.23)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    Platform (0.4.0)
+    awesome_print (1.1.0)
+    builder (3.2.2)
+    cucumber (1.3.6)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12.0)
+      multi_json (~> 1.7.5)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.4)
+    escape (0.0.4)
+    gherkin (2.12.1)
+      multi_json (~> 1.3)
+    httpclient (2.3.4.1)
+    json (1.8.0)
+    mime-types (1.25)
+    multi_json (1.7.9)
+    multi_test (0.0.2)
+    open4 (1.3.0)
+    popen4 (0.1.2)
+      Platform (>= 0.4.0)
+      open4 (>= 0.4.0)
+    rake (10.1.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    retriable (1.3.3.1)
+    rubyzip (0.9.9)
+    slowhandcuke (0.0.3)
+      cucumber
+    thor (0.18.1)
+    xamarin-test-cloud (0.9.23)
+      bundler (>= 1.3.0, < 2.0)
+      json
+      rest-client (~> 1.6.7)
+      retriable (~> 1.3.3.1)
+      rubyzip (~> 0.9.9)
+      thor (>= 0.18.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  calabash-android!
+  rake (= 10.1.0)

data/Rakefile

@@ -1,5 +1,6 @@
 require 'bundler'
 load 'lib/calabash-android/helpers.rb'
+load 'lib/calabash-android/env.rb'
 
 def build
   test_server_template_dir = File.join(File.dirname(__FILE__), 'test-server')
@@ -9,9 +10,8 @@ def build
     @test_server_dir = File.join(workspace_dir, 'test-server')
     FileUtils.cp_r(test_server_template_dir, workspace_dir)
 
-    ant_executable = (is_windows? ? "ant.bat" : "ant")
     args = [
-      ant_executable,
+      Env.ant_path,
       "clean",
       "package",
       "-debug",
@@ -44,9 +44,6 @@ task :build do
   end
 
   build
-
-  Rake::Task["install"].execute
-
 end
 
 

data/bin/calabash-android

@@ -3,6 +3,8 @@
 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

data/bin/calabash-android-build.rb

@@ -1,11 +1,26 @@
 def calabash_build(app)
-  keystore = read_keystore_info()
-  if fingerprint_from_keystore != fingerprint_from_apk(app)
-    puts "#{app} is not signed with the configured keystore '#{keystore["keystore_location"]}' Aborting!"
-    exit 1
-  end
+  apk_fingerprint = fingerprint_from_apk(app)
+  log "#{app} was signed with a certificate with fingerprint #{apk_fingerprint}"
 
+  keystores = JavaKeystore.get_keystores
+  keystore = keystores.find { |k| k.fingerprint == apk_fingerprint}
+
+  unless keystore
+    puts "#{app} is not signed with any of the available keystores."
+    puts "Tried the following keystores:"
+    keystores.each do |k|
+      puts k.location
+    end
+    puts ""
+    puts "You can resign the app with #{keystores.first.location} by running:
+    calabash-android resign #{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."
+
+    exit 1
+  end
 
   test_server_file_name = test_server_path(app)
   FileUtils.mkdir_p File.dirname(test_server_file_name) unless File.exist? File.dirname(test_server_file_name)
@@ -36,7 +51,7 @@ def calabash_build(app)
         zip_file.add("AndroidManifest.xml", "customAndroidManifest.xml")
       end
     end
-    sign_apk("#{workspace_dir}/TestServer.apk", test_server_file_name)
+    keystore.sign_apk("#{workspace_dir}/TestServer.apk", test_server_file_name)
     begin
 
     rescue Exception => e

data/bin/calabash-android-setup.rb

@@ -13,7 +13,7 @@ def calabash_setup
   ask_for_setting(:keystore_password, "Please enter the password for the keystore")
   ask_for_setting(:keystore_alias, "Please enter the alias")
 
-  open('.calabash_settings', 'w') do |f|
+  open('calabash_settings', 'w') do |f|
     f.puts @settings.to_json
   end
   puts "Saved your settings to .calabash_settings. You can edit the settings manually or run this setup script again"

data/calabash-android.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency( "awesome_print" )
   s.add_dependency( 'httpclient', '~> 2.3.2')
   s.add_dependency( 'xamarin-test-cloud', '>= 0.9.23')
+  s.add_dependency( 'popen4', '~> 0.1.2')
+  s.add_dependency( 'escape', '~> 0.0.4')
 end

data/lib/calabash-android/env.rb

@@ -0,0 +1,27 @@
+
+class Env
+
+  def self.keytool_path
+    if is_windows?
+      "\"#{ENV["JAVA_HOME"]}/bin/keytool.exe\""
+    else
+      "keytool"
+    end
+  end
+
+  def self.jarsigner_path
+    if is_windows?
+      "\"#{ENV["JAVA_HOME"]}/bin/jarsigner.exe\""
+    else
+      "jarsigner"
+    end
+  end
+
+  def self.ant_path
+    is_windows? ? "ant.bat" : "ant"
+  end
+
+  def self.is_windows?
+    (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+  end
+end

data/lib/calabash-android/helpers.rb

@@ -1,7 +1,12 @@
+require "stringio"
 require 'rexml/document'
 require 'rexml/xpath'
 require 'zip/zip'
 require 'tempfile'
+require 'popen4'
+require 'escape'
+require 'rbconfig'
+require 'calabash-android/java_keystore'
 
 include REXML
 
@@ -81,20 +86,8 @@ def resign_apk(app_path)
 end
 
 def sign_apk(app_path, dest_path)
-  keystore = read_keystore_info()
-
-  if is_windows?
-    jarsigner_path = "\"#{ENV["JAVA_HOME"]}/bin/jarsigner.exe\""
-  else
-    jarsigner_path = "jarsigner"
-  end
-
-  cmd = "#{jarsigner_path} -sigalg MD5withRSA -digestalg SHA1 -signedjar #{dest_path} -storepass #{keystore["keystore_password"]} -keystore #{keystore["keystore_location"]} \"#{app_path}\" #{keystore["keystore_alias"]}"
-  log cmd
-  unless system(cmd)
-    puts "jarsigner command: #{cmd}"
-    raise "Could not sign app (#{app_path}"
-  end
+  java_keystore = JavaKeystore.get_keystores.first
+  java_keystore.sign_apk(app_path, dest_path)
 end
 
 def tools_dir
@@ -107,60 +100,8 @@ def android_home_path
   ENV["ANDROID_HOME"].gsub("\\", "/")
 end
 
-def read_keystore_info
-  keystore = default_keystore
-
-  if File.exist? ".calabash_settings"
-    keystore = JSON.parse(IO.read(".calabash_settings"))
-    fail_if_key_missing(keystore, "keystore_location")
-    fail_if_key_missing(keystore, "keystore_password")
-    fail_if_key_missing(keystore, "keystore_alias")
-    keystore["keystore_location"] = File.expand_path(keystore["keystore_location"])
-  end
-  keystore["keystore_location"] = put_in_quotes(remove_quotes(keystore["keystore_location"]))
-  keystore
-end
-
-def default_keystore
-  {
-    "keystore_location" => File.expand_path(File.join(ENV["HOME"], "/.android/debug.keystore")),
-    "keystore_password" => "android",
-    "keystore_alias" => "androiddebugkey",
-  }
-end
-
-def fail_if_key_missing(map, key)
-  raise "Found .calabash_settings but no #{key} defined." unless map[key]
-end
-
-def remove_quotes(s)
-  s.gsub(/"/, "")
-end
-
-def put_in_quotes(s)
-  %Q{"#{s}"}
-end
-
-def keytool_path
-  if is_windows?
-    "\"#{ENV["JAVA_HOME"]}/bin/keytool.exe\""
-  else
-    "keytool"
-  end
-end
-
-def fingerprint_from_keystore
-  keystore_info = read_keystore_info
-  cmd = "#{keytool_path} -v -list -alias #{keystore_info["keystore_alias"]} -keystore #{keystore_info["keystore_location"]} -storepass #{keystore_info["keystore_password"]}"
-
-  log cmd
-  fingerprints = `#{cmd}`
-  md5_fingerprint = extract_md5_fingerprint(fingerprints)
-  log "MD5 fingerprint for keystore (#{keystore_info["keystore_location"]}): #{md5_fingerprint}"
-  md5_fingerprint
-end
-
 def fingerprint_from_apk(app_path)
+  app_path = File.expand_path(app_path)
   Dir.mktmpdir do |tmp_dir|
     Dir.chdir(tmp_dir) do
       FileUtils.cp(app_path, "app.apk")
@@ -169,10 +110,11 @@ def fingerprint_from_apk(app_path)
         z.extract if /^META-INF\/\w+.(RSA|rsa)/ =~ z.name
       end
       rsa_files = Dir["#{tmp_dir}/META-INF/*"]
+
       raise "No RSA file found in META-INF. Cannot proceed." if rsa_files.empty?
       raise "More than one RSA file found in META-INF. Cannot proceed." if rsa_files.length > 1
 
-      cmd = "#{keytool_path} -v -printcert -file \"#{rsa_files.first}\""
+      cmd = "#{Env.keytool_path} -v -printcert -file \"#{rsa_files.first}\""
       log cmd
       fingerprints = `#{cmd}`
       md5_fingerprint = extract_md5_fingerprint(fingerprints)
@@ -183,18 +125,11 @@ def fingerprint_from_apk(app_path)
 end
 
 def extract_md5_fingerprint(fingerprints)
-  log fingerprints
-
   m = fingerprints.scan(/MD5.*((?:[a-fA-F\d]{2}:){15}[a-fA-F\d]{2})/).flatten
   raise "No MD5 fingerprint found:\n #{fingerprints}" if m.empty?
   m.first
 end
 
-def is_windows?
-  require 'rbconfig'
-  (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-end
-
 def log(message, error = false)
   $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (error or ARGV.include? "-v" or ARGV.include? "--verbose")
 end

data/lib/calabash-android/java_keystore.rb

@@ -0,0 +1,91 @@
+class JavaKeystore
+  attr_reader :errors, :location, :keystore_alias, :password, :fingerprint
+  def initialize(location, keystore_alias, password)
+    raise "No such file #{location}" unless File.exists?(File.expand_path(location))
+
+    keystore_data = system_with_stdout_on_success(Env.keytool_path, '-list', '-v', '-alias', keystore_alias, '-keystore', location, '-storepass', password)
+    unless keystore_data
+      error = "Could not list certificates in keystore. Probably because the password was incorrect."
+      @errors = [message: error]
+      log error
+      #TODO: Handle the case where password is correct but the alias is missing.
+    end
+    @location = location
+    @keystore_alias = keystore_alias
+    @password = password
+    @fingerprint = extract_md5_fingerprint(keystore_data)
+  end
+
+  def sign_apk(apk_path, dest_path)
+    raise "Cannot sign with a miss configured keystore" if errors
+    raise "No such file: #{apk_path}" unless File.exists?(apk_path)
+
+    unless system_with_stdout_on_success(Env.jarsigner_path, '-sigalg', 'MD5withRSA', '-digestalg', 'SHA1', '-signedjar', dest_path, '-storepass', password, '-keystore',  location, apk_path, keystore_alias)
+      raise "Could not sign app: #{apk_path}"
+    end
+  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 = POpen4::popen4(cmd) do |stdout, stderr, stdin, pid|
+      out = stdout.read
+      err = stderr.read
+    end
+    if status.exitstatus == 0
+      out
+    else
+      nil
+    end
+  end
+
+  def self.read_keystore_with_default_password_and_alias(path)
+    path = File.expand_path path
+
+    if File.exists? path
+      keystore = JavaKeystore.new(path, 'androiddebugkey', 'android')
+      if keystore.errors
+        log "Trying to "
+        nil
+      else
+        log "Unlocked keystore at #{path} - fingerprint: #{keystore.fingerprint}"
+        keystore
+      end
+    else
+      log "Trying to read keystore from: #{path} - no such file"
+      nil
+    end
+  end
+
+  def self.get_keystores
+    if keystore = keystore_from_settings 
+      keystore
+    else
+      [
+        read_keystore_with_default_password_and_alias(File.join(ENV["HOME"], "/.android/debug.keystore")),
+        read_keystore_with_default_password_and_alias("debug.keystore"),
+        read_keystore_with_default_password_and_alias(File.join(ENV["HOME"], ".local/share/Xamarin/Mono\ for\ Android/debug.keystore")),
+        read_keystore_with_default_password_and_alias(File.join(ENV["HOME"], "AppData/Local/Xamarin/Mono for Android/debug.keystore")),
+      ].compact
+    end
+  end
+
+  def self.keystore_from_settings
+      keystore = JSON.parse(IO.read(".calabash_settings")) if File.exist? ".calabash_settings"
+      keystore = JSON.parse(IO.read("calabash_settings")) if File.exist? "calabash_settings"
+      return unless keystore
+      fail_if_key_missing(keystore, "keystore_location")
+      fail_if_key_missing(keystore, "keystore_password")
+      fail_if_key_missing(keystore, "keystore_alias")
+      keystore["keystore_location"] = File.expand_path(keystore["keystore_location"])
+      JavaKeystore.new(keystore["keystore_location"], keystore["keystore_alias"], keystore["keystore_password"])
+  end
+
+  def fail_if_key_missing(map, key)
+    raise "Found .calabash_settings but no #{key} defined." unless map[key]
+  end
+
+end

data/lib/calabash-android/operations.rb

@@ -10,6 +10,7 @@ require 'calabash-android/helpers'
 require 'calabash-android/wait_helpers'
 require 'calabash-android/touch_helpers'
 require 'calabash-android/version'
+require 'calabash-android/env'
 require 'retriable'
 require 'cucumber'
 
@@ -405,7 +406,7 @@ module Operations
     end
 
     def adb
-      if is_windows?
+      if Env.is_windows?
         %Q("#{ENV["ANDROID_HOME"]}\\platform-tools\\adb.exe")
       else
         %Q("#{ENV["ANDROID_HOME"]}/platform-tools/adb")

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.9"
+    VERSION = "0.4.10.pre1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10.pre1
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -122,6 +122,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.23
+- !ruby/object:Gem::Dependency
+  name: popen4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: escape
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 description: 'calabash-android drives tests for native  and hybrid Android apps. '
 email:
 - jonas@lesspainful.com
@@ -133,6 +161,7 @@ files:
 - .calabash_settings
 - CHANGES.txt
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - Rakefile
 - bin/calabash-android
@@ -158,7 +187,9 @@ files:
 - lib/calabash-android/canned_steps.md
 - lib/calabash-android/color_helper.rb
 - lib/calabash-android/cucumber.rb
+- lib/calabash-android/env.rb
 - lib/calabash-android/helpers.rb
+- lib/calabash-android/java_keystore.rb
 - lib/calabash-android/lib/AXMLPrinter2.jar
 - lib/calabash-android/lib/apktool-cli-1.5.3-SNAPSHOT.jar
 - lib/calabash-android/lib/manifest_extractor.jar
@@ -874,14 +905,13 @@ 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.2
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Client for calabash-android for automated functional testing on Android
 test_files: []
-has_rdoc: