Reset default_action when reparsing script

TODO.txt

@@ -1,12 +1,6 @@
 
-* reset default_action when reparsing script
-  * def reset
-
 * 1.9 compatibility
 
-* version.watchr
-  * sync versions (gemspec & Watchr::VERSION)
-
 * sometimes an action is fired without a file being saved
   * buffer flushing issue?
   * libev issue?
@@ -39,3 +33,6 @@
 
 * memory profiling / benchmarks
 
+* version.watchr
+  * sync versions (gemspec & Watchr::VERSION)
+

lib/watchr/script.rb

@@ -110,7 +110,7 @@ def default_action(&action)
     def parse!
       Watchr.debug('loading script file %s' % @path.to_s.inspect)
 
-      @rules.clear
+      reset
       instance_eval(@path.read)
 
     rescue Errno::ENOENT
@@ -120,6 +120,11 @@ def parse!
       instance_eval(@path.read)
     end
 
+    def reset
+      @default_action = lambda {}
+      @rules.clear
+    end
+
     # Find an action corresponding to a path. The returned action is actually a
     # wrapper around the rule's action, with the match_data prepopulated.
     #

test/test_script.rb

@@ -49,6 +49,21 @@ def setup
     script.action_for('abc').call.should be(:x)
   end
 
+  test "resets state" do
+    @script.default_action { 'x' }
+    @script.watch('foo') { 'bar' }
+    @script.reset
+    @script.instance_variable_get(:@default_action).should be_kind_of(Proc)
+    @script.instance_variable_get(:@default_action).call.should be(nil)
+    @script.instance_variable_get(:@rules).should be([])
+  end
+
+  test "resets state on parse" do
+    @script.stubs(:instance_eval)
+    @script.expects(:reset)
+    @script.parse!
+  end
+
   test "actions receive a MatchData object" do
     @script.watch('de(.)') {|m| [m[0], m[1]] }
     @script.action_for('def').call.should be(%w( def f ))