rspec_spinner 1.1.3 → 2.0.0

data/.rspec

@@ -0,0 +1,2 @@
+--require rspec_spinner --format RspecSpinner::Bar
+

data/README.rdoc

@@ -32,6 +32,19 @@ Require RspecSpinner on spec/spec_helper.rb:
   ...
 
 
+=== Rspec 2.x
+
+Add to your project /.rspec
+
+  --require rspec_spinner --format RspecSpinner::Bar
+
+or:
+
+  --require rspec_spinner --format RspecSpinner::Spinner
+
+
+=== Rspec 1.x
+
 Change your spec.opts --format to:
 
   --format RspecSpinner::Bar

data/Rakefile

@@ -8,7 +8,7 @@ begin
     gem.summary = "Extra formatters for Rspec"
     gem.email = "Cool Extra formatters for Rspec"
     gem.homepage = "http://github.com/nofxx/rspec_spinner"
-    gem.authors = ["Marcos Augusto"]
+    gem.authors = ["Marcos Piccinini"]
     gem.add_dependency 'rtui'
     gem.add_development_dependency 'rspec'
     gem.post_install_message = <<-POST_INSTALL_MESSAGE

data/VERSION

@@ -1 +1 @@
-1.1.3
+2.0.0

data/lib/rspec_spinner.rb

@@ -1,5 +1,5 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+# $:.unshift(File.dirname(__FILE__)) unless
+#   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 #require "spec/runner/options"
 require "rspec_spinner/base"
 require "rspec_spinner/spinner"
@@ -12,3 +12,4 @@ require "rspec_spinner/bar"
 #    end
 ##  end
 #end
+

data/lib/rspec_spinner/base.rb

@@ -1,9 +1,15 @@
-require "spec/runner/formatter/base_text_formatter"
+begin
+  require "spec/runner/formatter/base_text_formatter"
+rescue LoadError
+  require "rspec/core/formatters/base_text_formatter"
+end
+
 require "rubygems"
 require "rtui"
 
+
 module RspecSpinner
-  class RspecSpinnerBase < Spec::Runner::Formatter::BaseTextFormatter
+  class RspecSpinnerBase < RSpec::Core::Formatters::BaseTextFormatter
     # Threshold for slow specs, in seconds.
     # Anything that takes longer than this will be printed out
     #THRESHOLD = 0.25
@@ -11,17 +17,17 @@ module RspecSpinner
 
     attr_reader :total, :current
 
-    def initialize(options, where)
-      super
+    def initialize(options, where=nil)
+      super options
       @example_times = []
     end
 
     def start(example_count)
-      @current     = 0
-      @total       = example_count
+      @current = 0
+      @total = example_count
       @error_state = :all_passing
-      @pbar        = RTUI::Progress.new("#{example_count} examples", example_count,
-      {:out => output, :components => [:percentage, :spinner, :stat]})
+      @pbar = RTUI::Progress.new("#{example_count} examples", example_count,
+                                 {:out => output, :components => [:percentage, :spinner, :stat]})
     end
 
     def example_started(example)
@@ -59,7 +65,7 @@ module RspecSpinner
       end.reverse
 
       @example_times[0..14].each do |description, example, location, time|
-        _,line = location.split(":")
+        _, line = location.split(":")
         @output.print red(sprintf("%.7f", time))
         @output.puts " #{description}:#{line} #{example}"
       end
@@ -74,6 +80,11 @@ module RspecSpinner
       # ignore
     end
 
+    def self.fmt_backtrace(bkt)
+      return "" if bkt.nil?
+      return bkt.split("\n")
+    end
+
     # stolen and slightly modified from BaseTextFormatter#dump_failure
     def immediately_dump_failure(counter, failure)
       erase_current_line
@@ -81,15 +92,16 @@ module RspecSpinner
       output.print "#{counter.to_s}) "
       # Rspec 1.2.2
       output.puts colorize_failure("#{failure.header}\n#{failure.exception.message}", failure)
-      output.puts format_backtrace(failure.exception.backtrace)
+      output.puts failure.exception.backtrace
       output.puts
     end
 
+
     # stolen and modified from BaseTextFormatter#dump_pending
     def immediately_dump_pending(desc, msg, location)
       erase_current_line
       output.puts yellow("PENDING SPEC:") + " #{desc} (#{msg})"
-      output.puts format_backtrace("  Called from #{location}")
+      output.puts "  Called from #{location}"
       output.puts
     end
 
@@ -97,18 +109,23 @@ module RspecSpinner
       with_color do
         @current += 1
         # HACK: need to make sure the progress is printed, even when the bar hasn't changed
-        @pbar.instance_variable_set("@previous", 0)
-        @pbar.instance_variable_set("@title", "#{current}/#{total}")
+        if /^1\.8/ === RUBY_VERSION then
+          @pbar.instance_variable_set("@previous", 0)
+          @pbar.instance_variable_set("@title", "#{current}/#{total}")
+        else
+          @pbar.instance_variable_set("@previous".to_sym, 0)
+          @pbar.instance_variable_set("@title".to_sym, "#{current}/#{total}")
+        end
         @pbar.inc
       end
       output.flush
     end
 
     ERROR_STATE_COLORS = {
-      :all_passing  => "\e[32m", # green
-      :some_pending => "\e[33m", # yellow
-      :some_failed  => "\e[31m", # red
-      :pending_fix  => "\e[34m", # blue
+        :all_passing => "\e[32m", # green
+        :some_pending => "\e[33m", # yellow
+        :some_failed => "\e[31m", # red
+        :pending_fix => "\e[34m", # blue
     }
 
     def with_color

data/rspec_spinner.gemspec

@@ -1,35 +1,34 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rspec_spinner}
-  s.version = "1.1.3"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Marcos Augusto"]
-  s.date = %q{2010-03-18}
+  s.authors = ["Marcos Piccinini"]
+  s.date = %q{2011-04-15}
   s.email = %q{Cool Extra formatters for Rspec}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/rspec_spinner.rb",
-     "lib/rspec_spinner/bar.rb",
-     "lib/rspec_spinner/base.rb",
-     "lib/rspec_spinner/spinner.rb",
-     "rspec_spinner.gemspec",
-     "spec/rspec_spinner/base_spec.rb",
-     "spec/rspec_spinner/spinner_spec.rb",
-     "spec/rspec_spinner_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "MIT-LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/rspec_spinner.rb",
+    "lib/rspec_spinner/bar.rb",
+    "lib/rspec_spinner/base.rb",
+    "lib/rspec_spinner/spinner.rb",
+    "rspec_spinner.gemspec",
+    "spec/rspec_spinner/base_spec.rb",
+    "spec/rspec_spinner/spinner_spec.rb",
+    "spec/rspec_spinner_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/nofxx/rspec_spinner}
   s.post_install_message = %q{
@@ -52,22 +51,21 @@ or:
 Have fun!
 
 }
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Extra formatters for Rspec}
   s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/rspec_spinner/base_spec.rb",
-     "spec/rspec_spinner/spinner_spec.rb",
-     "spec/rspec_spinner_spec.rb"
+    "spec/rspec_spinner/base_spec.rb",
+    "spec/rspec_spinner/spinner_spec.rb",
+    "spec/rspec_spinner_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rtui>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else

data/spec/rspec_spinner/base_spec.rb

@@ -7,6 +7,9 @@ describe "Base" do
     @options = mock('options')
     @options.stub!(:dry_run).and_return(false)
     @options.stub!(:colour).and_return(false)
+    @options.stub!(:print)
+    @options.stub!(:flush)
+    @options.stub!(:puts)
     @formatter = RspecSpinner::Bar.new(@options, @io)
   end
 
@@ -16,7 +19,7 @@ describe "Base" do
   end
 
   it "should produce standard summary without pending when pending has a 0 count" do
-      @options.should_receive(:autospec).and_return(true)
+    @options.should_receive(:autospec).and_return(true)
     @formatter.dump_summary(3, 2, 1, 0)
     @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure\n")
   end

data/spec/spec_helper.rb

@@ -3,8 +3,15 @@ begin
 rescue LoadError
   require 'rubygems'
   gem 'rspec'
-  require 'spec'
+  require 'rspec'
 end
+require 'rspec_spinner'
+
+config = RSpec.configuration
+# we want to use colored output for the console, right?
+config.color_enabled = true
+documentation_formatter = config.send(:built_in_formatter, :documentation).new(config.output)
+custom_formatter = RspecSpinner::Spinner.new(STDOUT)
+config.instance_variable_set(:@reporter, RSpec::Core::Reporter.new(documentation_formatter, custom_formatter))
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'rspec_spinner'

metadata

@@ -3,24 +3,25 @@ name: rspec_spinner
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 1
-  - 1
-  - 3
-  version: 1.1.3
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
-- Marcos Augusto
+- Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 -03:00
+date: 2011-04-15 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rtui
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -33,6 +34,7 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -50,7 +52,7 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
+- .rspec
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -69,31 +71,18 @@ has_rdoc: true
 homepage: http://github.com/nofxx/rspec_spinner
 licenses: []
 
-post_install_message: |+
-  
-  50% |========= RSPEC_SPINNER =========|
-  
-  Require it on spec/spec_helper.rb:
-  
-    require 'spec'
-    require 'rspec_spinner'
-    ...
-  
-  Change your spec.opts --format to:
-  
-    --format RspecSpinner::Bar
-  
-  or:
-  
-    --format RspecSpinner::Spinner
-  
-  Have fun!
-  
-rdoc_options: 
-- --charset=UTF-8
+post_install_message: "\n\
+  50% |========= RSPEC_SPINNER =========|\n\n\
+  Require it on spec/spec_helper.rb:\n\n  require 'spec'\n  require 'rspec_spinner'\n  ...\n\n\
+  Change your spec.opts --format to:\n\n  --format RspecSpinner::Bar\n\n\
+  or:\n\n  --format RspecSpinner::Spinner\n\n\
+  Have fun!\n\n"
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -101,6 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -110,12 +100,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Extra formatters for Rspec
 test_files: 
-- spec/spec_helper.rb
 - spec/rspec_spinner/base_spec.rb
 - spec/rspec_spinner/spinner_spec.rb
 - spec/rspec_spinner_spec.rb
+- spec/spec_helper.rb

data/.gitignore

@@ -1,7 +0,0 @@
-*.swp
-.DS_Store
-doc/*
-rdoc/*
-coverage/*
-spec/debug.log
-pkg/*