fortschritt 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40f95f33dc74042947092df0d7714c9a3959278a
-  data.tar.gz: f95652c2c15304e4b578d5c21b2917982d342f19
+  metadata.gz: d8161d0b7307f0b9ef7fddc1e98d9a3ddcd5769d
+  data.tar.gz: 7b54ad9dd0a8724fa9935657d5681223d7993163
 SHA512:
-  metadata.gz: b15d6a18e3a78680a296f5fbbc52dbc276ca2781e89ff31ecfb820375058d29af4b16c023a4ae56fa359bed0676c1fc9539ee14c0e660d123a41d887413a3540
-  data.tar.gz: 5d52b1d41c8e98a8e44ff70a42b0784aa5db6d605e2c2f20ef98322e8ce04330258a4ea90fbb3f1abbe85451cff3553bb7254c66a641343da1072caa93dfe5ee
+  metadata.gz: 2c02bd0c6119fcfd14af27eebbfcd38243c32eba448492df03a854296a1c39086172207abdf35ad9378a5ecd9d147e93862ce7cef86ed50ad771dc614ae3bab5
+  data.tar.gz: 166b0d58bf5cddbcc6b3e0fc579acc2c394574e7a0ec37a60819c1b4b094819e9b5baaba4d6109582913c03d25739d3af161bfb07f27a19d6b60bcc51ebe2d8c

data/README.md

@@ -1,9 +1,5 @@
 # Fortschritt
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/fortschritt`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -22,15 +18,21 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Start a progress bar by calling `with_fortschritt` on an `Enumerable` or an `ActiveRecord::Relation`.
 
-## Development
+It will create a new progress bar, that will be incremented by calling `Fortschritt.increment`.
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+However, for convenience you can call `#fortschritt` on your iterated objects as well. It will call `Fortschritt.increment` and return `self`, so you can chain it up nicely.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```ruby
+User.all.with_fortschritt.find_each do |user|
+  user.fortschritt.valid?
+end
+
+# will print something like this: 1616/145096 → 00:13:21 → ETA 2016-02-04 18:11:50
+```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/fortschritt.
+Bug reports and pull requests are welcome on GitHub at https://github.com/xijo/fortschritt.
 

data/Rakefile

@@ -1,6 +1,15 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+task :demo do
+  require_relative 'lib/fortschritt'
+  count = ENV['COUNT'] ? ENV['COUNT'].to_i : 1000
+  (1..count).to_a.with_fortschritt.each do |i|
+    i.fortschritt
+    sleep rand/50
+  end
+end

data/lib/fortschritt/meter.rb

@@ -7,6 +7,7 @@ module Fortschritt
       @done            = 0
       @updated_at      = Time.now
       @average_seconds = 0
+      @started_at      = Time.now
     end
 
     def increment
@@ -35,9 +36,12 @@ module Fortschritt
       ((average_seconds * done) + value) / (done + 1)
     end
 
+    def total_elapsed_seconds
+      Time.now - @started_at
+    end
+
     def print!
       Fortschritt.printer.print(self)
     end
-
   end
 end

data/lib/fortschritt/printer.rb

@@ -9,10 +9,9 @@ module Fortschritt
         slice(meter),
         remaining(meter),
         eta(meter),
-      ].join ' → '
+        finished_after(meter),
+      ].compact.join ' → '
       "\r#{result}#{eol(meter)}"
-      # stream.print result
-      # print "\r#{done}/#{total}, avg #{average.round(3)}, remaining #{remaining}"#, percent: #{?| * (percent / 10)}> #{percent}%"
     end
 
     def slice(meter)
@@ -24,18 +23,28 @@ module Fortschritt
       "ETA #{result.strftime "%Y-%m-%d %H:%M:%S"}"
     end
 
-    def remaining(meter)
-      mm, ss = meter.remaining_seconds.divmod(60)
-      hh, mm = mm.divmod(60)
-      dd, hh = hh.divmod(24)
+    def finished_after(meter)
+      meter.completed? or return
+      "took #{format_seconds(meter.total_elapsed_seconds)}"
+    end
 
-      "%02d:%02d:%02d" % [hh, mm, ss]
-      # "%d days, %d hours, %d minutes and %d seconds" % [dd, hh, mm, ss]
-      #=> 3 days, 3 hours, 15 minutes and 21 seconds
+    def remaining(meter)
+      format_seconds meter.remaining_seconds
     end
 
     def eol(meter)
       meter.completed? ? "\n" : ''
     end
+
+    private
+
+    # "%d days, %d hours, %d minutes and %d seconds" % [dd, hh, mm, ss]
+    #=> 3 days, 3 hours, 15 minutes and 21 seconds
+    def format_seconds(seconds)
+      mm, ss = seconds.divmod(60)
+      hh, mm = mm.divmod(60)
+      dd, hh = hh.divmod(24)
+      "%02d:%02d:%02d" % [hh, mm, ss]
+    end
   end
 end

data/lib/fortschritt/version.rb

@@ -1,3 +1,3 @@
 module Fortschritt
-  VERSION = '0.1.1'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fortschritt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Johannes Opper
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,8 +92,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: non-fancy progress
 test_files: []
+has_rdoc: