Narnach-minitest 0.2.1 → 0.2.2

data/bin/minitest

@@ -4,5 +4,8 @@ require 'minitest'
 
 minitest = Minitest.new
 minitest.recent = (ARGV.include? "recent")
-minitest.spec_opts = "--format profile --colour --diff unified" if ARGV.include? "profile"
+custom_spec_opts = ''
+custom_spec_opts << " --drb" if ARGV.include? "drb"
+custom_spec_opts << " --format profile --colour --diff unified" if ARGV.include? "profile"
+minitest.spec_opts = custom_spec_opts if custom_spec_opts.size > 0
 minitest.start

data/lib/dir_monitor.rb

@@ -4,7 +4,7 @@
 # - Keep track of changed files in monitored directories.
 # - Link these files to their specs, so Minitest can run the specs.
 class DirMonitor
-  attr_reader :known_files, :dirs
+  attr_reader :known_files, :dirs, :last_mtime
   
   # Setup a new DirMonitor.
   # Directories can be provided in a number of ways:
@@ -15,6 +15,7 @@ class DirMonitor
   def initialize(*dirs)
     @dirs = dirs.flatten.map{|dir| dir.to_s}
     @known_files = []
+    @last_mtime = {}
   end
   
   # Scan for all files in the directories and their sub-directories.
@@ -28,6 +29,29 @@ class DirMonitor
     @known_files = results
   end
   
+  # Scan for changes in the known files.
+  # Yields the name of the changed files.
+  # Stores the mtime for all changed files.
+  def scan_changed(&block) # :yields: file
+    known_files.each do |known_file|
+      new_mtime = mtime_for(known_file)
+      if new_mtime != last_mtime[known_file]
+        block.call(known_file)
+        last_mtime[known_file]= new_mtime
+      end
+    end
+  end
+  
+  # Scans for changed known files, using #scan_changed. Yields the name of both the file and its associated spec.
+  # spec_for is used to determine what the name of the file's spec _should_ be.
+  # Does not yield a file/spec name when the spec does not exist.
+  def scan_changed_with_spec(&block) # :yields: file, spec
+    scan_changed do |file|
+      spec = spec_for(file)
+      block.call(file, spec) if File.exists?(spec)
+    end
+  end
+  
   # Scan for new files.
   # All new file names are yielded.
   def scan_new(&block) # :yields: file
@@ -39,6 +63,19 @@ class DirMonitor
     end
   end
   
+  # Scan for new files and check for changed known files.
+  # Only yields a file once per call.
+  def scan_new_or_changed_with_spec(&block) # :yields: file, spec
+    yielded_files = {}
+    yield_once_block = Proc.new do |file, spec|
+      next if yielded_files.has_key? file
+      block.call(file, spec)
+      yielded_files[file]=nil
+    end
+    scan_new_with_spec(&yield_once_block)
+    scan_changed_with_spec(&yield_once_block) 
+  end
+  
   # Scans for new files, like scan_new does, but yields the name of both the file and spec.
   # spec_for is used to determine what the name of the file's spec _should_ be.
   # Does not yield a file/spec name when the spec does not exist.
@@ -73,4 +110,11 @@ class DirMonitor
     spec_dir = dir_array.join('/')
     return File.join(spec_dir, spec_file)
   end
+
+private
+
+  # Get the modification time for a file.
+  def mtime_for(file)
+    File.mtime(file)
+  end
 end

data/spec/dir_monitor_spec.rb

@@ -31,77 +31,188 @@ describe DirMonitor, "#scan" do
 end
 
 describe DirMonitor, "#scan_new" do
+  before(:each) do
+    @known_files = %w[lib/minitest.rb lib/dir_monitor.rb]
+    Dir.stub!(:glob).with('lib/**/*').and_return(@known_files)
+    @dm = DirMonitor.new 'lib'
+  end
+  
   it "should yield the names of all new files" do
-    known_files = %w[lib/minitest.rb lib/dir_monitor.rb]
-    Dir.should_receive(:glob).with('lib/**/*').and_return(known_files)
-    dm = DirMonitor.new('lib')
     yield_results = []
-    dm.scan_new do |file|
+    @dm.scan_new do |file|
       yield_results << file
     end
-    yield_results.should == known_files
+    yield_results.should == @known_files
   end
   
   it "should not yield known file names" do
-    known_files = %w[lib/minitest.rb lib/dir_monitor.rb]
     known_files2 = %w[lib/minitest.rb lib/dir_monitor2.rb]
-    Dir.should_receive(:glob).with('lib/**/*').and_return(known_files, known_files2)
-    dm = DirMonitor.new('lib')
-    dm.scan
+    Dir.stub!(:glob).with('lib/**/*').and_return(@known_files, known_files2)
+    @dm.scan
     yield_results = []
-    dm.scan_new do |file|
+    @dm.scan_new do |file|
       yield_results << file
     end
-    yield_results.should == known_files2 - known_files
+    yield_results.should == known_files2 - @known_files
   end
 end
 
-describe DirMonitor, "#spec_for" do
-  it "should find the spec for a given file" do
-    file = 'lib/dir_monitor.rb'
-    spec = 'spec/dir_monitor_spec.rb'
-    dm = DirMonitor.new
-    dm.spec_for(file).should == spec
+describe DirMonitor, "#scan_new_with_spec" do
+  before :each do
+    @file = 'lib/dir_monitor.rb'
+    @spec = 'spec/dir_monitor_spec.rb'
+    Dir.stub!(:glob).with('lib/**/*').and_return([@file])
+    @dm = DirMonitor.new 'lib'
   end
   
-  it "should find the spec for non-ruby files" do
-    file = 'app/views/posts/post.html.haml'
-    spec = 'spec/views/posts/post.html.haml_spec.rb'
-    dm = DirMonitor.new
-    dm.spec_for(file).should == spec
+  it "should yield new files and their specs" do
+    File.should_receive(:exists?).with(@spec).and_return(true)
+    results = []
+    @dm.scan_new_with_spec do |new_file, new_spec|
+      results << {new_file => new_spec}
+    end
+    results.should == [{@file=>@spec}]
   end
   
-  it "should map specs to themselves" do
-    spec = 'spec/dir_monitor_spec.rb'
-    dm = DirMonitor.new
-    dm.spec_for(spec).should == spec
+  it "should not yield files with non-existent specs" do
+    File.should_receive(:exists?).with(@spec).and_return(false)
+    results = []
+    @dm.scan_new_with_spec do |new_file, new_spec|
+      results << {new_file => new_spec}
+    end
+    results.should == []
   end
 end
 
-describe DirMonitor, "#scan_new_with_spec" do
-  it "should yield new files and their specs" do
-    file = 'lib/dir_monitor.rb'
-    spec = 'spec/dir_monitor_spec.rb'
-    Dir.should_receive(:glob).with('lib/**/*').and_return([file])
-    File.should_receive(:exists?).with(spec).and_return(true)
-    dm = DirMonitor.new 'lib'
+describe DirMonitor, "#scan_changed" do
+  before(:each) do
+    @file = 'lib/dir_monitor.rb'
+    @time = Time.now
+    Dir.stub!(:glob).with('lib/**/*').and_return([@file])
+    File.stub!(:mtime).with(@file).and_return(@time)
+    @dm = DirMonitor.new 'lib'
+    @dm.scan
+  end
+  
+  it "should yield the names of changed known files" do
+    changes = []
+    @dm.scan_changed do |changed_file|
+      changes << changed_file
+    end
+    changes.should == [@file]
+  end
+  
+  it "should not yield the names of files which did not change since last scan" do
+    @dm.scan_changed { |f| }
+    changes = []
+    @dm.scan_changed do |changed_file|
+      changes << changed_file
+    end
+    changes.should == []
+  end
+
+  it "should yield for every change in a file" do
+    # Every scan should find the file changed:
+    File.should_receive(:mtime).with(@file).and_return(@time-3,@time-2,@time-1)
+    3.times do
+      changes = []
+      @dm.scan_changed do |changed_file|
+        changes << changed_file
+      end
+      changes.should == [@file]
+    end
+  end
+end
+
+describe DirMonitor, "scan_changed_with_spec" do
+  before(:each) do
+    @file = 'lib/dir_monitor.rb'
+    @spec = 'spec/dir_monitor_spec.rb'
+    @time = Time.now
+    Dir.stub!(:glob).with('lib/**/*').and_return([@file])
+    File.stub!(:mtime).with(@file).and_return(@time)
+    @dm = DirMonitor.new 'lib'
+    @dm.scan
+  end
+  
+  it "should yield the file name and spec name of changed files with an existing spec" do
+    File.should_receive(:exists?).with(@spec).and_return(true)
+    changes = []
+    @dm.scan_changed_with_spec do |changed_file, spec_file|
+      changes << { changed_file => spec_file }
+    end
+    changes.should == [{@file=>@spec}]
+  end
+
+  it "should not yield the file name and spec name of changed files without an existing spec" do
+    File.should_receive(:exists?).with(@spec).and_return(false)
+    changes = []
+    @dm.scan_changed_with_spec do |changed_file, spec_file|
+      changes << { changed_file => spec_file }
+    end
+    changes.should == []
+  end
+end
+
+describe DirMonitor, "scan_new_or_changed_with_spec" do
+  before(:each) do
+    @file = 'lib/dir_monitor.rb'
+    @spec = 'spec/dir_monitor_spec.rb'
+    @time = Time.now
+    Dir.stub!(:glob).with('lib/**/*').and_return([@file])
+    File.stub!(:mtime).with(@file).and_return(@time)
+    @dm = DirMonitor.new 'lib'
+  end
+  
+  it "should yield a file and spec when a file is new" do
     results = []
-    dm.scan_new_with_spec do |new_file, new_spec|
-      results << {new_file => new_spec}
+    @dm.scan_new_or_changed_with_spec do |file, spec|
+      results << {file => spec}
     end
-    results.should == [{file=>spec}]
+    results.should == [{@file=>@spec}]
   end
   
-  it "should not yield files with non-existent specs" do
-    file = 'lib/dir_monitor.rb'
-    spec = 'spec/dir_monitor_spec.rb'
-    Dir.should_receive(:glob).with('lib/**/*').and_return([file])
-    File.should_receive(:exists?).with(spec).and_return(false)
-    dm = DirMonitor.new 'lib'
+  it "should yield a file and spec when a file is not new but has changed" do
+    @dm.scan
+    @dm.scan_changed {|f|}
+    File.should_receive(:mtime).with(@file).and_return(@time+1)
     results = []
-    dm.scan_new_with_spec do |new_file, new_spec|
-      results << {new_file => new_spec}
+    @dm.scan_new_or_changed_with_spec do |file, spec|
+      results << {file => spec}
+    end
+    results.should == [{@file=>@spec}]
+  end
+  
+  it "should not yield a file and spec when a file is not new and has not changed" do
+    @dm.scan
+    @dm.scan_changed {|f|}
+    results = []
+    @dm.scan_new_or_changed_with_spec do |file, spec|
+      results << {file => spec}
     end
     results.should == []
   end
+end
+
+describe DirMonitor, "#spec_for" do
+  before(:each) do
+    @dm = DirMonitor.new
+  end
+  
+  it "should find the spec for a given file" do
+    file = 'lib/dir_monitor.rb'
+    spec = 'spec/dir_monitor_spec.rb'
+    @dm.spec_for(file).should == spec
+  end
+  
+  it "should find the spec for non-ruby files" do
+    file = 'app/views/posts/post.html.haml'
+    spec = 'spec/views/posts/post.html.haml_spec.rb'
+    @dm.spec_for(file).should == spec
+  end
+  
+  it "should map specs to themselves" do
+    spec = 'spec/dir_monitor_spec.rb'
+    @dm.spec_for(spec).should == spec
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Narnach-minitest
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Wes Oldenbeuving
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Minitest is a simple autotester tool.