hcl 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 045ee48931cd77620aacf51495ce49a0e4621602
-  data.tar.gz: 61957cdfa90886797d896efabfcd5b7cb90db63b
+  metadata.gz: 852da2430771d5354f8fd2fca9bc55558e2248b7
+  data.tar.gz: 0f21a80c83c9e105829f872c47860e34975120e0
 SHA512:
-  metadata.gz: ec4895148c586158a395ae08de8e225fe94cea6a2d2102e90ebd99003bd1776314d0ebf871dcbfadebb38ee22029b60b9b79b3961be1078c7dbbc676469a7b4e
-  data.tar.gz: 3411878c71f1f625f9b983a77041108826ea74c1f8723559ec6ccce09798a7436dfc89abac31fa765faed4f72090342f3bf1f69e9318affeb8d16a7e2008141d
+  metadata.gz: 6a411682c2f8c9d049bfe3e13f436c9efd5c2cc3be9892d4ea9a3ed1b58008a60491d4f05530a9878af6a10ce6e9f7cd31b795caffce9727cbca0fddbb062e12
+  data.tar.gz: 7c1e0be48bbe9043a86265cc35d05feb3fb4bcc64b13c56fd4bbdcff9bce1e04c9b564702cfaabcca132ea8e9cad49993edd0a44be5d6b05bd0b720d881ea59a

data/README.markdown

@@ -30,15 +30,14 @@ or you can install from source using jeweler:
 
 ## Usage
 
+    hcl (@<task_alias> | <project_id> <task_id>) [+time] [message]
+    hcl note <message>
+    hcl stop [message]
+    hcl resume [@<task_alias>]
     hcl show [date]
     hcl tasks
-    hcl set <key> <value ...>
-    hcl unset <key>
-    hcl start (<task_alias> | <project_id> <task_id>) [+time] [msg ...]
-    hcl note <msg ...>
+    hcl alias <task_alias> <project_id> <task_id>
     hcl aliases
-    hcl stop [msg]
-    hcl resume
 
 ### Available Projects and Tasks
 
@@ -67,11 +66,8 @@ commands are equivalent:
 
 ### Adding Notes to a Running Task
 
-While a task is running you can append lines to the task notes.
-Providing the note command is optional, just the bare message will work.
-These two commands are equivalent:
+While a task is running you can append lines to the task notes:
 
-    $ hcl Found a good time!
     $ hcl note Found a good time!
 
 ### Stopping a Timer
@@ -84,9 +80,11 @@ well:
 
 ### Resuming a Timer
 
-You can easily resume the last stopped timer:
+You can resume a stopped timer. Specify a task to resume the last timer
+for that task:
 
     $ hcl resume
+    $ hcl resume @xdev
 
 ### Date Formats
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/hcl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "hcl"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zack Hobson"]
-  s.date = "2013-11-18"
+  s.date = "2013-11-19"
   s.description = "HCl is a command-line client for manipulating Harvest time sheets."
   s.email = "zack@zackhobson.com"
   s.executables = ["hcl"]

data/lib/hcl/app.rb

@@ -31,7 +31,7 @@ class Net::HTTP
 end
 
 module HCl
-  VERSION = "0.3.1"
+  VERSION = "0.4.2"
 
   class App
     include HCl::Utility
@@ -61,14 +61,6 @@ module HCl
       Commands.method_defined? command
     end
 
-    def start_or_note *args
-      if DayEntry.with_timer
-        note *args
-      else
-        start *args
-      end
-    end
-
     # Start the application.
     def run
       begin
@@ -83,7 +75,7 @@ module HCl
               end
             end
           else
-            start_or_note @command, *@args
+            start @command, *@args
           end
         else
           show

data/lib/hcl/commands.rb

@@ -41,6 +41,7 @@ module HCl
         puts "Added alias @#{task_name} for #{task}."
       else
         puts "Unrecognized project and task ID: #{value.inspect}"
+        exit 1
       end
     end
 
@@ -49,48 +50,27 @@ module HCl
     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.detect {|a| a[0] == '@' }
-      if ident
-        args.delete(ident)
-        ident = ident.slice(1..-1)
-      else
-        ident = args.shift
-      end
-      if ident
-        task_ids = if @settings.key? "task.#{ident}"
-            @settings["task.#{ident}"].split(/\s+/)
-          else
-            [ident, args.shift]
-          end
-        task = Task.find *task_ids
-        if task.nil?
-          puts "Unknown task alias, try one of the following: ", aliases.join(', ')
-          exit 1
-        end
-        timer = task.start(
-          :starting_time => starting_time,
-          :note => args.join(' ')
-        )
-        puts "Started timer for #{timer} (at #{current_time})"
-      else
-        puts "You must provide a task alias to start a timer:", aliases.join(', ')
+      starting_time = get_starting_time args
+      task = get_task args
+      if task.nil?
+        puts "Unknown task alias, try one of the following: ", aliases.join(', ')
         exit 1
       end
+      timer = task.start \
+        :starting_time => starting_time,
+        :note => args.join(' ')
+      puts "Started timer for #{timer} (at #{current_time})"
     end
 
     def stop *args
       entry = DayEntry.with_timer
       if entry
-        entry.append_note(*args.join(' ')) if args.any?
+        entry.append_note(args.join(' ')) if args.any?
         entry.toggle
         puts "Stopped #{entry} (at #{current_time})"
       else
         puts "No running timers found."
+        exit 1
       end
     end
 
@@ -102,6 +82,7 @@ module HCl
         puts "Added note to #{entry}."
       else
         puts "No running timers found."
+        exit 1
       end
     end
 
@@ -118,19 +99,21 @@ module HCl
       puts "\t#{as_hours total_hours}\ttotal (as of #{current_time})"
     end
 
-    def resume
-      entry = DayEntry.last
+    def resume *args
+      ident = get_ident args
+      entry = if ident
+          task_ids = get_task_ids ident, args
+          DayEntry.last_by_task *task_ids
+        else
+          DayEntry.last
+        end
       if entry
-        puts "Resumed #{entry} (at #{current_time})"
         entry.toggle
       else
-        puts "No timers found"
+        puts "No matching timer found."
+        exit 1
       end
     end
 
-  private
-    def current_time
-      Time.now.strftime('%I:%M %p').downcase
-    end
   end
 end

data/lib/hcl/day_entry.rb

@@ -40,6 +40,11 @@ module HCl
       all.detect {|t| t.running? }
     end
 
+    def self.last_by_task project_id, task_id
+      all.sort {|a,b| b.updated_at<=>a.updated_at}.
+        detect {|t| t.project_id == project_id && t.task_id == task_id }
+    end
+
     def self.last
       all.sort {|a,b| a.updated_at<=>b.updated_at}[-1]
     end

data/lib/hcl/utility.rb

@@ -1,5 +1,39 @@
 module HCl
   module Utility
+    def get_task_ids ident, args
+      if @settings.key? "task.#{ident}"
+        @settings["task.#{ident}"].split(/\s+/)
+      else
+        [ident, args.shift]
+      end
+    end
+
+    def get_ident args
+      ident = args.detect {|a| a[0] == '@' }
+      if ident
+        args.delete(ident)
+        ident.slice(1..-1)
+      else
+        args.shift
+      end
+    end
+
+    def get_task args
+      Task.find *get_task_ids(get_ident(args), args)
+    end
+
+    def get_starting_time args
+      starting_time = args.detect {|x| x =~ /^\+\d*(\.|:)?\d+$/ }
+      if starting_time
+        args.delete(starting_time)
+        time2float starting_time
+      end
+    end
+
+    def current_time
+      Time.now.strftime('%I:%M %p').downcase
+    end
+
     # Convert from decimal to a string of the form HH:MM.
     #
     # @param [#to_f] hours number of hours in decimal

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hcl
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Zack Hobson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop