trak 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -1,10 +1,24 @@
 # Change log
 
+## v0.0.3 (2012-04-30)
+
+Changed:
+
+* (3483255): Added exit_err helper method
+* (0c0cbf7): Renamed TrackerUtil module to Trak
+* (9528123): Restructured lib dir
+
+Fixed:
+
+* (1050905): Fix bug where all time args are truncated to int
+* (328b276): Fixed debug wrapper method
+
 ## v0.0.2 (2012-04-26)
 
-Changed (8854df7):
+Changed:
 
-* Refactored currentTimeInMintues to Time#to_minutes
+* (8854df7) Refactored currentTimeInMintues to Time#to_minutes
+* (d485e0f) Removed currentTimeFormatted and timeToMinutes
 
 ## v0.0.1 (2012-04-26)
 

data/README.md

@@ -1,6 +1,6 @@
 # Trak: track chunks of time from the command line
 
-Trak, v0.0.2 (Apr 26, 2012)  
+Trak, v0.0.3 (Apr 30, 2012)  
 Written by Adam Sharp
 
 ## Notice

data/lib/trak.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
 # command:
-#   $ Tracker.pl 30 "I did stuff"
-#   $ Tracker.pl 1h "I did twice as much stuff"
+#   $ trak 30 work on trak
+#   $ trak 1h work really hard on trak
 #
 # format:
 #   - First arg is how much time spent
@@ -11,8 +11,9 @@
 require 'trollop'
 require 'debugger'
 
-require "trak/tracker_util"
-require 'trak/time'
+require 'trak/trak'
+require 'trak/exit'
+require 'trak/core_ext/time'
 
 # place where data is stored
 datadir = "#{ENV['HOME']}/Documents/Tracker/"
@@ -28,7 +29,7 @@ end
 
 $g_opts = opts
 def debug(steps = 1)
-  debugger if $g_opts[:debug]
+  debugger(steps) if $g_opts[:debug]
 end
 
 # all valid options have been processed, so figure out which mode
@@ -70,8 +71,7 @@ if MODE == 'report'
     begin
       file = File.open(filename).readlines.map &:chomp
     rescue
-      STDERR.puts "#{__FILE__}: #{$!}"
-      exit 1
+      Exit::exit_err "#{__FILE__}: #{$!}"
     end
     
     # The keys for each hash are the titles of the various tasks logged.
@@ -101,14 +101,14 @@ if MODE == 'report'
         puts "# Today's logged work"
     end
     
-    workTotal = TrackerUtil::printSubReport(work, "Work")
-    personalTotal = TrackerUtil::printSubReport(personal, "Personal")
+    workTotal = Trak::printSubReport(work, "Work")
+    personalTotal = Trak::printSubReport(personal, "Personal")
     
-    newTimeString = TrackerUtil::to12HourTime(TrackerUtil::newTimeWithMinutes(startTime, workTotal + personalTotal))
-    puts "Hours logged until #{newTimeString} (since #{TrackerUtil::to12HourTime(startTime)}). "
+    newTimeString = Trak::to12HourTime(Trak::newTimeWithMinutes(startTime, workTotal + personalTotal))
+    puts "Hours logged until #{newTimeString} (since #{Trak::to12HourTime(startTime)}). "
     
     # if we're reporting for today, print the current time
-    puts "Currently #{TrackerUtil::to12HourTime(Time.now.strftime(TrackerUtil::TIME_FORMAT_24HOUR))}." unless opts[:date]
+    puts "Currently #{Trak::to12HourTime(Time.now.strftime(Trak::TIME_FORMAT_24HOUR))}." unless opts[:date]
   else
     if opts[:date]
       STDERR.puts "No time log for #{fdate}. Track some time first."
@@ -126,8 +126,7 @@ elsif MODE == 'edit'
     end
     exit
   else
-    STDERR.puts "#{__FILE__}: #{filename} does not exist or unable to open."
-    exit 1
+    Exit::exit_err "#{__FILE__}: #{filename} does not exist or unable to open."
   end
 
 elsif MODE == 'insert'
@@ -136,14 +135,13 @@ elsif MODE == 'insert'
     print "Continue? (y/n) "
     input = STDIN.readline.chomp
     unless input =~ /^y(es)?/i
-        STDERR.puts "Timelog update cancelled."
-        exit 1
+        Exit::exit_err "Timelog update cancelled."
     end
   end
   
   # process arguments
   debug
-  minutes = TrackerUtil::processTimeArgument ARGV.shift
+  minutes = Trak::processTimeArgument ARGV.shift
   message = ARGV.join(" ")
   
   # open the output file
@@ -154,17 +152,15 @@ elsif MODE == 'insert'
       if first_time
         debug
         currentTimeInMinutes = Time.now.to_minutes
-        startTime = TrackerUtil::minutesToTime((currentTimeInMinutes - minutes).round_to_nearest 15)
+        startTime = Trak::minutesToTime((currentTimeInMinutes - minutes).round_to_nearest 15)
         file.puts "#{fdate} #{startTime}"
       end
       file.puts "#{minutes}: #{message}"
     end
   rescue
-    STDERR.puts "Couldn't open #{filename}: #{$!}"
-    exit 1
+    Exit::exit_err "Couldn't open #{filename}: #{$!}"
   end
 
 else
-    STDERR.puts "Couldn't determine the correct mode (I was given '#{MODE}'): #{$!}"
-    exit 1
+    Exit::exit_err "Couldn't determine the correct mode (I was given '#{MODE}'): #{$!}"
 end

data/lib/trak/{round_to_nearest.rb → core_ext/round_to_nearest.rb}

@@ -7,3 +7,13 @@ class Integer
     end
   end
 end
+
+class Float
+  def round_to_nearest(integer = 1)
+    if integer == 1
+      self.round
+    else
+      ((self / integer).round * integer).to_i
+    end
+  end
+end

data/lib/trak/exit.rb

@@ -0,0 +1,8 @@
+module Exit
+  EXIT_ERR = 1
+  
+  def self.exit_err(message)
+    STDERR.puts message
+    exit EXIT_ERR
+  end
+end

data/lib/trak/{tracker_util.rb → trak.rb}

@@ -1,7 +1,7 @@
-require "trak/blank"
-require "trak/round_to_nearest"
+require "trak/core_ext/blank"
+require "trak/core_ext/round_to_nearest"
 
-module TrackerUtil
+module Trak
   TIME_FORMAT_12HOUR = "%l:%M %p"
   TIME_FORMAT_24HOUR = "%k:%M"
   
@@ -63,7 +63,7 @@ module TrackerUtil
   # returns a number of minutes
   def self.processTimeArgument(time_string)
     if time_string =~ /^(\d*\.?\d+)((m|min|minute|minutes)|(h|hr|hour|hours))?$/i
-      time = $1.to_i
+      time = $1.to_f
       modifier = $2
       minutes = (modifier =~ /h.*/) ? time * 60 : time
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trak
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -49,10 +49,11 @@ executables:
 extensions: []
 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/core_ext/blank.rb
+- lib/trak/core_ext/round_to_nearest.rb
+- lib/trak/core_ext/time.rb
+- lib/trak/exit.rb
+- lib/trak/trak.rb
 - lib/trak.rb
 - bin/trak
 - CHANGELOG.md