calabash-cucumber 0.9.156 → 0.9.157

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 715059c1784340a903fff4c86c75cdb7cd42fe0c
-  data.tar.gz: fdf778b06281f52038fb092212110c3f5dc33f21
+  metadata.gz: bf0f204dd4bfa1ef9a3fb65156d60064f1aa39ff
+  data.tar.gz: cd89efebec79f86f9cda89ce2f6d3e52d285940e
 SHA512:
-  metadata.gz: e746d5950b9d3a7cb84e437f72d3e46703c827d0f22d7dc25284bf2f9d4cba6e5deb725a63eb5a4b4f5695bba65b8f4eb974f780e3813cf61fbe0b322d9357ae
-  data.tar.gz: d4352489b765393b9c1ce26ae1c03fe1792bec13cf6f63e74819467c9d574bf0a445f5f29e3fda1bdf84a0ed93f8d4c8c181a865ddd5bdf8c0d82fd6661d67f6
+  metadata.gz: a4eee6bc0bcf795ce013c48e5f075c4943d9e2c95db2ccc92ada7d7dcdc43a68fe4be0b33576de239f4baf0988099bfcf617d91bc325fbf659a289f3dea05205
+  data.tar.gz: 7821e5a78b37d87351904536444ad46a31d0c981eb8cc84653e292cba70120d28fac39d261104f898881e38012efb1ac9dcb4a96006a9e12563868b5aa1864b5

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

@@ -203,8 +203,18 @@ module Calabash
         return nil unless project_dir
 
         ios_project_dir = Dir[File.join(project_dir,'*.iOS')].first
-        return nil unless ios_project_dir && File.directory?(ios_project_dir)
-        ios_project_dir
+        return ios_project_dir if ios_project_dir && File.directory?(ios_project_dir)
+        # ios_project_dir does not exist
+        # Detect case where there is no such sub directory
+        # (i.e. iOS only Xamarin project)
+        bin_dir = File.join(project_dir, 'bin')
+        if File.directory?(bin_dir) &&
+            (File.directory?(File.join(bin_dir,'iPhoneSimulator')) ||
+             File.directory?(File.join(bin_dir,'iPhone')))
+            return project_dir ## Looks like iOS bin dir is here
+        end
+
+
       end
 
       def self.bundle_path_from_xamarin_project(device_build_dir='iPhoneSimulator')

data/lib/calabash-cucumber/launcher.rb

@@ -107,7 +107,7 @@ class Calabash::Cucumber::Launcher
     return :instruments unless sdk_version
     return :instruments if sdk_version.start_with?('7') # Only instruments supported for iOS7+
     sim_detector = SimLauncher::SdkDetector.new()
-    available = sim_detector.available_sdk_versions.reject {|v| v.start_with?('7')}
+    available = sim_detector.available_sdk_versions.reject { |v| v.start_with?('7') }
     if available.include?(sdk_version)
       :sim_launcher
     else
@@ -122,6 +122,18 @@ class Calabash::Cucumber::Launcher
 
     args[:app] = args[:app] || args[:bundle_id] || app_path || detect_app_bundle_from_args(args)
 
+
+    if args[:app]
+      if File.directory?(args[:app])
+        args[:app] = File.expand_path(args[:app])
+      else
+        # args[:app] is not a directory so must be a bundle id
+        if args[:device_target] == 'simulator' ## bundle id set, but simulator target
+          args[:app] = app_path || detect_app_bundle_from_args(args)
+        end
+      end
+    end
+
     unless args[:app]
       if args[:device_target]=='simulator'
         device_xamarin_build_dir = 'iPhoneSimulator'
@@ -131,12 +143,8 @@ class Calabash::Cucumber::Launcher
       args[:app] = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path, device_xamarin_build_dir)
     end
 
-    if File.directory?(args[:app])
-      args[:app] = File.expand_path(args[:app])
-    end
-
     args[:bundle_id] ||= detect_bundle_id_from_app_bundle(args)
-    
+
     args[:device] ||= detect_device_from_args(args)
 
 
@@ -288,7 +296,6 @@ class Calabash::Cucumber::Launcher
   end
 
 
-
   def info_plist_as_hash(plist_path)
     unless File.exist?(plist_path)
       raise "Unable to find Info.plist: #{plist_path}"

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.156'
+    VERSION = '0.9.157'
     FRAMEWORK_VERSION = '0.9.155'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.156
+  version: 0.9.157
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber