@@ -1,4 +1,4 @@ #! /usr/bin/env ruby $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib')) require 'beholder' -Beholder.cast_thy_gaze \ No newline at end of file +Beholder.run \ No newline at end of file bin/beholder @@ -2,33 +2,31 @@ require File.expand_path(File.dirname(__FILE__) + "/../example_helper") describe Beholder do - describe "when casting it's gaze" do + describe "when run is called" do - it "should begat a new beholder" do - beholder = stub(Beholder.new) { prepare_for_interlopers; open_your_eye; spawn_dragon } + it "should create a new beholder" do + beholder = stub(Beholder.new) { prepare; start } mock(Beholder).new { beholder } - Beholder.cast_thy_gaze + Beholder.run end - it "should prepare the child for interlopers" do + it "should prepare" do beholder = Beholder.new - stub(beholder).open_your_eye - stub(beholder).spawn_dragon - mock(beholder).prepare_for_interlopers + stub(beholder).start + mock(beholder).prepare stub(Beholder).new { beholder } - Beholder.cast_thy_gaze + Beholder.run end - it "should open the child's eyes" do + it "should start" do beholder = Beholder.new - mock(beholder).open_your_eye - stub(beholder).spawn_dragon - stub(beholder).prepare_for_interlopers + mock(beholder).start + stub(beholder).prepare stub(Beholder).new { beholder } - Beholder.cast_thy_gaze + Beholder.run end end @@ -46,7 +44,7 @@ describe Beholder do treasures = ['pot_o_gold'] beholder = Beholder.new stub(beholder).identify_stolen_treasure('pot_o_gold') { 'x marks the spot' } - mock(beholder).reclaim_stolen_treasure_at(['x marks the spot']) + mock(beholder).run_tests(['x marks the spot']) beholder.notice_thief_taking treasures end @@ -65,20 +63,20 @@ describe Beholder do end - describe "when closing it's eye" do + describe "when shutting down" do - it "should stop watching for interlopers" do + it "should stop watching for changes" do beholder = Beholder.new stub(beholder).exit - stub(beholder).the_eye { mock!.shutdown } - beholder.close_your_eye + stub(beholder).watcher { mock!.shutdown } + beholder.shutdown end - it "should leave the dungeon" do + it "should exit" do beholder = Beholder.new - stub(beholder).the_eye { stub!.shutdown } + stub(beholder).watcher { stub!.shutdown } mock(beholder).exit - beholder.close_your_eye + beholder.shutdown end end examples/lib/beholder_example.rb @@ -9,7 +9,7 @@ end class Beholder attr_reader :paths_to_watch, :sent_an_int, :mappings, :working_directory, :be_verbose - attr_reader :the_eye, :treasure_maps, :possible_map_locations, :all_examples + attr_reader :watcher, :treasure_maps, :possible_map_locations, :all_examples def initialize @paths_to_watch, @all_examples = [], [] @@ -20,12 +20,12 @@ class Beholder @possible_map_locations = ["#{@working_directory}/.treasure_map.rb", "#{@working_directory}/treasure_map.rb", "#{@working_directory}/config/treasure_map.rb"] end - def self.cast_thy_gaze + def self.run beholder = new beholder.read_all_maps beholder.set_all_examples if beholder.all_examples.empty? - beholder.prepare_for_interlopers - beholder.open_your_eye + beholder.prepare + beholder.start end def read_all_maps @@ -40,27 +40,27 @@ class Beholder end end - def prepare_for_interlopers + def prepare trap 'INT' do if @sent_an_int then puts " A second INT? Ok, I get the message. Shutting down now." - close_your_eye + shutdown else puts " Did you just send me an INT? Ugh. I'll quit for real if you do it again." @sent_an_int = true Kernel.sleep 1.5 - reclaim_stolen_treasure_at all_examples + run_tests all_examples end end end - def open_your_eye + def start say("Watching the following locations:\n #{paths_to_watch.join(", ")}") - @the_eye = FSEvents::Stream.watch(paths_to_watch) do |treasure_chest| + @watcher = FSEvents::Stream.watch(paths_to_watch) do |treasure_chest| notice_thief_taking(treasure_chest.modified_files) puts "\n\nWaiting to hear from the disk since #{Time.now}" end - @the_eye.run + @watcher.run end def read_default_map @@ -122,8 +122,8 @@ class Beholder @sent_an_int = false end - def close_your_eye - the_eye.shutdown + def shutdown + watcher.shutdown exit end @@ -141,7 +141,7 @@ class Beholder return [] end - def reclaim_stolen_treasure_at(coordinates) + def run_tests(coordinates) coordinates.flatten! coordinates.reject! do |coordinate| @@ -159,7 +159,7 @@ class Beholder def notice_thief_taking(treasure) say "#{treasure} changed" unless treasure.empty? coordinates = treasure.map { |t| identify_stolen_treasure(t) }.uniq.compact - reclaim_stolen_treasure_at coordinates + run_tests coordinates end private lib/beholder.rb 91d5673babfbdd435b380f9767559c199ace2957 Rob Sanheim rsanheim@gmail.com http://github.com/spicycode/beholder/commit/acd68456b75479591b4f2d06848fe3b1cb73decc acd68456b75479591b4f2d06848fe3b1cb73decc 2009-02-26T22:51:30-08:00 2009-02-26T22:51:30-08:00 commence (boring) conversion of beholder to names and terms I can understand 27dc646a2bc75af1fe1ec15005d9465dff7e2e2d Rob Sanheim rsanheim@gmail.com