ruby-progressbar 1.0.1 → 1.0.2

data/Gemfile

@@ -2,4 +2,8 @@ source "http://rubygems.org"
 
 gem 'rake'
 
+platforms :ruby do
+  gem 'ruby-prof', '~> 0.11.2'
+end
+
 gemspec

data/Guardfile

@@ -1,6 +1,10 @@
+notification  :tmux,
+              :success => 'colour22',
+              :failed  => 'colour52',
+              :display_message => true
+
 guard 'rspec', :version => 2 do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { 'spec' }
   watch('spec/spec_helper.rb')  { 'spec' }
 end
-

data/lib/progress_bar/components/progressable.rb

@@ -59,6 +59,8 @@ class ProgressBar
       end
 
       def percentage_completed
+        return 100 if total == 0
+
         # progress / total * 100
         #
         # Doing this way so we can avoid converting each

data/lib/progress_bar/format/base.rb

@@ -4,18 +4,40 @@ class ProgressBar
       attr_reader :molecules
 
       def initialize(format_string)
-        @molecules = parse(format_string)
+        @format_string = format_string
+        @molecules     = parse(format_string)
       end
 
+      def process(environment)
+        processed_string = @format_string.dup
+
+        non_bar_molecules.each do |molecule|
+          processed_string.gsub!("%#{molecule.key}", environment.send(molecule.method_name).to_s)
+        end
+
+        remaining_molecules = bar_molecules.size
+        placeholder_length  = remaining_molecules * 2
+
+        processed_string.gsub! '%%', '%'
+
+        leftover_bar_length = environment.send(:length) - processed_string.length + placeholder_length
+
+        bar_molecules.each do |molecule|
+          processed_string.gsub!("%#{molecule.key}", environment.send(molecule.method_name, leftover_bar_length).to_s)
+        end
+
+        processed_string
+      end
+
+    private
       def non_bar_molecules
-        molecules.select { |molecule| !molecule.bar_molecule? }
+        @non_bar_molecules ||= molecules.select { |molecule| !molecule.bar_molecule? }
       end
 
       def bar_molecules
-        molecules.select { |molecule| molecule.bar_molecule? }
+        @bar_molecules     ||= molecules.select { |molecule| molecule.bar_molecule? }
       end
 
-    private
       def parse(format_string)
         molecules        = []
 

data/lib/progress_bar/formatter.rb

@@ -4,17 +4,15 @@ class ProgressBar
     DEFAULT_TITLE         = 'Progress'
 
     def initialize(options)
-      @format_string = options[:format] || DEFAULT_FORMAT_STRING
-      @title         = options[:title]  || DEFAULT_TITLE
+      self.format_string = options[:format] || DEFAULT_FORMAT_STRING
+      @title             = options[:title]  || DEFAULT_TITLE
 
       super(options)
     end
 
-    def format(format_string = DEFAULT_FORMAT_STRING)
-      @format_string = format_string
-      @format        = ProgressBar::Format::Base.new(format_string)
-
-      process
+    def format(new_format_string = DEFAULT_FORMAT_STRING)
+      self.format_string = new_format_string
+      @format.process(self)
     end
 
     def title=(title)
@@ -30,23 +28,10 @@ class ProgressBar
     end
 
   private
-    def process
-      @format_string.dup.tap do |processed_string|
-        @format.non_bar_molecules.each do |molecule|
-          processed_string.gsub!("%#{molecule.key}", self.send(molecule.method_name).to_s)
-        end
-
-        remaining_molecule_match_data = processed_string.scan(/%[a-zA-Z]/) || []
-        remaining_molecules           = remaining_molecule_match_data.size
-        placeholder_length            = remaining_molecules * 2
-
-        processed_string.gsub! '%%', '%'
-
-        leftover_bar_length           = length - processed_string.length + placeholder_length
-
-        @format.bar_molecules.each do |molecule|
-          processed_string.gsub!("%#{molecule.key}", self.send(molecule.method_name, leftover_bar_length).to_s)
-        end
+    def format_string=(format_string)
+      if @format_string != format_string
+        @format_string = format_string
+        @format        = ProgressBar::Format::Base.new(format_string)
       end
     end
 

data/lib/progress_bar/length_calculator.rb

@@ -34,16 +34,25 @@ class ProgressBar
       80
     end
 
-    def dynamic_width
-      dynamic_width_stty.nonzero? || dynamic_width_tput
-    end
-
-    def dynamic_width_stty
-      %x{stty size 2>/dev/null}.split[1].to_i
-    end
-
-    def dynamic_width_tput
-      %x{tput cols 2>/dev/null}.to_i
+    begin
+      require 'io/console'
+
+      def dynamic_width
+        rows, columns = IO.console.winsize
+        columns
+      end
+    rescue LoadError
+      def dynamic_width
+        dynamic_width_stty.nonzero? || dynamic_width_tput
+      end
+
+      def dynamic_width_stty
+        %x{stty size 2>/dev/null}.split[1].to_i
+      end
+
+      def dynamic_width_tput
+        %x{tput cols 2>/dev/null}.to_i
+      end
     end
 
     def unix?

data/lib/progress_bar/time.rb

@@ -8,15 +8,15 @@ class ProgressBar
 
   private
     def self.unmocked_time_method
-      time_mocking_library_mapping.values.find { |method| @@time.respond_to? method }
+      time_mocking_library_methods.find { |method| @@time.respond_to? method }
     end
 
-    def self.time_mocking_library_mapping
-      {
-        :timecop  => :now_without_mock_time,
-        :delorean => :now_without_delorean,
-        :actual   => :now
-      }
+    def self.time_mocking_library_methods
+      [
+        :now_without_mock_time,       # Timecop
+        :now_without_delorean,        # Delorean
+        :now                          # Actual
+      ]
     end
   end
 end

data/lib/progress_bar/version.rb

@@ -1,3 +1,3 @@
 class ProgressBar
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/ruby-progressbar.gemspec

@@ -34,11 +34,10 @@ THEDOCTOR
   s.require_paths         = ["lib"]
   #= Manifest =#
 
-  s.add_development_dependency('bundler',     '~> 1.0')
-  s.add_development_dependency('rspec',       '~> 2.8')
-  s.add_development_dependency('timecop',     '~> 0.3.5')
+  s.add_development_dependency('rspec',       '~> 2.11')
+  s.add_development_dependency('timecop',     '~> 0.5')
   s.add_development_dependency('simplecov',   '~> 0.5')
-  s.add_development_dependency('guard',       '~> 1.0')
-  s.add_development_dependency('guard-rspec', '~> 0.6')
+  s.add_development_dependency('guard',       '~> 1.4')
+  s.add_development_dependency('guard-rspec', '~> 2.1')
+  s.add_development_dependency('rb-fsevent',  '~> 0.9')
 end
-

data/spec/fixtures/benchmark.rb

@@ -0,0 +1,5 @@
+# bundle exec ruby-prof --printer=graph_html --file=../results.html --require 'ruby-progressbar' --sort=total ./spec/fixtures/benchmark.rb
+
+bar = ProgressBar.create(:length => 80, :start => 0, :total => 100000)
+
+100000.times { bar.increment }

data/spec/progress_bar/components/progressable_spec.rb

@@ -27,4 +27,12 @@ describe ProgressBar::Components::Progressable do
       ProgressableClass.new.smoothing.should eql 0.1
     end
   end
+
+  describe '#percentage_completed' do
+    it 'returns the default total if total is zero' do
+      subject.total = 0
+
+      subject.percentage_completed.should eql 100
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-progressbar
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,16 +10,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,15 +27,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,15 +43,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,15 +59,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,15 +75,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,15 +91,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
 description: ! 'Ruby/ProgressBar is an extremely flexible text progress bar library
   for Ruby.
 
@@ -152,6 +152,7 @@ files:
 - lib/progressbar.rb
 - lib/ruby-progressbar.rb
 - ruby-progressbar.gemspec
+- spec/fixtures/benchmark.rb
 - spec/progress_bar/base_spec.rb
 - spec/progress_bar/components/bar_spec.rb
 - spec/progress_bar/components/elapsed_timer_spec.rb
@@ -176,18 +177,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2269240367279208668
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2269240367279208668
 requirements: []
 rubyforge_project: ruby-progressbar
 rubygems_version: 1.8.24
@@ -195,6 +190,7 @@ signing_key:
 specification_version: 3
 summary: Ruby/ProgressBar is a flexible text progress bar library for Ruby.
 test_files:
+- spec/fixtures/benchmark.rb
 - spec/progress_bar/base_spec.rb
 - spec/progress_bar/components/bar_spec.rb
 - spec/progress_bar/components/elapsed_timer_spec.rb