zenhob-hcl 0.1.3 → 0.2.0

data/README.markdown

@@ -27,7 +27,7 @@ HCl is a command-line tool for interacting with Harvest time sheets using the
     hcl tasks
     hcl set <key> <value ...>
     hcl unset <key>
-    hcl start (<task_alias> | <project_id> <task_id>) [msg ...]
+    hcl start (<task_alias> | <project_id> <task_id>) [+time] [msg ...]
     hcl note <msg ...>
     hcl stop
 
@@ -54,6 +54,15 @@ identify a task, HCl supports task aliases:
     $ hcl set task.xdev 1234 5678
     $ hcl start xdev adding a new feature
 
+### Starting a Timer with Initial Time
+
+You can also provide an initial time when starting a new timer.
+This can be expressed in floating-point or HH:MM. The following two
+commands are identical:
+
+    $ hcl start xdev +0:15 adding a new feature
+    $ hcl start +.25 xdev adding a new feature
+
 ### Adding Notes to a Running Task
 
 While a task is running you can append strings to the note for that task:

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 3
+:patch: 0
 :major: 0
-:minor: 1
+:minor: 2

data/hcl.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hcl}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zack Hobson"]
-  s.date = %q{2009-07-28}
+  s.date = %q{2009-07-30}
   s.default_executable = %q{hcl}
   s.description = %q{HCl is a command-line client for manipulating Harvest time sheets.}
   s.email = %q{zack@opensourcery.com}
@@ -29,7 +29,8 @@ Gem::Specification.new do |s|
      "lib/hcl/day_entry.rb",
      "lib/hcl/project.rb",
      "lib/hcl/task.rb",
-     "lib/hcl/timesheet_resource.rb"
+     "lib/hcl/timesheet_resource.rb",
+     "lib/hcl/utility.rb"
   ]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/zenhob/hcl}

data/lib/hcl/day_entry.rb

@@ -1,6 +1,7 @@
 
 class HCl 
   class DayEntry < TimesheetResource
+    include Utility
     # Get the time sheet entries for a given day. If no date is provided
     # defaults to today.
     def self.all date = nil
@@ -9,13 +10,13 @@ class HCl
     end
 
     def to_s
-      "#{client} #{project} #{task} (#{hours})"
+      "#{client} #{project} #{task} (#{formatted_hours})"
     end
 
     def self.from_xml xml
       doc = REXML::Document.new xml
       Task.cache_tasks doc
-      doc.root.elements.collect('*/day_entry') do |day|
+      doc.root.elements.collect('//day_entry') do |day|
         new xml_to_hash(day)
       end
     end
@@ -49,5 +50,11 @@ class HCl
       DayEntry.get("daily/timer/#{id}")
       self
     end
+
+    # Returns the hours formatted as "HH:MM"
+    def formatted_hours
+      as_hours hours
+    end
+
   end
 end

data/lib/hcl/task.rb

@@ -8,8 +8,10 @@ class HCl
           new xml_to_hash(task).merge(:project => project)
         end)
       end
-      File.open(File.join(ENV['HOME'],'.hcl_tasks'), 'w') do |f|
-        f.write tasks.uniq.to_yaml
+      unless tasks.empty?
+        File.open(File.join(ENV['HOME'],'.hcl_tasks'), 'w') do |f|
+          f.write tasks.uniq.to_yaml
+        end
       end
     end
 
@@ -18,19 +20,22 @@ class HCl
     end
 
     def self.find project_id, id
-      all.detect {|t| t.project.id == project_id && t.id == id }
+      all.detect do |t|
+        t.project.id.to_i == project_id.to_i && t.id.to_i == id.to_i
+      end
     end
 
     def to_s
       "#{project.name} #{name}"
     end
 
-    def start *args
-      notes = args.join ' '
+    def add opts
+      notes = opts[:note]
+      starting_time = opts[:starting_time] || 0
       days = DayEntry.from_xml Task.post("daily/add", <<-EOT)
       <request>
         <notes>#{notes}</notes>
-        <hours></hours>
+        <hours>#{starting_time}</hours>
         <project_id type="integer">#{project.id}</project_id>
         <task_id type="integer">#{id}</task_id>
         <spent_at type="date">#{Date.today}</spent_at>
@@ -39,6 +44,11 @@ class HCl
       days.first
     end
 
+    def start opts
+      day = add opts
+      DayEntry.from_xml(Task.get("daily/timer/#{day.id}")).first
+    end
+
   end
 end
 

data/lib/hcl/utility.rb

@@ -0,0 +1,18 @@
+class HCl
+  module Utility
+    # Convert from decimal to a string of the form HH:MM.
+    def as_hours hours
+      minutes = hours.to_f * 60.0
+      sprintf "%d:%02d", (minutes / 60).to_i, (minutes % 60).to_i
+    end
+
+    def time2float time_string
+      if time_string =~ /:/
+        hours, minutes = time_string.split(':')
+        hours.to_f + (minutes.to_f / 60.0)
+      elsif time_string =~ /./
+        time_string.to_f
+      end
+    end
+  end
+end

data/lib/hcl.rb

@@ -7,6 +7,7 @@ require 'chronic'
 require 'trollop'
 require 'highline/import'
 
+require 'hcl/utility'
 require 'hcl/timesheet_resource'
 require 'hcl/project'
 require 'hcl/task'
@@ -25,6 +26,8 @@ class Net::HTTP
 end
 
 class HCl
+  include Utility
+
   VERSION_FILE = File.dirname(__FILE__) + '/../VERSION.yml'
   SETTINGS_FILE = "#{ENV['HOME']}/.hcl_settings"
   CONFIG_FILE = "#{ENV['HOME']}/.hcl_config"
@@ -172,6 +175,11 @@ EOM
   end
 
   def start *args
+    starting_time = args.detect {|x| x =~ /^\+\d*(\.|:)\d+$/ }
+    if starting_time
+      args.delete(starting_time)
+      starting_time = time2float starting_time
+    end
     ident = args.shift
     task_ids = if @settings.key? "task.#{ident}"
         @settings["task.#{ident}"].split(/\s+/)
@@ -183,8 +191,8 @@ EOM
       puts "Unknown project/task alias, try one of the following: #{aliases.join(', ')}."
       exit 1
     end
-    task.start(*args)
-    puts "Started timer for #{task}."
+    timer = task.start(:starting_time => starting_time, :note => args.join(' '))
+    puts "Started timer for #{timer}."
   end
 
   def stop
@@ -212,20 +220,13 @@ EOM
     date = args.empty? ? nil : Chronic.parse(args.join(' '))
     total_hours = 0.0
     DayEntry.all(date).each do |day|
-      # TODO more information and formatting options
       running = day.running? ? '(running) ' : ''
-      puts "\t#{as_hours day.hours}\t#{running}#{day.project} #{day.notes}"[0..78]
+      puts "\t#{day.formatted_hours}\t#{running}#{day.project} #{day.notes}"[0..78]
       total_hours = total_hours + day.hours.to_f
     end
     puts "\t" + '-' * 13
     puts "\t#{as_hours total_hours}\ttotal"
   end
 
-  # Convert from decimal to a string of the form HH:MM.
-  def as_hours hours
-    minutes = hours.to_f * 60.0
-    sprintf "%d:%02d", (minutes / 60).to_i, (minutes % 60).to_i
-  end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zenhob-hcl
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Zack Hobson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-28 00:00:00 -07:00
+date: 2009-07-30 00:00:00 -07:00
 default_executable: hcl
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ files:
 - lib/hcl/project.rb
 - lib/hcl/task.rb
 - lib/hcl/timesheet_resource.rb
+- lib/hcl/utility.rb
 has_rdoc: true
 homepage: http://github.com/zenhob/hcl
 licenses: