calabash-android 0.2.0 → 0.2.1

data/CHANGES.txt

@@ -1,4 +1,8 @@
-0.2.0
+0.2.1:
+      Path to custom keystores can now be relative.
+      Setup only deals with custom keystores.
+
+0.2.0:
       No changes from 0.2.0.pre10.
 
 0.2.0.pre10:

data/bin/calabash-android-build.rb

@@ -19,9 +19,9 @@ def calabash_build(app)
         "package",
         "-Dtested.package_name=#{package_name(app)}",
         "-Dtested.main_activity=#{main_activity(app)}",
-        "-Dtested.project.apk=#{app}",
+        "-Dtested.project.apk='#{app}'",
         "-Dandroid.api.level=#{api_level}",
-        "-Dkey.store=#{keystore["keystore_location"]}",
+        "-Dkey.store='#{File.expand_path keystore["keystore_location"]}'",
         "-Dkey.store.password=#{keystore["keystore_password"]}",
         "-Dkey.alias=#{keystore["keystore_alias"]}",
         "-Dkey.alias.password=#{keystore["keystore_alias_password"]}",

data/bin/calabash-android-helpers.rb

@@ -18,13 +18,9 @@ def print_usage
     gen
       generate a features folder structure.
     setup 
-      sets up the current folder to run calabash against your 
-      application.
-      Will ask you some questions about you application, development
-      environment and key store to user for signing.
+      sets up a non-default keystore to use with this test project.
     build <apk>
       builds the test server that will be used when testing the app.
-      You need to run this command every time you make changes to the app.
     run <apk>
       runs Cucumber in the current folder with the enviroment needed.
     submit
@@ -46,18 +42,3 @@ end
 def is_json?(str)
   str[0..0] == '{'
 end
-
-def run_setup_if_settings_does_not_exist
-  unless File.exists?(".calabash_settings")
-    puts "Could not find .calabash_settings."
-    puts "Should I run calabash-android setup for you?"
-    puts "Please answer yes (y) or no (n)"
-    if ['yes', 'y'].include? STDIN.gets.chomp
-      calabash_setup
-    else
-      puts "Please run: calabash-android setup"
-      exit 1
-    end
-  end
-end
-

data/bin/calabash-android-setup.rb

@@ -7,33 +7,13 @@ def calabash_setup
   end
   @settings = {}
 
-  puts "To use Calabash-Android we need a bit of information about the app you want to test"
-  puts "When you are through this setup your settings will be saved to .calabash_settings. You can edit this file if you have the need."
-  ask_for_setting(:package_name, "What is the package name of the app? You can find the package name in AndroidManifest.xml")
-
-  ask_for_setting(:activity_name, "What is the fully qualified name of the main activity?")
-  ask_for_setting(:app_path, "What is the path to the app?")
-  puts "Which api level do you want to use?"
-  puts "It looks like you have the following versions installed:"
-  ask_for_setting(:api_level, platform_versions.join(", "))
-
-  @settings[:keystore_location] = "#{ENV["HOME"]}/.android/debug.keystore"
-  @settings[:keystore_password] = "android"
-  @settings[:keystore_alias] = "androiddebugkey"
-  @settings[:keystore_alias_password] = "android"
-
-  puts "Do you want to specify a keystore for signing the test app?"
-  puts "If not we will be using #{@settings[:keystore_location]}"
-  puts "Please answer yes (y) or no (n)"
-
-  if ['yes', 'y'].include? STDIN.gets.chomp
-    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_alias, "Please enter the alias")
-    ask_for_setting(:keystore_alias_password, "Please enter the password for the alias")
-  end
-
-
+  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_alias, "Please enter the alias")
+  ask_for_setting(:keystore_alias_password, "Please enter the password for the alias")
+  
   open('.calabash_settings', 'w') do |f|
     f.puts @settings.to_json
   end

data/doc/calabash-android-help.txt

@@ -12,14 +12,10 @@ Usage: calabash-android <command-name> [parameters] [options]
       setting up calabash to ensure that the features folder contains
       the right step definitions and environment to run with cucumber.
 
-    setup sets up the current folder to run calabash against your 
-      application.
-      Will ask you some questions about you application, development
-      environment and key store to user for signing.
+    setup sets up a non-default keystore to use with this test project.
 
     build builds the test server that will be used when testing the app.
-      You need to run this command every time you make changes to the app.
-
+      
     run runs Cucumber in the current folder with the enviroment needed.
 
     submit submits an apk along with your features to www.lesspainful.com

data/lib/calabash-android/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Android
-    VERSION = "0.2.0"
-    FRAMEWORK_VERSION = "0.2.0"
+    VERSION = "0.2.1"
+    FRAMEWORK_VERSION = "0.2.1"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: calabash-android
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jonas Maturana Larsen