motion-calabash 0.9.113 → 0.9.126

data/lib/motion/project/calabash.rb

@@ -35,9 +35,9 @@ namespace 'calabash' do
   # Retrieve optional Calabash args.
   def gather_calabash_env
      sdk = ENV['sdk'] || ENV['SDK_VERSION'] || "6.0" #Calabash env vars
-     os = ENV['os'] || ENV['OS'] || 'ios5' #Calabash env vars
+     os = ENV['os'] || ENV['OS'] || 'ios6' #Calabash env vars
      device = ENV['device'] || ENV['DEVICE'] || 'iphone' #Calabash env vars
-     {:sdk => sdk, :os => os, :device => device, :str => "SDK_VERSION=#{sdk} OS=#{os} DEVICE=#{device}"}
+     {"SDK_VERSION" => sdk, "OS" => os, "DEVICE" => device}
   end
 
 
@@ -50,7 +50,7 @@ namespace 'calabash' do
     # Retrieve optional bundle path.
     bundle_path = ENV['APP_BUNDLE_PATH']
     unless bundle_path
-      build = "build/iPhoneSimulator-#{calabash_env[:sdk]}-Development"
+      build = "build/iPhoneSimulator-#{calabash_env["SDK_VERSION"]}-Development"
       unless File.exist?(build)
         App.fail "No dir found in #{build}. Please build app first."
       end
@@ -63,9 +63,10 @@ namespace 'calabash' do
 
     App.fail "No app found in #{bundle_path} (APP_BUNDLE_PATH)" unless File.exist?(bundle_path)
 
-    cmd = "#{calabash_env[:str]} APP_BUNDLE_PATH=\"#{bundle_path}\" cucumber #{args}"
-    App.info 'Run', cmd
-    system(cmd)
+    calabash_env["APP_BUNDLE_PATH"] = "\"#{bundle_path}\""
+
+    App.info 'Run', "#{calabash_env} cucumber #{args.join(" ")}"
+    exec(calabash_env,"cucumber",*args)
   end
 
   desc "Start Calabash console."
@@ -73,8 +74,9 @@ namespace 'calabash' do
     # Retrieve configuration settings.
     calabash_env = gather_calabash_env
     cmd = "#{calabash_env[:str]} calabash-ios console"
-    App.info 'Run', cmd
-    system(cmd)
+    App.info 'Run', "#{calabash_env} calabash-ios console"
+
+    exec(calabash_env,"calabash-ios","console")
   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.113'
+  s.version = '0.9.126'
   s.summary = %q{Calabash support for RubyMotion}
-  s.description = %q{This will download and link-in calabash}
-  s.files = `git ls-files`.split("\n")
+  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.require_paths = ["lib"]
 
-  s.add_dependency("calabash-cucumber", "0.9.113")
+  s.add_dependency("calabash-cucumber", "0.9.126")
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-calabash
 version: !ruby/object:Gem::Version
-  version: 0.9.113
+  version: 0.9.126
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-12-15 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.113
+        version: 0.9.126
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,18 +26,18 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.113
-description: This will download and link-in calabash
+        version: 0.9.126
+description: This link-in calabash for iOS
 email: karl@lesspainful.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/framework/libcalabashuni-0.9.126.a
 - .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
-- lib/framework/libcalabashuni-0.9.111.a
 - lib/motion-calabash.rb
 - lib/motion/project/calabash.rb
 - motion-calabash.gemspec