progress_bar 1.0.5 → 1.3.2

data/spec/elapsed_spec.rb

@@ -1,48 +1,50 @@
+# frozen_string_literal: true
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe "ProgressBar elapsed output" do
+  let(:progress_bar) { ProgressBar.new(100, :elapsed) }
 
-describe 'ProgressBar elapsed output' do
   before do
     Timecop.freeze Time.utc(2010, 3, 10, 0, 0, 0)
-    @progress_bar = ProgressBar.new(100, :elapsed)
+    progress_bar
     Timecop.freeze Time.utc(2010, 3, 10, 0, 0, 10) # 10 seconds later
   end
 
-  subject { @progress_bar.to_s }
+  subject { progress_bar.to_s }
 
-  describe 'at count=0' do
+  describe "at count=0" do
     before do
-      @progress_bar.count = 0
+      progress_bar.count = 0
     end
 
     it { should == "[00:10]" }
   end
 
-  describe 'at count=50' do
+  describe "at count=50" do
     before do
-      @progress_bar.count = 50
+      progress_bar.count = 50
     end
 
     it { should == "[00:10]" }
   end
 
-  describe 'at count=100' do
+  describe "at count=100" do
     before do
-      @progress_bar.count = 100
+      progress_bar.count = 100
     end
 
     it { should == "[00:10]" }
   end
 
-  describe 'with times over 1 hour' do
+  describe "with times over 1 hour" do
+    let(:progress_bar) { ProgressBar.new(42, :elapsed) }
+
     before do
       Timecop.freeze Time.utc(2010, 3, 10, 0, 0, 0)
-      @progress_bar = ProgressBar.new(42, :elapsed)
       Timecop.freeze Time.utc(2010, 3, 10, 2, 0, 0) # 2 hours later
     end
 
-    it { should == '[02:00:00]' }
+    it { should == "[02:00:00]" }
   end
-
 end
-

data/spec/eta_spec.rb

@@ -1,50 +1,51 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+# frozen_string_literal: true
+
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe "ProgressBar eta output" do
+  let(:progress_bar) { ProgressBar.new(100, :eta) }
 
-describe 'ProgressBar eta output' do
   before do
     Timecop.freeze Time.utc(2010, 3, 10, 0, 0, 0)
-    @progress_bar = ProgressBar.new(100, :eta)
+    progress_bar
     Timecop.freeze Time.utc(2010, 3, 10, 0, 0, 10) # 10 seconds later
   end
 
-  subject { @progress_bar.to_s }
+  subject { progress_bar.to_s }
 
-  describe 'at count=0' do
+  describe "at count=0" do
     before do
-      @progress_bar.count = 0
+      progress_bar.count = 0
     end
 
     it { should == "[00:00]" }
   end
 
-  describe 'at count=50' do
+  describe "at count=50" do
     before do
-      @progress_bar.count = 50
+      progress_bar.count = 50
     end
 
     it { should == "[00:10]" }
   end
 
-  describe 'at count=100' do
+  describe "at count=100" do
     before do
-      @progress_bar.count = 100
+      progress_bar.count = 100
     end
 
     it { should == "[00:00]" }
   end
 
-  describe 'with times over 1 hour' do
+  describe "with times over 1 hour" do
+    let(:progress_bar) { ProgressBar.new(42, :eta) }
+
     before do
       Timecop.freeze Time.utc(2010, 3, 10, 0, 0, 0)
-      @progress_bar = ProgressBar.new(42, :eta)
-      @progress_bar.count = 21
+      progress_bar.count = 21
       Timecop.freeze Time.utc(2010, 3, 10, 2, 0, 0) # 2 hours later
     end
 
-    it { should == '[02:00:00]' }
+    it { should == "[02:00:00]" }
   end
-
 end
-
-
-

data/spec/percentage_spec.rb

@@ -1,44 +1,43 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+# frozen_string_literal: true
 
-describe 'ProgressBar percentage output' do
-  before do
-    @progress_bar = ProgressBar.new(100, :percentage)
-  end
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe "ProgressBar percentage output" do
+  let(:progress_bar) { ProgressBar.new(100, :percentage) }
 
-  subject { @progress_bar.to_s }
+  subject { progress_bar.to_s }
 
-  describe 'at count=0' do
+  describe "at count=0" do
     before do
-      @progress_bar.count = 0
+      progress_bar.count = 0
     end
 
     it { should == "[  0%]" }
   end
 
-  describe 'at count=50' do
+  describe "at count=50" do
     before do
