progress 3.3.1 → 3.3.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDEzZWY4ZjY0NjcxOTdkZDAxN2I3MTEwNWQ1NWEzMTZhMGIxYjlkNg==
-  data.tar.gz: !binary |-
-    N2I5ZTMxMGE0MmQ1NThiZmQ0YjMxY2QxYWI0YmE1MTE4ZmY3NWI4ZQ==
+SHA1:
+  metadata.gz: 64ca0726e8a2eb5bfd62828a9f9aeec7b0fc49b5
+  data.tar.gz: e7b15fed0cb040c622fc381a4922fd697c071ad5
 SHA512:
-  metadata.gz: !binary |-
-    MmI2NjIwZGYxMzMxZjgwMzEzZjhhY2YxMmM4NTlhNzVmNTk5YWRkNzFmODE2
-    MDcxZGUwZjA5NmE2Y2M0NjFmZTRlM2QzNjYxNmU5OTdlODRiMzkwN2E2MTgx
-    YWRkY2ExNzMzYTFkYjExNmZmOGJjNmNkYzQwNWE4M2IwOTFjYjM=
-  data.tar.gz: !binary |-
-    YjNjMjIzZDBjYThkYzMxZDU3ODQ1MjUyNDEzNjRkM2E2YzA1MTAwNzk0OWZi
-    YTdkMDMyNjY1OGVhNTRkZTAzZjBkZWVjZWJhMmM1ZDdjZjMwYzg5NzI3YjRj
-    ZWE1Nzg3NWE5YjU4YjAzMjdiMmRiZDc4MTA5ZmEwYjc0NTZiOWM=
+  metadata.gz: cda7bef90d61b0eed3af7397af5d2dc8a00fb8f2bf52539feef2edd9a5efc1d99ea9ea85d71465b8145f3fffad87cbe2ae43cc51ae3975f9475c681e110e647e
+  data.tar.gz: c20fd466c9d7a061035d4450a9c046d472f58c2bf43e49509c11717e9380bb28e04703aa8abcd810c1aeb8a2120ce6aabcd7083d9478a113c01329633c534c8e

data/.rubocop.yml

@@ -2,6 +2,24 @@ AllCops:
   Exclude:
     - '*.gemspec'
 
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
+Layout/SpaceBeforeBlockBraces:
+  EnforcedStyle: no_space
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
 Lint/EndAlignment:
   EnforcedStyleAlignWith: variable
 
@@ -27,8 +45,8 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Max: 10
 
-Style/AccessModifierIndentation:
-  EnforcedStyle: outdent
+Performance/RedundantBlockCall:
+  Enabled: false
 
 Style/Alias:
   EnforcedStyle: prefer_alias_method
@@ -36,12 +54,6 @@ Style/Alias:
 Style/BracesAroundHashParameters:
   Enabled: false
 
-Style/CaseIndentation:
-  EnforcedStyle: end
-
-Style/DotPosition:
-  EnforcedStyle: trailing
-
 Style/DoubleNegation:
   Enabled: false
 
@@ -49,7 +61,7 @@ Style/EmptyCaseCondition:
   Enabled: false
 
 Style/Encoding:
-  EnforcedStyle: when_needed
+  Enabled: false
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
@@ -57,29 +69,15 @@ Style/HashSyntax:
 Style/IfUnlessModifier:
   MaxLineLength: 40
 
-Style/IndentHash:
-  EnforcedStyle: consistent
-
 Style/NumericPredicate:
   Enabled: false
 
 Style/ParallelAssignment:
   Enabled: false
 
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%w': '[]'
-    '%W': '[]'
-
 Style/Semicolon:
   AllowAsExpressionSeparator: true
 
-Style/SpaceBeforeBlockBraces:
-  EnforcedStyle: no_space
-
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
-
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: no_comma
 

data/.travis.yml

@@ -7,19 +7,17 @@ rvm:
   - '1.9.3-p551'
   - '2.0.0-p648'
   - '2.1.10'
-  - '2.2.6'
-  - '2.3.3'
-  - '2.4.0'
-  - 'jruby-1.7.26'
+  - '2.2.8'
+  - '2.3.5'
+  - '2.4.2'
   - 'jruby-9.0.5.0'
-  - 'jruby-9.1.5.0'
+  - 'jruby-9.1.9.0'
 script: bundle exec rspec
 matrix:
-  fast_finish: true
   include:
     - env: RUBOCOP=✓
-      rvm: '2'
+      rvm: '2.4.2'
       script: bundle exec rubocop
     - env: CHECK_RUBIES=✓
-      rvm: '2'
+      rvm: '2.4.2'
       script: bundle exec travis_check_rubies

data/Gemfile

@@ -2,4 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'travis_check_rubies', '~> 0.1'
+if RUBY_VERSION >= '2.0'
+  gem 'travis_check_rubies', '~> 0.2'
+end

data/lib/progress/with_progress.rb

@@ -26,7 +26,7 @@ class Progress
     # befriend with in_threads gem
     def in_threads(*args, &block)
       @enum.in_threads(*args).with_progress(@title, @length, &block)
-    rescue
+    rescue NoMethodError
       super
     end
 
@@ -103,22 +103,22 @@ class Progress
       end
     end
 
-    def run_with_length(enum, length, method, *args)
+    def run_with_length(enum, length, method, *args, &block)
       Progress.start(@title, length) do
-        enum.send(method, *args) do |block_args|
+        enum.send(method, *args) do |*block_args|
           Progress.step do
-            yield(block_args)
+            block.call(*block_args)
           end
         end
       end
     end
 
-    def run_with_pos(io, method, *args)
+    def run_with_pos(io, method, *args, &block)
       size = io.respond_to?(:size) ? io.size : io.stat.size
       Progress.start(@title, size) do
-        io.send(method, *args) do |block_args|
+        io.send(method, *args) do |*block_args|
           Progress.set(io.pos) do
-            yield(block_args)
+            block.call(*block_args)
           end
         end
       end

data/progress.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'progress'
-  s.version     = '3.3.1'
+  s.version     = '3.3.2'
   s.summary     = %q{Show progress of long running tasks}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/spec/progress_spec.rb

@@ -52,8 +52,8 @@ describe Progress do
     it 'checks respond_to? methods of self and of Enumerable' do
       with_progress = [1, 2, 3].with_progress
 
-      ([:each, :with_progress] + Enumerable.instance_methods).each do |method|
-        expect(with_progress).to respond_to(method)
+      (%w[each with_progress] + Enumerable.instance_methods).each do |method|
+        expect(with_progress).to respond_to(method.to_sym)
       end
     end
 
@@ -95,6 +95,17 @@ describe Progress do
           expect{ reference.next }.to raise_error(StopIteration)
         end
 
+        it 'does not break each_with_index' do
+          reference = enum.each
+          counter = 0
+          enum.with_progress.each_with_index do |n, i|
+            expect(n).to eq(reference.next)
+            expect(i).to eq(counter)
+            counter += 1
+          end
+          expect{ reference.next }.to raise_error(StopIteration)
+        end
+
         it 'does not break find' do
           default = proc{ 'default' }
           expect(enum.with_progress.find{ |n| n == 100 }).

metadata

@@ -1,38 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: progress
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.27'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.27'
 description: 
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -58,21 +72,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: progress
-rubygems_version: 2.6.4
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Show progress of long running tasks
 test_files:
 - spec/progress_spec.rb
 - spec/test.csv
-has_rdoc: