progress 2.2.0 → 2.3.0

data/.gitignore

@@ -1,4 +1,5 @@
 /pkg/
+/*.gem
 
 /doc/
 /rdoc/

data/lib/progress.rb

@@ -76,12 +76,7 @@ class Progress
         @started_at = Time.now
         @eta = nil
         @semaphore = Mutex.new
-        @beeper = Thread.new do
-          loop do
-            sleep 1
-            print_message
-          end
-        end
+        start_beeper
       end
       levels << new(title, total)
       print_message true
@@ -129,7 +124,7 @@ class Progress
         end
         levels.pop
         if levels.empty?
-          @beeper.kill
+          stop_beeper
           io.puts
         end
       end
@@ -217,8 +212,31 @@ class Progress
       end
     end
 
+    def start_beeper
+      @beeper = Thread.new do
+        loop do
+          sleep 10
+          print_message unless Thread.current[:skip]
+        end
+      end
+    end
+
+    def stop_beeper
+      @beeper.kill
+      @beeper = nil
+    end
+
+    def restart_beeper
+      if @beeper
+        @beeper[:skip] = true
+        @beeper.run
+        @beeper[:skip] = false
+      end
+    end
+
     def print_message(force = false)
       lock force do
+        restart_beeper
         if force || time_to_print?
           inner = 0
           parts, parts_cl = [], []

data/lib/progress/enumerable.rb

@@ -20,7 +20,7 @@ module Enumerable
   #   (0...100).with_progress('Numbers').all? do |numbers|
   #     # code
   #   end
-  def with_progress(title = nil, &block)
-    Progress::WithProgress.new(self, title, &block)
+  def with_progress(title = nil, length = nil, &block)
+    Progress::WithProgress.new(self, title, length, &block)
   end
 end

data/lib/progress/with_progress.rb

@@ -15,31 +15,29 @@ class Progress
 
     # each object with progress
     def each
+      enumerable, length = case
+      when @length
+        [@enumerable, @length]
+      when !@enumerable.respond_to?(:length) || @enumerable.is_a?(String) || (defined?(StringIO) && @enumerable.is_a?(StringIO)) || (defined?(TempFile) && @enumerable.is_a?(TempFile))
+        elements = @enumerable.each.to_a
+        [elements, elements.length]
+      else
+        [@enumerable, @enumerable.length]
+      end
+
       Progress.start(@title, length) do
-        @enumerable.each do |object|
+        enumerable.each do |object|
           Progress.step do
             yield object
           end
         end
-      end
-    end
-
-    # determine number of objects
-    def length
-      @length ||= if @enumerable.respond_to?(:length) && !@enumerable.is_a?(String)
-        @enumerable.length
-      elsif @enumerable.respond_to?(:count)
-        @enumerable.count
-      elsif @enumerable.respond_to?(:to_a)
-        @enumerable.to_a.length
-      else
-        @enumerable.inject(0){ |length, obj| length + 1 }
+        @enumerable
       end
     end
 
     # returns self but changes title
-    def with_progress(title = nil, &block)
-      self.class.new(@enumerable, title, @length, &block)
+    def with_progress(title = nil, length = nil, &block)
+      self.class.new(@enumerable, title, length || @length, &block)
     end
   end
 end

data/progress.gemspec

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

@@ -247,6 +247,49 @@ describe Progress do
           wp_wp.enumerable.should == wp.enumerable
         end
       end
+
+      describe "calls to each" do
+        class CallsToEach
+          include Enumerable
+
+          COUNT = 100
+        end
+
+        def init_calls_to_each
+          @enum = CallsToEach.new
+          @objects = 10.times.to_a
+          @enum.should_receive(:each).once{ |&block|
+            @objects.each(&block)
+          }
+        end
+
+        it "should call each only one time for object with length" do
+          init_calls_to_each
+          @enum.should_receive(:length).and_return(10)
+          got = []
+          @enum.with_progress.each{ |o| got << o }.should == @enum
+          got.should == @objects
+        end
+
+        it "should call each only one time for object without length" do
+          init_calls_to_each
+          got = []
+          @enum.with_progress.each{ |o| got << o }.should == @enum
+          got.should == @objects
+        end
+
+        it "should call each only one time for String" do
+          @objects = ('a'..'z').map{ |c| "#{c}\n" }
+          str = @objects.join('')
+          str.should_not_receive(:length)
+          str.should_receive(:each).once{ |&block|
+            @objects.each(&block)
+          }
+          got = []
+          str.with_progress.each{ |o| got << o }.should == str
+          got.should == @objects
+        end
+      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: progress
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 2
-  - 2
+  - 3
   - 0
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-04 00:00:00 Z
+date: 2011-12-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: progress
-rubygems_version: 1.8.11
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Show progress of long running tasks