0
@@ -1,5 +1,4 @@
0
 dir = File.dirname(__FILE__)
0
-ARGV.push('--require', "#{dir}/spec_helpers/indented_text_formatter", '--options', "#{dir}/spec.opts")
0
 
0
 Dir["#{dir}/{rails_integration}/**/*_spec.rb"].each do |file|
0
   require file

0
@@ -1,5 +1,4 @@
0
 dir = File.dirname(__FILE__)
0
-ARGV.push('--require', "#{dir}/spec_helpers/indented_text_formatter", '--options', "#{dir}/spec.opts")
0
 
0
 Dir["#{dir}/{selenium}/**/*_spec.rb"].each do |file|
0
   require file

0
@@ -1,6 +1,6 @@
0
 --colour
0
 --format
0
-profile
0
+indented
0
 --loadby
0
 mtime
0
 --reverse

0
@@ -1,6 +1,7 @@
0
 ENV["RAILS_ENV"] = "test"
0
 dir = File.dirname(__FILE__)
0
 require File.expand_path("#{dir}/../config/environment")
0
+#ARGV.concat ["--options", "#{dir}/spec.opts"]
0
 require 'spec'
0
 require 'spec/rails'
0
 require 'hpricot'

0
@@ -1,49 +1 @@
0
-require 'spec/runner/formatter/base_text_formatter'
0
-
0
-module Spec
0
-  module Runner
0
-    module Formatter
0
-      class IndentedTextFormatter < BaseTextFormatter
0
-        def add_example_group(example_group)
0
-          super
0
-          if example_group.description_args
0
-            output.puts "#{example_group_indentation(example_group)}#{example_group.description_args}"
0
-            output.flush
0
-          end
0
-        end
0
-
0
-        def example_failed(example, counter, failure)
0
-          message = if failure.expectation_not_met?
0
-            "#{example_group_indentation(example.class)}  #{example.description} (FAILED - #{counter})"
0
-          else
0
-            "#{example_group_indentation(example.class)}  #{example.description} (ERROR - #{counter})"
0
-          end
0
-
0
-          output.puts(failure.expectation_not_met? ? red(message) : magenta(message))
0
-          output.flush
0
-        end
0
-
0
-        def example_passed(example)
0
-          message = "#{example_group_indentation(example.class)}  #{example.description}"
0
-          output.puts green(message)
0
-          output.flush
0
-        end
0
-
0
-        def example_pending(example_group_description, example, message)
0
-          super
0
-          output.puts yellow("#{example_group_indentation(example.class)}  #{example.description} (PENDING: #{message})")
0
-          output.flush
0
-        end
0
-
0
-        def example_group_indentation(example_group)
0
-          example_group_chain = []
0
-          example_group.send(:execute_in_class_hierarchy) do |parent_example_group|
0
-            example_group_chain << parent_example_group if parent_example_group.description_args
0
-          end
0
-          '  ' * (example_group_chain - [example_group]).length
0
-        end
0
-      end
0
-    end
0
-  end
0
-end

0
@@ -1,5 +1,4 @@
0
 dir = File.dirname(__FILE__)
0
-ARGV.push('--require', "#{dir}/spec_helpers/indented_text_formatter", '--options', "#{dir}/spec.opts")
0
 
0
 Dir["#{dir}/{models,fixture_specs,views,controllers,helpers}/**/*_spec.rb"].each do |file|
0
   require file

0
@@ -1,7 +1,7 @@
0
 --- 
0
 format: 1
0
 handler: 
0
-  commit: 8d86e0a630ad6c3529f0c17f12fb73abbfb9ba14
0
+  commit: d5180adac27ffd4abe58aca9d448a9cd9ca711d5
0
 repository_url: git://github.com/dchelimsky/rspec-rails.git
0
 lock: false
0
 repository_class: Piston::Git::Repository

0
@@ -1,4 +1,4 @@
0
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper'
0
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
0
 
0
 describe <%= class_name %>Controller do
0
 

0
@@ -1,4 +1,4 @@
0
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper'
0
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
0
 
0
 describe <%= class_name %>Helper do
0
   

0
@@ -1,4 +1,4 @@
0
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper'
0
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
0
 
0
 describe "/<%= class_name.underscore %>/<%= action %>" do
0
   before(:each) do
0
@@ -7,7 +7,7 @@
0
   
0
   #Delete this example and add some real ones or delete this file
0
   it "should tell you where to find the file" do
0
-    response.should have_tag('p', /Find me in app\/views\/<%= class_name.underscore %>\/<%= action %>/)
0
+    response.should have_tag('p', %r[Find me in app/views/<%= class_name.underscore %>/<%= action %>])
0
   end
0
 end

0
@@ -1,4 +1,4 @@
0
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper'
0
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
0
 
0
 describe <%= class_name %> do
0
   before(:each) do

0
@@ -1,4 +1,4 @@
0
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper'
0
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
0
 
0
 describe <%= controller_class_name %>Controller do
0
   describe "handling GET /<%= table_name %>" do

0
@@ -1,4 +1,4 @@
0
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper'
0
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
0
 
0
 describe "/<%= table_name %>/edit.<%= default_file_extension %>" do
0
   include <%= controller_class_name %>Helper

0
@@ -1,4 +1,4 @@
0
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper'
0
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
0
 
0
 describe <%= controller_class_name %>Helper do
0
   

0
@@ -1,4 +1,4 @@
0
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper'
0
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
0
 
0
 describe "/<%= table_name %>/index.<%= default_file_extension %>" do
0
   include <%= controller_class_name %>Helper

0
@@ -1,4 +1,4 @@
0
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper'
0
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
0
 
0
 describe "/<%= table_name %>/new.<%= default_file_extension %>" do
0
   include <%= controller_class_name %>Helper

0
@@ -1,4 +1,4 @@
0
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper'
0
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
0
 
0
 describe <%= controller_class_name %>Controller do
0
   describe "route generation" do

0
@@ -1,4 +1,4 @@
0
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper'
0
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
0
 
0
 describe "/<%= table_name %>/show.<%= default_file_extension %>" do
0
   include <%= controller_class_name %>Helper

0
@@ -1,7 +1,7 @@
0
 module Spec
0
   module Rails
0
     module VERSION #:nodoc:
0
-      BUILD_TIME_UTC = 20080504004334
0
+      BUILD_TIME_UTC = 20080522075859
0
     end
0
   end
0
 end

0
@@ -1,7 +1,7 @@
0
 --- 
0
 format: 1
0
 handler: 
0
-  commit: fa5228c4213849870231b0da371ddbef39a4982d
0
+  commit: e1bce2b4517a206dd08313652cf2f0b0cf740d4f
0
 repository_url: git://github.com/dchelimsky/rspec.git
0
 lock: false
0
 repository_class: Piston::Git::Repository

0
@@ -27,6 +27,7 @@
0
 * Applied patch from Bob Cotton: Nested ExampleGroups do not have a spec_path. Closes #224.
0
 * Add before_suite and after_suite callbacks to ExampleGroupMethods and Options. Closes #210.
0
 * The after(:suite) callback lambda is passed a boolean representing whether the suite passed or failed
0
+* Added IndentedTextFormatter. Closes #366.
0
 
0
 == Version 1.1.3
0
 

0
@@ -119,8 +119,8 @@
0
 
0
       def run
0
         examples = examples_to_run
0
-        return true if examples.empty?
0
         reporter.add_example_group(self)
0
+        return true if examples.empty?
0
         return dry_run(examples) if dry_run?
0
 
0
         plugin_mock_framework

0
@@ -4,22 +4,14 @@
0
   module Runner
0
     module Formatter
0
       class FailingExampleGroupsFormatter < BaseTextFormatter
0
-        attr_reader :example_group
0
-        def add_example_group(example_group)
0
-          super
0
-          @example_group = example_group
0
-        end
0
-
0
         def example_failed(example, counter, failure)
0
-          if @example_group
0
-            description_parts = @example_group.description_parts.collect do |description|
0
-              description =~ /(.*) \(druby.*\)$/ ? $1 : description
0
-            end
0
-            @output.puts ::Spec::Example::ExampleGroupMethods.description_text(*description_parts)
0
-
0
-            @output.flush
0
-            @example_group = nil
0
+          description_parts = @example_group.description_parts.collect do |description|
0
+            description =~ /(.*) \(druby.*\)$/ ? $1 : description
0
           end
0
+          @output.puts ::Spec::Example::ExampleGroupMethods.description_text(*description_parts)
0
+
0
+          @output.flush
0
+          @example_group = nil
0
         end
0
 
0
         def dump_failure(counter, failure)

0
@@ -9,8 +9,8 @@
0
         
0
         def initialize(options, output)
0
           super
0
-          @current_example_group_number = 0
0
-          @current_example_number = 0
0
+          @example_group_number = 0
0
+          @example_number = 0
0
         end
0
         
0
         def method_missing(sym, *args)
0
0
@@ -18,13 +18,13 @@
0
         end
0
 
0
         # The number of the currently running example_group
0
-        def current_example_group_number
0
-          @current_example_group_number
0
+        def example_group_number
0
+          @example_group_number
0
         end
0
         
0
         # The number of the currently running example (a global counter)
0
-        def current_example_number
0
-          @current_example_number
0
+        def example_number
0
+          @example_number
0
         end
0
         
0
         def start(example_count)
0
0
@@ -39,14 +39,14 @@
0
           super
0
           @example_group_red = false
0
           @example_group_red = false
0
-          @current_example_group_number += 1
0
-          unless current_example_group_number == 1
0
+          @example_group_number += 1
0
+          unless example_group_number == 1
0
             @output.puts "  </dl>"
0
             @output.puts "</div>"
0
           end
0
           @output.puts "<div class=\"example_group\">"
0
           @output.puts "  <dl>"
0
-          @output.puts "  <dt id=\"example_group_#{current_example_group_number}\">#{h(example_group.description)}</dt>"
0
+          @output.puts "  <dt id=\"example_group_#{example_group_number}\">#{h(example_group.description)}</dt>"
0
           @output.flush
0
         end
0
 
0
@@ -57,7 +57,7 @@
0
         end
0
 
0
         def example_started(example)
0
-          @current_example_number += 1
0
+          @example_number += 1
0
         end
0
 
0
         def example_passed(example)
0
@@ -71,7 +71,7 @@
0
           failure_style = failure.pending_fixed? ? 'pending_fixed' : 'failed'
0
           @output.puts "    <script type=\"text/javascript\">makeRed('rspec-header');</script>" unless @header_red
0
           @header_red = true
0
-          @output.puts "    <script type=\"text/javascript\">makeRed('example_group_#{current_example_group_number}');</script>" unless @example_group_red
0
+          @output.puts "    <script type=\"text/javascript\">makeRed('example_group_#{example_group_number}');</script>" unless @example_group_red
0
           @example_group_red = true
0
           move_progress
0
           @output.puts "    <dd class=\"spec #{failure_style}\">"
0
@@ -87,7 +87,7 @@
0
 
0
         def example_pending(example, message)
0
           @output.puts "    <script type=\"text/javascript\">makeYellow('rspec-header');</script>" unless @header_red
0
-          @output.puts "    <script type=\"text/javascript\">makeYellow('example_group_#{current_example_group_number}');</script>" unless @example_group_red
0
+          @output.puts "    <script type=\"text/javascript\">makeYellow('example_group_#{example_group_number}');</script>" unless @example_group_red
0
           move_progress
0
           @output.puts "    <dd class=\"spec not_implemented\"><span class=\"not_implemented_spec_name\">#{h(example.description)} (PENDING: #{h(message)})</span></dd>"
0
           @output.flush
0
@@ -110,7 +110,7 @@
0
         def percent_done
0
           result = 100.0
0
           if @example_count != 0
0
-            result = ((current_example_number).to_f / @example_count.to_f * 1000).to_i / 10.0
0
+            result = ((example_number).to_f / @example_count.to_f * 1000).to_i / 10.0
0
           end
0
           result
0
         end

0
@@ -1 +1,49 @@
0
+require 'spec/runner/formatter/base_text_formatter'
0
+
0
+module Spec
0
+  module Runner
0
+    module Formatter
0
+      class IndentedTextFormatter < BaseTextFormatter
0
+        def add_example_group(example_group)
0
+          super
0
+          if example_group.description_args && !example_group.description_args.empty?
0
+            output.puts "#{example_group_indentation(example_group)}#{example_group.description_args}"
0
+            output.flush
0
+          end
0
+        end
0
+
0
+        def example_failed(example, counter, failure)
0
+          message = if failure.expectation_not_met?
0
+            "#{example_group_indentation(example.class)}  #{example.description} (FAILED - #{counter})"
0
+          else
0
+            "#{example_group_indentation(example.class)}  #{example.description} (ERROR - #{counter})"
0
+          end
0
+
0
+          output.puts(failure.expectation_not_met? ? red(message) : magenta(message))
0
+          output.flush
0
+        end
0
+
0
+        def example_passed(example)
0
+          message = "#{example_group_indentation(example.class)}  #{example.description}"
0
+          output.puts green(message)
0
+          output.flush
0
+        end
0
+
0
+        def example_pending(example, message)
0
+          super
0
+          output.puts yellow("#{example_group_indentation(example.class)}  #{example.description} (PENDING: #{message})")
0
+          output.flush
0
+        end
0
+
0
+        def example_group_indentation(example_group)
0
+          example_group_chain = []
0
+          example_group.send(:execute_in_class_hierarchy) do |parent_example_group|
0
+            example_group_chain << parent_example_group if parent_example_group.description_args
0
+          end
0
+          '  ' * (example_group_chain - [example_group]).length
0
+        end
0
+      end
0
+    end
0
+  end
0
+end

0
@@ -46,6 +46,7 @@
0
                                                     "progress|p               : Text progress",
0
                                                     "profile|o                : Text progress with profiling of 10 slowest examples",
0
                                                     "specdoc|s                : Example doc as text",
0
+                                                    "indented|i               : Example doc as indented text",
0
                                                     "html|h                   : A nice HTML report",
0
                                                     "failing_examples|e       : Write all failing examples - input for --example",
0
                                                     "failing_example_groups|g : Write all failing example groups - input for --example",

0
@@ -8,6 +8,8 @@
0
       EXAMPLE_FORMATTERS = { # Load these lazily for better speed
0
                'specdoc' => ['spec/runner/formatter/specdoc_formatter',                'Formatter::SpecdocFormatter'],
0
                      's' => ['spec/runner/formatter/specdoc_formatter',                'Formatter::SpecdocFormatter'],
0
+              'indented' => ['spec/runner/formatter/indented_text_formatter',          'Formatter::IndentedTextFormatter'],
0
+                     'i' => ['spec/runner/formatter/indented_text_formatter',          'Formatter::IndentedTextFormatter'],
0
                   'html' => ['spec/runner/formatter/html_formatter',                   'Formatter::HtmlFormatter'],
0
                      'h' => ['spec/runner/formatter/html_formatter',                   'Formatter::HtmlFormatter'],
0
               'progress' => ['spec/runner/formatter/progress_bar_formatter',           'Formatter::ProgressBarFormatter'],

0
@@ -6,7 +6,7 @@
0
       TINY   = 3
0
       RELEASE_CANDIDATE = nil
0
 
0
-      BUILD_TIME_UTC = 20080504004334
0
+      BUILD_TIME_UTC = 20080522075859
0
 
0
       STRING = [MAJOR, MINOR, TINY].join('.')
0
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')