fuubar 1.0.0 → 1.1.0.rc1

data/README.textile

@@ -1,7 +1,8 @@
-h1. Fuubar "!http://stillmaintained.com/jeffkreeftmeijer/fuubar.png!":http://stillmaintained.com/jeffkreeftmeijer/fuubar
+h1. Fuubar !http://travis-ci.org/jeffkreeftmeijer/fuubar.png!
 
 Fuubar is an instafailing "RSpec":http://github.com/rspec formatter that uses a progress bar instead of a string of letters and dots as feedback. Here's "a video of Fuubar in action":http://vimeo.com/16845253.
 
+
 h2. Installation
 
 Installing Fuubar is easy. Just put it in your @Gemfile@ and run your specs like this from now on:
@@ -13,6 +14,13 @@ If you want to use Fuubar as your default formatter, simply put the options in y
 bc. --format Fuubar
 --color
 
+h3. Rspec-1
+
+Use the "fuubar-legacy":https://rubygems.org/gems/fuubar-legacy gem:
+
+bc. gem 'fuubar-legacy'
+
+
 h2. Contributing
 
 Found an issue? Have a great idea? Want to help? Great! Create an issue "issue":http://github.com/jeffkreeftmeijer/fuubar/issues for it, "ask":http://github.com/inbox/new/jeffkreeftmeijer, or even better; fork the project and fix the problem yourself. Pull requests are always welcome. :)

data/fuubar.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "fuubar"
-  s.version     = '1.0.0'
+  s.version     = '1.1.0.rc1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Nicholas Evans", "Jeff Kreeftmeijer"]
   s.email       = ["jeff@kreeftmeijer.nl"]
@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('rspec', ["~> 2.0"])
-  s.add_dependency('ruby-progressbar', ["~> 0.0.10"])
+  s.add_dependency('ruby-progressbar', ["~> 1.0.0rc1"])
   s.add_dependency('rspec-instafail', ["~> 0.2.0"])
 end

data/lib/fuubar.rb

@@ -1,23 +1,17 @@
 require 'rspec/core/formatters/base_text_formatter'
-require 'progressbar'
+require 'ruby-progressbar'
 require 'rspec/instafail'
 
 class Fuubar < RSpec::Core::Formatters::BaseTextFormatter
 
-  attr_reader :example_count, :finished_count
-
   def start(example_count)
-    @example_count = example_count
-    @finished_count = 0
-    @progress_bar = ProgressBar.new("  #{example_count} examples", example_count, output)
-    @progress_bar.bar_mark = '='
+    super
+    @progress_bar   = ProgressBar.create(:format => ' %c/%C |%w>%i| %e ', :total => example_count, :output => output)
   end
 
   def increment
     with_color do
-      @finished_count += 1
-      @progress_bar.instance_variable_set("@title", "  #{finished_count}/#{example_count}")
-      @progress_bar.inc
+      @progress_bar.increment
     end
   end
 
@@ -43,10 +37,6 @@ class Fuubar < RSpec::Core::Formatters::BaseTextFormatter
     increment
   end
 
-  def start_dump
-    with_color { @progress_bar.finish }
-  end
-
   def dump_failures
     # don't!
   end

data/spec/fuubar_spec.rb

@@ -18,31 +18,23 @@ describe Fuubar do
   describe 'start' do
 
     it 'should create a new ProgressBar' do
-      progress_bar.should be_instance_of ProgressBar
+      progress_bar.should be_instance_of ProgressBar::Base
     end
 
-    it 'should set the title' do
-      progress_bar.instance_variable_get(:@title).should == '  2 examples'
+    it 'should set the format of the bar' do
+      progress_bar.instance_variable_get(:@format_string).should == ' %c/%C |%w>%i| %e '
     end
 
     it 'should set the total amount of specs' do
-      progress_bar.instance_variable_get(:@total).should == 2
+      progress_bar.total.should == 2
     end
 
     it 'should set the output' do
-      progress_bar.instance_variable_get(:@out).should == formatter.output
-    end
-
-    it 'should set the example_count' do
-      formatter.instance_variable_get(:@example_count).should == 2
-    end
-
-    it 'should set the finished_count to 0' do
-      formatter.instance_variable_get(:@finished_count).should == 0
+      progress_bar.send(:output).should == formatter.output
     end
 
     it 'should set the bar mark to =' do
-      progress_bar.instance_variable_get(:@bar_mark).should == '='
+      progress_bar.instance_variable_get(:@bar).progress_mark.should == '='
     end
 
   end
@@ -110,24 +102,7 @@ describe Fuubar do
   describe 'increment' do
 
     it 'should increment the progress bar' do
-      progress_bar.should_receive(:inc)
-      formatter.increment
-    end
-
-    it 'should change the progress bar title' do
-      formatter.stub!(:finished_count).and_return(1)
-      formatter.stub!(:example_count).and_return(2)
-      formatter.increment
-      progress_bar.instance_variable_get(:@title).should == '  1/2'
-    end
-
-    it 'should increment the finished_count' do
-      lambda { formatter.increment }.should change(formatter, :finished_count).by(1)
-    end
-
-    it 'should increment the progress bar before updating the title' do
-      progress_bar.should_receive(:instance_variable_set).ordered
-      progress_bar.should_receive(:inc).ordered
+      progress_bar.should_receive(:increment)
       formatter.increment
     end
 
@@ -141,15 +116,6 @@ describe Fuubar do
 
   end
 
-  describe 'start_dump' do
-
-    it 'should finish the progress bar' do
-      progress_bar.should_receive(:finish)
-      formatter.start_dump
-    end
-
-  end
-
   describe 'state' do
 
     it 'should be :green by default' do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: fuubar
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Nicholas Evans
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70331591522620 !ruby/object:Gem::Requirement
+  requirement: &70363317408220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,21 +22,21 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70331591522620
+  version_requirements: *70363317408220
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
-  requirement: &70331591517460 !ruby/object:Gem::Requirement
+  requirement: &70363317422420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 1.0.0rc1
   type: :runtime
   prerelease: false
-  version_requirements: *70331591517460
+  version_requirements: *70363317422420
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
-  requirement: &70331591516040 !ruby/object:Gem::Requirement
+  requirement: &70363317431200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70331591516040
+  version_requirements: *70363317431200
 description: the instafailing RSpec progress bar formatter
 email:
 - jeff@kreeftmeijer.nl
@@ -77,15 +77,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: fuubar
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: the instafailing RSpec progress bar formatter
 test_files:
 - spec/fuubar_spec.rb
 - spec/spec_helper.rb
+has_rdoc: