calabash-cucumber 0.9.139 → 0.9.140.pre1

data/bin/calabash-ios

@@ -34,6 +34,9 @@ elsif cmd == 'console'
 elsif cmd == 'build'
   build
   exit 0
+elsif cmd == 'update'
+  update(ARGV)
+  exit 0
 elsif cmd == 'run'
   run
   exit 0

data/bin/calabash-ios-helpers.rb

@@ -1,6 +1,7 @@
 require 'tempfile'
 require 'json'
 
+UPDATE_TARGETS = ['hooks']
 
 def msg(title, &block)
   puts "\n" + "-"*10 + title + "-"*10
@@ -21,6 +22,8 @@ def print_usage
       starts an interactive console to interact with your app via Calabash
     setup [<path>]
       setup your XCode project for calabash-ios (EXPERIMENTAL)
+    update [target]
+      updates one of the following targets: hooks
     download
       install latest compatible version of calabash.framework
     check [{<path to .ipa>|<path to .app>}]

data/bin/calabash-ios-setup.rb

@@ -290,4 +290,50 @@ def validate_app(app)
     end
   end
 
+end
+
+
+def update(args)
+  if args.length > 0
+    target = args[0]
+    unless UPDATE_TARGETS.include?(target)
+      msg("Error") do
+        puts "Invalid target #{target}. Must be one of: #{UPDATE_TARGETS.join(' ')}"
+      end
+      exit 1
+    end
+
+
+
+    target_file = "features/support/launch.rb"
+    msg("Question") do
+      puts "I'm about to update the #{target_file} file."
+      puts "Please hit return to confirm that's what you want."
+    end
+    exit 2 unless STDIN.gets.chomp == ''
+
+
+    unless File.exist?(target_file)
+      msg("Error") do
+        puts "Unable to find file #{target_file}"
+        puts "Please change directory so that #{target_file} exists."
+      end
+      exit 1
+    end
+    new_launch_script = File.join(@script_dir,"launch.rb")
+
+    FileUtils.cp(new_launch_script, target_file, :verbose => true)
+
+    msg("Info") do
+      puts "File copied.\n"
+      puts "Launch on device using environment variable DEVICE_TARGET=device."
+    end
+  else
+    msg("Error") do
+      puts "update must take one of the following targets: #{UPDATE_TARGETS.join(' ')}"
+    end
+    exit 1
+
+  end
+
 end

data/doc/calabash-ios-help.txt

@@ -44,6 +44,9 @@ Usage: calabash-ios <command-name> [parameters]
         If something goes wrong. Close Xcode and copy project.pbxproj.bak
         to project.pbxproj inside your .xcodeproj folder.
 
+  update [target]
+        updates one of the following targets: hooks
+
   download [opt_path]?
         copies current compatible version of calabash.framework to your project.
         It should be run from a directory containing an Xcode project,

data/lib/calabash-cucumber/core.rb

@@ -325,7 +325,12 @@ module Calabash
         device = options["DEVICE"] || ENV["DEVICE"] || "iphone"
 
         unless os
-          major = Calabash::Cucumber::SimulatorHelper.ios_major_version
+          if @calabash_launcher && @calabash_launcher.active?
+            major = @calabash_launcher.ios_major_version
+          else
+            major = Calabash::Cucumber::SimulatorHelper.ios_major_version
+          end
+
           unless major
             raise <<EOF
           Unable to determine iOS major version
@@ -471,24 +476,28 @@ EOF
       end
 
 
-      def start_app_in_background(path=nil, sdk = nil, version = 'iphone', args = nil)
-
-        if path.nil?
-          path = ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH)
-        end
-        app_bundle_path = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(path)
+      ## args :app for device bundle id, for sim path to app
+      ##
+      def start_test_server_in_background(args={})
+        target = args[:device_target] || :simulator
+        stop_test_server
+        @calabash_launcher = Calabash::Cucumber::Launcher.new(target)
+        @calabash_launcher.relaunch(args)
 
-        @ios_device = RunLoop.run(:app => app_bundle_path)
       end
 
-      def send_uia_command(opts ={})
-        RunLoop.send_command(opts[:device] ||@ios_device, opts[:command])
+      def stop_test_server
+        if @calabash_launcher
+           @calabash_launcher.stop
+        end
       end
 
-      def stop_background_app(stop_spec = nil)
-
-        @ios_device = RunLoop.stop(stop_spec || @ios_device)
-
+      def send_uia_command(opts ={})
+        run_loop = opts[:run_loop] || (@calabash_launcher && @calabash_launcher.active? && @calabash_launcher.run_loop)
+        command = opts[:command]
+        raise ArgumentError, 'please supply :run_loop or instance var @calabash_launcher' unless run_loop
+        raise ArgumentError, 'please supply :command' unless command
+        RunLoop.send_command(run_loop, opts[:command])
       end
 
 

data/lib/calabash-cucumber/launcher.rb

@@ -0,0 +1,155 @@
+require 'calabash-cucumber/launch/simulator_helper'
+require 'sim_launcher'
+require 'run_loop'
+
+
+class Calabash::Cucumber::Launcher
+  attr_accessor :run_loop
+  attr_accessor :device_target
+  attr_accessor :ios_version
+
+  def initialize(device_target=:simulator)
+    self.device_target = device_target
+  end
+
+  class CalabashLauncherTimeoutErr < Timeout::Error
+  end
+
+  def calabash_no_stop?
+    ENV['NO_LAUNCH']=="1" or ENV['NO_STOP']=="1"
+  end
+
+  def device_target?
+    ENV['DEVICE_TARGET'] == 'device'
+  end
+
+  def simulator_target?
+    ENV['DEVICE_TARGET'] == 'simulator'
+  end
+
+  def active?
+    (simulator_target? || device_target?) && (not run_loop.nil?)
+  end
+
+  def ios_major_version
+    v = ios_version
+    (v && v.split('.')[0])
+  end
+
+
+  def reset_app_jail(sdk, app_path)
+    return if device_target?
+
+    app = File.basename(app_path)
+    bundle = `find "#{ENV['HOME']}/Library/Application Support/iPhone Simulator/#{sdk}/Applications/" -type d -depth 2 -name "#{app}" | head -n 1`
+    return if bundle.empty? # Assuming we're already clean
+
+    sandbox = File.dirname(bundle)
+    ['Library', 'Documents', 'tmp'].each do |dir|
+      FileUtils.rm_rf(File.join(sandbox, dir))
+    end
+  end
+
+  def relaunch(args={})
+    RunLoop.stop(run_loop) if run_loop
+
+    if device_target?
+      default_args = {:app => ENV['BUNDLE_ID']}
+      self.run_loop = RunLoop.run(default_args.merge(args))
+    else
+
+      sdk = ENV['SDK_VERSION'] || SimLauncher::SdkDetector.new().latest_sdk_version
+      path = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path)
+      if ENV['RESET_BETWEEN_SCENARIOS']=="1"
+        reset_app_jail(sdk, path)
+      end
+
+      if simulator_target?
+        device = (ENV['DEVICE'] || 'iphone').to_sym
+        default_args = {:app => path, :device => device}
+        self.run_loop = RunLoop.run(default_args.merge(args))
+      else
+        ## sim launcher
+        Calabash::Cucumber::SimulatorHelper.relaunch(path, sdk, ENV['DEVICE'] || 'iphone', args)
+      end
+
+    end
+    ensure_connectivity
+  end
+
+
+  def ensure_connectivity
+    begin
+      max_retry_count = (ENV['MAX_CONNECT_RETRY'] || 10).to_i
+      timeout = (ENV['CONNECT_TIMEOUT'] || 30).to_i
+      retry_count = 0
+      connected = false
+      puts "Waiting for App to be ready"
+      until connected do
+        raise "MAX_RETRIES" if retry_count == max_retry_count
+        retry_count += 1
+        begin
+          Timeout::timeout(timeout, CalabashLauncherTimeoutErr) do
+            until connected
+              begin
+                connected = (ping_app == '200')
+                break if connected
+              rescue Exception => e
+                #p e
+                #retry
+              ensure
+                sleep 1 unless connected
+              end
+            end
+          end
+        rescue CalabashLauncherTimeoutErr => e
+          puts "Timed out...Retry.."
+        end
+      end
+    rescue e
+      p e
+      msg = "Unable to make connection to Calabash Server at #{ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/"}\n"
+      msg << "Make sure you don't have a firewall blocking traffic to #{ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/"}.\n"
+      raise msg
+    end
+  end
+
+  def ping_app
+    url = URI.parse(ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/")
+
+    http = Net::HTTP.new(url.host, url.port)
+    res = http.start do |sess|
+      sess.request Net::HTTP::Get.new "version"
+    end
+    status = res.code
+    begin
+      http.finish if http and http.started?
+    rescue Exception => e
+
+    end
+
+    if status=='200'
+      version_body = JSON.parse(res.body)
+      if version_body['iOS_version']
+        self.ios_version = version_body['iOS_version']
+      end
+    end
+
+    status
+  end
+
+  def stop
+    RunLoop.stop(run_loop)
+  end
+
+  def app_path
+    ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH)
+  end
+
+  def calabash_notify(world)
+    if world.respond_to?(:on_launch)
+      world.on_launch
+    end
+  end
+end
+

data/lib/calabash-cucumber/operations.rb

@@ -3,6 +3,7 @@ require 'calabash-cucumber/tests_helpers'
 require 'calabash-cucumber/keyboard_helpers'
 require 'calabash-cucumber/wait_helpers'
 require 'calabash-cucumber/location'
+require 'calabash-cucumber/launcher'
 require 'net/http'
 require 'test/unit/assertions'
 require 'json'
@@ -99,7 +100,6 @@ module Calabash
       end
 
 
-
       #not officially supported yet
       #def change_slider_value_to(q, value)
       #  target = value.to_f

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.139'
+    VERSION = '0.9.140.pre1'
     FRAMEWORK_VERSION = '0.9.139'
   end
 end

data/scripts/launch.rb

@@ -0,0 +1,49 @@
+########################################
+#                                      #
+#       Important Note                 #
+#                                      #
+#   When running calabash-ios tests at #
+#   www.lesspainful.com                #
+#   this file will be overwritten by   #
+#   a file which automates             #
+#   app launch on devices.             #
+#                                      #
+#   Don't rely on this file being      #
+#   present when running at            #
+#   www.lesspainful.com.               #
+#                                      #
+#  Only put stuff here to automate     #
+#  iOS Simulator.                      #
+#                                      #
+#  You can put your app bundle path    #
+#  for automating simulator app start: #
+#  Uncomment APP_BUNDLE_PATH =..       #
+#                                      #
+########################################
+
+require 'calabash-cucumber/launcher'
+
+# Uncomment and replace ?? appropriately
+# This should point to your Simulator build
+# which includes calabash framework
+# this is usually the Calabash build configuration
+# of your production target.
+#APP_BUNDLE_PATH = "~/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app"
+#
+
+
+Before do |scenario|
+  @calabash_launcher = Calabash::Cucumber::Launcher.new
+  @calabash_launcher.relaunch
+  @calabash_launcher.calabash_notify(self)
+end
+
+After do |scenario|
+  unless @calabash_launcher.calabash_no_stop?
+    if @calabash_launcher.active?
+      @calabash_launcher.stop
+    else
+      Calabash::Cucumber::SimulatorHelper.stop
+    end
+  end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.139
-  prerelease: 
+  version: 0.9.140.pre1
+  prerelease: 8
 platform: ruby
 authors:
 - Karl Krukow
@@ -211,6 +211,7 @@ files:
 - lib/calabash-cucumber/ibase.rb
 - lib/calabash-cucumber/keyboard_helpers.rb
 - lib/calabash-cucumber/launch/simulator_helper.rb
+- lib/calabash-cucumber/launcher.rb
 - lib/calabash-cucumber/location.rb
 - lib/calabash-cucumber/operations.rb
 - lib/calabash-cucumber/resources/cell_swipe_ios4_ipad.base64
@@ -298,6 +299,7 @@ files:
 - scripts/data/.GlobalPreferences.plist
 - scripts/data/clients.plist
 - scripts/data/com.apple.Accessibility.plist
+- scripts/launch.rb
 - scripts/reset_simulator.scpt
 - staticlib/calabash.framework.zip
 homepage: http://calaba.sh
@@ -315,9 +317,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23