rsanheim-beholder 0.5.13 → 0.6.0

data/Rakefile

@@ -1,5 +1,3 @@
-GEM_VERSION = "0.5.5.1"
-
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|

data/examples/lib/beholder_example.rb

@@ -48,6 +48,14 @@ describe Beholder do
       beholder.on_change files
     end
     
+    it "should re-eval the treasure map if the map was modified" do
+      treasure_map = "#{Dir.pwd}/.treasure_map.rb"
+      beholder = Beholder.new
+      stub(File).exist?(treasure_map) { true }
+      mock(beholder).read_map_at(treasure_map)
+      beholder.on_change treasure_map
+    end
+    
   end
   
   describe "build_cmd" do
@@ -98,14 +106,20 @@ describe Beholder do
     
     it "adds paths to watch" do
       beholder = Beholder.new
-      beholder.watch "foo", "bar"
-      beholder.paths_to_watch.should == ["foo", "bar"]
+      beholder.watch "bar", "foo"
+      beholder.paths_to_watch.should == ["bar", "foo"]
     end
     
     it "aliases keep_a_watchful_eye_for to watch" do
       beholder = Beholder.new
-      beholder.keep_a_watchful_eye_for "foo", "bar"
-      beholder.paths_to_watch.should == ["foo", "bar"]
+      beholder.keep_a_watchful_eye_for "bar", "foo"
+      beholder.paths_to_watch.should == ["bar", "foo"]
+    end
+    
+    it "should uniq and sort the paths" do
+      beholder = Beholder.new
+      beholder.watch "foo", "bar", "specs", "foo", "bar", "bar2"
+      beholder.paths_to_watch.should == ["bar", "bar2", "foo", "specs"]
     end
   end
   
@@ -135,4 +149,30 @@ describe Beholder do
     end
   end
   
+  describe "read_map_at" do
+    
+    it "rescues exceptions from instance_eval'ing the map, and carrys on" do
+      beholder = Beholder.new
+      stub(File).exist? { true }
+      mock(File).readlines("my_map.rb") { ["!and this is invalid Ruby;end\nand more"] }
+      stub(beholder).puts
+      lambda { beholder.read_map_at("my_map.rb") }.should_not raise_error
+    end
+    
+  end
+  
+  describe "output" do
+    
+    it "say puts to stdout if verbose is true" do
+      begin 
+        ARGV.push("-v")
+        beholder = Beholder.new
+        mock(beholder).puts("yo dawg")
+        beholder.__send__ :say, "yo dawg"
+      ensure
+        ARGV.pop
+      end
+    end
+  end
+  
 end

data/lib/beholder.rb

@@ -42,7 +42,9 @@ class Beholder
   end
 
   def watch(*paths)
-    @paths_to_watch.concat(paths)
+    self.paths_to_watch.concat(paths)
+    self.paths_to_watch.uniq!
+    self.paths_to_watch.sort!
   end
   
   alias :keep_a_watchful_eye_for :watch
@@ -55,6 +57,8 @@ class Beholder
 
   def on_change(paths)
     say "#{paths} changed" unless paths.nil? || paths.empty?
+    treasure_maps_changed = paths.select { |p| possible_map_locations.include?(p) }
+    treasure_maps_changed.each {|map_path| read_map_at(map_path) }
     matches = paths.map { |path| find_matches(path) }.uniq.compact
     run_tests matches
   end
@@ -73,20 +77,24 @@ class Beholder
     cmd
   end
 
-  protected
-
   def read_all_maps
     read_default_map
-
-    possible_map_locations.each do |map_location|
-      if File.exist?(map_location)
-        say "Found a map at #{map_location}"
-        instance_eval(File.readlines(map_location).join("\n"))
-        return
-      end
+    possible_map_locations.each { |path| read_map_at(path) }
+  end
+  
+  def read_map_at(path)
+    return unless File.exist?(path)
+    say "Found a map at #{path}"
+    begin
+      instance_eval(File.readlines(path).join("\n"))
+    rescue Object => e
+      puts "Exception caught trying to load map at #{path}"
+      puts e
     end
   end
 
+  protected
+
   def prepare
     trap 'INT' do
       if @sent_an_int then      
@@ -102,13 +110,18 @@ class Beholder
   end    
 
   def start
-    say("Watching the following locations:\n  #{paths_to_watch.join(", ")}")
+    startup_msg
     @watcher = FSEvents::Stream.watch(paths_to_watch) do |event|
       on_change(event.modified_files)
-      puts "\n\nWaiting to hear from the disk since #{Time.now}"
+      puts "\n\nWaiting for changes since #{Time.now}"
     end
     @watcher.run
-  end    
+  end
+  
+  def startup_msg
+    puts %[Beholder has loaded - CTRL-C once to reset, twice to quit.]
+    puts %[Watching the following paths: #{paths_to_watch.join(", ")}]
+  end
   
   def read_default_map
     map_for(:default) do |m|
@@ -180,6 +193,7 @@ class Beholder
   end
   
   private
+
   def say(msg)
     puts msg if verbose
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rsanheim-beholder
 version: !ruby/object:Gem::Version 
-  version: 0.5.13
+  version: 0.6.0
 platform: ruby
 authors: 
 - Chad Humphries, Rob Sanheim
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-05 00:00:00 -08:00
+date: 2009-03-23 00:00:00 -07:00
 default_executable: beholder
 dependencies: 
 - !ruby/object:Gem::Dependency