rubyist-jacker 1.1 → 1.2

data/bin/jacker

@@ -1,11 +1,6 @@
 #!/usr/bin/env ruby
 # -*- ruby -*-
-begin
-  require 'jacker'
-rescue LoadError
-  require 'rubygems'
-  require 'jacker'
-end
+require File.dirname(__FILE__) + "/../lib/jacker"
 
 case command = ARGV.shift
 when 'start'
@@ -13,12 +8,12 @@ when 'start'
 when 'stop'
   Jacker.stop
 when 'current'
-  puts Jacker.current || ''
+  puts Jacker.current(:elapsed => true) || ''
 when 'status'
   puts Jacker.status
 when 'report'
   Jacker.report do |entry, start, stop|
-    puts "#{start.strftime('%D %H:%M')} #{stop.strftime('%H:%M')} #{entry}"
+    puts "#{start.strftime('%D %H:%M')} - #{stop.strftime('%H:%M')} (#{Jacker.elapsed(start, stop)}) #{entry}"
   end
 when 'reset'
   print "This will kill all entries - are you sure? [yes/N] "

data/lib/jacker.rb

@@ -33,11 +33,23 @@ module Jacker
     results.size > 0 && results[0][0].to_i > 0
   end
 
-  def self.current
+  def self.current(options={})
     results = self.with_db do |db|
-      db.execute("SELECT what FROM entries WHERE stop IS NULL")
+      db.execute("SELECT what, start FROM entries WHERE stop IS NULL")
     end
-    results.size > 0 ? results[0][0] : nil
+
+    return nil if results.empty?
+
+    what, start = results[0][0], Time.parse(results[0][1])
+    options[:elapsed] ? "#{what} (#{elapsed(start, Time.now)})" : what
+  end
+
+  # rounds up to nearest 15 minute increment
+  def self.elapsed(start, stop)
+    seconds = ((stop - start) / 60).to_i
+    hours = seconds / 60
+    minutes = (seconds % 60 + 14) / 15 * 15
+    sprintf("%d:%02d", hours, minutes)
   end
 
   def self.report
@@ -52,7 +64,7 @@ module Jacker
 
   def self.status
     if running?
-      "jacking: #{current}"
+      "jacking: #{current(:elapsed => true)}"
     else
       "not jacking"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyist-jacker
 version: !ruby/object:Gem::Version 
-  version: "1.1"
+  version: "1.2"
 platform: ruby
 authors: 
 - Scott Barron