ke 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a454abebf9c74fc4899e037d679ffc93ff2c3c5f
-  data.tar.gz: ddb889ef03b9d3ebfcd45aec0cc492825d0db945
+  metadata.gz: ac5fe567263c2c11146fb81885c01e7d1c7e563b
+  data.tar.gz: 2be98663121456d17d17afadc50589c61d5a54b3
 SHA512:
-  metadata.gz: e9c14271dbff7f588832f90d102a006ad808a6c6a6c9e606f50bc950e2e587aa601fc53e94aa750d8332905a92cef6dd9e7d5de5bf237f9d0813c06fdbb870b4
-  data.tar.gz: c1dfe86497dab79e7957510475b461a46a5a32719056b4d420efdabed6247c9ce08d088a5327d24b9bf0f982fbb6d0788b6f970015a6df97ae4561766fd9c939
+  metadata.gz: 5f77cf8fe60eb71c672203fcae9ec837f97b0bd62bf8b264a278b4f7152d6e3503ad25822763400ba4e56032482bb35a2e6988e00a63a20e295b9dcbd7b0be79
+  data.tar.gz: a5d860927aa29abec767b81a0d542fcd577966028571714eaf11334ef1ef39f207c163f6234d5b62598d5208e7b9ae978b551dd3c7081a470b08b37b884651a2

data/lib/ke/capped_sample.rb

@@ -22,15 +22,28 @@ module Ke
     alias :to_ary :to_a
 
     def mean
+      array_mean @array
+    end
+
+    def mean_iqr
+      array_sorted = @array.sort
+      array_size = @array.size
+      iqr = array_sorted[(array_size * 0.25).floor..(array_size * 0.75).ceil]
+      array_mean iqr
+    end
+
+    def to_s
+      "#<CappedSample: #{@array.inspect}>"
+    end
+
+    private
+
+    def array_mean(array)
       if @array.size > 0
         @array.inject(:+) / @array.size.to_f
       else
         0
       end
     end
-
-    def to_s
-      "#<CappedSample: #{@array.inspect}>"
-    end
   end
 end

data/lib/ke/indeterminate_task.rb

@@ -7,6 +7,7 @@ module Ke
       @duration_per_tick = 0
       @duration_per_tick_history = CappedSample.new(100)
       @mutex = Mutex.new
+      @last_tick_time = nil
     end
 
     def start_time
@@ -26,7 +27,7 @@ module Ke
     end
 
     def duration_per_tick
-      @duration_per_tick_history.mean
+      @duration_per_tick_history.mean_iqr
     end
 
     def tick

data/lib/ke/reporters/multi_line_reporter.rb

@@ -11,19 +11,35 @@ module Ke
     end
 
     def print_tick
-      ticks_per_second = (1 / @task.duration_per_tick).round(2)
+      @io.puts "#{prefix}#{infix}#{suffix}"
+    end
+
+    def print_complete
+      @io.puts "Completed #{@label}, #{@task.total_duration} total duration"
+    end
+
+    private
+
+    def prefix
       elapsed_time = (@task.elapsed_duration / 60.0).round(2)
+      "Running #{@label}, #{elapsed_time} minutes elapsed"
+    end
 
+    def infix
       if @task.respond_to?(:estimated_duration_until_complete)
         estimated_duration_until_complete = (@task.estimated_duration_until_complete / 60.0).round(2)
-        @io.puts "Running #{@label}, #{elapsed_time} minutes elapsed, #{estimated_duration_until_complete} minutes remaining"
+        ", #{estimated_duration_until_complete} minutes remaining"
       else
-        @io.puts "Running #{@label}, #{elapsed_time} minutes elapsed, #{ticks_per_second} ticks/second"
+        ticks_per_second = (1.0 / @task.duration_per_tick).round(2)
+        ", #{ticks_per_second} ticks/second"
       end
     end
 
-    def print_complete
-      @io.puts "Completed #{@label}, #{@task.total_duration} total duration"
+    def suffix
+      if @task.respond_to?(:total_ticks)
+        pct = (@task.tick_count.to_f * 100 / @task.total_ticks).round(2)
+        ", #{@task.tick_count}/#{@task.total_ticks} ticks ~ #{pct}% complete"
+      end
     end
   end
 end

data/lib/ke/reporters/single_line_reporter.rb

@@ -7,7 +7,7 @@ module Ke
     end
 
     def print_start
-      @io.print "Starting #{@label}"
+      @io.print "Starting #{@label} ..."
     end
 
     def print_tick
@@ -16,14 +16,20 @@ module Ke
 
       if @task.respond_to?(:estimated_duration_until_complete)
         estimated_duration_until_complete = (@task.estimated_duration_until_complete / 60.0).round(2)
-        @io.print "{#{elapsed_time}/#{estimated_duration_until_complete} mins}"
+
+        if @task.respond_to?(:total_ticks)
+          pct = (@task.tick_count.to_f * 100 / @task.total_ticks).round(2)
+          @io.print " #{elapsed_time}/#{estimated_duration_until_complete} mins, #{@task.tick_count}/#{@task.total_ticks} ticks ~ #{pct}% ..."
+        else
+          @io.print " #{elapsed_time}/#{estimated_duration_until_complete} mins ..."
+        end
       else
-        @io.print "{#{elapsed_time} mins, #{ticks_per_second} ticks/sec}"
+        @io.print " #{elapsed_time} mins, #{ticks_per_second} ticks/sec ..."
       end
     end
 
     def print_complete
-      @io.puts "complete."
+      @io.puts " complete (#{@task.total_duration} total duration)."
     end
   end
 end

data/lib/ke/version.rb

@@ -1,3 +1,3 @@
 module Ke
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/ke_test.rb

@@ -1,26 +1,28 @@
 require 'test_helper'
 
-task = Ke::IndeterminateTask.new
-reporter = Ke::MultiLineReporter.new(task, "indeterminate task")
-task.start
-reporter.print_start
-loop do
-  break if rand(200) == 50
-  sleep 0.1
-  task.tick
-  reporter.print_tick if task.tick_count % 10 == 0
-end
-task.complete
-reporter.print_complete
+[Ke::MultiLineReporter, Ke::SingleLineReporter].each do |reporter_klass|
+  task = Ke::IndeterminateTask.new
+  reporter = reporter_klass.new(task, "indeterminate task")
+  task.start
+  reporter.print_start
+  loop do
+    break if rand(200) == 50
+    sleep 0.05 + (rand / 100.0)
+    task.tick
+    reporter.print_tick if task.tick_count % 10 == 0
+  end
+  task.complete
+  reporter.print_complete
 
-task = Ke::DeterminateTask.new(total_ticks: 50)
-reporter = Ke::SingleLineReporter.new(task, "determinate task")
-task.start
-reporter.print_start
-50.times do
-  sleep 0.1
-  task.tick
-  reporter.print_tick if task.tick_count % 10 == 0
+  task = Ke::DeterminateTask.new(total_ticks: 50)
+  reporter = reporter_klass.new(task, "determinate task")
+  task.start
+  reporter.print_start
+  50.times do
+    sleep 0.05 + (rand / 100.0)
+    task.tick
+    reporter.print_tick if task.tick_count % 10 == 0
+  end
+  task.complete
+  reporter.print_complete
 end
-task.complete
-reporter.print_complete

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: ke
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mark Dodwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-12 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Measure progress of Ruby code.
@@ -45,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -73,21 +73,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Measure progress of Ruby code.
 test_files:
 - test/ke_test.rb
 - test/test_helper.rb
-has_rdoc: