lib/stowaway/runner.rb in stowaway-0.2.2 vs lib/stowaway/runner.rb in stowaway-0.2.5

@@ -1,32 +1,39 @@
-require_relative 'options'
-require_relative 'locator'
-require_relative 'sweeper'
+require_relative "options"
+require_relative "locator"
+require_relative "sweeper"
+require_relative "target_context"
 
 module Stowaway
   class Runner
-    
+
     def initialize(options, locator, sweeper)
       @options = options
       @locator = locator
       @sweeper = sweeper
     end
-    
+
+    #TODO: clean-up all the print and puts methods and use
     def run
-      path = @options.path
+      context = TargetContext.new(@options.path)
+      assets = locate_assets(context)
+      Dir.chdir(context.root)
+      puts "sweeping: #{Dir.pwd}"
+      display_results(@sweeper.sweep(context, assets))
+    end
+
+    private
+
+    def locate_assets(context)
       print "\nLocating files ... "
-      assets = @locator.find_all(path)
+      assets = @locator.find_all(context)
       print "#{assets.length} files located"
       blank_lines
-      Dir.chdir(@options.path)
-      puts "sweeping: #{Dir.pwd}"
-      respond @sweeper.sweep(path, assets)
+      assets
     end
-    
-    private
 
-    def respond(result)
+    def display_results(result)
       files = result.files
       name_only_matches = result.name_only_matches
 
       if files.empty?
         print "Zero stowaways found. "
@@ -35,26 +42,25 @@
       if files.empty? and name_only_matches.empty?
         print "You run a tight ship."
         blank_lines
         return
       end
-      
+
       damage(result)
     end
-    
+
     def damage(result)
       files = result.files
       name_only_matches = result.name_only_matches
 
       print "\nYou have #{files.length} stowaway(s) ... scurvy dogs!\n"
-      warn name_only_matches
+      warn name_only_matches unless name_only_matches.empty?
       60.times { print "-" }
       blank_lines
       files.each_with_index { |f, i| print "#{i+1}: #{f.root_path}\n" }
     end
 
     def warn name_only_matches
-        return if name_only_matches.empty?
         print "WARNING: #{name_only_matches.length} file(s) partially matched on name only\n"
     end
 
     def blank_lines
       print "\n\n"