timetrap 1.8.4 → 1.8.5

data/Gemfile

@@ -7,6 +7,7 @@ gem 'getopt-declare', ">= 1.28"
 gem 'json', ">= 1.4.6"
 gem 'icalendar', "~>1.1.5"
 gem 'rake'
+gem 'rdoc'
 
 group :test do
   gem "rspec", "~>2"

data/VERSION.yml

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

data/lib/timetrap/cli.rb

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

data/spec/timetrap_spec.rb

@@ -599,6 +599,42 @@ END:VCALENDAR
         end
       end
 
+      describe "month" do
+        it "should display all entries for the month" do
+          create_entry(
+            :start => Time.local(2012, 2, 5, 1, 2, 3),
+            :end => Time.local(2012, 2, 5, 2, 2, 3)
+          )
+          create_entry(
+            :start => Time.local(2012, 2, 6, 1, 2, 3),
+            :end => Time.local(2012, 2, 6, 2, 2, 3)
+          )
+          create_entry(
+            :start => Time.local(2012, 1, 5, 1, 2, 3),
+            :end => Time.local(2012, 1, 5, 2, 2, 3)
+          )
+
+          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'
+        end
+
+        it "should work in December" do
+          create_entry(
+            :start => Time.local(2012, 12, 5, 1, 2, 3),
+            :end => Time.local(2012, 12, 5, 2, 2, 3)
+          )
+
+          Date.should_receive(:today).and_return(Date.new(2012, 12, 5))
+          invoke "month"
+
+          $stdout.string.should include 'Wed Dec 05, 2012   01:02:03 - 02:02:03'
+        end
+      end
+
       describe "kill" do
         it "should give me a chance not to fuck up" do
           entry = create_entry

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "timetrap"
-  s.version = "1.8.4"
+  s.version = "1.8.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = "2012-11-17"
+  s.date = "2012-12-06"
   s.description = "Command line time tracker"
   s.email = "sgrock@gmail.com"
   s.executables = ["t"]
@@ -61,6 +61,7 @@ Gem::Specification.new do |s|
       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"])
+      s.add_runtime_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_runtime_dependency(%q<sqlite3>, ["~> 1.3.3"])
@@ -74,6 +75,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<json>, [">= 1.4.6"])
       s.add_dependency(%q<icalendar>, ["~> 1.1.5"])
       s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
@@ -88,6 +90,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<json>, [">= 1.4.6"])
     s.add_dependency(%q<icalendar>, ["~> 1.1.5"])
     s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<sequel>, [">= 3.9.0"])
     s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])

metadata

@@ -1,217 +1,232 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: timetrap
-version: !ruby/object:Gem::Version
-  version: 1.8.4
+version: !ruby/object:Gem::Version 
+  hash: 61
   prerelease: 
+  segments: 
+  - 1
+  - 8
+  - 5
+  version: 1.8.5
 platform: ruby
-authors:
+authors: 
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2012-12-06 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 3
+        - 9
+        - 0
         version: 3.9.0
-  type: :runtime
+  version_requirements: *id001
+  name: sequel
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    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
-        version: 1.3.3
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: chronic
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: *id002
+  name: sqlite3
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 6
+        - 4
         version: 0.6.4
-  type: :runtime
+  version_requirements: *id003
+  name: chronic
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.4
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 1
+        - 28
+        version: "1.28"
+  version_requirements: *id004
   name: getopt-declare
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.28'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.28'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.6
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 4
+        - 6
         version: 1.4.6
-- !ruby/object:Gem::Dependency
-  name: icalendar
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: *id005
+  name: json
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 1
+        - 5
         version: 1.1.5
-  type: :runtime
+  version_requirements: *id006
+  name: icalendar
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.5
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id007
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id008
+  name: rdoc
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id009
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 3
+        - 9
+        - 0
         version: 3.9.0
-  type: :runtime
+  version_requirements: *id010
+  name: sequel
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    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
-        version: 1.3.3
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: chronic
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: *id011
+  name: sqlite3
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 6
+        - 4
         version: 0.6.4
-  type: :runtime
+  version_requirements: *id012
+  name: chronic
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.4
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 1
+        - 28
+        version: "1.28"
+  version_requirements: *id013
   name: getopt-declare
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.28'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.28'
+  type: :runtime
 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
@@ -239,28 +254,37 @@ 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Command line time tracker
 test_files: []
+