rspec-longrun 0.0.2 → 0.0.3

data/README.md

@@ -22,14 +22,13 @@ Specify the custom output format when invoking RSpec, as follows:
 
 The resulting test output looks something like:
 
-    Example group
-      * First example
-        OK
-      * Second example
-        OK
-      * Third example
-        PENDING (Not implemented yet)
+    Example group {
+      First example OK (1.2s)
+      Second example OK (3.4s)
+      Third example PENDING (Not implemented yet) (0.2s)
+    } (5.2s)
 
+(though a little more colourful).
 
 ### Tracking progress
 
@@ -61,12 +60,13 @@ Include RSpec::Longrun::DSL to define the 'step' method, which can be used to gr
 
 The resulting test output looks something like:
 
-    Account management
-      * Log in and alter preferences
-        - Log in
-        - Navigate to preferences page
-        - Change preferences
-        OK
+    Account management {
+      Log in and alter preferences {
+        Log in (0.5s)
+        Navigate to preferences page (0.2s)
+        Change preferences (5.2s)
+      } OK (7.1s)
+    } OK (7.2s)
 
 which gives you some extra context in the event that something fails, or hangs, during the test run.
 

data/examples/example_spec.rb

@@ -0,0 +1,52 @@
+require 'rspec'
+require 'rspec/longrun'
+
+describe "Underpants gnomes" do
+
+  include RSpec::Longrun::DSL
+
+  it "The plan" do
+    step "Collect underpants" do
+    end
+    step "Umm ..." do
+      sleep 0.3 # thinking
+    end
+    step "Profit!" do
+      pending "need a real business plan"
+    end
+  end
+
+end
+
+describe "Killer app" do
+
+  include RSpec::Longrun::DSL
+
+  describe "Some feature" do
+
+    it "Scenario 1" do
+      step "Step 1" do
+      end
+      step "Step 2" do
+      end
+      step "Step 3" do
+      end
+    end
+
+    it "Scenario 2" do
+    end
+
+  end
+
+  describe "Another feature" do
+
+    it "Scenario" do
+      step "Step 1" do
+      end
+      step "Step 2" do
+      end
+    end
+
+  end
+
+end

data/lib/rspec/longrun/formatter.rb

@@ -7,12 +7,12 @@ module RSpec
 
       def initialize(output)
         super(output)
-        @indent_level = 0
+        @blocks = [Block.new(true)]
       end
 
       def example_group_started(example_group)
         super(example_group)
-        start_block(example_group.description)
+        begin_block(example_group.description)
       end
 
       def example_group_finished(example_group)
@@ -22,7 +22,7 @@ module RSpec
 
       def example_started(example)
         super(example)
-        start_block('* ' + cyan(example.description))
+        begin_block(cyan(example.description))
       end
 
       def example_passed(example)
@@ -41,7 +41,7 @@ module RSpec
       end
 
       def step_started(description)
-        start_block(faint('- ' + description))
+        begin_block(description)
       end
 
       def step_finished(description)
@@ -50,28 +50,70 @@ module RSpec
 
       private
 
-      def start_block(message)
-        emit(message.strip)
-        @indent_level += 1
+      def current_block
+        @blocks.last
       end
 
-      def end_block(message = nil)
-        emit(message.strip) if message
-        @indent_level -= 1
+      def begin_block(message)
+        unless current_block.nested?
+          output << faint("{\n")
+          current_block.nested!
+        end
+        output << current_indentation
+        output << message.strip
+        output << ' '
+        @blocks.push(Block.new)
       end
 
-      def emit(message)
-        output.puts(message.gsub(/^/, current_indentation))
+      def end_block(message = nil)
+        block = @blocks.pop
+        block.finished!
+        if block.nested?
+          output << current_indentation
+          output << faint('} ')
+        end
+        if message
+          output << message.strip
+          output << ' '
+        end
+        output << faint('(' + block.timing + ')')
+        output << "\n"
       end
 
       def current_indentation
-        '  ' * @indent_level
+        '  ' * (@blocks.size - 1)
       end
 
       def faint(text)
         color(text, "\e[2m")
       end
 
+      class Block
+
+        def initialize(nested = false)
+          @began_at = Time.now
+          @nested = nested
+        end
+
+        def finished!
+          @finished_at = Time.now
+        end
+
+        def timing
+          delta = @finished_at - @began_at
+          '%.2fs' % delta
+        end
+
+        def nested!
+          @nested = true
+        end
+
+        def nested?
+          @nested
+        end
+
+      end
+
     end
 
   end

data/lib/rspec/longrun/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Longrun
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/rspec/longrun/formatter_spec.rb

@@ -3,8 +3,6 @@ require "stringio"
 
 describe RSpec::Longrun::Formatter do
 
-  include RSpec::Longrun::DSL
-
   let(:output_buffer) { StringIO.new }
   let(:formatter) { described_class.new(output_buffer) }
 
@@ -47,12 +45,14 @@ describe RSpec::Longrun::Formatter do
       end
     end
 
-    it "outputs nested group name" do
+    it "outputs nested group names" do
       output.should eql(undent(<<-EOF))
-        foo
-          bar
-            baz
-          qux
+        foo {
+          bar {
+            baz (0.00s)
+          } (0.00s)
+          qux (0.00s)
+        } (0.00s)
       EOF
     end
 
@@ -74,13 +74,11 @@ describe RSpec::Longrun::Formatter do
 
     it "outputs example names and status" do
       output.should eql(undent(<<-EOF))
-        suite
-          * works
-            OK
-          * is unimplemented
-            PENDING: implement me
-          * fails
-            FAILED
+        suite {
+          works OK (0.00s)
+          is unimplemented PENDING: implement me (0.00s)
+          fails FAILED (0.00s)
+        } (0.00s)
       EOF
     end
 
@@ -104,16 +102,16 @@ describe RSpec::Longrun::Formatter do
     end
 
     it "outputs steps" do
-      step "try steps" do
-        output.should eql(undent(<<-EOF))
-          suite
-            * has steps
-              - Collect underpants
-              - Er ...
-                - (thinking)
-              PENDING: Profit!
-        EOF
-      end
+      output.should eql(undent(<<-EOF))
+        suite {
+          has steps {
+            Collect underpants (0.00s)
+            Er ... {
+              (thinking) (0.00s)
+            } (0.00s)
+          } PENDING: Profit! (0.00s)
+        } (0.00s)
+      EOF
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-longrun
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -40,6 +40,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- examples/example_spec.rb
 - lib/rspec/longrun.rb
 - lib/rspec/longrun/core_ext.rb
 - lib/rspec/longrun/dsl.rb
@@ -61,7 +62,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1671641901183265154
+      hash: -2839138365557975715
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -70,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1671641901183265154
+      hash: -2839138365557975715
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23