calabash-cucumber 0.9.67 → 0.9.68

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    calabash-cucumber (0.9.67)
+    calabash-cucumber (0.9.68)
       CFPropertyList
       cucumber
       json

data/bin/cal.xcconfig

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

data/bin/calabash-ios

@@ -32,6 +32,9 @@ elsif cmd == 'console'
 elsif cmd == 'build'
   build
   exit 0
+elsif cmd == 'run'
+  run
+  exit 0
 elsif cmd == 'download'
   calabash_download(ARGV)
   exit 0

data/bin/calabash-ios-build.rb

@@ -1,3 +1,8 @@
+def ensure_build_dir(options={:build_dir => "Calabash"})
+  if !File.exist?(options[:build_dir])
+    FileUtils.mkdir_p options[:build_dir]
+  end
+end
 
 def build(options={:build_dir=>"Calabash",
                    :configuration => "Debug",
@@ -6,9 +11,7 @@ def build(options={:build_dir=>"Calabash",
                    :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
+  ensure_build_dir(options)
 
   if !File.exists?("#{options[:build_dir]}/cal.xcconfig")
       FileUtils.cp(File.join(File.dirname(__FILE__),"cal.xcconfig"),"#{options[:build_dir]}/cal.xcconfig")
@@ -32,11 +35,13 @@ def build(options={:build_dir=>"Calabash",
 
   cmd << %Q[WRAPPER_NAME="#{options[:wrapper_name]}"]
 
+  res =nil
   msg("Calabash Build") do
     cmd_s = cmd.join(" ")
     puts cmd_s
-    system(cmd_s)
+    res=system(cmd_s)
   end
+  res
 end
 
 def console(options={:script => "irb_ios5.sh"})
@@ -51,3 +56,36 @@ def console(options={:script => "irb_ios5.sh"})
   puts "Running irb with ./.irbrc..."
   system("./#{options[:script]}")
 end
+
+
+def run(options={:build_dir=>"Calabash",
+                   :configuration => "Debug",
+                   :sdk => "iphonesimulator",
+                   :dstroot => "Calabash/build",
+                   :wrapper_name => "Calabash.app"})
+  if ENV['NO_DOWNLOAD'] != "1"
+    if !File.directory?("calabash.framework")
+      calabash_download(ARGV)
+    end
+  end
+
+  if ENV['NO_BUILD'] != "1"
+    if !build(options)
+      msg("Info") do
+        puts "Build failed. Please consult logs. Aborting."
+      end
+    end
+  end
+
+  if ENV["NO_GEN"] != "1"
+    if !File.directory?("features")
+      calabash_scaffold
+    end
+  end
+
+  default_path = "#{options[:dstroot]}/#{options[:wrapper_name]}"
+  cmd = %Q[APP_BUNDLE_PATH="#{ENV['APP_BUNDLE_PATH'] || default_path}" cucumber]
+  puts cmd
+  system(cmd)
+  puts "Done..."
+end

data/bin/calabash-ios-setup.rb

@@ -121,6 +121,7 @@ def download_calabash(project_path)
       else
         connection = Net::HTTP
       end
+      begin
       connection.start(uri.host, uri.port) do |http|
         request = Net::HTTP::Get.new uri.request_uri
 
@@ -139,6 +140,13 @@ def download_calabash(project_path)
           end
         end
       end
+      rescue SocketError => e
+        msg("Error") do
+          puts "Exception: #{e}"
+          puts "Unable to download Calabash. Please check connection."
+        end
+        exit 1
+      end
       if success
         puts "\nDownload done: #{file}. Unzipping..."
         if not system("unzip -C -K -o -q -d #{project_path} #{zip_file}")

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.67"
+    VERSION = "0.9.68"
     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.67
+  version: 0.9.68
   prerelease: 
 platform: ruby
 authors: