calabash-cucumber 0.9.127.pre1 → 0.9.128

data/bin/calabash-ios-build.rb

@@ -44,28 +44,13 @@ def build(options={:build_dir=>"Calabash",
   res
 end
 
-def console(options={:script => "irb_ios5.sh"})
-  path = File.join(@source_dir,".irbrc")
-  if File.exists?(".irbrc")
-    old_str = File.read(".irbrc")
-    new_str = File.read(path)
-    if old_str != new_str
-      puts "Moving old .irbrc file to .irbrc.old"
-      FileUtils.mv(".irbrc", ".irbrc.old")
-      puts "Copying calabash-ios .irbrc file to current directory..."
-      FileUtils.cp(path, ".")
-    end
-  else
-    puts "Copying calabash-ios .irbrc file to current directory..."
-    FileUtils.cp(path, ".")
-  end
-
-  if !File.exists?(options[:script])
-    puts "Copying calabash-ios #{options[:script]} file to current directory..."
-    FileUtils.cp(File.join(@source_dir,options[:script]), ".")
+def console
+  unless ENV['IRBRC']
+    path = File.expand_path(File.join(@script_dir,".irbrc"))
+    ENV['IRBRC'] = path
   end
-  puts "Running irb with ./.irbrc..."
-  system("./#{options[:script]}")
+  puts "Running irb..."
+  exec("irb")
 end
 
 

data/bin/calabash-ios-generate.rb

@@ -13,9 +13,6 @@ def calabash_scaffold
   exit 2 unless STDIN.gets.chomp == ''
 
   FileUtils.cp_r(@source_dir, @features_dir)
-  FileUtils.mv "#{@features_dir}/.irbrc", "."
-  FileUtils.mv "#{@features_dir}/irb_ios4.sh", "."
-  FileUtils.mv "#{@features_dir}/irb_ios5.sh", "."
 
   msg("Info") do
     puts "Features subdirectory created. \n"

data/calabash-cucumber.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |s|
   s.add_dependency( "httpclient","2.2.7")
   s.add_dependency( "bundler", "~> 1.1")
   s.add_dependency( "run_loop", "0.0.3" )
+  s.add_dependency( "awesome_print")
 
 end

data/features/step_definitions/calabash_steps.rb

@@ -33,6 +33,13 @@ Then /^I (?:press|touch) the "([^\"]*)" button$/ do |name|
   sleep(STEP_PAUSE)
 end
 
+Then /^I (?:press|touch) (?:input|text) field number (\d+)$/ do |index|
+  index = index.to_i
+  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
+  touch("textField index:#{index-1}")
+  sleep(STEP_PAUSE)  
+end
+
 Then /^I (?:press|touch) the "([^\"]*)" (?:input|text) field$/ do |name|
   touch("textField placeholder:'#{name}'")
   sleep(STEP_PAUSE)
@@ -90,7 +97,10 @@ Then /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |text_field, text_to_type|
 end
 
 Then /^I use the native keyboard to enter "([^\"]*)" into the "([^\"]*)" (?:text|input) field$/ do |text_to_type, field_name|
-  raise "Native keyboard entering is not yet implemented on iOS"
+  macro %Q|I touch the "#{field_name}" text field|
+  await_keyboard()
+  keyboard_enter_text(text_to_type)
+  sleep(STEP_PAUSE)
 end
 
 Then /^I fill in text fields as follows:$/ do |table|
@@ -105,11 +115,13 @@ Then /^I enter "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text, ind
   set_text("textField index:#{index-1}",text)
 end
 
-Then /^I use the native keyboard to enter "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text, index|
-  raise "Native keyboard entering is not yet implemented on iOS"
+Then /^I use the native keyboard to enter "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text_to_type, index|
+  macro %Q|I touch text field number #{index}|
+  await_keyboard()
+  keyboard_enter_text(text_to_type)
+  sleep(STEP_PAUSE)
 end
 
-
 When /^I clear "([^\"]*)"$/ do |name|
   macro %Q|I enter "" into the "#{name}" text field|
 end

data/lib/calabash-cucumber/core.rb

@@ -507,7 +507,7 @@ EOF
               body = @http.get(options[:uri], options[:body]).body
             end
             break
-          rescue HTTPClient::TimeoutError => e
+          rescue HTTPClient::TimeoutError, HTTPClient::KeepAliveDisconnected => e
             if count < CAL_HTTP_RETRY_COUNT-1
               sleep(0.5)
               @http.reset_all
@@ -519,6 +519,7 @@ EOF
               puts "Failing... #{e.class}"
               raise e
             end
+
           rescue Exception => e
             if retryable_errors.include?(e)
               if count < CAL_HTTP_RETRY_COUNT-1

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.127.pre1"
+    VERSION = "0.9.128"
     FRAMEWORK_VERSION = "0.9.126"
   end
 end

data/{features-skeleton → scripts}/.irbrc

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'irb/completion'
 require 'irb/ext/save-history'
+require 'awesome_print'
+AwesomePrint.irb!
 
 ARGV.concat [ "--readline",
               "--prompt-mode",

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.127.pre1
-  prerelease: 8
+  version: 0.9.128
+  prerelease: 
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -155,6 +155,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email:
@@ -180,9 +196,6 @@ files:
 - calabash-cucumber.gemspec
 - doc/calabash-ios-help.txt
 - epl-v10.html
-- features-skeleton/.irbrc
-- features-skeleton/irb_ios4.sh
-- features-skeleton/irb_ios5.sh
 - features-skeleton/my_first.feature
 - features-skeleton/step_definitions/calabash_steps.rb
 - features-skeleton/step_definitions/my_first_steps.rb
@@ -280,6 +293,7 @@ files:
 - lib/calabash-cucumber/tests_helpers.rb
 - lib/calabash-cucumber/version.rb
 - lib/calabash-cucumber/wait_helpers.rb
+- scripts/.irbrc
 - scripts/data/.GlobalPreferences.plist
 - scripts/data/clients.plist
 - scripts/data/com.apple.Accessibility.plist
@@ -299,9 +313,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -310,3 +324,4 @@ specification_version: 3
 summary: Client for calabash-ios-server for automated functional testing on iOS
 test_files:
 - features/step_definitions/calabash_steps.rb
+has_rdoc: 

data/features-skeleton/irb_ios4.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-IRBRC=.irbrc OS=ios4 irb

data/features-skeleton/irb_ios5.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-IRBRC=.irbrc irb