images/bad.png images/good.png @@ -1 +1,13 @@ +def growl(message, image) + message.gsub!("'",'') + message.strip! + system "growlnotify -n 'Beholder' -m '#{message}' --image #{image}" +end + Beholder.runner = 'spec --options spec/spec.opts --require spec/setup.rb' +Beholder.on_success = lambda do |output| + growl 'It is all good, in the applebees neighborhood', '/Users/chad/Projects/spicycode/spicycode-beholder/images/good.png' +end +Beholder.on_failure = lambda do |output| + growl output, '/Users/chad/Projects/spicycode/spicycode-beholder/images/bad.png' +end .treasure_map.rb @@ -5,12 +5,17 @@ class Beholder DEFAULT_RUNNER = 'ruby' class << self - attr_writer :runner, :test_types, :possible_treasure_map_locations - + attr_writer :test_types, :possible_treasure_map_locations + attr_accessor :on_success, :on_failure + def runner @runner ||= ::Beholder::DEFAULT_RUNNER end + def runner=(new_runner) + @runner = new_runner + end + def possible_treasure_map_locations @possible_treasure_map_locations ||= ["#{Dir.pwd}/.treasure_map.rb", "#{Dir.pwd}/treasure_map.rb", "#{Dir.pwd}/config/treasure_map.rb"] end @@ -79,12 +84,7 @@ class Beholder @current_map = nil end - def default_options - { :command => ::Beholder.runner } - end - def prepare_spell_for(pattern, options = {}, &blk) - options = default_options.merge(options) @current_map << [pattern, options, blk] end @@ -105,18 +105,20 @@ class Beholder def on_change(paths) say "#{paths} changed" unless paths.nil? || paths.empty? - treasure_maps_changed = paths.select { |p| ::Beholder.possible_treasure_map_locations.include?(p) } - treasure_maps_changed.each {|map_path| read_map_at(map_path) } - + paths.reject! { |path| ::Beholder.possible_treasure_map_locations.include?(path) } runners_with_paths = {} + paths.each do |path| - find_and_populate_matches(path, runners_with_paths) - end + runner, tests = *find_and_populate_matches(path) + next if tests.nil? || tests.empty? - runners_with_paths.each do |runner, paths| - paths.uniq! - paths.compact! - end + tests.uniq! + tests.compact! + + if tests.any? + runners_with_paths[runner] = tests + end + end run_tests runners_with_paths end @@ -160,7 +162,7 @@ class Beholder 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 - run_tests ::Beholder.runner => ::Beholder.all_tests + run_tests nil => ::Beholder.all_tests end end end @@ -203,16 +205,12 @@ class Beholder @sent_an_int = false end - def find_and_populate_matches(path, runners_with_paths) + def find_and_populate_matches(path) treasure_maps.each do |name, map| map.each do |pattern, options, blk| - run_using = options[:command] - if match = path.match(pattern) say "Found the match for #{path} using the #{name} map " - runners_with_paths[run_using] ||= [] - runners_with_paths[run_using].concat(blk.call(match)) - return + return [options[:command], blk.call(match)] end end end @@ -226,7 +224,14 @@ class Beholder return if runners_with_paths.empty? runners_with_paths.each do |runner, paths| - system build_cmd(runner, paths) + runner ||= ::Beholder.runner + result = %x{#{build_cmd(runner, paths)}} + puts result + if $?.exitstatus.zero? + ::Beholder.on_success && ::Beholder.on_success.call(result) + else + ::Beholder.on_failure && ::Beholder.on_failure.call(result) + end end blink @@ -235,6 +240,9 @@ class Beholder private def remove_runners_with_no_valid_files_to_run(runners_with_paths) + return [] if runners_with_paths.nil? + require 'pp' + pp runners_with_paths runners_with_paths.each do |runner, paths| paths.reject! do |path| found_treasure = File.exist?(path) lib/beholder.rb @@ -17,7 +17,6 @@ describe Beholder do end describe "when run is called" do - it "should create a new beholder" do beholder = stub(Beholder.new) { prepare; start } mock(Beholder).new { beholder } @@ -42,26 +41,15 @@ describe Beholder do Beholder.run end - end describe "when it notices file(s) changed" do - it "should identify what was changed" do files = ['widgets'] beholder = Beholder.new - mock(beholder).find_and_populate_matches('widgets', {}) { nil } + mock(beholder).find_and_populate_matches('widgets') { nil } 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 @@ -74,11 +62,9 @@ describe Beholder do beholder = Beholder.new beholder.build_cmd("ruby", ["test/foo_test.rb", "test/functionals/foo_test.rb"]).should == %[ruby test/foo_test.rb test/functionals/foo_test.rb] end - end describe "blink" do - it "should forget about any interlopers" do beholder = Beholder.new beholder.instance_variable_set("@sent_an_int", true) # Not so hot, but I'm tired @@ -87,11 +73,9 @@ describe Beholder do beholder.__send__ :blink beholder.sent_an_int.should be_false end - end describe "when shutting down" do - it "should stop watching for changes" do beholder = Beholder.new stub(beholder).exit @@ -105,11 +89,9 @@ describe Beholder do mock(beholder).exit beholder.shutdown end - end describe "watch" do - it "adds paths to watch" do beholder = Beholder.new beholder.watch "bar", "foo" @@ -141,6 +123,7 @@ describe Beholder do # This is not ideal # currently returns array, array beholder.treasure_maps[:example].first.first.should == %r%example_helper\.rb% + 1.should == 3 end # it "adds mapping using default command of ruby" do @@ -152,7 +135,6 @@ describe Beholder do end describe "tests_matching" do - it "finds a fuzzy match from all tests" do beholder = Beholder.new stub(Beholder).all_tests { ["spec/unit/bar_example.rb", "src/foo_system_example.rb", "spec/some/deeper/dir/foo_example.rb"] } @@ -161,7 +143,6 @@ describe Beholder do end describe "read_map_at" do - it "rescues exceptions from instance_eval'ing the map, and carries on" do beholder = Beholder.new stub(File).exist? { true } @@ -169,11 +150,9 @@ describe Beholder do stub(beholder).puts lambda { beholder.read_map_at("my_map.rb") }.should_not raise_error end - end describe "say" do - it "puts to stdout if verbose is true" do begin ARGV.push("-v") spec/beholder_spec.rb 82cc140f72e2eebca9d407031e52a3861fdef702 Chad Humphries chad@spicycode.com http://github.com/spicycode/beholder/commit/3cf82368bed30c4bdd0de30539dac9a50f821830 3cf82368bed30c4bdd0de30539dac9a50f821830 2009-10-09T10:50:41-07:00 2009-10-09T10:50:41-07:00 In progress magic 58a540e3e495843daa412084cb74b9c25ebcedae Chad Humphries chad@spicycode.com