calabash-android 0.0.8 → 0.0.10

data/CHANGES.txt

@@ -1,3 +1,9 @@
+0.0.10:
+      Added -v and --verbose options to calabash-android run.
+      This will turn on verbose logging for Calabash as well as Cucumber.
+      Default logging is much less verbose now but can be even better.
+0.0.9:
+      Moved from Robotium 2.5 to 3.2.1
 0.0.8:
       Added colors to Cucumber output
 

data/bin/calabash-android-helpers.rb

@@ -11,7 +11,7 @@ end
 
 def print_usage
   puts <<EOF
-  Usage: calabash-android <command-name> [parameters]
+  Usage: calabash-android <command-name> [parameters] [options]
   <command-name> can be one of
     help
       prints more detailed help information.
@@ -27,6 +27,11 @@ def print_usage
       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.
+
+
+  <options> can be
+    -v, --verbose
+      Turns on verbose logging
 EOF
 end
 

data/bin/calabash-android-setup.rb

@@ -23,7 +23,7 @@ def calabash_setup
   @settings[:keystore_alias_password] = "android"
 
   puts "Do you want to specify a keystore for signing the test app?"
-  puts "If now we will be using #{@settings[:keystore_location]}"
+  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

data/doc/calabash-android-help.txt

@@ -1,4 +1,4 @@
-Usage: calabash-android <command-name> [parameters]
+Usage: calabash-android <command-name> [parameters] [options]
   <command-name> can be one of
     help
     gen
@@ -19,4 +19,8 @@ Usage: calabash-android <command-name> [parameters]
     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.
+    run runs Cucumber in the current folder with the enviroment needed.
+
+
+    Options:
+    -v, --verbose  Turns on verbose logging

data/lib/calabash-android/canned_steps.md

@@ -95,7 +95,8 @@ To scroll up
     
     Then /^I scroll up$/
 
-Then /^I select "([^\"]*)" from the menu$/
+To open the menu and press the specified text
+    Then /^I select "([^\"]*)" from the menu$/
 
 Touching
 --------
@@ -130,9 +131,10 @@ Will look for the specified text and press it if found.
 
     Then /^I press list item number (\d+)$/
 Will press the specified list item in the first visible list.
+
     Then /^I long press list item number (\d+)$/
 
-Will lon press the specified list item in the first visible list.
+Will long press the specified list item in the first visible list.
 
     Then /^I click on screen (\d+)% from the left and (\d+)% from the top$/
 Simulates a touch on the screen at the specified location.

data/lib/calabash-android/operations.rb

@@ -11,7 +11,7 @@ module Operations
 
 
   def log(message)
-    $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}"
+    $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")} - #{message}" if (ARGV.include? "-v" or ARGV.include? "--verbose")
   end
 
   def take_screenshot

data/lib/calabash-android/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Android
-    VERSION = "0.0.8"
-    FRAMEWORK_VERSION = "0.0.8"
+    VERSION = "0.0.10"
+    FRAMEWORK_VERSION = "0.0.10"
   end
 end

data/test-server/instrumentation-backend/.classpath

@@ -5,6 +5,6 @@
 	<classpathentry kind="src" path="assets"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="lib" path="libs/robotium-solo-2.5.jar"/>
+	<classpathentry kind="lib" path="libs/robotium-solo-3.2.1.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

metadata

@@ -2,7 +2,7 @@
 name: calabash-android
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors: 
 - Jonas Maturana Larsen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-16 00:00:00 -03:00
+date: 2012-05-18 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,7 +113,7 @@ files:
 - test-server/instrumentation-backend/AndroidManifest.xml
 - test-server/instrumentation-backend/assets/foo.bar
 - test-server/instrumentation-backend/gen/com/lesspainful/simpleui/test/R.java
-- test-server/instrumentation-backend/libs/robotium-solo-2.5.jar
+- test-server/instrumentation-backend/libs/robotium-solo-3.2.1.jar
 - test-server/instrumentation-backend/project.properties
 - test-server/instrumentation-backend/res/drawable-hdpi/ic_launcher.png
 - test-server/instrumentation-backend/res/drawable-ldpi/ic_launcher.png