motion-calabash 0.9.127 → 0.9.136

data/lib/motion/project/calabash.rb

@@ -34,13 +34,13 @@ namespace 'calabash' do
 
   # Retrieve optional Calabash args.
   def gather_calabash_env
-     sdk = ENV['sdk'] || ENV['SDK_VERSION'] || "6.0" #Calabash env vars
+    sdk = ENV['target'] || ENV['sdk'] || ENV['SDK_VERSION'] || "6.1" #Calabash env vars
      major = sdk[0]
      os = ENV['os'] || ENV['OS']
      if os.nil?
        os = "ios#{major}"
      end
-     device = ENV['device'] || ENV['DEVICE'] || 'iphone' #Calabash env vars
+     device = ENV['device_family'] || ENV['device'] || ENV['DEVICE'] || 'iphone' #Calabash env vars
      {"SDK_VERSION" => sdk, "OS" => os, "DEVICE" => device}
   end
 
@@ -49,33 +49,46 @@ namespace 'calabash' do
     # Retrieve optional args to pass to cucumber.
     args = ENV["args"] || ""
 
+    ENV['DEVICE_ENDPOINT'] ||= 'http://localhost:37265/'
+
+    target = ARGV[1] || 'simulator'
+
+
+    project_config_vars = Motion::Project::App.config.variables
+
+    bundle_id = project_config_vars["identifier"]
+
     calabash_env = gather_calabash_env
 
-    # Retrieve optional bundle path.
-    bundle_path = ENV['APP_BUNDLE_PATH']
-    unless bundle_path
-      build = "build"
-      unless File.exist?(build)
-        App.fail "No dir found: #{build}. Please build app first."
-      end
-      sim_dir = Dir.glob("#{build}/*").find {|d| /Simulator-/.match(d)}
-      unless sim_dir and File.directory?(sim_dir)
-        App.fail "No Simulator dir found in #{build}. Please build app for simulator first."
-      end
-      app = Dir.glob("#{sim_dir}/*").find {|d| /\.app$/.match(d)}
-      unless app and File.exist?(app)
-        App.fail "No .app found in #{sim_dir}. Please build app for simulator first."
+    calabash_env['DEVICE_TARGET'] = target
+    calabash_env['BUNDLE_ID'] = bundle_id
+
+    unless target == 'device'
+      # Retrieve optional bundle path.
+      bundle_path = ENV['APP_BUNDLE_PATH']
+      unless bundle_path
+        build = "build"
+        unless File.exist?(build)
+          App.fail "No dir found: #{build}. Please build app first."
+        end
+        sim_dir = Dir.glob("#{build}/*").find {|d| /Simulator-/.match(d)}
+        unless sim_dir and File.directory?(sim_dir)
+          App.fail "No Simulator dir found in #{build}. Please build app for simulator first."
+        end
+        app = Dir.glob("#{sim_dir}/*").find {|d| /\.app$/.match(d)}
+        unless app and File.exist?(app)
+          App.fail "No .app found in #{sim_dir}. Please build app for simulator first."
+        end
+        bundle_path = File.expand_path("#{app}")
       end
-      bundle_path = File.expand_path("#{app}")
+      App.fail "No app found in #{bundle_path} (APP_BUNDLE_PATH)" unless File.exist?(bundle_path)
+      calabash_env["APP_BUNDLE_PATH"] = bundle_path
     end
 
-    App.fail "No app found in #{bundle_path} (APP_BUNDLE_PATH)" unless File.exist?(bundle_path)
-
-    calabash_env["APP_BUNDLE_PATH"] = "\"#{bundle_path}\""
 
     App.info 'Run', "#{calabash_env} cucumber #{args}"
-    env_str = calabash_env.map {|envname, envval| "#{envname}=#{envval}"}.join(" ")
-    system("#{env_str} cucumber #{args}")
+
+    exec(calabash_env,"cucumber", *(args.split(' ')))
   end
 
   desc "Start Calabash console."
@@ -88,5 +101,26 @@ namespace 'calabash' do
     exec(calabash_env,"calabash-ios","console")
   end
 
