calabash-android 0.5.5 → 0.5.6.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04dc84f79d9bd91dd4010145fe596fba7a6ec374
-  data.tar.gz: bb81f4c4ea5b081882268c2da9bfb66db0f5c75a
+  metadata.gz: a74d4549e7707f4bbd13f1bc350e65abaf141a8c
+  data.tar.gz: 0735ac8f6275459de7da70a68fcbb26112ce230e
 SHA512:
-  metadata.gz: 120293383e6e69c910b47fed3921ce90e032ff432cd0256fb759b75b7b5d213e719bb4bbb8135025f37c0a4bb68507991041ec0669dba78492792a1a18b57a25
-  data.tar.gz: d0e5188bb01d89c7c8b87026196f24be19c6b08dee5cb1f7b685fe597c160c03938f7cbdf6e137e40af972932d956b5fc26cf5ac9afc0447b4d0a2b07564b3b6
+  metadata.gz: bdf83cbc21f2f2af5db8bbc34e1458f98df251b4e60ba1f8ef03ec8ffdd0e2b8a5f8c35a68b4eabc4229466b8c5f920efbb40ea1ee7f5f64999eddf400f439b2
+  data.tar.gz: fa0affed55981236ebb54fd363ec7a3e04508c66a9259535887b88d4a64f991fb90edb2450c50a2acea580daa787dd73d2e75b979fb0d3d6e9acffaa5dd912ff

data/Rakefile

@@ -1,15 +1,6 @@
 require 'bundler'
 load 'lib/calabash-android/env.rb'
 
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new do |t|
-    # see .yardopts for options
-  end
-rescue Exception => _
-  warn 'skipping yard requirement because it is a development dependency'
-end
-
 def build
   test_server_template_dir = File.join(File.dirname(__FILE__), 'test-server')
 

data/bin/calabash-android-setup.rb

@@ -1,4 +1,5 @@
 require "calabash-android/version"
+require "io/console"
 
 def calabash_setup
   @settings = {}
@@ -6,7 +7,7 @@ def calabash_setup
   puts "Please enter keystore information to use a custom keystore instead of the default"
 
   ask_for_setting(:keystore_location, "Please enter keystore location")
-  ask_for_setting(:keystore_password, "Please enter the password for the keystore")
+  ask_for_setting(:keystore_password, "Please enter the password for the keystore", true)
   ask_for_setting(:keystore_alias, "Please enter the alias")
 
   open('.calabash_settings', 'w') do |f|
@@ -15,7 +16,7 @@ def calabash_setup
   puts "Saved your settings to .calabash_settings. You can edit the settings manually or run this setup script again"
 end
 
-def ask_for_setting(key, msg)
+def ask_for_setting(key, msg, secure = false)
   puts msg
-  @settings[key] = STDIN.gets.chomp
-end
+  @settings[key] = (!secure ? STDIN.gets : STDIN.noecho(&:gets)).chomp
+end

data/lib/calabash-android/env.rb

@@ -50,6 +50,7 @@ class Env
   def self.jdk_path
     path_if_jdk(ENV['JAVA_HOME']) ||
     if is_windows?
+      path_if_jdk(read_registry(::Win32::Registry::HKEY_LOCAL_MACHINE, 'SOFTWARE\\JavaSoft\\Java Development Kit\\1.8', 'JavaHome')) ||
       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
@@ -182,4 +183,5 @@ class Env
     end
   end
 
-end
+end
+

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.5.5"
+    VERSION = "0.5.6.pre1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6.pre1
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -254,9 +254,9 @@ 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
@@ -264,3 +264,4 @@ signing_key:
 specification_version: 4
 summary: Client for calabash-android for automated functional testing on Android
 test_files: []
+has_rdoc: