fuubar-cucumber 0.0.17 → 0.0.18

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.0.18 (August 22, 2012) ##
+
+### bug fix
+  * Update ruby-progressbar to 1.0.0 (fixes ruby-progress bar bugs) (by [@nashby](https://github.com/nashby))
+  * Don't duplicate final progress bar output (7a2aeea) (by [@nashby](https://github.com/nashby))
+
+### enhancements
+  * Add ability to disable color with cucumber's `--color` option. #22 (by [@hron](https://github.com/hron))
+
 ## 0.0.17 (July 31, 2012) ##
 
 ### bug fix

data/fuubar-cucumber.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = "fuubar-cucumber"
-  s.version       = '0.0.17'
+  s.version       = '0.0.18'
   s.platform      = Gem::Platform::RUBY
   s.authors       = ["Marcin Ciunelis", "Vasiliy Ermolovich"]
   s.email         = ["marcin.ciunelis@gmail.com", "younash@gmail.com"]
@@ -15,5 +15,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'cucumber', ["~> 1.2.0"]
-  s.add_dependency 'ruby-progressbar', ["~> 0.11"]
+  s.add_dependency 'ruby-progressbar', ["~> 1.0.0"]
 end

data/lib/cucumber/formatter/fuubar.rb

@@ -1,6 +1,7 @@
 require 'cucumber/formatter/console'
+require 'cucumber/formatter/ansicolor'
 require 'cucumber/formatter/io'
-require 'progressbar'
+require 'ruby-progressbar'
 
 module Cucumber
   module Formatter
@@ -12,14 +13,11 @@ module Cucumber
 
       def initialize(step_mother, path_or_io, options)
         @step_mother, @io, @options = step_mother, ensure_io(path_or_io, "fuubar"), options
-        @step_count = @finished_count = @issues_count = 0
+        @step_count = @issues_count = 0
       end
 
       def after_features(features)
         @state = :red if step_mother.scenarios(:failed).any?
-        @io.print COLORS[state]
-        @progress_bar.finish
-        @io.print "\e[0m"
         @io.puts
         @io.puts
         print_summary(features)
@@ -27,8 +25,7 @@ module Cucumber
 
       def before_features(features)
         @step_count = get_step_count(features)
-        @progress_bar = ProgressBar.new("  #{@step_count} steps", @step_count, @io)
-        @progress_bar.bar_mark = '='
+        @progress_bar = ProgressBar.create(:format => ' %c/%C |%w>%i| %e ', :total => @step_count, :output => @io)
       end
 
       def before_background(background)
@@ -43,7 +40,7 @@ module Cucumber
         return if @in_background || status == :skipped
         @state = :red if status == :failed
         if exception and [:failed, :undefined].include? status
-          @io.print "\e[K"
+          @io.print "\e[K" if colors_enabled?
           @issues_count += 1
           @io.puts
           @io.puts "#{@issues_count})"
@@ -88,11 +85,9 @@ module Cucumber
         COLORS = { :green =>  "\e[32m", :yellow => "\e[33m", :red => "\e[31m" }
 
         def progress(status = 'passed', count = 1)
-          @io.print COLORS[state]
-          @finished_count += count
-          @progress_bar.inc(count)
-          @progress_bar.instance_variable_set("@title", "  #{@finished_count}/#{@step_count}")
-          @io.print "\e[0m"
+          with_colors(COLORS[state]) do
+            @progress_bar.progress += count
+          end
         end
 
         def get_step_count(features)
@@ -125,6 +120,16 @@ module Cucumber
           end
           return count
         end
+
+        def with_colors(color, &block)
+          @io.print color if colors_enabled?
+          yield
+          @io.print "\e[0m" if colors_enabled?
+        end
+
+        def colors_enabled?
+          Cucumber::Term::ANSIColor.coloring?
+        end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuubar-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &10581380 !ruby/object:Gem::Requirement
+  requirement: &22546800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,18 +22,18 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *10581380
+  version_requirements: *22546800
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
-  requirement: &10580420 !ruby/object:Gem::Requirement
+  requirement: &22545900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *10580420
+  version_requirements: *22545900
 description: the instafailing Cucumber progress bar formatter
 email:
 - marcin.ciunelis@gmail.com
@@ -68,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -125579862188153635
+      hash: -3219431044563237244
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -125579862188153635
+      hash: -3219431044563237244
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10