calabash-cucumber 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7beda75c6242b6bc7f82b44c1a61d3ed14a57a33
-  data.tar.gz: 0753bd7f7c8bb00bf02f769300cd2308568f405d
+  metadata.gz: 858401fd6208b68bba5b454ead0fc6c0fb1cf096
+  data.tar.gz: 615e20e056d41bf5bac1617fd29c311213244a0b
 SHA512:
-  metadata.gz: b9bbeb8638dc56f4cbba5d1a14ff8904265e049011245f083aa1746edd5d7440aa3b5921ecbcb407eb5987e4c291fe306e7c795aa54edf40b2269fe65e046aa8
-  data.tar.gz: 91fd05fae2b029a11d7df9ce4645c2b9018cd5237a400bc692322d33ac350f7ddc56bfb53d9963330c68054e87785005387cd46dcfc32303b67b2459bee6eb8a
+  metadata.gz: 72c8518231bc1becf0ded6507d9f033d26639a8acdbb8f515c6c8626ba509cce2cd8987f2a4c5e8e4791f8a06d23a8d0d194bfeddcbb7f52b0421855dccc5055
+  data.tar.gz: ae4c2405c6b4091c5280f67ee0710d69838d76e1dcd007376a7350fa8bb446873188d343188d48ded4626f1be59d3903a6ffe9aafdb21e8b3d9ebacbea7326d7

data/bin/calabash-ios-setup.rb

@@ -229,55 +229,41 @@ def validate_setup(args)
 end
 
 def validate_ipa(ipa)
-  require 'tmpdir'
-  fail = false
-  Dir.mktmpdir do |dir|
-    if not system("unzip -C -K -o -q -d #{dir} #{ipa}")
-      msg("Error") do
-        puts "Unable to unzip ipa: #{ipa}"
-      end
-      Dir
-      fail = true
-    end
-
-    app_dir = Dir.foreach("#{dir}/Payload").find {|d| /\.app$/.match(d)}
-
-    res = `otool "#{File.expand_path(dir)}/Payload/#{app_dir}/"* -o 2> /dev/null | grep CalabashServer`
-    msg("Info") do
-      if /CalabashServer/.match(res)
-        puts "Ipa: #{ipa} *contains* calabash.framework"
-      else
-        puts "Ipa: #{ipa} *does not contain* calabash.framework"
-      end
-    end
-
+  begin
+    version = RunLoop::Ipa.new(ipa).calabash_server_version
+  rescue => e
+    $stderr.puts(e.message)
+    exit(1)
   end
-  if fail 
+
+  if version
+    puts "Ipa: #{ipa} *contains* calabash.framework"
+    puts version.to_s
+    exit(0)
+  else
+    puts "Ipa: #{ipa} *does not contain* calabash.framework"
     exit(1)
   end
-  
 end
 
 def validate_app(app)
-  if not File.directory?app
-    msg("Error") do
-      puts "Path: #{app} is not a directory."
-    end
-    exit 1
+  begin
+    version = RunLoop::App.new(app).calabash_server_version
+  rescue => e
+    $stderr.puts(e.message)
+    exit(1)
   end
-  out = `otool "#{File.expand_path(app)}"/* -o 2> /dev/null | grep CalabashServer`
 
-  msg("Info") do
-    if /CalabashServer/.match(out)
-      puts "App: #{app} *contains* calabash.framework"
-    else
-      puts "App: #{app} *does not contain* calabash.framework"
-    end
+  if version
+    puts "App: #{app} *contains* calabash.framework"
+    puts version.to_s
+    exit(0)
+  else
+    puts "App: #{app} *does not contain* calabash.framework"
+    exit(1)
   end
-
 end
 
-
 def update(args)
   if args.length > 0
     target = args[0]

data/features-skeleton/support/dry_run.rb

@@ -1,2 +1,19 @@
-require 'calabash-cucumber'
+require "calabash-cucumber"
 
+# Cucumber -d must pass, but support/env.rb is not eval'd on dry runs.
+# We must detect that the user wants to use pre-defined steps.
+dir = File.expand_path(File.dirname(__FILE__))
+env = File.join(dir, "env.rb")
+
+contents = File.read(env).force_encoding("UTF-8")
+
+contents.split($-0).each do |line|
+
+  # Skip comments.
+  next if line.chars[0] == "#"
+
+  if line[/calabash-cucumber\/cucumber/, 0]
+    require "calabash-cucumber/calabash_steps"
+    break
+  end
+end

data/features-skeleton/support/env.rb

@@ -9,7 +9,3 @@ require "calabash-cucumber/cucumber"
 # require "calabash-cucumber/wait_helpers"
 # require "calabash-cucumber/operations"
 # World(Calabash::Cucumber::Operations)
-
-# Uncomment this line if you want the Calabash::Formatters::Html formatter.
-# require "calabash-cucumber/formatters/html"
-

data/lib/calabash-cucumber/cucumber.rb

@@ -1,6 +1,5 @@
 require 'calabash-cucumber/wait_helpers'
 require 'calabash-cucumber/operations'
-require "calabash-cucumber/formatters/html"
 
 World(Calabash::Cucumber::Operations)
 

data/lib/calabash-cucumber/launch/simulator_launcher.rb

@@ -241,52 +241,32 @@ module Calabash
             msg << "Make sure you build for Simulator and that you're using the Calabash components"
             raise msg.join("\n")
           end
-          if full_console_logging?
-            puts('-'*37)
-            puts "Auto detected APP_BUNDLE_PATH:\n\n"
-
-            puts "APP_BUNDLE_PATH= '#{bundle_path}'\n\n"
-            puts 'Please verify!'
-            puts "If this is wrong please set it as APP_BUNDLE_PATH in features/support/01_launch.rb\n"
-            puts('-'*37)
-          end
         else
-          bo_dir = build_output_dir_for_project
-          sim_dirs = Dir.glob(File.join(bo_dir, '*-iphonesimulator', '*.app'))
-          
-          if sim_dirs.empty?
-            msg = ['Unable to auto detect APP_BUNDLE_PATH.']
-            msg << 'Have you built your app for simulator?'
-            msg << "Searched dir: #{bo_dir}"
-            msg << 'Please build your app from Xcode'
-            msg << 'You should build the -cal target.'
-            msg << ''
-            msg << 'Alternatively, specify APP_BUNDLE_PATH in features/support/01_launch.rb'
-            msg << "This should point to the location of your built app linked with calabash.\n"
-            raise msg.join("\n")
-          end
-          preferred_dir = find_preferred_dir(sim_dirs)
-          if preferred_dir.nil?
-            msg = ['Error... Unable to find APP_BUNDLE_PATH.']
-            msg << 'Cannot find a built app that is linked with calabash.framework'
-            msg << 'Please build your app from Xcode'
-            msg << 'You should build your calabash target.'
-            msg << ''
-            msg << 'Alternatively, specify APP_BUNDLE_PATH in features/support/01_launch.rb'
-            msg << "This should point to the location of your built app linked with calabash.\n"
-            raise msg.join("\n")
-          end
-          if full_console_logging?
-            puts('-'*37)
-            puts "Auto detected APP_BUNDLE_PATH:\n\n"
+          search_dir = build_output_dir_for_project || DERIVED_DATA
+          bundle_path = select_most_recent_bundle(search_dir)
+
+          if bundle_path.nil?
+            raise RuntimeError,
+%Q{
+Unable to auto detect a .app that is linked Calabash.
 
-            puts "APP_BUNDLE_PATH=#{preferred_dir || sim_dirs[0]}\n\n"
-            puts 'Please verify!'
-            puts "If this is wrong please set it as APP_BUNDLE_PATH in features/support/01_launch.rb\n"
-            puts('-'*37)
+Searched: #{search_dir}
+
+Have you built your app for simulator?
+
+Please build your app from Xcode
+
+Alternatively, specify APP in features/support/01_launch.rb
+or as an environment variable:
+
+$ APP=/path/to/Your.app bundle exec cucumber
+}
           end
-          bundle_path = sim_dirs[0]
         end
+
+        Calabash::Cucumber.log_debug("Auto detected app at path:")
+        Calabash::Cucumber.log_debug(bundle_path)
+        Calabash::Cucumber.log_debug("If this is incorrect, set the APP variable")
         bundle_path
       end
 
@@ -592,7 +572,46 @@ module Calabash
         _deprecated('0.9.169', 'check is now done in Launcher', :warn)
         raise(NotImplementedError, 'this method has been deprecated and will be removed')
       end
-    end
 
+      private
+
+      # @!visibility private
+      def app(bundle_path)
+        RunLoop::App.new(bundle_path)
+      end
+
+      # @!visibility private
+      def lipo(bundle_path)
+        RunLoop::Lipo.new(bundle_path)
+      end
+
+      # @!visibility private
+      def collect_app_bundles(base_dir)
+        bundles = []
+
+        Dir.glob("#{base_dir}/**/*.app") do |bundle|
+          next if !RunLoop::App.valid?(bundle)
+
+          lipo = lipo(bundle)
+          arches = lipo.info
+          if arches.include?("x86_64") || arches.include?("i386")
+            app = app(bundle)
+            if app.calabash_server_version
+              bundles << bundle
+            end
+          end
+        end
+
+        bundles
+      end
+
+      # @!visibility private
+      def select_most_recent_bundle(base_dir)
+        bundles = collect_app_bundles(base_dir)
+        bundles.max do |a, b|
+          File.mtime(a) <=> File.mtime(b)
+        end
+      end
+    end
   end
 end

data/lib/calabash-cucumber/version.rb

@@ -3,10 +3,10 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = "0.18.0"
+    VERSION = "0.18.1"
 
     # @!visibility public
     # The minimum required version of the Calabash embedded server.
-    MIN_SERVER_VERSION = "0.18.0"
+    MIN_SERVER_VERSION = "0.18.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -132,7 +132,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -142,7 +142,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -402,7 +402,6 @@ files:
 - lib/calabash-cucumber/environment.rb
 - lib/calabash-cucumber/environment_helpers.rb
 - lib/calabash-cucumber/failure_helpers.rb
-- lib/calabash-cucumber/formatters/html.rb
 - lib/calabash-cucumber/http_helpers.rb
 - lib/calabash-cucumber/ibase.rb
 - lib/calabash-cucumber/ipad_1x_2x.rb
@@ -528,6 +527,7 @@ files:
 - lib/calabash-cucumber/utils/xctools.rb
 - lib/calabash-cucumber/version.rb
 - lib/calabash-cucumber/wait_helpers.rb
+- lib/calabash/formatters/html.rb
 - lib/frank-calabash.rb
 - scripts/.irbrc
 - scripts/calabash.xcconfig.erb