stowaway 0.1.8 → 0.1.9

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 8
+:patch: 9
 :build: 

data/lib/stowaway/fshelpyhelp.rb

@@ -7,4 +7,4 @@ module FSHelpyHelp
     end
     false
   end
-end
+end

data/lib/stowaway/matcher.rb

@@ -41,15 +41,17 @@ module Stowaway
       return false if @line !~ expression
       params = $3.gsub(/[\s|"|']/, "").split(",")
       params.each do |f|
-          return true if "/public/#{directory}/#{f}" == @file.root_path ||
-                         "/public/#{directory}/#{f}.#{extension}" == @file.root_path
+          path = @file.root_path
+          return true if "/public/#{directory}/#{f}" == path ||
+                         "/public/#{directory}/#{f}.#{extension}" == path
       end
       false
     end
 
     def direct_or_public_dir_match?(expression)
-      @line =~ Regexp.new(expression.to_s % @file.root_path) ||
-      @line =~ Regexp.new(expression.to_s % trim_public)
+      expression = expression.to_s
+      @line =~ Regexp.new(expression % @file.root_path) ||
+      @line =~ Regexp.new(expression % trim_public)
     end
 
     def trim_public

data/lib/stowaway/options.rb

@@ -13,6 +13,7 @@ module Stowaway
     end
     
     private
+
     def parse(argv) 
       OptionParser.new do |opts| 
         opts.banner = "Usage: stowaway [ options ] path/to/site" 

data/lib/stowaway/runner.rb

@@ -23,20 +23,40 @@ module Stowaway
     private
 
     def respond(result)
-      if result.files.empty?
-        print "Zero stowaways found. You run a tight ship.\n\n"
-      else
-        print "\nYou have #{result.files.length} stowaway(s) ... shameful\n\n"
+      files = result.files
+      name_only_matches = result.name_only_matches
 
-        unless result.name_only_matches.empty?
-          p "Warning: #{result.name_only_matches.length} file(s) partially matched on name only"
-        end
+      if files.empty?
+        print "Zero stowaways found. "
+      end
 
-        60.times { print "-" }
-        print "\n\n"
-        result.files.each_with_index { |f, i| print "#{i+1}: #{f.root_path}\n" }
-        print "\n"
+      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
+      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"
     end
   end
 end

data/stowaway.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stowaway}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emilio Cavazos"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stowaway
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Emilio Cavazos