autowatchr 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/autowatchr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{autowatchr}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Stephens"]
-  s.date = %q{2009-10-02}
+  s.date = %q{2009-10-06}
   s.description = %q{Provides some autotest-like behavior for watchr (http://github.com/mynyml/watchr).}
   s.email = %q{viking415@gmail.com}
   s.extra_rdoc_files = [

data/lib/autowatchr.rb

@@ -65,6 +65,19 @@ class Autowatchr
     end
   end
 
+  class Tee < StringIO
+    attr_reader :io
+    def initialize(io)
+      super("")
+      @io = io
+    end
+
+    def write(string)
+      super
+      @io.write(string)
+    end
+  end
+
   attr_reader :config
 
   def initialize(script, options = {})
@@ -114,25 +127,8 @@ class Autowatchr
     cmd = commands.join("; ")
     puts cmd
 
-    # straight outta autotest
-    results = []
-    line = []
-    open("| #{cmd}", "r") do |f|
-      until f.eof? do
-        c = f.getc
-        putc c
-        line << c
-        if c == ?\n then
-          results << if RUBY_VERSION >= "1.9" then
-                       line.join
-                     else
-                       line.pack "c*"
-                     end
-          line.clear
-        end
-      end
-    end
-    handle_results(results.join, files)
+    results = execute_cmd(cmd)
+    handle_results(results, files)
   end
 
   def classname_to_path(s)
@@ -153,6 +149,20 @@ class Autowatchr
       @script.watch(@config.lib_re)  { |md| run_lib_file(md[0]) }
     end
 
+    def execute_cmd(cmd)
+      tee = Tee.new($stdout)
+      $stdout = tee
+
+      system(cmd)
+
+      $stdout = tee.io
+      tee.rewind
+      results = tee.read
+      tee.close
+
+      results
+    end
+
     def handle_results(results, files_ran)
       return  if !@config.failing_only
       num_previously_failed = @failed_tests.length

data/test/helper.rb

@@ -9,21 +9,42 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'autowatchr'
 
 class Test::Unit::TestCase
-  def fake_result(name)
-    StringIO.new(open(File.dirname(__FILE__) + "/fixtures/results/#{name}.txt").read)
+end
+
+module Mocha::ObjectMethods
+  def stubs_system_call(result_name = nil)
+    self.stubs(:system).with() do |_|
+      $stdout.print(result_name ? fake_result(result_name) : "")
+      true
+    end
   end
 
-  # File vendor/rails/activesupport/lib/active_support/core_ext/kernel/reporting.rb, line 36
-  def silence_stream(stream)
-    old_stream = stream.dup
-    stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
-    stream.sync = true
-    yield
-  ensure
-    stream.reopen(old_stream)
+  def expects_system_call(expected_command, result_name = nil)
+    self.expects(:system).with() do |actual_command|
+      if expected_command == actual_command
+        $stdout.print(result_name ? fake_result(result_name) : "")
+        true
+      else
+        false
+      end
+    end
   end
 end
 
+def fake_result(name)
+  open(File.dirname(__FILE__) + "/fixtures/results/#{name}.txt").read
+end
+
+# File vendor/rails/activesupport/lib/active_support/core_ext/kernel/reporting.rb, line 36
+def silence_stream(stream)
+  old_stream = stream.dup
+  stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
+  stream.sync = true
+  yield
+ensure
+  stream.reopen(old_stream)
+end
+
 def debug_p(obj, label = nil)
   $stderr.print "#{label}: "  if label
   $stderr.puts obj.inspect

data/test/test_autowatchr.rb

@@ -13,7 +13,7 @@ class TestAutowatchr < Test::Unit::TestCase
     @script = stub("fake watchr script", :watch => nil)
     @lib_dir = File.dirname(__FILE__) + "/fixtures/lib"
     @test_dir = File.dirname(__FILE__) + "/fixtures/test"
-    Autowatchr.any_instance.stubs(:open)
+    Autowatchr.any_instance.stubs_system_call
   end
 
   def test_new_with_hash
@@ -86,9 +86,8 @@ class TestAutowatchr < Test::Unit::TestCase
   end
 
   def test_run_lib_file
-    result = fake_result("foo")
-    expected_cmd = "| /usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_foo.rb"
-    Autowatchr.any_instance.expects(:open).with(expected_cmd, "r").yields(result)
+    expected_cmd = "/usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_foo.rb"
+    Autowatchr.any_instance.expects_system_call(expected_cmd, "foo")
 
     silence_stream(STDOUT) do
       aw = new_autowatchr
@@ -97,9 +96,8 @@ class TestAutowatchr < Test::Unit::TestCase
   end
 
   def test_running_multiple_test_files
-    result = fake_result("all")
-    expected_cmd = "| /usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} -e \"%w[#{@test_dir}/test_bar.rb #{@test_dir}/test_foo.rb].each { |f| require f }\""
-    Autowatchr.any_instance.expects(:open).with(expected_cmd, "r").yields(result)
+    expected_cmd = "/usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} -e \"%w[#{@test_dir}/test_bar.rb #{@test_dir}/test_foo.rb].each { |f| require f }\""
+    Autowatchr.any_instance.expects_system_call(expected_cmd, "all")
 
     silence_stream(STDOUT) do
       aw = new_autowatchr
@@ -108,10 +106,9 @@ class TestAutowatchr < Test::Unit::TestCase
   end
 
   def test_runs_all_test_files_on_start
-    result = fake_result("all")
     files = Dir.glob("#{@test_dir}/**/test_*.rb").join(" ")
-    expected_cmd = %!| /usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} -e "%w[#{files}].each { |f| require f }"!
-    Autowatchr.any_instance.expects(:open).with(expected_cmd, "r").yields(result)
+    expected_cmd = %!/usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} -e "%w[#{files}].each { |f| require f }"!
+    Autowatchr.any_instance.expects_system_call(expected_cmd, "all")
 
     silence_stream(STDOUT) do
       new_autowatchr
@@ -127,16 +124,14 @@ class TestAutowatchr < Test::Unit::TestCase
   end
 
   def test_only_runs_failing_tests
-    result = fake_result("all")
-    Autowatchr.any_instance.stubs(:open).yields(result)
+    Autowatchr.any_instance.stubs_system_call("all")
     aw = nil
     silence_stream(STDOUT) do
       aw = new_autowatchr
     end
 
-    result = fake_result("foo_flunk")
-    expected_cmd = %!| /usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_foo.rb -n "/^(test_flunk)$/"!
-    aw.expects(:open).with(expected_cmd, "r").yields(result)
+    expected_cmd = %!/usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_foo.rb -n "/^(test_flunk)$/"!
+    aw.expects_system_call(expected_cmd, "foo_flunk")
 
     silence_stream(STDOUT) do
       aw.run_test_file("#{@test_dir}/test_foo.rb")
@@ -144,65 +139,57 @@ class TestAutowatchr < Test::Unit::TestCase
   end
 
   def test_clears_failing_test_when_it_passes
-    result = fake_result("all")
-    Autowatchr.any_instance.stubs(:open).yields(result)
+    Autowatchr.any_instance.stubs_system_call("all")
     aw = nil
     silence_stream(STDOUT) do
       aw = new_autowatchr
     end
 
-    result = fake_result("foo_pass")
+    aw.stubs_system_call("foo_pass")
     silence_stream(STDOUT) do
       aw.run_test_file("#{@test_dir}/test_foo.rb")
     end
 
-    result = fake_result("foo")
-    expected_cmd = %!| /usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_foo.rb!
-    aw.expects(:open).with(expected_cmd, "r").yields(result)
+    expected_cmd = %!/usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_foo.rb!
+    aw.expects_system_call(expected_cmd, "foo")
     silence_stream(STDOUT) do
       aw.run_test_file("#{@test_dir}/test_foo.rb")
     end
   end
 
   def test_not_only_running_failing_tests
-    result = fake_result("all")
-    Autowatchr.any_instance.stubs(:open).yields(result)
+    Autowatchr.any_instance.stubs_system_call("all")
     aw = nil
     silence_stream(STDOUT) do
       aw = new_autowatchr(:failing_only => false)
     end
 
-    result = fake_result("foo")
-    expected_cmd = %!| /usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_foo.rb!
-    aw.expects(:open).with(expected_cmd, "r").yields(result)
+    expected_cmd = %!/usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_foo.rb!
+    aw.expects_system_call(expected_cmd, "foo")
     silence_stream(STDOUT) do
       aw.run_test_file("#{@test_dir}/test_foo.rb")
     end
   end
 
   def test_running_entire_suite_after_green
-    result_1 = fake_result("all")
-    Autowatchr.any_instance.stubs(:open).yields(result_1)
+    Autowatchr.any_instance.stubs_system_call("all")
     aw = nil
     silence_stream(STDOUT) do
       aw = new_autowatchr
     end
 
-    result_2 = fake_result("foo_pass")
-    expected_cmd_2 = %!| /usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_foo.rb -n "/^(test_flunk)$/"!
-    aw.expects(:open).with(expected_cmd_2, "r").yields(result_2)
+    expected_cmd_2 = %!/usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_foo.rb -n "/^(test_flunk)$/"!
+    aw.expects_system_call(expected_cmd_2, "foo_pass")
     silence_stream(STDOUT) do
       aw.run_test_file("#{@test_dir}/test_foo.rb")
     end
 
-    result_3 = fake_result("bar_pass")
-    expected_cmd_3 = %!| /usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_bar.rb -n "/^(test_flunk)$/"!
-    aw.expects(:open).with(expected_cmd_3, "r").yields(result_3)
+    expected_cmd_3 = %!/usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_bar.rb -n "/^(test_flunk)$/"!
+    aw.expects_system_call(expected_cmd_3, "bar_pass")
 
     files = Dir.glob("#{@test_dir}/**/test_*.rb").join(" ")
-    result_4 = fake_result("all")
-    expected_cmd_4 = %!| /usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} -e "%w[#{files}].each { |f| require f }"!
-    aw.expects(:open).with(expected_cmd_4, "r").yields(result_4)
+    expected_cmd_4 = %!/usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} -e "%w[#{files}].each { |f| require f }"!
+    aw.expects_system_call(expected_cmd_4, "all")
 
     silence_stream(STDOUT) do
       aw.run_test_file("#{@test_dir}/test_bar.rb")
@@ -210,23 +197,20 @@ class TestAutowatchr < Test::Unit::TestCase
   end
 
   def test_not_running_entire_suite_after_green
-    result_1 = fake_result("all")
-    Autowatchr.any_instance.stubs(:open).yields(result_1)
+    Autowatchr.any_instance.stubs_system_call("all")
     aw = nil
     silence_stream(STDOUT) do
       aw = new_autowatchr(:run_suite => false)
     end
 
-    result_2 = fake_result("foo_pass")
-    expected_cmd_2 = %!| /usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_foo.rb -n "/^(test_flunk)$/"!
-    aw.expects(:open).with(expected_cmd_2, "r").yields(result_2)
+    expected_cmd_2 = %!/usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_foo.rb -n "/^(test_flunk)$/"!
+    aw.expects_system_call(expected_cmd_2, "foo_pass")
     silence_stream(STDOUT) do
       aw.run_test_file("#{@test_dir}/test_foo.rb")
     end
 
-    result_3 = fake_result("bar_pass")
-    expected_cmd_3 = %!| /usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_bar.rb -n "/^(test_flunk)$/"!
-    aw.expects(:open).with(expected_cmd_3, "r").yields(result_3)
+    expected_cmd_3 = %!/usr/local/bin/ruby -I.:#{@lib_dir}:#{@test_dir} #{@test_dir}/test_bar.rb -n "/^(test_flunk)$/"!
+    aw.expects_system_call(expected_cmd_3, "bar_pass")
 
     silence_stream(STDOUT) do
       aw.run_test_file("#{@test_dir}/test_bar.rb")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autowatchr
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jeremy Stephens
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-02 00:00:00 -05:00
+date: 2009-10-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency