console_progress 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c71df20be61e4883f8b00664151b2aff535caa89
-  data.tar.gz: d6e06f27d1fccf73dc9f3977845fae49bf822801
+  metadata.gz: ba4756c4e6f20a41abdcfe9641c96a2ce916639f
+  data.tar.gz: a033674cbc6e758300100db634fe847b1e9adbf8
 SHA512:
-  metadata.gz: 778670e005b3152761f97459942c9e9ad8c55ace597d52794a98433eb2ac115f6fbe36089cb3196cd1cab499477e69919146f087411fabdd7938a890b752e322
-  data.tar.gz: b4a3b1342d78688afa0a9d9f3a0596bd0a375a42e201b4c79f5c329d94d96bb1fe0d1d555ea377aa8febf9ee7e32c460ec231c5c7e71ecf3eb852aaea7ace6be
+  metadata.gz: b6a71f155ef80bd599f1a84c08354369c1b09e3bbf674d2926781553251215b9186489cabd957f72c77efea755ca180519c5e506ac2735bf934335f5c49c2221
+  data.tar.gz: c486ecab73928c2ba7f963227f6a29a3f839ac8fcf842aa0214d4e002361fd72f675381bd4984d65c70a90228e6c255dc3d3fa620c82c2debe0d63125e3f60a0

data/README.md

@@ -21,9 +21,9 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-prog = ConsoleProgress::ETA.new(5)
+prog = ConsoleProgress::ETA.new(100)
 prog.start
-5.times do
+100.times do
   puts prog.progress
   sleep 2
 end
@@ -31,11 +31,11 @@ end
 
 Would output something like:
 ```
-ETA: 1/5 Time Left 0.00h or 0.00m Took: 0.00s Avg: 0.00s
-ETA: 2/5 Time Left 0.00h or 0.07m Took: 2.00s Avg: 1.00s
-ETA: 3/5 Time Left 0.00h or 0.07m Took: 2.00s Avg: 1.34s
-ETA: 4/5 Time Left 0.00h or 0.05m Took: 2.00s Avg: 1.50s
-ETA: 5/5 Time Left 0.00h or 0.03m Took: 2.00s Avg: 1.60s
+ETA: 1/100 Remainng: 0 Took: 0.00s Avg: 0.00s Elapsed: 0
+ETA: 2/100 Remainng: 1:39 Took: 2.00s Avg: 1.00s Elapsed: 2
+ETA: 3/100 Remainng: 2:10 Took: 2.00s Avg: 1.33s Elapsed: 4
+ETA: 4/100 Remainng: 2:25 Took: 2.00s Avg: 1.50s Elapsed: 6
+...
 ```
 
 Initialize with `number of steps`. Start it. Call `.progress` to move up a step.

data/lib/console_progress.rb

@@ -4,8 +4,8 @@ module ConsoleProgress
   class ETA
     ATTR = [:steps, :step, :step_time, :times,
             :avg_time, :format, :start_time,
-            :hours, :minutes, :seconds,
-            :message_prefix]
+            :seconds, :message_prefix,
+            :elapsed_time, :time_left]
 
     attr_accessor *ATTR
 
@@ -14,8 +14,9 @@ module ConsoleProgress
       @format = format
       @message_prefix = 'ETA'
       @format ||= "{{message_prefix}}: {{step}}/{{steps}} "\
-                  "Time Left {{hours}}h or {{minutes}}m "\
-                  "Took: {{step_time}}s Avg: {{avg_time}}s"
+                  "Remainng: {{time_left}} "\
+                  "Took: {{step_time}}s Avg: {{avg_time}}s "\
+                  "Elapsed: {{elapsed_time}}"
       @step = 0
       @times = []
     end
@@ -29,13 +30,17 @@ module ConsoleProgress
       @message_prefix = msg if msg
       t = Time.now
       @step_time = t - @step_time_start
+
+      @elapsed_time = seconds_to_time(Time.now - @start_time)
+
       @times << @step_time
       @avg_time = @times.reduce(0, :+) / @times.size
       steps_left = @steps - @step
       @step = current_step + 1
+
       @seconds = steps_left * @avg_time
-      @minutes = '%.2f' % (@seconds / 60)
-      @hours = '%.2f' % (@seconds / 60 / 60)
+      @time_left = seconds_to_time(@seconds)
+
       @step_time = '%.2f' % @step_time
       @avg_time = '%.2f' % @avg_time
       @step_time_start = t
@@ -49,5 +54,23 @@ module ConsoleProgress
       end
       out
     end
+
+    def seconds_to_time(t)
+      mm, ss = t.divmod(60)
+      hh, mm = mm.divmod(60)
+      dd, hh = hh.divmod(24)
+      [dd, hh, mm, ss].delete_if {|r| r == 0}
+        .map(&:to_i)
+        .join(':')
+    end
+
+    def self.example
+      eta = ConsoleProgress::ETA.new(100)
+      eta.start
+      100.times do
+        puts eta.progress
+        sleep 2
+      end
+    end
   end
 end

data/lib/console_progress/version.rb

@@ -1,3 +1,3 @@
 module ConsoleProgress
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console_progress
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ben Wiseley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler