run_loop 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a796cf1b151815127a2c4ee38c6fadf13be9cef8
-  data.tar.gz: 40e6b8e223325fba4d2a13683afa1609b2f9348c
+  metadata.gz: 7e1857365bd24d24d05315ce7d1a010434482c4a
+  data.tar.gz: 8f4ea53c1879ade929b57ba8ba2a88ecd9b42085
 SHA512:
-  metadata.gz: d0b6d5bb57703550c6592a5d665c1d11d74db9075bf8b688156e2f6094efd6ab0e3efc72c19e9080228f1da8d003f8d115382f804303228a091d05043d3a7309
-  data.tar.gz: 8b53742a9c3b4fe65036f387e93dd189ff350e57bd24ebd90bb7c24e1f6635543a675aafb9500bdf34b92640d61ed6adb5c8eb81e9c9833fcab2f6588d28d7a7
+  metadata.gz: 9e0d5bb32beb634eb15bdd09b76e2fbdecd0bc3bc5018d8d4087f2beb2b46d166abc8e09d71e6a38b1c0256bbba3ef607b4661a1b4a4fb5ade8978afbf43b4b5
+  data.tar.gz: 1c960eb4a3b376dc824275680bf4135b68066a6b42977d6112cdb0c202213280e8dac6c8f59fbcc834b1cd50c66b9c0cbdbf2c071f3832119e615929abb76ce4

data/lib/run_loop/detect_aut/detect.rb

@@ -9,6 +9,11 @@ module RunLoop
       include RunLoop::DetectAUT::XamarinStudio
       include RunLoop::DetectAUT::Xcode
 
+      # @!visibility private
+      DEFAULTS = {
+        :search_depth => 5
+      }
+
       # @!visibility private
       def app_for_simulator
         path = RunLoop::Environment.path_to_app_bundle
@@ -20,19 +25,12 @@ module RunLoop
           search_dirs = [solution_directory]
           apps = candidate_apps(search_dirs.first)
         else
-          apps = []
-          search_dirs = []
-        end
-
-        # If this is a Xamarin project, we've already searched the local
-        # directory tree for .app.
-        if apps.empty? && !xamarin_project?
-          search_dirs << File.expand_path("./")
-          apps = candidate_apps(File.expand_path("./"))
+          search_dirs = [Dir.pwd]
+          apps = candidate_apps(search_dirs.first)
         end
 
         if apps.empty?
-          raise_no_simulator_app_found(search_dirs)
+          raise_no_simulator_app_found(search_dirs, DEFAULTS[:search_depth])
         end
 
         app = select_most_recent_app(apps)
@@ -65,7 +63,12 @@ module RunLoop
       # @param [String] base_dir where to start the recursive search
       def candidate_apps(base_dir)
         candidates = []
-        Dir.glob("#{base_dir}/**/*.app").each do |bundle_path|
+
+        globs = globs_for_app_search(base_dir)
+        Dir.glob(globs).each do |bundle_path|
+          # Gems, like run-loop, can contain *.app if the user is building
+          # from :git =>, :github =>, or :path => sources.
+          next if bundle_path[/vendor\/cache/, 0] != nil
           app = app_or_nil(bundle_path)
           candidates << app if app
         end
@@ -91,6 +94,14 @@ module RunLoop
         path = File.join(app.path, app.executable_name)
         File.mtime(path)
       end
+
+      # @!visibility private
+      def globs_for_app_search(base_dir)
+        search_depth = DEFAULTS[:search_depth]
+        Array.new(search_depth) do |depth|
+          File.join(base_dir, *Array.new(depth) { |_| "*"}, "*.app")
+        end
+      end
     end
   end
 end

data/lib/run_loop/detect_aut/errors.rb

@@ -59,7 +59,7 @@ $ XCODEPROJ=MyiOSApp.xcodeproj
       raise RunLoop::MultipleXcodeprojError,
 %Q[Found multiple .xcodeproj directories:
 
-#{projects.each { |path| puts "    #{path}" }}
+#{projects.join($-0)}
 
 Which project contains the target of the application you are trying to test?
 
@@ -106,19 +106,18 @@ $ SOLUTION=~/some/other/directory/MyApp.sln
 
       # @!visibility private
       # Raised when no app can found by the discovery algorithm
-      def raise_no_simulator_app_found(search_directories)
+      def raise_no_simulator_app_found(search_directories, search_depth)
         raise RunLoop::NoSimulatorAppFoundError,
-              %Q[Searched these directories:
+%Q[Recursively searched these directories to depth #{search_depth}:
 
-#{search_directories.each { |path| puts "    #{path}" }}
+#{search_directories.join($-0)}
 
-but could not find any .app for the simulator that contains the Calabash iOS
-server.
+but could not find any .app for the simulator that links the Calabash iOS server.
 
 Make sure you have built your app for a simulator target from Xcode.
 
-If you testing a stand-alone .app (you don't have an Xcode project), put your
-.app in the same directory (or below) the directory you run `cucumber` from.
+If you are testing a stand-alone .app (you don't have an Xcode project), put
+your .app in the same directory (or below) the directory you run `cucumber` from.
 ]
       end
     end

data/lib/run_loop/detect_aut/xcode.rb

@@ -30,7 +30,19 @@ module RunLoop
 
       # @!visibility private
       def find_xcodeproj
-        Dir.glob("#{Dir.pwd}/**/*.xcodeproj")
+        xcode_projects = []
+        Dir.glob("#{Dir.pwd}/**/*.xcodeproj").each do |path|
+          next if ignore_xcodeproj?(path)
+          xcode_projects << path
+        end
+        xcode_projects
+      end
+
+      # @!visibility private
+      def ignore_xcodeproj?(path)
+        path[/CordovaLib/, 0] ||
+          path[/Pods/, 0] ||
+          path[/Carthage/, 0]
       end
 
       # @!visibility private
@@ -42,6 +54,9 @@ module RunLoop
           dirs_to_search << dir_from_prefs
         end
 
+        dirs_to_search << Dir.pwd
+        dirs_to_search.uniq!
+
         apps = []
         dirs_to_search.each do |dir|
           # defined in detect_aut/apps.rb

data/lib/run_loop/version.rb

@@ -1,5 +1,5 @@
 module RunLoop
-  VERSION = "2.0.8"
+  VERSION = "2.0.9"
 
   # A model of a software release version that can be used to compare two versions.
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -373,4 +373,3 @@ specification_version: 4
 summary: The bridge between Calabash iOS and Xcode command-line tools like instruments
   and simctl.
 test_files: []
-has_rdoc: