timetrap 1.14.2 → 1.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00a629afadbecd036fa581ba17160e35f1438cb5
-  data.tar.gz: e8cf2677661d3130083c510352be81a919113f52
+  metadata.gz: 250958b0809cd1e2b583424a014ea4c9e92c6b54
+  data.tar.gz: befa65a8e899b9bb4270dbee6364cce935780c4a
 SHA512:
-  metadata.gz: a15337c354b845148596c5111182c59c98018f733effce4b936ecc3ef15e38f31cd1ae6e037aa9fc0a9171f1a29d8bd0b3c1ef7c73173f753e195bee2b10e3bc
-  data.tar.gz: 49c156ca122366c0cf5dc3f25ccc8e36d770ce91787f829f3460178889b593f9efc00329ac96da02c4162f189c7ecdfa651539b7b77f8198fae95c490a4e2495
+  metadata.gz: 38ff8bce1804940310b7689719f4a05b3426e86e80b796308f0ea060e156648add7d4f39084ea908ce333e2d63b75dc3b28e71806d7a829c43154e394e4bc5d1
+  data.tar.gz: 0b37bd85eafb9188eeb19c1eec3eca7695efcc90004f02ed91ce1333e0992c692e8d5b7b6033ba2b07e27bda78e078b247ed045956f7480f321be63ddbae2626

data/CONTRIBUTORS

@@ -15,3 +15,4 @@
 * Marc Addeo
 * Patrick Davey
 * Kyle Brett
+* namdnguyen

data/README.md

@@ -406,7 +406,8 @@ Commands
   usage: ``t yesterday [--ids] [--format FMT] [SHEET | all]``
 
 **week**
-  Shortcut for display with start date set to Monday of this week
+  Shortcut for display with start date set to a day of this week. The default
+  start of the week is Monday.
 
   usage: ``t week [--ids] [--end DATE] [--format FMT] [TIMESHEET | all]``
 
@@ -469,6 +470,7 @@ See ``t configure`` for details.  Currently supported options are:
                on Notes Editing for tips on using non-terminal based editors.
                Example: note_editor: "vim"
 
+  **week_start**: The day of the week to use as the start of the week for t week.
 
 ### Autocomplete
 

data/lib/timetrap/cli.rb

@@ -45,6 +45,8 @@ COMMAND is one of:
       note_editor:            Command to launch notes editor or false if no editor use.
                               If you use a non terminal based editor (e.g. sublime, atom)
                               please read the notes in the README.
+      week_start:             The day of the week to use as the start of the
+                              week for t week.
 
   * display - Display the current timesheet or a specific. Pass `all' as SHEET
       to display all unarchived sheets or `full' to display archived and
@@ -106,7 +108,9 @@ COMMAND is one of:
   * yesterday - Shortcut for display with start and end dates as the day before the current day
     usage: t yesterday [--ids] [--format FMT] [SHEET | all]
 
-  * week - Shortcut for display with start date set to monday of this week.
+  * week - Shortcut for display with start date set to a day of this week.
+    The default start of the week is Monday.
+.
     usage: t week [--ids] [--end DATE] [--format FMT] [SHEET | all]
 
   * month - Shortcut for display with start date set to the beginning of either
@@ -443,7 +447,13 @@ COMMAND is one of:
     end
 
     def week
-      args['-s'] = Date.today.wday == 1 ? Date.today.to_s : Date.parse(Chronic.parse(%q(last monday)).to_s).to_s
+      d = Chronic.parse( args['-s'] || Date.today )
+
+      today = Date.new( d.year, d.month, d.day )
+      end_of_week = today + 6
+      last_week_start = Date.parse(Chronic.parse('last '.concat(Config['week_start']).to_s, :now => today).to_s)
+      args['-s'] = today.wday == Date.parse(Config['week_start']).wday ? today.to_s : last_week_start.to_s
+      args['-e'] = end_of_week.to_s
       display
     end
 

data/lib/timetrap/config.rb

@@ -37,7 +37,9 @@ module Timetrap
         # interactively prompt for a note if one isn't passed when checking in.
         'require_note' => false,
         # command to launch external editor (false if no external editor used)
-        'note_editor' => false
+        'note_editor' => false,
+        # set day of the week when determining start of the week.
+        'week_start' => "Monday",
       }
     end
 

data/lib/timetrap/version.rb

@@ -1,3 +1,3 @@
 module Timetrap
-  VERSION = '1.14.2'
+  VERSION = '1.14.3'
 end

data/spec/timetrap_spec.rb

@@ -986,6 +986,92 @@ END:VCALENDAR
           $stdout.string.should include Time.now.strftime('%a %b %d, %Y')
           $stdout.string.should_not include 'Feb 01, 2012'
         end
+
+        describe "with week_start config option set" do
+          let(:week_start_config) { 'Tuesday' }
+          before do
+            with_stubbed_config 'week_start' => week_start_config
+          end
+
+          #https://github.com/samg/timetrap/issues/161
+          it "should work at the end of the month" do
+            Date.should_receive(:today).and_return(Date.new(2017, 7, 30))
+
+            create_entry(
+              :start => Time.local(2017, 7, 29, 1, 2, 3),
+              :end => Time.local(2017, 7, 29, 2, 2, 3)
+            )
+            invoke "week"
+            $stdout.string.should include 'Jul 29, 2017'
+
+          end
+
+          it "should not show entries prior to defined start of week" 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, 8, 1, 2, 3),
+              :end => Time.local(2012, 2, 8, 2, 2, 3)
+            )
+            create_entry(
+              :start => Time.local(2012, 2, 9, 1, 2, 3),
+              :end => Time.local(2012, 2, 9, 2, 2, 3)
+            )
+
+            Date.should_receive(:today).and_return(Date.new(2012, 2, 9))
+            invoke 'week'
+
+            $stdout.string.should include 'Feb 08, 2012'
+            $stdout.string.should include 'Feb 09, 2012'
+            $stdout.string.should_not include 'Feb 05, 2012'
+          end
+
+          it "should only show entries from today if today is start of week" do
+            create_entry(
+              :start => Time.local(2012, 1, 31, 1, 2, 3),
+              :end => Time.local(2012, 1, 31, 2, 2, 3)
+            )
+            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, 7, 1, 2, 3),
+              :end => Time.local(2012, 2, 7, 2, 2, 3)
+            )
+
+            Date.should_receive(:today).and_return(Date.new(2012, 2, 7))
+            invoke 'week'
+
+            $stdout.string.should include 'Feb 07, 2012'
+            $stdout.string.should_not include 'Jan 31, 2012'
+            $stdout.string.should_not include 'Feb 05, 2012'
+          end
+
+          it "should not show entries 7 days past start of week" do
+            create_entry(
+              :start => Time.local(2012, 2, 9, 1, 2, 3),
+              :end => Time.local(2012, 2, 9, 2, 2, 3)
+            )
+            create_entry(
+              :start => Time.local(2012, 2, 14, 1, 2, 3),
+              :end => Time.local(2012, 2, 14, 2, 2, 3)
+            )
+            create_entry(
+              :start => Time.local(2012, 2, 16, 1, 2, 3),
+              :end => Time.local(2012, 2, 16, 2, 2, 3)
+            )
+
+            Date.should_receive(:today).and_return(Date.new(2012, 2, 7))
+            invoke 'week'
+
+            $stdout.string.should include 'Feb 09, 2012'
+            $stdout.string.should_not include 'Feb 14, 2012'
+            $stdout.string.should_not include 'Feb 16, 2012'
+          end
+        end
       end
 
       describe "month" do

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: timetrap
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.14.3
 platform: ruby
 authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.43.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.43.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.2
 description: Command line time tracker
@@ -146,9 +146,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CONTRIBUTORS
 - Gemfile
 - LICENSE.txt
@@ -194,17 +194,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Command line time tracker