calabash-cucumber 0.9.66 → 0.9.67

data/Gemfile.lock

@@ -1,38 +1,33 @@
 PATH
   remote: .
   specs:
-    calabash-cucumber (0.9.65)
+    calabash-cucumber (0.9.67)
       CFPropertyList
       cucumber
       json
       net-http-persistent
-      sim_launcher (= 0.4.1.pre2)
+      sim_launcher (= 0.3.8)
       slowhandcuke
 
 GEM
   remote: http://rubygems.org/
   specs:
-    CFPropertyList (2.0.17)
-      libxml-ruby (>= 1.1.0)
-      rake (>= 0.7.0)
+    CFPropertyList (2.1.1)
     builder (3.0.0)
-    cucumber (1.1.9)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.9.0)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
-    gherkin (2.9.0)
+    gherkin (2.11.0)
       json (>= 1.4.6)
-    json (1.6.5)
-    libxml-ruby (2.3.0)
-    net-http-persistent (2.6)
+    json (1.6.4)
+    net-http-persistent (2.7)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
-    rake (0.9.2.2)
-    sim_launcher (0.4.1.pre2)
+    sim_launcher (0.3.8)
       sinatra
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
@@ -40,7 +35,6 @@ GEM
       tilt (~> 1.3, >= 1.3.3)
     slowhandcuke (0.0.3)
       cucumber
-    term-ansicolor (1.0.7)
     tilt (1.3.3)
 
 PLATFORMS

data/bin/cal.xcconfig

@@ -0,0 +1,3 @@
+INSTALL_PATH = /./
+
+OTHER_LDFLAGS = $(inherited) -force_load $(SRCROOT)/Calabash/calabash.framework/calabash -framework CFNetwork -lstdc++

data/bin/calabash-ios

@@ -9,6 +9,7 @@ require File.join(File.dirname(__FILE__),"calabash-ios-helpers")
 require File.join(File.dirname(__FILE__),"calabash-ios-generate")
 require File.join(File.dirname(__FILE__),"calabash-ios-setup")
 require File.join(File.dirname(__FILE__),"calabash-ios-sim")
+require File.join(File.dirname(__FILE__),"calabash-ios-build")
 
 @features_dir = File.join(FileUtils.pwd, "features")
 @source_dir = File.join(File.dirname(__FILE__), '..', 'features-skeleton')
@@ -25,6 +26,12 @@ if cmd == 'help'
 elsif cmd == 'gen'
   calabash_scaffold
   exit 0
+elsif cmd == 'console'
+  console
+  exit 0
+elsif cmd == 'build'
+  build
+  exit 0
 elsif cmd == 'download'
   calabash_download(ARGV)
   exit 0

data/bin/calabash-ios-build.rb

@@ -0,0 +1,53 @@
+
+def build(options={:build_dir=>"Calabash",
+                   :configuration => "Debug",
+                   :sdk => "iphonesimulator",
+                   :dstroot => "Calabash/build",
+                   :wrapper_name => "Calabash.app"})
+  #Follow Pete's .xcconfig-based approach with zero-config
+
+  if !File.exist?(options[:build_dir])
+    FileUtils.mkdir_p options[:build_dir]
+  end
+
+  if !File.exists?("#{options[:build_dir]}/cal.xcconfig")
+      FileUtils.cp(File.join(File.dirname(__FILE__),"cal.xcconfig"),"#{options[:build_dir]}/cal.xcconfig")
+  end
+
+  cmd=["xcodebuild"]
+  cmd << %Q[-xcconfig "#{options[:build_dir]}/cal.xcconfig"]
+  cmd << "install"
+
+  (options[:target] || []).each do |tgt|
+    options << %Q[-target "#{tgt}"]
+  end
+
+  cmd << "-configuration"
+  cmd << %Q["#{options[:configuration]}"]
+
+  cmd << "-sdk"
+  cmd << %Q["#{options[:sdk]}"]
+
+  cmd << %Q[DSTROOT="#{options[:dstroot]}"]
+
+  cmd << %Q[WRAPPER_NAME="#{options[:wrapper_name]}"]
+
+  msg("Calabash Build") do
+    cmd_s = cmd.join(" ")
+    puts cmd_s
+    system(cmd_s)
+  end
+end
+
+def console(options={:script => "irb_ios5.sh"})
+  if !File.exists?(".irbrc")
+    puts "Copying calabash-ios .irbrc file to current directory..."
+    FileUtils.cp(File.join(@source_dir,".irbrc"), ".")
+  end
+  if !File.exists?(options[:script])
+    puts "Copying calabash-ios #{options[:script]} file to current directory..."
+    FileUtils.cp(File.join(@source_dir,options[:script]), ".")
+  end
+  puts "Running irb with ./.irbrc..."
+  system("./#{options[:script]}")
+end

data/features-skeleton/irb_ios4.sh

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

data/features-skeleton/irb_ios5.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-IRBRC=.irbrc OS=ios5 DEVICE=iphone irb
+IRBRC=.irbrc irb

data/lib/calabash-cucumber/operations.rb

@@ -263,16 +263,7 @@ module Operations
 
 
   def load_playback_data(recording,options={})
-    os = options["OS"] || ENV["OS"]
-    if not os and ENV['SDK_VERSION']
-       sdk = ENV['SDK_VERSION']
-       if sdk[0] != '4' and sdk[0] != '5'
-         raise "SDK_VERSION should be 4.x or 5.x"
-       end
-       os = "ios#{sdk[0]}"
-    elsif os.nil? and ENV['SDK_VERSION'].nil?
-      raise "Either SDK_VERSION or OS environment vars must be set."
-    end
+    os = options["OS"] || ENV["OS"] || "ios5"
     device = options["DEVICE"] || ENV["DEVICE"] || "iphone"
 
     rec_dir = ENV['PLAYBACK_DIR'] || "#{Dir.pwd}/playback"

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.66"
+    VERSION = "0.9.67"
     FRAMEWORK_VERSION = "0.9.65"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.66
+  version: 0.9.67
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-17 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -123,7 +123,9 @@ files:
 - LICENSE
 - Rakefile
 - bin/CalabashSetup
+- bin/cal.xcconfig
 - bin/calabash-ios
+- bin/calabash-ios-build.rb
 - bin/calabash-ios-generate.rb
 - bin/calabash-ios-helpers.rb
 - bin/calabash-ios-setup.rb