+  desc "Scaffold Calabash features folder."
+  task :scaffold do
+     # Retrieve configuration settings.
+     calabash_env = gather_calabash_env
+     cmd = '(echo "" | calabash-ios gen) &> /dev/null'
+     App.info 'Run', "Scaffolding features"
+     App.info 'Info', "Run rake calabash:run to try"
+
+     env_str = calabash_env.map {|envname, envval| "export #{envname}=#{envval};"}.join(" ")
+     system("(#{env_str}) && #{cmd}")
+
+
+     this_path = File.expand_path(__FILE__)
+     launch_path = File.join(this_path,'..','..','..','..','scripts','launch.rb')
+     launch_path = File.expand_path(launch_path)
+     puts "Copy launch file #{launch_path} to features/support/launch.rb"
+     FileUtils.cp(launch_path,File.join('features','support','launch.rb'))
+
+
+  end
+
 end
 

data/motion-calabash.gemspec

@@ -7,12 +7,12 @@ Gem::Specification.new do |s|
   s.author = 'Karl Krukow'
   s.email = 'karl@lesspainful.com'
   s.homepage = 'http://www.lesspainful.com'
-  s.version = '0.9.127'
+  s.version = '0.9.136'
   s.summary = %q{Calabash support for RubyMotion}
-  s.description = %q{This link-in calabash for iOS}
-  s.files = ["lib/framework/libcalabashuni-0.9.126.a"].concat(`git ls-files`.split("\n"))
+  s.description = %q{This linkes-in calabash for iOS}
+  s.files = ["lib/framework/libcalabashuni-0.9.136.a"].concat(`git ls-files`.split("\n"))
   s.require_paths = ["lib"]
 
-  s.add_dependency("calabash-cucumber", "0.9.126")
+  s.add_dependency("calabash-cucumber", "0.9.136")
 
 end

data/scripts/launch.rb

@@ -0,0 +1,171 @@
+########################################
+#                                      #
+#       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/launch/simulator_helper'
+require 'sim_launcher'
+require 'run_loop'
+
+# 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"
+#
+
+
+def calabash_no_stop?
+  ENV['NO_LAUNCH']=="1" or ENV['NO_STOP']=="1"
+end
+
+def device_target?
+  ENV['DEVICE_TARGET'] == 'device'
+end
+
+
+class MotionLauncherTimeoutErr < Timeout::Error
+end
+
+class MotionLauncher
+  attr_accessor :run_loop
+
+  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=nil)
+    if run_loop
+      RunLoop.stop(run_loop)
+    end
+    if device_target?
+      self.run_loop = RunLoop.run(:app => ENV['BUNDLE_ID'])
+      ensure_connectivity
+    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
+      Calabash::Cucumber::SimulatorHelper.relaunch(path, sdk, ENV['DEVICE'] || 'iphone', args)
+    end
+
+  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, MotionLauncherTimeoutErr) 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 MotionLauncherTimeoutErr => 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
+
+    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
+
+AfterConfiguration do
+  system("rake device") if device_target?
+end
+
+Before do |scenario|
+  @launcher = MotionLauncher.new
+  @launcher.relaunch
+  @launcher.calabash_notify(self)
+end
+
+After do |scenario|
+  unless calabash_no_stop?
+    if device_target?
+      @launcher.stop
+    else
+      Calabash::Cucumber::SimulatorHelper.stop
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-calabash
 version: !ruby/object:Gem::Version
-  version: 0.9.127
+  version: 0.9.136
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: calabash-cucumber
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.126
+        version: 0.9.136
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,14 +26,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.126
-description: This link-in calabash for iOS
+        version: 0.9.136
+description: This linkes-in calabash for iOS
 email: karl@lesspainful.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/framework/libcalabashuni-0.9.126.a
+- lib/framework/libcalabashuni-0.9.136.a
 - .gitignore
 - LICENSE
 - README.rdoc
@@ -41,6 +41,7 @@ files:
 - lib/motion-calabash.rb
 - lib/motion/project/calabash.rb
 - motion-calabash.gemspec
+- scripts/launch.rb
 homepage: http://www.lesspainful.com
 licenses: []
 post_install_message: 
@@ -66,3 +67,4 @@ signing_key:
 specification_version: 3
 summary: Calabash support for RubyMotion
 test_files: []
+has_rdoc: