trak 0.0.0 → 0.0.2

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change log
 
+## v0.0.2 (2012-04-26)
+
+Changed (8854df7):
+
+* Refactored currentTimeInMintues to Time#to_minutes
+
+## v0.0.1 (2012-04-26)
+
+Fixed (94929f0):
+
+* Exception when tracking first time for day. Removed an erroneous call
+  to sprintf instead of strftime. Also ensured use of integers when
+  calculating current time in minutes.
+
 ## v0.0.0 (2012-04-25)
 
 Tracker is now known as trak, and it's a RubyGem!

data/README.md

@@ -1,6 +1,6 @@
 # Trak: track chunks of time from the command line
 
-Trak, v0.0.0 (Apr 25, 2012)  
+Trak, v0.0.2 (Apr 26, 2012)  
 Written by Adam Sharp
 
 ## Notice
@@ -35,10 +35,9 @@ An example work log that trak will create:
 
 ## Installation
 
-Check out this repository and then create a symlink to bin/trak
-somewhere in your path:
+Trak is available from [RubyGems](https://rubygems.org/gems/trak):
 
-        $ ln -s <repo>/bin/trak /usr/bin/trak
+    $ gem install trak
 
 ## Usage
 

data/lib/trak.rb

@@ -12,6 +12,7 @@ require 'trollop'
 require 'debugger'
 
 require "trak/tracker_util"
+require 'trak/time'
 
 # place where data is stored
 datadir = "#{ENV['HOME']}/Documents/Tracker/"
@@ -107,7 +108,7 @@ if MODE == 'report'
     puts "Hours logged until #{newTimeString} (since #{TrackerUtil::to12HourTime(startTime)}). "
     
     # if we're reporting for today, print the current time
-    puts "Currently #{TrackerUtil::to12HourTime(TrackerUtil::currentTimeFormatted())}." unless opts[:date]
+    puts "Currently #{TrackerUtil::to12HourTime(Time.now.strftime(TrackerUtil::TIME_FORMAT_24HOUR))}." unless opts[:date]
   else
     if opts[:date]
       STDERR.puts "No time log for #{fdate}. Track some time first."
@@ -151,7 +152,8 @@ elsif MODE == 'insert'
   begin
     File.open filename, 'a', :autoclose => true do |file|
       if first_time
-        currentTimeInMinutes = TrackerUtil::timeToMinutes(TrackerUtil::currentTimeFormatted)
+        debug
+        currentTimeInMinutes = Time.now.to_minutes
         startTime = TrackerUtil::minutesToTime((currentTimeInMinutes - minutes).round_to_nearest 15)
         file.puts "#{fdate} #{startTime}"
       end

data/lib/trak/time.rb

@@ -0,0 +1,6 @@
+class Time
+  def to_minutes
+    minute, hour = self.to_a[1..2]
+    hour*60 + minute
+  end
+end

data/lib/trak/tracker_util.rb

@@ -58,10 +58,6 @@ module TrackerUtil
     end
   end
   
-  def self.currentTimeFormatted
-    Time.now.strftime(TIME_FORMAT_24HOUR)
-  end
-
   # expects a single argument - the time argument in the format ##m or ##h
   # if argument has no m/h qualifier, assume m
   # returns a number of minutes
@@ -84,20 +80,13 @@ module TrackerUtil
     end
   end
 
-  # expects a time string formatted HH24:MM
-  def self.timeToMinutes(time)
-    hours, minutes = time.split(':')
-    hours*60 + minutes
-  end
-
   # expects an integer
   def self.minutesToTime(minutes)
-    time_with_hours_minutes(minutes / 60, minutes % 60).sprintf TIME_FORMAT_24HOUR
+    time_with_hours_minutes(minutes / 60, minutes % 60).strftime(TIME_FORMAT_24HOUR).strip
   end
 
   # expects an integer which is the amount of minutes logged
   def self.startTimeInMinutes(minutes)
-    currentTimeInMinutes = timeToMinutes(currentTimeFormatted).round_to_nearest 15
-    currentTimeInMinutes - minutes
+    Time.now.to_minutes.round_to_nearest(15) - minutes
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trak
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -51,6 +51,7 @@ extra_rdoc_files: []
 files:
 - lib/trak/blank.rb
 - lib/trak/round_to_nearest.rb
+- lib/trak/time.rb
 - lib/trak/tracker_util.rb
 - lib/trak.rb
 - bin/trak