timetrap 1.8.1 → 1.8.2

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/CONTRIBUTORS

@@ -6,3 +6,4 @@
 * Ryan Funduk
 * Christopher Peplin
 * Johan Venant
+* Steven Ghyselbrecht

data/README.md

@@ -359,6 +359,8 @@ See ``t configure`` for details.  Currently supported options are:
 
   **default_formatter**: The format to use when display is invoked without a `--format` option
 
+  **default_command**: The default command to invoke when you call `t`
+
 Special Thanks
 --------------
 

data/VERSION.yml

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

data/lib/timetrap/cli.rb

@@ -32,6 +32,7 @@ COMMAND is one of:
       database_file:          The file path of the sqlite database
       append_notes_delimiter: delimiter used when appending notes via
                               t edit --append
+      default_command:        The default command to run when calling t.
 
   * display - Display the current timesheet or a specific. Pass `all' as SHEET
       to display all unarchived sheets or `full' to display archived and
@@ -140,6 +141,9 @@ COMMAND is one of:
     end
 
     def invoke_command_if_valid
+      if args.unused.empty? && Timetrap::Config['default_command']
+        self.args = Getopt::Declare.new(USAGE.dup, Timetrap::Config['default_command'])
+      end
       command = args.unused.shift
       set_global_options
       case (valid = commands.select{|name| name =~ %r|^#{command}|}).size
@@ -149,6 +153,10 @@ COMMAND is one of:
       end
     end
 
+    def valid_command(command)
+       return commands.include?(command)
+    end
+
     def handle_invalid_command(command)
       if !command
         puts USAGE

data/lib/timetrap/config.rb

@@ -22,7 +22,9 @@ module Timetrap
           "#{ENV['HOME']}/.timetrap/formatters"
         ],
         # formatter to use when display is invoked without a --format option
-        'default_formatter' => 'text'
+        'default_formatter' => 'text',
+        # the default command to when you run `t`.  default to printing usage.
+        'default_command' => nil
       }
     end
 

data/spec/timetrap_spec.rb

@@ -16,6 +16,7 @@ module Timetrap::StubConfig
     options.each do |k, v|
       Timetrap::Config.stub(:[]).with(k).and_return v
     end
+    yield if block_given?
   end
 end
 
@@ -47,8 +48,28 @@ describe Timetrap do
 
       describe 'with no command' do
         it "should invoke --help" do
-          invoke ''
-          $stdout.string.should include "Usage"
+          with_stubbed_config('default_command' => nil) do
+            invoke ''
+            $stdout.string.should include "Usage"
+          end
+        end
+      end
+
+      describe 'with default command configured' do
+        it "should invoke the default command" do
+          with_stubbed_config('default_command' => 'n') do
+            invoke ''
+            $stdout.string.should include('*default: not running')
+          end
+        end
+
+        it "should allow a complicated default command" do
+          with_stubbed_config('default_command' => 'display -f csv', 'formatter_search_paths' => '/tmp') do
+            invoke 'in foo bar'
+            invoke 'out'
+            invoke ''
+            $stdout.string.should include(',"foo bar"')
+          end
         end
       end
 

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "timetrap"
-  s.version = "1.8.1"
+  s.version = "1.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = "2012-04-04"
+  s.date = "2012-10-27"
   s.description = "Command line time tracker"
   s.email = "sgrock@gmail.com"
   s.executables = ["t"]
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
+    ".travis.yml",
     "CONTRIBUTORS",
     "Gemfile",
     "LICENSE.txt",
@@ -46,7 +47,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/samg/timetrap/tree/master"
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "Command line time tracker"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timetrap
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70257588611440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70257588611440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70257588610880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70257588610880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70257588636460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 0.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *70257588636460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: getopt-declare
-  requirement: &70257588635400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '1.28'
   type: :runtime
   prerelease: false
-  version_requirements: *70257588635400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.28'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70257588634220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70257588634220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: icalendar
-  requirement: &70257588633020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70257588633020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70257588632140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70257588632140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70257588631220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257588631220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70257588630640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: 3.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70257588630640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70257588630160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +165,15 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70257588630160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70257588643640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: 0.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *70257588643640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: getopt-declare
-  requirement: &70257588638940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +197,12 @@ dependencies:
         version: '1.28'
   type: :runtime
   prerelease: false
-  version_requirements: *70257588638940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.28'
 description: Command line time tracker
 email: sgrock@gmail.com
 executables:
@@ -153,6 +213,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .rspec
+- .travis.yml
 - CONTRIBUTORS
 - Gemfile
 - LICENSE.txt
@@ -190,6 +251,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 799045396901513239
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Command line time tracker