-      @progress_bar.count = 50
+      progress_bar.count = 50
     end
 
     it { should == "[ 50%]" }
   end
 
-  describe 'at count=100' do
+  describe "at count=100" do
     before do
-      @progress_bar.count = 100
+      progress_bar.count = 100
     end
 
     it { should == "[100%]" }
   end
 
-  describe 'with a max that is not 100' do
+  describe "with a max that is not 100" do
+    let(:progress_bar) { ProgressBar.new(42, :percentage) }
+
     before do
-      @progress_bar = ProgressBar.new(42, :percentage)
-      @progress_bar.count = 21
+      progress_bar.count = 21
     end
 
-    it { should == '[ 50.00%]' }
+    it { should == "[ 50.00%]" }
   end
-
 end
-

data/spec/print_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "ProgressBar print output" do
+  let(:progress_bar) { ProgressBar.new(:counter) }
+
+  before do
+    allow(progress_bar).to receive(:terminal_width).and_return(10)
+  end
+
+  it "should replace the current bar with the text, and continue the bar on the next line" do
+    expect {
+      progress_bar.increment!
+      progress_bar.puts("Hello, world!")
+    }.to output("\r[  1/100]" \
+                "\r#{' ' * 10}" \
+                "\rHello, world!\n" \
+                "\r[  1/100]").to_stderr
+  end
+end

data/spec/progress_bar_spec.rb

@@ -1,47 +1,47 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+# frozen_string_literal: true
+
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe "ProgressBar bar output" do
+  let(:progress_bar) { ProgressBar.new(100) }
 
-describe 'ProgressBar bar output' do
   before do
     Timecop.freeze Time.utc(2010, 3, 10, 0, 0, 0)
-    @progress_bar = ProgressBar.new(100)
-    @progress_bar.stub(:terminal_width) { 60 }
+    allow(progress_bar).to receive(:terminal_width).and_return(60)
     Timecop.freeze Time.utc(2010, 3, 10, 0, 0, 10) # 10 seconds later
   end
 
-  subject { @progress_bar.to_s }
+  subject { progress_bar.to_s }
 
-  describe 'at count=0' do
+  describe "at count=0" do
     before do
-      @progress_bar.count = 0
+      progress_bar.count = 0
     end
 
     it { should == "[              ] [  0/100] [  0%] [00:10] [00:00] [  0.00/s]" }
   end
 
-  describe 'at count=50' do
+  describe "at count=50" do
     before do
-      @progress_bar.count = 50
+      progress_bar.count = 50
     end
 
     it { should == "[#######       ] [ 50/100] [ 50%] [00:10] [00:10] [  5.00/s]" }
   end
 
-  describe 'at count=100' do
+  describe "at count=100" do
     before do
-      @progress_bar.count = 100
+      progress_bar.count = 100
     end
 
     it { should == "[##############] [100/100] [100%] [00:10] [00:00] [ 10.00/s]" }
   end
 
-  describe 'at count=105' do
+  describe "at count=105" do
     before do
-      @progress_bar.count = 105
+      progress_bar.count = 105
     end
 
     it { should == "[##############] [100/100] [100%] [00:10] [00:00] [ 10.00/s]" }
   end
-
 end
-
-

data/spec/rate_spec.rb

@@ -1,63 +1,63 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+# frozen_string_literal: true
+
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe "ProgressBar rate output" do
+  let(:progress_bar) { ProgressBar.new(100, :rate) }
 
-describe 'ProgressBar rate output' do
   before do
     Timecop.freeze Time.utc(2010, 3, 10, 0, 0, 0)
-    @progress_bar = ProgressBar.new(100, :rate)
+    progress_bar
     Timecop.freeze Time.utc(2010, 3, 10, 0, 0, 10) # 10 seconds later
   end
 
-  subject { @progress_bar.to_s }
+  subject { progress_bar.to_s }
 
-  describe 'at count=0' do
+  describe "at count=0" do
     before do
-      @progress_bar.count = 0
+      progress_bar.count = 0
     end
 
     it { should == "[  0.00/s]" }
   end
 
-  describe 'at count=50' do
+  describe "at count=50" do
     before do
-      @progress_bar.count = 50
+      progress_bar.count = 50
     end
 
     it { should == "[  5.00/s]" }
   end
 
-  describe 'at count=100' do
+  describe "at count=100" do
     before do
-      @progress_bar.count = 100
+      progress_bar.count = 100
     end
 
     it { should == "[ 10.00/s]" }
   end
 
-  describe 'with a shorter max' do
+  describe "with a shorter max" do
+    let(:progress_bar) { ProgressBar.new(42, :rate) }
+
     before do
       Timecop.freeze Time.utc(2010, 3, 10, 0, 0, 0)
-      @progress_bar = ProgressBar.new(42, :rate)
-      @progress_bar.count = 21
+      progress_bar.count = 21
       Timecop.freeze Time.utc(2010, 3, 10, 0, 0, 10) # 10 seconds later
     end
 
-    it { should == '[ 2.10/s]' }
+    it { should == "[ 2.10/s]" }
   end
 
-  describe 'with a longer max' do
+  describe "with a longer max" do
+    let(:progress_bar) { ProgressBar.new(4242, :rate) }
+
     before do
       Timecop.freeze Time.utc(2010, 3, 10, 0, 0, 0)
-      @progress_bar = ProgressBar.new(4242, :rate)
-      @progress_bar.count = 21
+      progress_bar.count = 21
       Timecop.freeze Time.utc(2010, 3, 10, 0, 0, 10) # 10 seconds later
     end
 
-    it { should == '[   2.10/s]' }
+    it { should == "[   2.10/s]" }
   end
-
 end
-
-
-
-
-

data/spec/spec_helper.rb

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/progress_bar'))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib/progress_bar"))
 
-require 'rspec'
-require 'timecop'
+require "rspec"
+require "timecop"
 
 RSpec.configure do |cfg|
   cfg.after do
     Timecop.return
   end
 end
-

data/spec/with_progress_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+
+describe ProgressBar::WithProgress do
+  context "with block" do
+    let!(:bar){ ProgressBar.new }
+
+    before{
+      Range.include ProgressBar::WithProgress
+      allow(ProgressBar).to receive(:new){ |max| bar.max = max; bar }
+    }
+
+    it "should set max and increment on each iteration" do
+      (1..20).each_with_progress do |i|
+        break if i > 10
+      end
+      expect(bar.max).to eq 20
+      expect(bar.count).to eq 10
+    end
+  end
+
+  context "without block" do
+    let!(:bar){ ProgressBar.new }
+
+    before{
+      Range.include ProgressBar::WithProgress
+      allow(ProgressBar).to receive(:new){ |max| bar.max = max; bar }
+    }
+
+    it "should give Enumerator" do
+      enum = (1..20).each_with_progress
+      expect(enum).to be_kind_of(Enumerator)
+      expect(bar.max).to eq 20
+      expect(bar.count).to eq 0
+
+      res = enum.map{ |i| i + 1 }
+      expect(res).to eq (2..21).to_a
+      expect(bar.count).to eq 20
+    end
+  end
+end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: progress_bar
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.3.2
 platform: ruby
 authors:
 - Paul Sadauskas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: options
   requirement: !ruby/object:Gem::Requirement
@@ -25,21 +45,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,6 +86,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -88,16 +136,26 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/pronto.yml"
+- ".github/workflows/rspec.yml"
 - ".gitignore"
+- ".reek.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
+- Changelog.mkd
 - Gemfile
 - LICENSE
 - README.mkd
 - Rakefile
+- examples/enumerable.rb
+- examples/printing_messages.rb
 - examples/simple.rb
 - lib/progress_bar.rb
+- lib/progress_bar/core_ext/enumerable_with_progress.rb
 - lib/progress_bar/version.rb
+- lib/progress_bar/with_progress.rb
 - profile/shell_every_update
 - profile/shell_every_update.gif
 - profile/shell_once
@@ -109,11 +167,14 @@ files:
 - spec/elapsed_spec.rb
 - spec/eta_spec.rb
 - spec/percentage_spec.rb
+- spec/print_spec.rb
 - spec/progress_bar_spec.rb
 - spec/rate_spec.rb
 - spec/spec_helper.rb
+- spec/with_progress_spec.rb
 homepage: http://github.com/paul/progress_bar
-licenses: []
+licenses:
+- WTFPL
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -123,15 +184,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: progress_bar
-rubygems_version: 2.4.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Simple Progress Bar for output to a terminal
@@ -142,6 +202,8 @@ test_files:
 - spec/elapsed_spec.rb
 - spec/eta_spec.rb
 - spec/percentage_spec.rb
+- spec/print_spec.rb
 - spec/progress_bar_spec.rb
 - spec/rate_spec.rb
 - spec/spec_helper.rb
+- spec/with_progress_spec.rb