progress 2.4.0 → 3.0.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWNkMGE2NDNkOTU0NmM5NzVlN2JkNWQ5YjdiMjY2ZjJlZWRjMTA5ZQ==
+  data.tar.gz: !binary |-
+    MmYyYTQ1NGFiNzliM2VhNzE1OWI2OGE0OWZkOWVmMDI2ZjMzNmRmYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NWQ5ODQyNTg5YTg4MDhjZGI1Y2EzZmQ1ZTA2NGMzNzRmNzg0NWFjOTJiZDdk
+    OTZkYzIzMDIwMzIxZjhlNTQ1M2M5MDAyOGQ3NmQ5YTM1ZWIxODIxYmQyZDNh
+    OGUwNDlmOWE3MTNlMjAwYmEzN2EyNTEyZjA0YTNjMzVkNGJkNTc=
+  data.tar.gz: !binary |-
+    NTJmNjY4YzJlMmVlYzM2MDMyNjk4NDNjMjFkYTIyMmFiNTQ5NDdiMTkzYTg3
+    ODY4MmU5MTNlMGFjZGViZjhiNGZjOGZjMzBiYTM4MDYzODE3MTY3ZGVkNjJm
+    ZTFjZmMxZTI3ZTUwZDI2ZTQ1NTQ5MjdlZjVkNDI1NjY0NGJjNzM=

data/.gitignore

@@ -6,6 +6,7 @@
 /.yardoc/
 /coverage/
 
+Gemfile.lock
 Makefile
 *.o
 *.bundle

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+  - ree
+script: "bundle exec rspec"

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/LICENSE.txt

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

@@ -2,6 +2,8 @@
 
 Show progress during console script run.
 
+[![Build Status](https://travis-ci.org/toy/progress.png?branch=master)](https://travis-ci.org/toy/progress)
+
 ## Installation
 
     gem install progress
@@ -102,27 +104,27 @@ NOTE: you will get WRONG progress if you use something like this:
 But you can use this:
 
     10.times_with_progress('A') do |time|
-      Progress.step 1, 2 do
+      Progress.step 5 do
         10.times_with_progress('B') do
           # code
         end
       end
-      Progress.step 1, 2 do
+      Progress.step 5 do
         10.times_with_progress('C') do
           # code
         end
       end
     end
 
-Or if you know that B runs 10 times faster than C:
+Or if you know that B runs 9 times faster than C:
 
     10.times_with_progress('A') do |time|
-      Progress.step 1, 11 do
+      Progress.step 1 do
         10.times_with_progress('B') do
           # code
         end
       end
-      Progress.step 10, 11 do
+      Progress.step 9 do
         10.times_with_progress('C') do
           # code
         end
@@ -131,4 +133,4 @@ Or if you know that B runs 10 times faster than C:
 
 ## Copyright
 
-Copyright (c) 2010-2011 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2010-2013 Ivan Kuchin. See LICENSE.txt for details.

data/lib/progress/active_record.rb

@@ -1,33 +1,31 @@
 require 'progress'
 
-if defined?(ActiveRecord::Base)
-  module ActiveRecord
-    module BatchesWithProgress
-      # run `find_each` with progress
-      def find_each_with_progress(options = {})
-        Progress.start(name.tableize, count(options)) do
-          find_each do |model|
-            Progress.step do
-              yield model
-            end
+module ActiveRecord
+  module BatchesWithProgress
+    # run `find_each` with progress
+    def find_each_with_progress(options = {})
+      Progress.start(name.tableize, count(options)) do
+        find_each do |model|
+          Progress.step do
+            yield model
           end
         end
       end
+    end
 
-      # run `find_in_batches` with progress
-      def find_in_batches_with_progress(options = {})
-        Progress.start(name.tableize, count(options)) do
-          find_in_batches do |batch|
-            Progress.step batch.length do
-              yield batch
-            end
+    # run `find_in_batches` with progress
+    def find_in_batches_with_progress(options = {})
+      Progress.start(name.tableize, count(options)) do
+        find_in_batches do |batch|
+          Progress.step batch.length do
+            yield batch
           end
         end
       end
     end
+  end
 
-    class Base
-      extend BatchesWithProgress
-    end
+  class Base
+    extend BatchesWithProgress
   end
 end

data/lib/progress/beeper.rb

@@ -0,0 +1,24 @@
+class Progress
+  class Beeper
+    class Restart < RuntimeError; end
+
+    def initialize(time, &block)
+      @thread = Thread.new do
+        begin
+          sleep time
+          block.call
+        rescue Restart
+        end
+        redo
+      end
+    end
+
+    def restart
+      @thread.raise Restart
+    end
+
+    def stop
+      @thread.kill
+    end
+  end
+end

data/lib/progress/eta.rb

@@ -0,0 +1,48 @@
+class Progress
+  class Eta
+    def initialize
+      @started_at = Time.now
+    end
+
+    def left(completed)
+      seconds = seconds_left(completed)
+      if seconds && seconds > 0
+        seconds_to_string(seconds)
+      end
+    end
+
+    def elapsed
+      seconds_to_string(Time.now - @started_at)
+    end
+
+  private
+
+    def seconds_to_string(seconds)
+      if seconds
+        case seconds
+        when 0...60
+          '%.0fs' % seconds
+        when 60...3600
+          '%.1fm' % (seconds / 60)
+        when 3600...86400
+          '%.1fh' % (seconds / 3600)
+        else
+          '%.1fd' % (seconds / 86400)
+        end
+      end
+    end
+
+    def seconds_left(completed)
+      now = Time.now
+      if completed > 0 && now - @started_at >= 1
+        current_eta = @started_at + (now - @started_at) / completed
+        @left = if @left
+          @left + (current_eta - @left) * (1 + completed) * 0.5
+        else
+          current_eta
+        end
+        @left - now
+      end
+    end
+  end
+end

data/lib/progress/with_progress.rb

@@ -1,7 +1,8 @@
 require 'progress'
+require 'delegate'
 
 class Progress
-  class WithProgress
+  class WithProgress < Delegator
     include Enumerable
 
     attr_reader :enumerable, :title
@@ -9,20 +10,36 @@ class Progress
     # 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
-      enumerable, length = case
+      enumerable = 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]
+        @enumerable
+      when
+            @enumerable.is_a?(String),
+            @enumerable.is_a?(IO),
+            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
       else
-        [@enumerable, @enumerable.length]
+        @enumerable
+      end
+
+      length = case
+      when @length
+        @length
+      when enumerable.respond_to?(:size)
+        enumerable.size
+      when enumerable.respond_to?(:length)
+        enumerable.length
+      else
+        enumerable.count
       end
 
       Progress.start(@title, length) do
@@ -39,5 +56,23 @@ class Progress
     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