zenhob-hcl 0.2.1 → 0.2.2

data/VERSION

@@ -0,0 +1 @@
+0.2.2

data/bin/hcl

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'hcl'
+require 'hcl/app'
 
-HCl.command *ARGV
+HCl::App.command *ARGV
 

data/deps.rip

@@ -0,0 +1,3 @@
+git://github.com/lutzky/trollop.git a8d63c816 # 1.10.2
+git://github.com/mojombo/chronic.git 180e44763 # 0.3.0
+git://github.com/JEG2/highline.git rel_1_5_1

data/hcl.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hcl}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zack Hobson"]
-  s.date = %q{2009-07-30}
+  s.date = %q{2009-08-09}
   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}
@@ -21,11 +21,12 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.markdown",
      "Rakefile",
-     "VERSION.yml",
+     "VERSION",
      "bin/hcl",
+     "deps.rip",
      "hcl.gemspec",
      "hcl_conf.yml.example",
-     "lib/hcl.rb",
+     "lib/hcl/app.rb",
      "lib/hcl/day_entry.rb",
      "lib/hcl/project.rb",
      "lib/hcl/task.rb",

data/lib/{hcl.rb → hcl/app.rb}

@@ -1,12 +1,15 @@
+## stdlib dependencies
 require 'yaml'
 require 'rexml/document'
 require 'net/http'
 require 'net/https'
 
+## gem dependencies
 require 'chronic'
 require 'trollop'
 require 'highline/import'
 
+## app dependencies
 require 'hcl/utility'
 require 'hcl/timesheet_resource'
 require 'hcl/project'
@@ -25,10 +28,10 @@ class Net::HTTP
   end
 end
 
-class HCl
-  include Utility
+module HCl
+  class App
+  include HCl::Utility
 
-  VERSION_FILE = File.dirname(__FILE__) + '/../VERSION.yml'
   SETTINGS_FILE = "#{ENV['HOME']}/.hcl_settings"
   CONFIG_FILE = "#{ENV['HOME']}/.hcl_config"
 
@@ -39,38 +42,36 @@ class HCl
   end
 
   def run
-    if @command
-      if respond_to? @command
-        result = send @command, *@args
-        if not result.nil?
-          if result.respond_to? :to_a
-            puts result.to_a.join(', ')
-          elsif result.respond_to? :to_s
-            puts result
+    begin
+      if @command
+        if respond_to? @command
+          result = send @command, *@args
+          if not result.nil?
+            if result.respond_to? :to_a
+              puts result.to_a.join(', ')
+            elsif result.respond_to? :to_s
+              puts result
+            end
           end
+        else
+          raise UnknownCommand, "unrecognized command `#{@command}'"
         end
       else
-        raise UnknownCommand, "unrecognized command `#{@command}'"
+        show
       end
-    else
-      show
+    rescue TimesheetResource::Failure => e
+      puts "Internal failure. #{e}"
+      exit 1
     end
   end
 
   def initialize
-    @version = YAML::load(File.read(VERSION_FILE))
     read_config
     read_settings
   end
 
-  def version
-    [:major, :minor, :patch].map { |v| @version[v] }.join('.')
-  end
-
   def process_args *args
-    version_string = version
     Trollop::options(args) do
-      version "HCl #{version_string}"
       stop_on %w[ show tasks set unset note add rm start stop ]
       banner <<-EOM
 HCl is a command-line client for manipulating Harvest time sheets.
@@ -228,5 +229,6 @@ EOM
     puts "\t#{as_hours total_hours}\ttotal"
   end
 
+  end
 end
 

data/lib/hcl/day_entry.rb

@@ -1,7 +1,8 @@
 
-class HCl 
+module 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
@@ -15,6 +16,7 @@ class HCl
 
     def self.from_xml xml
       doc = REXML::Document.new xml
+      raise Failure, "No root node in XML document: #{xml}" if doc.root.nil?
       Task.cache_tasks doc
       doc.root.elements.collect('//day_entry') do |day|
         new xml_to_hash(day)
@@ -25,9 +27,14 @@ class HCl
     def append_note new_notes
       # If I don't include hours it gets reset.
       # This doens't appear to be the case for task and project.
+      if notes.nil?
+        notes = new_notes
+      else
+        notes << " #{new_notes}"
+      end
       DayEntry.post("daily/update/#{id}", <<-EOD)
       <request>
-        <notes>#{notes << " #{new_notes}"}</notes>
+        <notes>#{notes}</notes>
         <hours>#{hours}</hours>
       </request>
       EOD

data/lib/hcl/task.rb

@@ -1,4 +1,4 @@
-class HCl
+module HCl
   class Task < TimesheetResource
     def self.cache_tasks doc
       tasks = []

data/lib/hcl/timesheet_resource.rb

@@ -1,5 +1,7 @@
-class HCl
+module HCl
   class TimesheetResource
+    class Failure < Exception; end
+
     def self.configure opts = nil
       if opts
         self.login = opts['login']

data/lib/hcl/utility.rb

@@ -1,4 +1,4 @@
-class HCl
+module HCl
   module Utility
     # Convert from decimal to a string of the form HH:MM.
     def as_hours hours

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zenhob-hcl
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Zack Hobson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-30 00:00:00 -07:00
+date: 2009-08-09 00:00:00 -07:00
 default_executable: hcl
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,11 +67,12 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
-- VERSION.yml
+- VERSION
 - bin/hcl
+- deps.rip
 - hcl.gemspec
 - hcl_conf.yml.example
-- lib/hcl.rb
+- lib/hcl/app.rb
 - lib/hcl/day_entry.rb
 - lib/hcl/project.rb
 - lib/hcl/task.rb

data/VERSION.yml

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