timetrap 1.6.0 → 1.6.1

data/README.md

@@ -32,7 +32,7 @@ All commands can be abbreviated.
 
 Each timesheet contains *entries*.  Each entry has a start and end time, and a
 note associated with it.  An entry without an end time set is considered to be
-*running*.
+running.
 
 You check in to the current sheet with the `in` command.
 
@@ -199,9 +199,9 @@ Commands
 
 **sheet**
   Switch to a timesheet creating it if necessary. The default timesheet is
-  called "default".
+  called "default". When no sheet is specified list all existing sheets.
 
-  usage: ``t sheet TIMESHEET``
+  usage: ``t sheet [TIMESHEET]``
 
 **week**
   Shortcut for display with start date set to monday of this week

data/VERSION.yml

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

data/lib/timetrap/cli.rb

@@ -51,8 +51,6 @@ COMMAND is one of:
                                 configurable (see configure)
     -m, --move <sheet>        Move to another sheet
 
-  * format - Deprecated: alias for display.
-
   * in - Start the timer for the current timesheet.
     usage: t in [--at TIME] [NOTES]
     -a, --at <time:qs>        Use this time instead of now
@@ -71,12 +69,9 @@ COMMAND is one of:
     usage: t out [--at TIME] [TIMESHEET]
     -a, --at <time:qs>        Use this time instead of now
 
-  * running - Deprecated: alias for now.
-
-  * sheet - Switch to a timesheet creating it if necessary.
-    usage: t sheet TIMESHEET
-
-  * switch - Deprecated: renamed to sheet.
+  * sheet - Switch to a timesheet creating it if necessary. When no sheet is
+      specified list all sheets.
+    usage: t sheet [TIMESHEET]
 
   * week - Shortcut for display with start date set to monday of this week.
     usage: t week [--ids] [--end DATE] [--format FMT] [SHEET | all]
@@ -121,17 +116,33 @@ COMMAND is one of:
       Timetrap::CLI::USAGE.scan(/\* \w+/).map{|s| s.gsub(/\* /, '')}
     end
 
+    def deprecated_commands
+      {
+        'switch' => 'sheet',
+        'running' => 'now',
+        'format' => 'display'
+      }
+    end
+
     def invoke_command_if_valid
       command = args.unused.shift
       set_global_options
       case (valid = commands.select{|name| name =~ %r|^#{command}|}).size
-      when 0 then puts "Invalid command: #{command}"
+      when 1 then send valid[0]
       else
-        if command
-          send valid[0]
-        else
-          puts USAGE
-        end
+        handle_invalid_command(command)
+      end
+    end
+
+    def handle_invalid_command(command)
+      if !command
+        puts USAGE
+      elsif mapping = deprecated_commands.detect{|(k,v)| k =~ %r|^#{command}|}
+        deprecated, current = *mapping
+        warn "The #{deprecated.inspect} command is deprecated in favor of #{current.inspect}. Sorry for the inconvenience."
+        send current
+      else
+        warn "Invalid command: #{command.inspect}"
       end
     end
 
@@ -246,20 +257,17 @@ COMMAND is one of:
         puts fmt_klass.new(entries).output
       end
     end
-    alias_method :format, :display
 
     def sheet
       sheet = unused_args
       unless sheet =~ /.+/
-        warn "No sheet specified"
+        list
       else
         Timer.current_sheet = sheet
         warn "Switching to sheet #{sheet.inspect}"
       end
     end
 
-    alias_method :switch, :sheet
-
     def list
       sheets = ([Timer.current_sheet] | Entry.sheets).map do |sheet|
         sheet_atts = {:total => 0, :running => 0, :today => 0}
@@ -301,7 +309,6 @@ COMMAND is one of:
         puts out
       end
     end
-    alias_method :running, :display
 
     def week
       args['-s'] = Date.today.wday == 1 ? Date.today.to_s : Date.parse(Chronic.parse(%q(last monday)).to_s).to_s

data/spec/timetrap_spec.rb

@@ -44,6 +44,14 @@ describe Timetrap do
         end
       end
 
+      describe 'with an invalid command' do
+        it "should tell me I'm wrong" do
+          invoke 'poo'
+          $stderr.string.should include 'Invalid command: "poo"'
+        end
+      end
+
+
       describe 'archive' do
         before do
           3.times do |i|
@@ -279,6 +287,12 @@ Grand Total                                 10:00:00
           create_entry(:start => '2008-10-05 12:00:00', :end => '2008-10-05 14:00:00')
         end
         describe 'csv' do
+          it "should be deprecated" do
+            invoke 'format'
+            $stderr.string.should == <<-WARN
+The "format" command is deprecated in favor of "display". Sorry for the inconvenience.
+            WARN
+          end
 
           it "should not export running items" do
             invoke 'in'
@@ -579,6 +593,12 @@ END:VCALENDAR
           invoke 'sheet'
           Timetrap::Timer.current_sheet.should == 'sheet 1'
         end
+
+        it "should list timesheets when there are no arguments" do
+          invoke 'sheet sheet 1'
+          invoke 'sheet'
+          $stdout.string.should == " Timesheet  Running     Today       Total Time\n*sheet 1     0:00:00     0:00:00     0:00:00\n"
+        end
       end
     end
   end

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrap}
-  s.version = "1.6.0"
+  s.version = "1.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2010-11-28}
+  s.date = %q{2010-11-29}
   s.default_executable = %q{t}
   s.description = %q{Command line time tracker}
   s.email = %q{sgrock@gmail.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timetrap
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 1
   - 6
-  - 0
-  version: 1.6.0
+  - 1
+  version: 1.6.1
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-28 00:00:00 -08:00
+date: 2010-11-29 00:00:00 -08:00
 default_executable: t
 dependencies: 
 - !ruby/object:Gem::Dependency