stowaway 0.2.0 → 0.2.2

data/TODO.txt

@@ -2,7 +2,6 @@
 
 * add verbose option to output file names of the files that weren't found and
   the files that were only partially matched on name.
-* ignore vendor folder
-* ignore spec folder
+* centralize ignore patterns
 * DRY options.rb
 * specify runner.rb

data/VERSION.yml

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

data/lib/stowaway/file.rb

@@ -1,16 +1,16 @@
 module Stowaway
   class FileObj
     attr :fullpath
-    
+
     def initialize(fullpath, root = nil)
       @fullpath = fullpath
       @root = root || Dir.pwd
     end
-    
+
     def name
       File.basename(@fullpath)
     end
-    
+
     def path
       File.split(@fullpath)[0]
     end
@@ -19,7 +19,7 @@ module Stowaway
       root = @root.split("/").last
       @fullpath.sub(/^.+\/#{root}/, "")
     end
-    
+
     def ==(fileObj)
       self.fullpath == fileObj.fullpath
     end

data/lib/stowaway/fshelpyhelp.rb

@@ -1,10 +1,33 @@
-module FSHelpyHelp
-  def ignore?(file)
-    @ignore.each do |exp|
-      if file.match(exp)
-        return true
+module Stowaway
+  module FSHelpyHelp
+    def ignore?(file)
+      @ignore.each do |exp|
+        if file.match(exp)
+          return true
+        end
+      end
+      false
+    end
+
+    def ignore_special_directories(root)
+      @ignore << "/#{root}\/test$|spec$|vendor$|features$"
+    end
+
+    def recursively(path, &block)
+      dir = Dir.new(path)
+
+      dir.each do |f|
+        next if ignore?(dir.path)
+        next if ignore?(f)
+
+        file_p = File.join(dir.path, f)
+
+        if File.directory?(file_p)
+          recursively(file_p, &block)
+        else
+          yield(file_p)
+        end
       end
     end
-    false
   end
 end

data/lib/stowaway/locator.rb

@@ -10,23 +10,18 @@ module Stowaway
       @ignore = [/^\./]
     end
 
-    def find_all(path, files = [])
-      @root = path if @root.nil?
-
-      dir = Dir.new(path)
-
-      dir.each do |f|
-        next if ignore?(f)
-
-        file = File.join(dir.path, f)
-
-        if File.directory?(file) 
-          find_all file, files
-        elsif type?(f)
-          files << FileObj.new(file, @root)
-        end
+    def find_all(path)
+      @root = path
+      @files = []
+      ignore_special_directories(@root)
+      recursively(path) do |file_p|
+        push_if_ext_match(file_p)
       end
-      files
+      @files
+    end
+
+    def push_if_ext_match(file_p)
+      @files << FileObj.new(file_p, @root) if type?(file_p)
     end
 
     def type?(file)

data/lib/stowaway/sweeper.rb

@@ -20,40 +20,32 @@ module Stowaway
       @ignore << /^\.|\.jpg$|\.jpeg$|\.gif$|\.png$|\.ico$|\.bmp$/i
     end
 
-    def sweep(path, files=nil)
-      @root ||= path
-      @result ||= OpenStruct.new({ :files => files, :name_only_matches => []})
-
-      dir = Dir.new(path)
-
-      dir.each do |f|
-        next if ignore?(f)
-
-        file = File.join(dir.path, f)
-
-        if File.directory?(file)
-          sweep(file)
-        else
-          inspect_file(file)
-        end
-      end
+    def sweep(path, files)
+      @root = path
+      @result = OpenStruct.new({ :files => files, :name_only_matches => []})
+      ignore_special_directories(@root)
+      recursively(path) { |fp| inspect_file(fp) }
       @result
     end
 
     private
 
-    def inspect_file(file)
-      root = @root.split("/").last
-      file_name = file.sub(/^.+\/(#{root})/, "")
-      clr_print("  => #{file_name}")
-      File.open(file, "r") do |i|
+    def inspect_file(file_p)
+      clr_print("  => #{path_relative_to_root(file_p)}")
+      File.open(file_p, "r") do |i|
         while line = i.gets
+          next unless line.valid_encoding?
           remove_match(line) #rescue nil
         end
       end
       flush
     end
 
+    def path_relative_to_root(file_p)
+      root = @root.split("/").last
+      file_p.sub(/^.+\/(#{root})/, "")
+    end
+
     def remove_match(line)
       @result.files.delete_if do |file|
         if @matcher.match?(line, file)

data/spec/lib/io_mock.rb

@@ -0,0 +1,10 @@
+class IOMock
+  def initialize
+    @counter = 0
+  end
+  def gets
+    return nil if @counter > 0
+    @counter += 1
+    "\xA9".force_encoding("utf-8")
+  end
+end

data/spec/lib/sweeper_spec.rb

@@ -2,6 +2,7 @@ require "spec/spec_helper"
 require "lib/stowaway/file"
 require "lib/stowaway/sweeper"
 require "lib/stowaway/matcher"
+require "spec/lib/io_mock.rb"
 
 describe Stowaway::Sweeper do
 
@@ -34,7 +35,7 @@ describe Stowaway::Sweeper do
     files.length.should == 1
   end
   
-  it "should output a message when sweeping through a file" do 
+  it "should print the path to the file (relative to root) being swept through" do 
     @ignore << /testfile2/
     sweeper.should_receive(:clr_print).once.with("  => /testfile1.txt")
     sweeper.sweep("spec/data", [])
@@ -64,5 +65,12 @@ describe Stowaway::Sweeper do
     files.should_not be_empty
     files.first.fullpath.should == "/a/stowaway.txt"
   end
-  
+
+  it "should ignore lines with invalid encoding" do
+    files = [Stowaway::FileObj.new("/fake/path1/button.jpg")]
+    File.stub!(:open).and_yield(IOMock.new)
+    sweeper.should_not_receive(:remove_match)
+    sweeper.sweep("spec/data", files)
+  end
+
 end

data/stowaway.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stowaway}
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emilio Cavazos"]
-  s.date = %q{2010-02-26}
+  s.date = %q{2010-03-04}
   s.default_executable = %q{stowaway}
   s.email = %q{ejcavazos@gmail.com}
   s.executables = ["stowaway"]
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
      "spec/data/testfile1.txt",
      "spec/data/testfile2.txt",
      "spec/lib/file_spec.rb",
+     "spec/lib/io_mock.rb",
      "spec/lib/locator_spec.rb",
      "spec/lib/matcher_spec.rb",
      "spec/lib/options_spec.rb",
@@ -53,6 +54,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Locate files in a web project that aren't being used.}
   s.test_files = [
     "spec/lib/file_spec.rb",
+     "spec/lib/io_mock.rb",
      "spec/lib/locator_spec.rb",
      "spec/lib/matcher_spec.rb",
      "spec/lib/options_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stowaway
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors: 
 - Emilio Cavazos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 -08:00
+date: 2010-03-04 00:00:00 -08:00
 default_executable: stowaway
 dependencies: []
 
@@ -41,6 +41,7 @@ files:
 - spec/data/testfile1.txt
 - spec/data/testfile2.txt
 - spec/lib/file_spec.rb
+- spec/lib/io_mock.rb
 - spec/lib/locator_spec.rb
 - spec/lib/matcher_spec.rb
 - spec/lib/options_spec.rb
@@ -80,6 +81,7 @@ specification_version: 3
 summary: Locate files in a web project that aren't being used.
 test_files: 
 - spec/lib/file_spec.rb
+- spec/lib/io_mock.rb
 - spec/lib/locator_spec.rb
 - spec/lib/matcher_spec.rb
 - spec/lib/options_spec.rb