progress 1.0.0 → 1.0.1

data/README.rdoc

@@ -13,7 +13,7 @@ Class to show progress during console script run
 
 == SYNOPSIS:
 
-  1000.times_with_progress('Wait') do |time|
+  1000.times_with_progress('Wait') do |time| # title is optional
     puts time
   end
 
@@ -53,6 +53,7 @@ Class to show progress during console script run
 
 or just
 
+  symbols = []
   Progress('Input 100 symbols', 100) do
     while symbols.length < 100
       input = gets.scan(/\S/)
@@ -71,26 +72,22 @@ 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('B,C', 2) do
-      Progress.step do
-        10.times_with_progress('B'){ … }
-      end
-      Progress.step do
-        10.times_with_progress('C'){ … }
-      end
+    Progress.step 1, 2 do
+      10.times_with_progress('B'){ … }
+    end
+    Progress.step 1, 2 do
+      10.times_with_progress('C'){ … }
     end
   end
 
 Or if you know that B runs 10 times faster than C:
 
   10.times_with_progress('A') do |time|
-    Progress('B,C', 11) do
-      Progress.step 1 do
-        10.times_with_progress('B'){ … }
-      end
-      Progress.step 10 do
-        10.times_with_progress('C'){ … }
-      end
+    Progress.step 1, 11 do
+      10.times_with_progress('B'){ … }
+    end
+    Progress.step 10, 11 do
+      10.times_with_progress('C'){ … }
     end
   end
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/progress.rb

@@ -85,9 +85,9 @@ class Progress
       end
     end
 
-    def step(steps = 1, &block)
+    def step(num = 1, den = 1, &block)
       if levels.last
-        set(levels.last.current + Float(steps), &block)
+        set(levels.last.current + Float(num) / den, &block)
       elsif block
         block.call
       end
@@ -98,7 +98,9 @@ class Progress
         ret = if block
           levels.last.step(value - levels.last.current, &block)
         end
-        levels.last.current = Float(value)
+        if levels.last
+          levels.last.current = Float(value)
+        end
         print_message
         ret
       elsif block

data/lib/progress/active_record.rb

@@ -4,8 +4,9 @@ if defined?(ActiveRecord::Base)
       def find_each_with_progress(options = {})
         Progress.start(name.tableize, count(options)) do
           find_each do |model|
-            yield model
-            Progress.step
+            Progress.step do
+              yield model
+            end
           end
         end
       end
@@ -13,8 +14,9 @@ if defined?(ActiveRecord::Base)
       def find_in_batches_with_progress(options = {})
         Progress.start(name.tableize, count(options)) do
           find_in_batches do |batch|
-            yield batch
-            Progress.step batch.length
+            Progress.step batch.length do
+              yield batch
+            end
           end
         end
       end

data/lib/progress/integer.rb

@@ -7,8 +7,9 @@ class Integer
   def times_with_progress(title = nil)
     Progress.start(title, self) do
       times do |i|
-        yield i
-        Progress.step
+        Progress.step do
+          yield i
+        end
       end
     end
   end

data/lib/progress/with_progress.rb

@@ -23,8 +23,9 @@ class Progress
     include Enumerable
     def each(*args, &block)
       __getobj__.each(*args) do |*yielded|
-        block.call(*yielded)
-        Progress.step
+        Progress.step do
+          block.call(*yielded)
+        end
       end
     end
 

data/progress.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{progress}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Boba Fat"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: progress
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Boba Fat