hcl 0.3.0 → 0.3.1

data/CHANGELOG

@@ -1,5 +1,17 @@
 = Recent Changes in HCl
 
+== v0.3.1
+
+* use STDERR instead of STDOUT for error reporting
+* sort tasks before viewing tasks (brian@madebyrocket.com)
+* resume command to resume the most recently active timer (brian@madebyrocket.com)
+* show current time when on 'start', 'stop', and 'show' commands (scharfie@gmail.com)
+* include client name in tasks list (scharfie@gmail.com)
+
+== v0.3.0 Fri Apr 2 10:42:20 2010 -0700
+
+* added support for free accounts
+
 == v0.2.3 Sun Aug 23 21:39:34 2009 -0700
 
 * Allow decimal time offset without a dot, closes #29.

data/HACKING.markdown

@@ -0,0 +1,21 @@
+# Hacking HCl
+
+## Rubygems
+
+They're useful so we use them to install our gems. However there's no need to
+explicitly include rubygems in the app. That's up the system to decide. Don't
+require rubygems in the code.
+
+We require rubygems in the test as a developer convenience.
+
+## Running HCl in place
+
+This is common and supported:
+
+  ruby -rubygems -Ilib bin/hcl
+
+Don't add dir(__FILE__)/lib to the load path in the binary. Bad manners.
+
+## That's it
+
+That's it. I mostly wrote this to explain why I rolled back certain changes.

data/README.markdown

@@ -7,18 +7,22 @@ HCl is a command-line tool for interacting with Harvest time sheets using the
 
 ## Quick Start
 
-You can install hcl from Gemcutter:
+You can install hcl directly from rubygems.org:
 
     $ gem install hcl
     $ hcl show [date]
 
+or you can install from source using jeweler:
+
+    $ gem install jeweler
+    $ rake install
+
 ### Prerequisites
 
  * Ruby (tested with 1.8.7)
  * Ruby OpenSSL support (in debian/ubuntu: apt-get install libopenssl-ruby)
  * Ruby extension building support (in debian/ubuntu: apt-get install ruby-dev)
  * RubyGems 1.3.3
- * Gemcutter (gem install gemcutter; gem tumble)
  * Trollop option-parsing library (gem install trollop)
  * Chronic date-parsing library (gem install chronic)
  * HighLine console input library (gem install highline)
@@ -32,7 +36,9 @@ You can install hcl from Gemcutter:
     hcl unset <key>
     hcl start (<task_alias> | <project_id> <task_id>) [+time] [msg ...]
     hcl note <msg ...>
-    hcl stop
+    hcl aliases
+    hcl stop [msg]
+    hcl resume
 
 ### Starting a Timer
 
@@ -95,10 +101,16 @@ commands show the timesheet for the specified day:
 
 ## Author
 
-[Zack Hobson][zgh], [OpenSourcery LLC][os]
+HCl was designed and implemented by [Zack Hobson][zgh].
+
+* Non-SSL support by [Michael Bleigh][mbleigh].
+* Resume command by [Brian Cooke][bricooke].
+* UI improvements by [Chris Scharf][scharfie].
 
 See LICENSE for copyright details.
 
-[zgh]: mailto:zack@opensourcery.com
-[os]: http://www.opensourcery.com/
+[zgh]: http://github.com/zenhob
+[mbleigh]: http://github.com/mbleigh
+[bricooke]: http://github.com/bricooke
+[scharfie]: http://github.com/scharfie
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/bin/hcl

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

data/hcl.gemspec

@@ -1,63 +1,55 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{hcl}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zack Hobson"]
-  s.date = %q{2010-04-02}
+  s.date = %q{2011-07-13}
   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}
   s.executables = ["hcl"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.markdown"
+    "README.markdown"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "CHANGELOG",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "bin/hcl",
-     "deps.rip",
-     "hcl.gemspec",
-     "lib/hcl/app.rb",
-     "lib/hcl/commands.rb",
-     "lib/hcl/day_entry.rb",
-     "lib/hcl/project.rb",
-     "lib/hcl/task.rb",
-     "lib/hcl/timesheet_resource.rb",
-     "lib/hcl/utility.rb",
-     "test/app_test.rb",
-     "test/day_entry_test.rb",
-     "test/test_helper.rb",
-     "test/utility_test.rb"
+    "CHANGELOG",
+    "HACKING.markdown",
+    "LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "bin/hcl",
+    "deps.rip",
+    "hcl.gemspec",
+    "lib/hcl/app.rb",
+    "lib/hcl/commands.rb",
+    "lib/hcl/day_entry.rb",
+    "lib/hcl/project.rb",
+    "lib/hcl/task.rb",
+    "lib/hcl/timesheet_resource.rb",
+    "lib/hcl/utility.rb",
+    "test/app_test.rb",
+    "test/day_entry_test.rb",
+    "test/test_helper.rb",
+    "test/utility_test.rb"
   ]
   s.homepage = %q{http://github.com/zenhob/hcl}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.4.1}
   s.summary = %q{Harvest timesheets from the command-line}
-  s.test_files = [
-    "test/app_test.rb",
-     "test/day_entry_test.rb",
-     "test/test_helper.rb",
-     "test/utility_test.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<termios>, [">= 0"])
       s.add_runtime_dependency(%q<trollop>, [">= 1.10.2"])
       s.add_runtime_dependency(%q<chronic>, [">= 0.2.3"])

data/lib/hcl/app.rb

@@ -30,7 +30,7 @@ class Net::HTTP
 end
 
 module HCl
-  VERSION = "0.2.3"
+  VERSION = "0.3.1"
 
   class App
     include HCl::Utility
@@ -39,8 +39,6 @@ module HCl
     SETTINGS_FILE = "#{ENV['HOME']}/.hcl_settings"
     CONFIG_FILE = "#{ENV['HOME']}/.hcl_config"
   
-    class UnknownCommand < StandardError; end
-  
     def initialize
       read_config
       read_settings
@@ -73,13 +71,17 @@ module HCl
               end
             end
           else
-            raise UnknownCommand, "unrecognized command `#{@command}'"
+            STDERR.puts "unrecognized command `#{@command}'"
+            exit 1
           end
         else
           show
         end
+      rescue RuntimeError => e
+        STDERR.puts "Error: #{e}"
+        exit 1
       rescue TimesheetResource::Failure => e
-        puts "Internal failure. #{e}"
+        STDERR.puts "Internal failure. #{e}"
         exit 1
       end
     end
@@ -99,6 +101,7 @@ Commands:
     hcl unset <key>
     hcl start <task> [msg]
     hcl stop [msg]
+    hcl resume
     hcl note <msg>
 
 Examples:

data/lib/hcl/commands.rb

@@ -51,14 +51,14 @@ module HCl
         exit 1
       end
       timer = task.start(:starting_time => starting_time, :note => args.join(' '))
-      puts "Started timer for #{timer}."
+      puts "Started timer for #{timer} (at #{current_time})"
     end
-  
+    
     def stop
       entry = DayEntry.with_timer
       if entry
         entry.toggle
-        puts "Stopped #{entry}."
+        puts "Stopped #{entry} (at #{current_time})"
       else
         puts "No running timers found."
       end
@@ -84,7 +84,22 @@ module HCl
         total_hours = total_hours + day.hours.to_f
       end
       puts "\t" + '-' * 13
-      puts "\t#{as_hours total_hours}\ttotal"
+      puts "\t#{as_hours total_hours}\ttotal (as of #{current_time})"
+    end
+    
+    def resume
+      entry = DayEntry.last
+      if entry
+        puts "Resumed #{entry} (at #{current_time})"
+        entry.toggle
+      else
+        puts "No timers found"
+      end
+    end
+    
+  private
+    def current_time
+      Time.now.strftime('%I:%M %p').downcase
     end
   end
 end

data/lib/hcl/day_entry.rb

@@ -11,7 +11,7 @@ module HCl
     end
 
     def to_s
-      "#{client} #{project} #{task} (#{formatted_hours})"
+      "#{client} - #{project} - #{task} (#{formatted_hours})"
     end
 
     def self.from_xml xml
@@ -42,6 +42,10 @@ module HCl
     def self.with_timer
       all.detect {|t| t.running? }
     end
+    
+    def self.last
+      all.sort {|a,b| a.updated_at<=>b.updated_at}[-1]
+    end
 
     def running?
       !@data[:timer_started_at].nil? && !@data[:timer_started_at].empty?

data/lib/hcl/task.rb

@@ -9,14 +9,25 @@ module HCl
         end)
       end
       unless tasks.empty?
-        File.open(File.join(ENV['HOME'],'.hcl_tasks'), 'w') do |f|
+        File.open(cache_file, 'w') do |f|
           f.write tasks.uniq.to_yaml
         end
       end
     end
+    
+    def self.cache_file
+      File.join(ENV['HOME'],'.hcl_tasks')
+    end
 
     def self.all
-      YAML.load File.read(File.join(ENV['HOME'],'.hcl_tasks'))
+      tasks = File.exists?(cache_file) ? YAML.load(File.read(cache_file)) : []
+      tasks = tasks.sort do |a,b|
+        r = a.project.client <=> b.project.client
+        r = a.project.name <=> b.project.name if r == 0
+        r = a.name <=> b.name if r == 0
+        r
+      end
+      tasks
     end
 
     def self.find project_id, id
@@ -26,7 +37,7 @@ module HCl
     end
 
     def to_s
-      "#{project.name} #{name}"
+      "#{project.client} - #{project.name} - #{name}"
     end
 
     def add opts

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hcl
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Zack Hobson
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 -07:00
+date: 2011-07-13 00:00:00 -07:00
 default_executable: hcl
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: termios
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: trollop
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 1
         - 10
@@ -47,9 +52,11 @@ dependencies:
   name: chronic
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 0
         - 2
@@ -61,9 +68,11 @@ dependencies:
   name: highline
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 5
@@ -75,9 +84,11 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -87,9 +98,11 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -106,8 +119,8 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .document
-- .gitignore
 - CHANGELOG
+- HACKING.markdown
 - LICENSE
 - README.markdown
 - Rakefile
@@ -131,33 +144,34 @@ homepage: http://github.com/zenhob/hcl
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Harvest timesheets from the command-line
-test_files: 
-- test/app_test.rb
-- test/day_entry_test.rb
-- test/test_helper.rb
-- test/utility_test.rb
+test_files: []
+

data/.gitignore

@@ -1,5 +0,0 @@
-*.sw[nop]
-pkg
-tags
-doc
-.yardoc