timetrap 1.8.5 → 1.8.6

data/lib/timetrap.rb

@@ -5,7 +5,7 @@ require 'sequel'
 require 'yaml'
 require 'erb'
 require 'sequel/extensions/inflector'
-require 'Getopt/Declare'
+require File.join(File.dirname(__FILE__), 'Getopt/Declare')
 require File.join(File.dirname(__FILE__), 'timetrap', 'config')
 require File.join(File.dirname(__FILE__), 'timetrap', 'helpers')
 require File.join(File.dirname(__FILE__), 'timetrap', 'cli')

data/lib/timetrap/cli.rb

@@ -375,7 +375,7 @@ COMMAND is one of:
     end
 
     def month
-      d = Chronic.parse( "last #{args['-s'] || Date.today.strftime("%B")}" )
+      d = Chronic.parse( args['-s'] || Date.today )
 
       beginning_of_month = Date.new( d.year, d.month )
       end_of_month = if d.month == 12 # handle edgecase

data/spec/timetrap_spec.rb

@@ -598,6 +598,18 @@ END:VCALENDAR
           end
         end
       end
+      describe "week" do
+        it "should only show entries from this week" do
+          create_entry(
+            :start => Time.local(2012, 2, 1, 1, 2, 3),
+            :end => Time.local(2012, 2, 1, 2, 2, 3)
+          )
+          create_entry
+          invoke 'week'
+          $stdout.string.should include Time.now.strftime('%a %b %d, %Y')
+          $stdout.string.should_not include 'Feb 01, 2012'
+        end
+      end
 
       describe "month" do
         it "should display all entries for the month" do
@@ -617,6 +629,7 @@ END:VCALENDAR
           Date.should_receive(:today).and_return(Date.new(2012, 2, 5))
           invoke "month"
 
+
           $stdout.string.should include 'Feb 05, 2012'
           $stdout.string.should include 'Feb 06, 2012'
           $stdout.string.should_not include 'Jan'

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "timetrap"
-  s.version = "1.8.5"
+  s.version = "1.8.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = "2012-12-06"
+  s.date = "2013-02-26"
   s.description = "Command line time tracker"
   s.email = "sgrock@gmail.com"
   s.executables = ["t"]
@@ -57,7 +57,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_runtime_dependency(%q<sqlite3>, ["~> 1.3.3"])
       s.add_runtime_dependency(%q<chronic>, [">= 0.6.4"])
-      s.add_runtime_dependency(%q<getopt-declare>, [">= 1.28"])
       s.add_runtime_dependency(%q<json>, [">= 1.4.6"])
       s.add_runtime_dependency(%q<icalendar>, ["~> 1.1.5"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
@@ -66,12 +65,10 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_runtime_dependency(%q<sqlite3>, ["~> 1.3.3"])
       s.add_runtime_dependency(%q<chronic>, [">= 0.6.4"])
-      s.add_runtime_dependency(%q<getopt-declare>, [">= 1.28"])
     else
       s.add_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
       s.add_dependency(%q<chronic>, [">= 0.6.4"])
-      s.add_dependency(%q<getopt-declare>, [">= 1.28"])
       s.add_dependency(%q<json>, [">= 1.4.6"])
       s.add_dependency(%q<icalendar>, ["~> 1.1.5"])
       s.add_dependency(%q<rake>, [">= 0"])
@@ -80,13 +77,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
       s.add_dependency(%q<chronic>, [">= 0.6.4"])
-      s.add_dependency(%q<getopt-declare>, [">= 1.28"])
     end
   else
     s.add_dependency(%q<sequel>, [">= 3.9.0"])
     s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
     s.add_dependency(%q<chronic>, [">= 0.6.4"])
-    s.add_dependency(%q<getopt-declare>, [">= 1.28"])
     s.add_dependency(%q<json>, [">= 1.4.6"])
     s.add_dependency(%q<icalendar>, ["~> 1.1.5"])
     s.add_dependency(%q<rake>, [">= 0"])
@@ -95,7 +90,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sequel>, [">= 3.9.0"])
     s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
     s.add_dependency(%q<chronic>, [">= 0.6.4"])
-    s.add_dependency(%q<getopt-declare>, [">= 1.28"])
   end
 end
 

metadata

@@ -1,232 +1,201 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: timetrap
-version: !ruby/object:Gem::Version 
-  hash: 61
+version: !ruby/object:Gem::Version
+  version: 1.8.6
   prerelease: 
-  segments: 
-  - 1
-  - 8
-  - 5
-  version: 1.8.5
 platform: ruby
-authors: 
+authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-02-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 3
-        - 9
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.9.0
-  version_requirements: *id001
-  name: sequel
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.3.3
-  version_requirements: *id002
-  name: sqlite3
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 6
-        - 4
-        version: 0.6.4
-  version_requirements: *id003
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
   name: chronic
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 1
-        - 28
-        version: "1.28"
-  version_requirements: *id004
-  name: getopt-declare
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.4
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
-  version_requirements: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.6
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.6
+- !ruby/object:Gem::Dependency
+  name: icalendar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 1
-        - 5
+      - !ruby/object:Gem::Version
         version: 1.1.5
-  version_requirements: *id006
-  name: icalendar
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id007
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.5
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id008
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id009
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 3
-        - 9
-        - 0
-        version: 3.9.0
-  version_requirements: *id010
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: sequel
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.9.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.3.3
-  version_requirements: *id011
-  name: sqlite3
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 6
-        - 4
-        version: 0.6.4
-  version_requirements: *id012
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
   name: chronic
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 1
-        - 28
-        version: "1.28"
-  version_requirements: *id013
-  name: getopt-declare
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.4
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.4
 description: Command line time tracker
 email: sgrock@gmail.com
-executables: 
+executables:
 - t
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .rspec
 - .travis.yml
 - CONTRIBUTORS
@@ -237,6 +206,8 @@ files:
 - VERSION.yml
 - bin/dev_t
 - bin/t
+- lib/Getopt/Declare.rb
+- lib/Getopt/DelimScanner.rb
 - lib/timetrap.rb
 - lib/timetrap/cli.rb
 - lib/timetrap/config.rb
@@ -254,37 +225,28 @@ files:
 - timetrap.gemspec
 homepage: http://github.com/samg/timetrap/tree/master
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --inline-source
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Command line time tracker
 test_files: []
-