progress 3.0.0 → 3.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWNkMGE2NDNkOTU0NmM5NzVlN2JkNWQ5YjdiMjY2ZjJlZWRjMTA5ZQ==
+    MzcwYjdhOTE5ZDQ5NWViMWM3NzY2ZmQ3YTQ5MGUzNDI2Njk3MDQ4Yw==
   data.tar.gz: !binary |-
-    MmYyYTQ1NGFiNzliM2VhNzE1OWI2OGE0OWZkOWVmMDI2ZjMzNmRmYg==
+    ZGMyYjk3MTg1N2VlYjBiNWY1NTJlMjdlNmMzNzI1NWY0NmE3ZThjNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWQ5ODQyNTg5YTg4MDhjZGI1Y2EzZmQ1ZTA2NGMzNzRmNzg0NWFjOTJiZDdk
-    OTZkYzIzMDIwMzIxZjhlNTQ1M2M5MDAyOGQ3NmQ5YTM1ZWIxODIxYmQyZDNh
-    OGUwNDlmOWE3MTNlMjAwYmEzN2EyNTEyZjA0YTNjMzVkNGJkNTc=
+    NDQyNzI2YmVlZWQ1YmU2OGIyMGY5M2I3ODFhZTBiYzU4YTZhNjdlM2FmOGI5
+    MzdjM2E3NDcxZThhMzE2MDEwNTIzOGI5NmM5YzU3YzdiM2UxMGZiMzJhZThi
+    MzZmZDVkYWQ2ZmFiZDZlNTNmNmUxNGRmNzJhZGNiZDkzNTZlZTU=
   data.tar.gz: !binary |-
-    NTJmNjY4YzJlMmVlYzM2MDMyNjk4NDNjMjFkYTIyMmFiNTQ5NDdiMTkzYTg3
-    ODY4MmU5MTNlMGFjZGViZjhiNGZjOGZjMzBiYTM4MDYzODE3MTY3ZGVkNjJm
-    ZTFjZmMxZTI3ZTUwZDI2ZTQ1NTQ5MjdlZjVkNDI1NjY0NGJjNzM=
+    N2VkZThiYjYxMzhhOGM4ZjkzZDllNzBkYzU4Y2Q5ZDVmN2MyNmY2ZmY1YzQ4
+    NWExNzdiOWUxMWEyMjdiODBlMWIwNTJkYjEyZmM5MGMxZDFiZjdiODEwYzIx
+    OTdjNjU0ZTFhODMxYzAwNjQzMjcyNjM4ZmM5NjMxOTMyNjM3OGM=

data/.travis.yml

@@ -6,7 +6,5 @@ rvm:
   - 2.0.0
   - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
   - ree
 script: "bundle exec rspec"

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Ivan Kuchin
+Copyright (c) 2010-2014 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

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

data/lib/progress/with_progress.rb

@@ -1,22 +1,47 @@
 require 'progress'
-require 'delegate'
 
 class Progress
-  class WithProgress < Delegator
-    include Enumerable
-
+  class WithProgress
     attr_reader :enumerable, :title
 
     # initialize with object responding to each, title and optional length
     # if block is provided, it is passed to each
     def initialize(enumerable, title, length = nil, &block)
-      super(enumerable)
       @enumerable, @title, @length = enumerable, title, length
       each(&block) if block
     end
 
-    # each object with progress
-    def each
+    # returns self but changes title
+    def with_progress(title = nil, length = nil, &block)
+      self.class.new(@enumerable, title, length || @length, &block)
+    end
+
+    # befriend with in_threads gem
+    def in_threads(*args, &block)
+      @enumerable.in_threads(*args).with_progress(@title, @length, &block)
+    rescue
+      super
+    end
+
+    def respond_to?(sym, include_private = false)
+      enumerable_method?(method) || super(sym, include_private)
+    end
+
+    def method_missing(method, *args, &block)
+      if enumerable_method?(method)
+        run(method, *args, &block)
+      else
+        super(method, *args, &block)
+      end
+    end
+
+  protected
+
+    def enumerable_method?(method)
+      method == :each || Enumerable.method_defined?(method)
+    end
+
+    def run(method, *args, &block)
       enumerable = case
       when @length
         @enumerable
@@ -26,7 +51,9 @@ class Progress
             Object.const_defined?(:StringIO) && @enumerable.is_a?(StringIO),
             Object.const_defined?(:TempFile) && @enumerable.is_a?(TempFile)
         warn "Progress: collecting elements for instance of class #{@enumerable.class}"
-        @enumerable.each.to_a
+        lines = []
+        @enumerable.each{ |line| lines << line }
+        lines
       else
         @enumerable
       end
@@ -42,37 +69,27 @@ class Progress
         enumerable.count
       end
 
-      Progress.start(@title, length) do
-        enumerable.each do |object|
+      if block
+        result = Progress.start(@title, length) do
+          enumerable.send(method, *args) do |*block_args|
+            Progress.step do
+              block.call(*block_args)
+            end
+          end
+        end
+        if result.eql?(enumerable)
+          @enumerable
+        else
+          result
+        end
+      else
+        Progress.start(@title) do
           Progress.step do
-            yield object
+            enumerable.send(method, *args)
           end
         end
-        @enumerable
       end
     end
 
-    # returns self but changes title
-    def with_progress(title = nil, length = nil, &block)
-      self.class.new(@enumerable, title, length || @length, &block)
-    end
-
-    # befriend with in_threads gem
-    def in_threads(*args, &block)
-      @enumerable.in_threads(*args).with_progress(@title, @length, &block)
-    rescue
-      super
-    end
-
-  protected
-
-    def __getobj__
-      @enumerable
-    end
-
-    def __setobj__(obj)
-      @enumerable = obj
-    end
-
   end
 end

data/progress.gemspec

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

@@ -133,26 +133,26 @@ describe Progress do
 
           it "should call each only once for Array" do
             enum = [1, 2, 3]
-            enum.should_receive(:each).once
+            enum.should_receive(:each).once.and_return(enum)
             enum.with_progress.each{ }.should == enum
           end
 
           it "should call each only once for Hash" do
             enum = {1 => 1, 2 => 2, 3 => 3}
-            enum.should_receive(:each).once
+            enum.should_receive(:each).once.and_return(enum)
             enum.with_progress.each{ }.should == enum
           end
 
           it "should call each only once for Set" do
             enum = [1, 2, 3].to_set
-            enum.should_receive(:each).once
+            enum.should_receive(:each).once.and_return(enum)
             enum.with_progress.each{ }.should == enum
           end
 
           if ''.is_a?(Enumerable) # ruby1.8
             it "should call each only once for String" do
               enum = "a\nb\nc"
-              enum.should_receive(:each).once
+              enum.should_receive(:each).once.and_return(enum)
               without_warnings do
                 enum.with_progress.each{ }.should == enum
               end
@@ -161,7 +161,7 @@ describe Progress do
 
           it "should call each only once for File (IO)" do
             enum = File.open(__FILE__)
-            enum.should_receive(:each).once
+            enum.should_receive(:each).once.and_return(enum)
             without_warnings do
               enum.with_progress.each{ }.should == enum
             end
@@ -169,7 +169,7 @@ describe Progress do
 
           it "should call each only once for StringIO" do
             enum = StringIO.new("a\nb\nc")
-            enum.should_receive(:each).once
+            enum.should_receive(:each).once.and_return(enum)
             without_warnings do
               enum.with_progress.each{ }.should == enum
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: progress
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -70,3 +70,4 @@ specification_version: 4
 summary: Show progress of long running tasks
 test_files:
 - spec/progress_spec.rb
+has_rdoc: