uberspec 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/uberspec.rb

@@ -81,13 +81,8 @@ module Uberspec
     end
 
     def system_with_notify(command)
-      #my_io = MyIO.new($stdout)
-      #$stdout = my_io
-      #system(command)
-      #$stdout = my_io.old_io
-      #results = my_io.captured
       if notifier
-        results = %x{#{command}}
+        results = `#{command}`
         notifier.notify(parse_results(results))
         puts results 
       else

data/lib/uberspec/rspec.rb

@@ -4,7 +4,7 @@ module Uberspec
   class Rspec < Uberspec::Base
 
     def command
-      @command ||= Gem.loaded_specs['rspec'].version >= Gem::Version.create('2.0') ? 'rspec' : 'spec'
+      version == 2 ? 'rspec' : 'spec'
     end
 
     def all_test_files
@@ -15,9 +15,9 @@ module Uberspec
       results = result_string.split("\n")
       results = results.last(4).compact.delete_if {|i| i !~ /\S/i }
 
-      time = results[0].match(/\d+\.\d+/)[0].to_f
+      time = results.select {|r| r.match(/finished/i)}.first.match(/\d+\.\d+/)[0].to_f
 
-      stats = results[1].split(', ').map(&:to_i)
+      stats = results.select {|r| r.match(/examples/)}.first.split(', ').map(&:to_i)
       examples = stats[0]
       failed = stats[1]
       pending = stats[2]
@@ -25,5 +25,11 @@ module Uberspec
       {:time => time, :examples => examples, :failed => failed, :pending => pending}
     end
 
+  private
+
+    def version
+      @version ||= Gem.loaded_specs['rspec'].version.to_s.to_i
+    end
+
   end
 end

data/spec/uberspec_spec.rb

@@ -62,7 +62,7 @@ describe Uberspec::Base do
     end
   end
 
-  context "running files" do
+  context "watching" do
     before(:each) do
       @base = Uberspec::Base.watch(@watchr_script)
     end
@@ -146,12 +146,43 @@ describe Uberspec::Base do
         @base.run
       end
 
-      it "should run the tests and save the results" do
-        @base.should_receive(:system)
-        @base.system_with_notify('echo test')
+      context "without notifications" do
+        it "should run the tests and let the console do its own output" do
+          @base.should_receive(:system).with('echo test')
+          @base.system_with_notify('echo test')
+        end
+      end
+
+      context "with notifications" do
+        before(:each) do
+          @notifier = mock(:notifier, :notify => true)
+          @base.stub(:notifier).and_return(@notifier)
+          @base.stub(:puts).and_return(@notifier)
+          @base.stub(:`).and_return('test')
+          @base.stub(:parse_results).and_return('you win')
+        end
+
+        it "should execute the command" do
+          @base.should_receive(:`).with('echo test')
+          @base.system_with_notify('echo test')
+        end
+        
+        it "should parse the results" do
+          @base.should_receive(:parse_results).with('test')
+          @base.system_with_notify('echo test')
+        end
+
+        it "should pass the results on to the notify" do
+          @notifier.should_receive(:notify).with('you win')
+          @base.system_with_notify('echo test')
+        end
+
+        it "should put the results" do
+          @base.should_receive(:puts).with('test')
+          @base.system_with_notify('echo test')
+        end
       end
 
-      it "should have the custom IO stuff better tested"
     end
 
     context "when parsing results" do

data/uberspec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uberspec}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alan Peabody"]
-  s.date = %q{2011-02-15}
+  s.date = %q{2011-02-16}
   s.description = %q{Continious Integration for Rspec using Watchr}
   s.email = %q{gapeabody@gmail.com}
   s.extra_rdoc_files = [

data/uberspec.watchr

@@ -1,9 +1,9 @@
 require 'uberspec'
 
-Uberspec::Parallel.watch(self) do |config|
+Uberspec::Rspec.watch(self) do |config|
   config.code_paths += ['^lib/(.*)\.rb']
   config.spec_paths += ['^spec/(.*)\.']
-  config.notify = false #'LibNotify' #'Growl' #false
+  config.notify = 'LibNotify' #'Growl' #false
 end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: uberspec
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Alan Peabody
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 -05:00
+date: 2011-02-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency