progress 3.2.1 → 3.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWI0NTI1YjgxOTFiODcwZTA0NGQyMTUwMTg1NWM2NDM2N2RhM2E2YQ==
+    ZDQ1YmVhMWRhNzgwNWY3NTA0NTlmMGEzMGFhYWU0MTQ3NWU4MTUxNw==
   data.tar.gz: !binary |-
-    ZDMyYThlNDA5NjY5ZDMxYmRhMmQ3ZjA4YWI1NzE0MDBkYzQ4ZmVjOA==
+    NzAwYjY4ZTIxMWM2ZmRhYjgxYzkxNTFjN2E1YzVjMGJlYjhiYTM0MA==
 SHA512:
   metadata.gz: !binary |-
-    MjZhOGNmYTY0N2Y5YWFmMDViNTA5OWU0ZGY4ZTZmNzBiYjgxNWRmZWEwM2Zk
-    YTBjN2U3MzBjMThiYWMxMWFiZWZmYjQ4Yzg3MWRlYzkzYWUxNWFkMGUyMmI3
-    NGI3MDVhNzE3NjU3Y2EyYmZlNGYzNDJmMjc1OGJlYmM5MzE2NjI=
+    YjUwNzgyNTA4MjMzODQzNzAwYjE2N2UxNmFlYzM0Nzk0MWZiMjdhNTFhMzk1
+    MzY4ZTAyY2I5N2MyMDU0ZTIyZjAwYWUyNTA1MDYwYTkyOWJiN2NhNGU4MTVj
+    NTI4ZDcwY2MwMzRhYzA2OWExM2JjMGU5MmRkOWFmYTc2OGFhY2I=
   data.tar.gz: !binary |-
-    ODA4MGQ2NDYwMzYwZDExNDg5ODVjZjM1YzMxYmRlYTMxNmJjMThhMjZhNTVl
-    NzlhZTExYjQ4NmJlZWJkZWEyZWIzNTUyODVmZjMwMGI4Y2ZhOWNlZjI1ZDdl
-    YWI2OGVjYzczMmJkNmNlMWZlMmJkOTI0MTBjOTgwOTRhODJkY2E=
+    YmEyNjdjZGQxM2E3ZGMwNGM0NGU0N2JiMWNlYmE1ZmFlNmU5YTE1NjU5MTIy
+    OGM5YTYzOWQ2MDUzODU4MDI2OGFhNmVmZTc0MzBhODI0Y2Q2ZmRkMDVkZmI2
+    MzNiYTE2YzRlOGVhMDQ4MTQ3MjA2MGMzMTNmYTNkYjdkNjBiYzE=

data/lib/progress/with_progress.rb

@@ -105,9 +105,9 @@ class Progress
 
     def run_with_length(enum, length, method, *args)
       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)
+            yield(block_args)
           end
         end
       end
@@ -116,9 +116,9 @@ class Progress
     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|
+        io.send(method, *args) do |block_args|
           Progress.set(io.pos) do
-            yield(*block_args)
+            yield(block_args)
           end
         end
       end

data/progress.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'progress'
-  s.version     = '3.2.1'
+  s.version     = '3.2.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

@@ -137,35 +137,55 @@ describe Progress do
           end
         end
 
-        describe 'collections' do
-          [
-            [1, 2, 3],
-            {1 => 1, 2 => 2, 3 => 3},
-            [1, 2, 3].to_set,
-          ].each do |enum|
-            it "calls each only once for #{enum.class}" do
+        shared_examples 'yielding' do |enum|
+          let(:expected){ [] }
+          let(:got){ [] }
+
+          after{ expect(got).to eq(expected) }
+
+          it 'yields same objects with one block argument' do
+            enum.each{ |a| expected << a }
+            enum.with_progress{ |a| got << a }
+          end
+
+          it 'yields same objects with two block arguments' do
+            enum.each{ |a, b| expected << [a, b] }
+            enum.with_progress{ |a, b| got << [a, b] }
+          end
+
+          it 'yields same objects with splat block arguments' do
+            enum.each{ |*a| expected << a }
+            enum.with_progress{ |*a| got << a }
+          end
+        end
+
+        [
+          [1, [2, :b], [3, :c, :d, :e]],
+          {1 => 1, 2 => 2, 3 => 3},
+          [1, 2, 3].to_set,
+        ].each do |enum|
+          describe enum.class do
+            it 'calls each only once' do
               expect(enum).to receive(:each).once.and_call_original
               expect(enum.with_progress.each{}).to eq(enum)
             end
 
-            it "yields same objects for #{enum.class}" do
-              expect(enum.with_progress.entries).to eq(enum.entries)
-            end
+            include_examples 'yielding', enum
           end
+        end
 
-          [
-            100.times,
-            'a'..'z',
-          ].each do |enum|
-            it "calls each twice for #{enum.class}" do
+        [
+          100.times,
+          'a'..'z',
+        ].each do |enum|
+          describe enum.class do
+            it 'calls each twice' do
               enum_each = enum.each{}
               expect(enum).to receive(:each).at_most(:twice).and_call_original
               expect(enum.with_progress.each{}).to eq(enum_each)
             end
 
-            it "yields same objects for #{enum.class}" do
-              expect(enum.with_progress.entries).to eq(enum.entries)
-            end
+            include_examples 'yielding', enum
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: progress
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec