progress 3.3.2 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64ca0726e8a2eb5bfd62828a9f9aeec7b0fc49b5
-  data.tar.gz: e7b15fed0cb040c622fc381a4922fd697c071ad5
+  metadata.gz: ed83a839d83aa17fc079ed2a5d16c5fa2b9c4d07
+  data.tar.gz: 419b4c459474fd7b8f73c325006bc9d33a30c25d
 SHA512:
-  metadata.gz: cda7bef90d61b0eed3af7397af5d2dc8a00fb8f2bf52539feef2edd9a5efc1d99ea9ea85d71465b8145f3fffad87cbe2ae43cc51ae3975f9475c681e110e647e
-  data.tar.gz: c20fd466c9d7a061035d4450a9c046d472f58c2bf43e49509c11717e9380bb28e04703aa8abcd810c1aeb8a2120ce6aabcd7083d9478a113c01329633c534c8e
+  metadata.gz: c98e8c3477ca6a71b7de133afec93bf1fcfeaa53924f7dca5369b1b808f2aca9b5ce14faf19a889677245b21d8deeea9d9d0f29e9770f3eac9f2d211a0a9c944
+  data.tar.gz: 9ea259515c34274950bbc5916035ded346837f5f36d7af6cdbf4fa31ce589b186c07d6ab0d0aa4b98121dea43ddb42948ce65243cf9af1249362a08011a1274e

data/.rubocop.yml

@@ -45,9 +45,6 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Max: 10
 
-Performance/RedundantBlockCall:
-  Enabled: false
-
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 
@@ -63,9 +60,6 @@ Style/EmptyCaseCondition:
 Style/Encoding:
   Enabled: false
 
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
-
 Style/IfUnlessModifier:
   MaxLineLength: 40
 

data/.travis.yml

@@ -3,7 +3,6 @@ language: ruby
 before_install:
   - gem update bundler
 rvm:
-  - '1.8.7-p371'
   - '1.9.3-p551'
   - '2.0.0-p648'
   - '2.1.10'

data/CHANGELOG.markdown

@@ -0,0 +1,257 @@
+# ChangeLog
+
+## unreleased
+
+## v3.4.0 (2017-10-11)
+
+* Remove special handling for CSV in ruby 1.8 [@toy](https://github.com/toy)
+* Set minimum ruby version to 1.9.3 [@toy](https://github.com/toy)
+* Support `Enumerable#each_with_index` which stopped working since [45435b3](https://github.com/toy/progress/commit/45435b31ae0f9ad42255d9105d264f5fe9722c88) ([v3.2.2](#v322-2016-07-27)), not compatible with ruby 1.8 [#9](https://github.com/toy/progress/pull/9) [@amatsuda](https://github.com/amatsuda)
+
+## v3.3.2 (2017-10-09)
+
+* Support `Enumerable#each_with_index` which stopped working since [45435b3](https://github.com/toy/progress/commit/45435b31ae0f9ad42255d9105d264f5fe9722c88) ([v3.2.2](#v322-2016-07-27)), compatible with ruby 1.8 [#10](https://github.com/toy/progress/pull/10) [@amatsuda](https://github.com/amatsuda)
+
+## v3.3.1 (2017-02-22)
+
+* Fix for jruby raising wrong exception when checking if io is seekable [@toy](https://github.com/toy)
+
+## v3.3.0 (2017-01-30)
+
+* Add public setter for `io` and make `io` and `io_tty?` methods public [#8](https://github.com/toy/progress/issues/8) [@toy](https://github.com/toy)
+
+## v3.2.2 (2016-07-27)
+
+* Fix block arguments for `Hash` in ruby < 1.9 [@toy](https://github.com/toy)
+
+## v3.2.1 (2016-07-26)
+
+* Fix `respond_to?` for non existing methods in ruby < 1.9 [@toy](https://github.com/toy)
+
+## v3.2.0 (2016-07-26)
+
+* Provide `respond_to_missing?` instead of `respond_to?` in `WithProgress` [@toy](https://github.com/toy)
+
+## v3.1.1 (2016-01-11)
+
+* Fix `Thread.exclusive` deprecation in Ruby 2.3.0 [#4](https://github.com/toy/progress/pull/4) [@katsuma](https://github.com/katsuma)
+
+## v3.1.0 (2014-12-22)
+
+* Add handling for CSV in ruby 1.8 [@toy](https://github.com/toy)
+* Fix getting total for progress on `Range` [@toy](https://github.com/toy)
+* Use `StringIO` for `String` progress and `pos`/`size` for `IO` progress to not convert to array before progress [@toy](https://github.com/toy)
+* Set `WithProgress` title to `nil` by default [@toy](https://github.com/toy)
+* Fix return value from `with_progress{}` to equal `with_progress.each{}` [@toy](https://github.com/toy)
+* Fix wrong variable name in `WithProgress#respond_to?` [@toy](https://github.com/toy)
+* Fix using wrong constant `TempFile` instead of `Tempfile` [@toy](https://github.com/toy)
+* Remove methods `eta` and `elapsed` created for mocking eta [@toy](https://github.com/toy)
+* Rename `set_terminal_title` to `terminal_title` [@toy](https://github.com/toy)
+
+## v3.0.2 (2014-12-19)
+
+* Restore updating eta when there is no progress [@toy](https://github.com/toy)
+
+## v3.0.1 (2014-08-18)
+
+* Step once when running without block [@toy](https://github.com/toy)
+* Fix working with `in_threads` by removing `WithProgress` inheritance of `Delegator` [@toy](https://github.com/toy)
+
+## v3.0.0 (2013-08-20)
+
+* Befriend with [`in_threads`](https://rubygems.org/gems/in_threads) gem [@toy](https://github.com/toy)
+* Warn and use `to_a` on `IO` and `String` related objects before running progress, for other objects use for length in order: `size`, `length`, `count` [@toy](https://github.com/toy)
+* Make `WithProgress` inherit `Delegator` [@toy](https://github.com/toy)
+* Show elapsed time on finish [@toy](https://github.com/toy)
+* Cleanup/rewrite, extract `Eta` and `Beeper` [@toy](https://github.com/toy)
+* Conditionally require active_record support instead of conditionally creating module [@toy](https://github.com/toy)
+* Don't kill dead thread for eta output without progress [@toy](https://github.com/toy)
+* Don't show eta until at least one second passed [@toy](https://github.com/toy)
+
+## v2.4.0 (2012-01-03)
+
+* Add `Progress.running?` for checking if progress is running [@toy](https://github.com/toy)
+
+## v2.3.0 (2011-12-25)
+
+* Better handle edge cases of eta output without progress [@toy](https://github.com/toy)
+* Call each only once for enumerable that can not be reused [@toy](https://github.com/toy)
+* Allow to set length directly when calling `with_progress` [@toy](https://github.com/toy)
+
+## v2.2.0 (2011-12-05)
+
+* Make `with_progress.with_progress` create new instance instead of changing current, added enumerable and title attribute readers [@toy](https://github.com/toy)
+
+## v2.1.1 (2011-12-04)
+
+* Fix `with_progress.with_progress` with block not calling each [@toy](https://github.com/toy)
+
+## v2.1.0 (2011-11-29)
+
+* Change title when overriding progress with another call to `with_progress` [@toy](https://github.com/toy)
+* Allow to directly specify length when initialising `WithProgress` [@toy](https://github.com/toy)
+
+## v2.0.0 (2011-11-28)
+
+* Show eta every second instead of every three when there is no progress [@toy](https://github.com/toy)
+* Cache calculated length [@toy](https://github.com/toy)
+* Use count method of enumerable if available to determine total for progress [@toy](https://github.com/toy)
+* Call `each` with progress when `with_progress` is called with block [@toy](https://github.com/toy)
+* Stop thread triggering eta update [@toy](https://github.com/toy)
+* Rework `WithProgress` [@toy](https://github.com/toy)
+* Remove `each_with_progress` and `each_with_index_and_progress` [@toy](https://github.com/toy)
+
+## v1.2.1 (2011-10-18)
+
+* Add missing `require 'thread'` [@toy](https://github.com/toy)
+
+## v1.2.0 (2011-10-18)
+
+* Updated eta every 3 seconds if nothing is happening [@toy](https://github.com/toy)
+
+## v1.1.3 (2011-01-15)
+
+* Fix `io` method, so `$stderr` can be silenced using `reopen` [@toy](https://github.com/toy)
+* Remove `require 'rubygems'` [@toy](https://github.com/toy)
+
+## v1.1.2.1 (2010-12-15)
+
+* Internal gem changes [@toy](https://github.com/toy)
+
+## v1.1.2 (2010-12-09)
+
+* Use control character to clear line to end [@toy](https://github.com/toy)
+
+## v1.1.1 (2010-12-07)
+
+* Fix in notes handling [@toy](https://github.com/toy)
+
+## v1.1.0 (2010-12-07)
+
+* Add note for step [@toy](https://github.com/toy)
+
+## v1.0.1 (2010-11-14)
+
+* Fix progress by using `step` with block everywhere [@toy](https://github.com/toy)
+* Separate `step` arguments to numerator and denominator [@toy](https://github.com/toy)
+
+## v1.0.0 (2010-11-14)
+
+* Show progress in terminal title [@toy](https://github.com/toy)
+* Add eta [@toy](https://github.com/toy)
+* Fix `step` by implementing through `set` and fix `set` return value  [@toy](https://github.com/toy)
+
+## v0.4.1 (2010-11-13)
+
+* Fix active record batch extension inclusion [@toy](https://github.com/toy)
+
+## v0.4.0 (2010-11-13)
+
+* Add support for active record batch progress [@toy](https://github.com/toy)
+* Fix `each_with_index_and_progress` requiring title [@toy](https://github.com/toy)
+
+## v0.3.0 (2010-11-13)
+
+* Allow progress without title [@toy](https://github.com/toy)
+
+## v0.2.2 (2010-01-20)
+
+* Fix bug in i18n gem [@toy](https://github.com/toy)
+
+## v0.2.1 (2010-01-16)
+
+* Ensure outputting final 100% of outer progress [@toy](https://github.com/toy)
+
+## v0.2.0 (2009-12-30)
+
+* Limit frequency of progress output [@toy](https://github.com/toy)
+
+## v0.1.2 (2009-12-29)
+
+* Internal gem changes [@toy](https://github.com/toy)
+
+## v0.1.1.3 (2009-09-28)
+
+* Remove debugging character from output [@toy](https://github.com/toy)
+
+## v0.1.1.2 (2009-09-28)
+
+* Fix highlighting [@toy](https://github.com/toy)
+
+## v0.1.1.0 (2009-09-21)
+
+* Allow `Progress(…)` instead `Progress.start(…)` [@toy](https://github.com/toy)
+* Allow `step` to accept block for valid counting of custom progress [@toy](https://github.com/toy)
+* Kill progress on cycle break [@toy](https://github.com/toy)
+
+## v0.1.0.3 (2009-09-21)
+
+* Internal gem changes [@toy](https://github.com/toy)
+
+## v0.1.0.2 (2009-08-19)
+
+* Don't raise error on extra `Progress.stop` [@toy](https://github.com/toy)
+
+## v0.1.0.1 (2009-08-19)
+
+* Fix output by verifying and converting progress to float [@toy](https://github.com/toy)
+
+## v0.1.0.0 (2009-08-19)
+
+* Inner progress increases outer progress, ability to set progress using `set` alongside stepping using `step` [@toy](https://github.com/toy)
+
+## v0.0.9.3 (2009-08-06)
+
+* Use space instead of `'>'` for padding [@toy](https://github.com/toy)
+
+## v0.0.9.2 (2009-07-28)
+
+* Force behaving as with tty by setting `PROGRESS_TTY` environment variable [@toy](https://github.com/toy)
+
+## v0.0.9.1 (2009-07-28)
+
+* Separate handling of staying on same line and colourising output [@toy](https://github.com/toy)
+
+## v0.0.9.0 (2009-07-20)
+
+* Add `Enumerable#with_progress` on which any enumerable method can be called [@toy](https://github.com/toy)
+
+## v0.0.8.1 (2009-05-02)
+
+* Return to line start after printing message instead of before [@toy](https://github.com/toy)
+
+## v0.0.8 (2009-04-27)
+
+* No colours and don't stay on same line when not on tty or explicitly using `:lines => true` option [@toy](https://github.com/toy)
+
+## v0.0.7.1 (2009-04-24)
+
+* Internal gem changes [@toy](https://github.com/toy)
+
+## v0.0.7 (2009-03-24)
+
+* Internal gem changes [@toy](https://github.com/toy)
+
+## v0.0.6 (2009-02-19)
+
+* Output to stderr [@toy](https://github.com/toy)
+
+## v0.0.5 (2008-11-07)
+
+* Return result of enumerable method [@toy](https://github.com/toy)
+
+## v0.0.4 (2008-11-06)
+
+* Allow to change step size [@toy](https://github.com/toy)
+
+## v0.0.3 (2008-11-01)
+
+* Output final newline after finishing progress [@toy](https://github.com/toy)
+
+## v0.0.2 (2008-10-31)
+
+* Allow enclosed progress [@toy](https://github.com/toy)
+
+## v0.0.1 (2008-08-10)
+
+* Initial [@toy](https://github.com/toy)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2017 Ivan Kuchin
+Copyright (c) 2008-2017 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -137,4 +137,4 @@ Or if you know that B runs 9 times faster than C:
 
 ## Copyright
 
-Copyright (c) 2010-2017 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2008-2017 Ivan Kuchin. See LICENSE.txt for details.

data/lib/progress/class_methods.rb

@@ -10,7 +10,7 @@ class Progress
     # start progress indication
     def start(total = nil, title = nil)
       init(total, title)
-      print_message :force => true
+      print_message force: true
       return unless block_given?
       begin
         yield
@@ -45,7 +45,7 @@ class Progress
     def stop
       return unless running?
       if @levels.length == 1
-        print_message :force => true, :finish => true
+        print_message force: true, finish: true
         stop_beeper
       end
       @levels.pop

data/lib/progress/with_progress.rb

@@ -64,8 +64,6 @@ class Progress
         run_for_string(method, *args, &block)
       when io?
         run_for_io(method, *args, &block)
-      when defined?(CSV::Reader) && @enum.is_a?(CSV::Reader)
-        run_for_ruby18_csv(method, *args, &block)
       else
         run_with_length(@enum, enum_length(@enum), method, *args, &block)
       end
@@ -88,13 +86,6 @@ class Progress
       end
     end
 
-    def run_for_ruby18_csv(method, *args, &block)
-      warn "Progress: #{@enum.class} doesn't expose IO, collecting elements"
-      with_substitute(@enum.to_a) do |lines|
-        run_with_length(lines, lines.length, method, *args, &block)
-      end
-    end
-
     def run_without_block(enum, method, *args)
       Progress.start(@title) do
         Progress.step do
@@ -103,22 +94,22 @@ class Progress
       end
     end
 
-    def run_with_length(enum, length, method, *args, &block)
+    def run_with_length(enum, length, method, *args)
       Progress.start(@title, length) do
         enum.send(method, *args) do |*block_args|
           Progress.step do
-            block.call(*block_args)
+            yield(*block_args)
           end
         end
       end
     end
 
-    def run_with_pos(io, method, *args, &block)
+    def run_with_pos(io, method, *args)
       size = io.respond_to?(:size) ? io.size : io.stat.size
       Progress.start(@title, size) do
         io.send(method, *args) do |*block_args|
           Progress.set(io.pos) do
-            block.call(*block_args)
+            yield(*block_args)
           end
         end
       end

data/progress.gemspec

@@ -2,12 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name        = 'progress'
-  s.version     = '3.3.2'
+  s.version     = '3.4.0'
   s.summary     = %q{Show progress of long running tasks}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
   s.license     = 'MIT'
 
+  s.required_ruby_version = '>= 1.9.3'
+
   s.rubyforge_project = s.name
 
   s.files         = `git ls-files`.split("\n")

data/spec/progress_spec.rb

@@ -13,7 +13,7 @@ describe Progress do
     allow(Progress).to receive(:start_beeper)
     allow(Progress).to receive(:time_to_print?).and_return(true)
 
-    eta = instance_double(Progress::Eta, :left => nil, :elapsed => '0s')
+    eta = instance_double(Progress::Eta, left: nil, elapsed: '0s')
     allow(Progress).to receive(:eta).and_return(eta)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: progress
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.4.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-08 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -47,6 +47,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.markdown
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -74,7 +75,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="