stowaway 0.1.10 → 0.2.0

data/VERSION.yml

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

data/lib/stowaway/fshelpyhelp.rb

@@ -1,7 +1,7 @@
 module FSHelpyHelp
-  def ignore? file
-    @ignore.each do |s|
-      if file.match(/#{s}/i)
+  def ignore?(file)
+    @ignore.each do |exp|
+      if file.match(exp)
         return true
       end
     end

data/lib/stowaway/output.rb

@@ -0,0 +1,20 @@
+module Stowaway
+  module Output
+    RESET = "\r\e[0K"
+
+    def clr_print(msg)
+      print "#{RESET}#{msg}"
+    end
+
+    def flush
+      print RESET
+      $stdout.flush
+    end
+
+    def new_line(count = 1)
+      count.times do
+        print "\n"
+      end
+    end
+  end
+end

data/lib/stowaway/runner.rb

@@ -14,9 +14,12 @@ module Stowaway
     def run
       path = @options.path
       print "\nLocating files ... "
-      files = @locator.find_all(path)
-      print "#{files.length} files located\n"
-      respond @sweeper.sweep(path, files)
+      assets = @locator.find_all(path)
+      print "#{assets.length} files located"
+      blank_lines
+      Dir.chdir(@options.path)
+      puts "sweeping: #{Dir.pwd}"
+      respond @sweeper.sweep(path, assets)
     end
     
     private

data/lib/stowaway/sweeper.rb

@@ -1,5 +1,5 @@
 require_relative "fshelpyhelp"
-require_relative "status"
+require_relative "output"
 require_relative "matcher"
 require_relative "file"
 require "ostruct"
@@ -12,15 +12,16 @@ module Stowaway
 
   class Sweeper
     include FSHelpyHelp
+    include Output
 
-    def initialize(status = Status.new, matcher = Matcher.new, ext_to_ignore = [])
-      @status = status
+    def initialize(matcher = Matcher.new, ext_to_ignore = [])
       @matcher = matcher
-      @ignore = ext_to_ignore || []
-      @ignore += [/^\.|\.jpg$|\.jpeg$|\.gif$|\.png$|\.ico$|\.bmp$/i]
+      @ignore = ext_to_ignore
+      @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)
@@ -42,13 +43,15 @@ module Stowaway
     private
 
     def inspect_file(file)
-      @status.out "Sweeping: #{file}"
-      File.open(file, 'r') do |i|
+      root = @root.split("/").last
+      file_name = file.sub(/^.+\/(#{root})/, "")
+      clr_print("  => #{file_name}")
+      File.open(file, "r") do |i|
         while line = i.gets
           remove_match(line) #rescue nil
         end
       end
-      @status.flush
+      flush
     end
 
     def remove_match(line)

data/spec/lib/output_spec.rb

@@ -0,0 +1,50 @@
+require 'spec/spec_helper'
+require 'lib/stowaway/output'
+
+describe Stowaway::Output do
+
+  before(:each) do
+    @klass = Class.new do
+      include Stowaway::Output
+    end.new
+  end
+
+  describe "clr_print" do
+    it "should reset current line and print message" do
+      reset = "\r\e[0K"
+      msg = "yo yo sucka beeches!"
+      @klass.should_receive(:print).once.with("#{reset}#{msg}")
+      @klass.clr_print(msg)
+    end
+  end
+
+  describe "flush" do
+    it "should reset current line" do
+      @klass.should_receive(:print).once.with("\r\e[0K")
+      @klass.flush
+    end
+
+    it "should call flush on stdout" do
+      $stdout.should_receive(:flush)
+      @klass.flush
+    end
+  end
+
+  describe "new_line" do
+    it "should print 1 new line" do
+      @klass.should_receive(:print).once.with("\n")
+      @klass.new_line
+    end
+
+    it "should print 2 new lines" do
+      @klass.should_receive(:print).twice.with("\n")
+      @klass.new_line(2)
+    end
+
+    it "should print 8 new lines" do
+      @klass.should_receive(:print).exactly(8).times.with("\n")
+      @klass.new_line(8)
+    end
+  end
+
+end

data/spec/lib/sweeper_spec.rb

@@ -4,13 +4,15 @@ require "lib/stowaway/sweeper"
 require "lib/stowaway/matcher"
 
 describe Stowaway::Sweeper do
-  
-  def sweeper(ignore = nil)
-    @sweeper ||= Stowaway::Sweeper.new(@status_mock, Stowaway::Matcher.new, ignore)
+
+  Stowaway::Output.class_eval do
+    def print str;end
   end
 
+  let(:sweeper) { Stowaway::Sweeper.new(Stowaway::Matcher.new, @ignore) }
+
   before(:each) do
-    @status_mock = mock("status_mock", :null_object => true)
+    @ignore = [/^\.|\.rb$/]
   end
   
   it "should remove files when a reference to the file is found in source" do
@@ -26,36 +28,39 @@ describe Stowaway::Sweeper do
   end
 
   it "should not sweep through ignored file types" do
+    @ignore << /\.txt$/
     files = [Stowaway::FileObj.new("/fake/path1/button.jpg")]
-    sweeper([/^\.|\.rb$|\.txt$/]).sweep("spec/data", files)
+    sweeper.sweep("spec/data", files)
     files.length.should == 1
   end
   
   it "should output a message when sweeping through a file" do 
-    @status_mock.should_receive(:out).with("Sweeping: spec/data/testfile1.txt").once
-    sweeper([/^\.|\.rb$|testfile2/]).sweep("spec/data", [])
+    @ignore << /testfile2/
+    sweeper.should_receive(:clr_print).once.with("  => /testfile1.txt")
+    sweeper.sweep("spec/data", [])
   end
 
   it "should flush the output after sweeping through a file" do 
-    @status_mock.should_receive(:flush).once
-    sweeper([/^\.|\.rb$|testfile2/]).sweep("spec/data", [])
+    @ignore << /testfile2/
+    sweeper.should_receive(:flush).once
+    sweeper.sweep("spec/data", [])
   end
 
   it "should files of the same name but with different paths as last resort" do
     files = [Stowaway::FileObj.new("/fake/path1/button.jpg"),
              Stowaway::FileObj.new("/fake/path2/button.jpg")]
-    sweeper([/^\.|\.rb$/]).sweep("spec/data", files)
+    sweeper.sweep("spec/data", files)
     files.should be_empty
   end
 
   it "should add a file to an array of partially matched files when matched on name only" do
     files = [Stowaway::FileObj.new("/missing/button.jpg")]
-    sweeper([/^\.|\.rb$/]).sweep("spec/data", files).should have(1).name_only_matches
+    sweeper.sweep("spec/data", files).should have(1).name_only_matches
   end
 
   it "should not remove files that were not found" do
     files = [Stowaway::FileObj.new("/a/stowaway.txt")]
-    sweeper([/^\.|\.rb$/]).sweep("spec/data", files)
+    sweeper.sweep("spec/data", files)
     files.should_not be_empty
     files.first.fullpath.should == "/a/stowaway.txt"
   end

data/spec/runner_spec.rb

@@ -1,30 +1,53 @@
 require 'spec/spec_helper'
 require 'lib/stowaway/runner'
 
+class Stowaway::Status
+  # mock so I don't look at noise
+  def out(msg); end
+  def flush; end
+end
+
 describe Stowaway::Runner do
 
   before(:each) do
-    @argv = []
+    @argv = ["."]
+    @options = Stowaway::Options.new(@argv)
+    @locator = Stowaway::Locator.new(@options.file_types)
   end
 
   def runner
-    options = Stowaway::Options.new(@argv)
-    locator = Stowaway::Locator.new(options.file_types)
     sweeper = Stowaway::Sweeper.new
-    @runner ||= Stowaway::Runner.new(options, locator, sweeper)
+    @runner ||= Stowaway::Runner.new(@options, @locator, sweeper)
   end
 
-  it "should notify user that file location has begun" do
-    @argv << "."
-    runner.should_receive(:print).with("\nLocating files ... ")
-    runner.should_receive(:print).any_number_of_times
-    runner.run
+  describe "output" do
+    it "should notify user that file location has begun" do
+      runner.should_receive(:print).with("\nLocating files ... ")
+      runner.should_receive(:print).any_number_of_times
+      runner.run
+    end
+
+    it "should notify user of the total number of files that were found" do
+      runner.should_receive(:print).with("0 files located")
+      runner.should_receive(:print).any_number_of_times
+      runner.run
+    end
+
+    it "should notify user that no stowaways were found when all files-to-find have been deleted" do
+      runner.should_receive(:print).with("Zero stowaways found. ")
+      runner.should_receive(:print).any_number_of_times
+      runner.run
+    end
+
+    it "should tell user how awesome their cleanliness is" do
+      runner.should_receive(:print).with("You run a tight ship.")
+      runner.should_receive(:print).any_number_of_times
+      runner.run
+    end
   end
 
-  it "should notify user of the total number of files that were found" do
-    @argv << "."
-    runner.should_receive(:print).with("0 files located\n").any_number_of_times
-    runner.should_receive(:print).any_number_of_times
+  it "should locate all assets" do
+    @locator.should_receive(:find_all).with(".").and_return([])
     runner.run
   end
 end

data/stowaway.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stowaway}
-  s.version = "0.1.10"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emilio Cavazos"]
-  s.date = %q{2010-02-23}
+  s.date = %q{2010-02-26}
   s.default_executable = %q{stowaway}
   s.email = %q{ejcavazos@gmail.com}
   s.executables = ["stowaway"]
@@ -30,8 +30,8 @@ Gem::Specification.new do |s|
      "lib/stowaway/locator.rb",
      "lib/stowaway/matcher.rb",
      "lib/stowaway/options.rb",
+     "lib/stowaway/output.rb",
      "lib/stowaway/runner.rb",
-     "lib/stowaway/status.rb",
      "lib/stowaway/sweeper.rb",
      "spec/data/testfile1.txt",
      "spec/data/testfile2.txt",
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "spec/lib/locator_spec.rb",
      "spec/lib/matcher_spec.rb",
      "spec/lib/options_spec.rb",
+     "spec/lib/output_spec.rb",
      "spec/lib/sweeper_spec.rb",
      "spec/runner_spec.rb",
      "spec/spec.opts",
@@ -55,6 +56,7 @@ Gem::Specification.new do |s|
      "spec/lib/locator_spec.rb",
      "spec/lib/matcher_spec.rb",
      "spec/lib/options_spec.rb",
+     "spec/lib/output_spec.rb",
      "spec/lib/sweeper_spec.rb",
      "spec/runner_spec.rb",
      "spec/spec_helper.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stowaway
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors: 
 - Emilio Cavazos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -08:00
+date: 2010-02-26 00:00:00 -08:00
 default_executable: stowaway
 dependencies: []
 
@@ -35,8 +35,8 @@ files:
 - lib/stowaway/locator.rb
 - lib/stowaway/matcher.rb
 - lib/stowaway/options.rb
+- lib/stowaway/output.rb
 - lib/stowaway/runner.rb
-- lib/stowaway/status.rb
 - lib/stowaway/sweeper.rb
 - spec/data/testfile1.txt
 - spec/data/testfile2.txt
@@ -44,6 +44,7 @@ files:
 - spec/lib/locator_spec.rb
 - spec/lib/matcher_spec.rb
 - spec/lib/options_spec.rb
+- spec/lib/output_spec.rb
 - spec/lib/sweeper_spec.rb
 - spec/runner_spec.rb
 - spec/spec.opts
@@ -82,6 +83,7 @@ test_files:
 - spec/lib/locator_spec.rb
 - spec/lib/matcher_spec.rb
 - spec/lib/options_spec.rb
+- spec/lib/output_spec.rb
 - spec/lib/sweeper_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb

data/lib/stowaway/status.rb

@@ -1,13 +0,0 @@
-module Stowaway
-  class Status
-    RESET = "\r\e[0K"
-    def out(msg)
-      print "#{RESET}#{msg}"
-    end
-
-    def flush
-      print RESET 
-      $stdout.flush
-    end
-  end
-end