calabash-cucumber 0.9.43 → 0.9.44

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

@@ -7,7 +7,9 @@ module Calabash
 
     module SimulatorHelper
 
-      DEFAULT_DERIVED_DATA = File.expand_path("~/Library/Developer/Xcode/DerivedData/*/info.plist")
+      DERIVED_DATA = File.expand_path("~/Library/Developer/Xcode/DerivedData")
+      DEFAULT_DERIVED_DATA_INFO = File.expand_path("#{DERIVED_DATA}/*/info.plist")
+
       MAX_PING_ATTEMPTS = 5
 
       def self.relaunch(path, sdk = nil, version = 'iphone')
@@ -26,7 +28,7 @@ module Calabash
       def self.derived_data_dir_for_project
         dir = project_dir
 
-        info_plist = Dir.glob(DEFAULT_DERIVED_DATA).find { |plist_file|
+        info_plist = Dir.glob(DEFAULT_DERIVED_DATA_INFO).find { |plist_file|
           begin
             plist = CFPropertyList::List.new(:file => plist_file)
             hash = CFPropertyList.native_types(plist.value)
@@ -37,22 +39,56 @@ module Calabash
             false
           end
         }
+
         if not info_plist.nil?
-          File.dirname(info_plist)
+          return File.dirname(info_plist)
         else
-          msg = ["Unable to find your built app."]
-          msg << "This means that Calabash can't automatically launch iOS simulator."
-          msg << "Searched in Xcode 4.x default: #{DEFAULT_DERIVED_DATA}"
-          msg << ""
-          msg << "To fix there are a couple of options:\n"
-          msg << "Option 1) Make sure you are running this command from your project directory, "
-          msg << "i.e., the directory containing your .xcodeproj file."
-          msg << "In Xcode, build your calabash target for simulator."
-          msg << "Check that your app can be found in\n #{File.expand_path("~/Library/Developer/Xcode/DerivedData")}"
-          msg << "\n\nOption 2). In features/support/launch.rb set APP_BUNDLE_PATH to"
-          msg << "the path where Xcode has built your Calabash target."
-          msg << "Alternatively you can use the environment variable APP_BUNDLE_PATH.\n"
-          raise msg.join("\n")
+          res = Dir.glob("#{dir}/*.xcodeproj")
+          if res.empty?
+            raise "Unable to find *.xcodeproj in #{dir}"
+          elsif res.count > 1
+            raise "Unable to found several *.xcodeproj in #{dir}: #{res}"
+          end
+
+          xcode_proj_name = res.first.split(".xcodeproj")[0]
+
+          xcode_proj_name = File.basename(xcode_proj_name)
+
+          build_dirs = Dir.glob("#{DERIVED_DATA}/*").find_all do |xc_proj|
+            File.basename(xc_proj).start_with?(xcode_proj_name)
+          end
+
+          if (build_dirs.count == 0)
+            msg = ["Unable to find your built app."]
+            msg << "This means that Calabash can't automatically launch iOS simulator."
+            msg << "Searched in Xcode 4.x default: #{DEFAULT_DERIVED_DATA_INFO}"
+            msg << ""
+            msg << "To fix there are a couple of options:\n"
+            msg << "Option 1) Make sure you are running this command from your project directory, "
+            msg << "i.e., the directory containing your .xcodeproj file."
+            msg << "In Xcode, build your calabash target for simulator."
+            msg << "Check that your app can be found in\n #{File.expand_path("~/Library/Developer/Xcode/DerivedData")}"
+            msg << "\n\nOption 2). In features/support/launch.rb set APP_BUNDLE_PATH to"
+            msg << "the path where Xcode has built your Calabash target."
+            msg << "Alternatively you can use the environment variable APP_BUNDLE_PATH.\n"
+            raise msg.join("\n")
+
+          elsif (build_dirs.count > 1)
+            msg = ["Unable to auto detect APP_BUNDLE_PATH."]
+            msg << "You have several projects with the same name: #{xcode_proj_name} in #{DERIVED_DATA}:\n"
+            msg << build_dirs.join("\n")
+
+            msg << "\nThis means that Calabash can't automatically launch iOS simulator."
+            msg << "Searched in Xcode 4.x default: #{DEFAULT_DERIVED_DATA_INFO}"
+            msg << "\nIn features/support/launch.rb set APP_BUNDLE_PATH to"
+            msg << "the path where Xcode has built your Calabash target."
+            msg << "Alternatively you can use the environment variable APP_BUNDLE_PATH.\n"
+            raise msg.join("\n")
+          else
+            puts "Found potential build dir: #{build_dirs.first}"
+            puts "Checking..."
+            return build_dirs.first
+          end
         end
       end
 
@@ -179,4 +215,3 @@ module Calabash
 
   end
 end
-

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.43"
+    VERSION = "0.9.44"
     FRAMEWORK_VERSION = "0.9.43"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.43
+  version: 0.9.44
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-08 00:00:00.000000000 Z
+date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70298053834840 !ruby/object:Gem::Requirement
+  requirement: &70316273929280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70298053834840
+  version_requirements: *70316273929280
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70298053834060 !ruby/object:Gem::Requirement
+  requirement: &70316273928640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70298053834060
+  version_requirements: *70316273928640
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
-  requirement: &70298053833120 !ruby/object:Gem::Requirement
+  requirement: &70316273926740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70298053833120
+  version_requirements: *70316273926740
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &70298053832320 !ruby/object:Gem::Requirement
+  requirement: &70316273925720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70298053832320
+  version_requirements: *70316273925720
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
-  requirement: &70298053831340 !ruby/object:Gem::Requirement
+  requirement: &70316273924200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70298053831340
+  version_requirements: *70316273924200
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70298053830720 !ruby/object:Gem::Requirement
+  requirement: &70316273922960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70298053830720
+  version_requirements: *70316273922960
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email: