timetrap 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05ce9b29076154da0dee41fe4df8a38bffdedc7f
-  data.tar.gz: d9617fc345497096984c88798645c64779e51f18
+  metadata.gz: 2f0cfbd1ca2273c6fbcaa8a48af329f8bb02e29b
+  data.tar.gz: 55d18f5690cfcfbf6f5379f244e323d5f2da4d80
 SHA512:
-  metadata.gz: db1443b89c6cc00b5098f59aa1705c9e57796cde4d204cbafdb1423635bb09fd4f3c5ecce95470f8abd877d678a82de3d9ea99fd133f676632671db10b8aca71
-  data.tar.gz: ea3431e082d78bcea28801c288e078d595bb4c99951fcab4f106f2ee756090acc65433e8f09d3133b98e2188e67d7f7c0e76fbdf0047a1f5dedec16479b83bfa
+  metadata.gz: 099d87442198a0dd457bf1ea35c6a2a7dd390b0b6c3935f63edfd6d5bb76d0adb605e82c46a454f1b5ff8e3bc36933c230267838050d2d311fac9a28ea776bfa
+  data.tar.gz: 4e18a20f8a8cdff882cf3a2b72f4e31f5adb8af5b5f2aed738f649e2a5190c0028cbff9a40649bedd6cfa15587524633fc7763d7e292a71fbdc85575a0226654

data/.travis.yml

@@ -1,7 +1,4 @@
 language: ruby
 rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.5
-  - 2.2.0
+  - 2.1.8
+  - 2.2.4

data/lib/timetrap/auto_sheets/nested_dotfiles.rb

@@ -0,0 +1,25 @@
+module Timetrap
+  module AutoSheets
+    #
+    # Check the current dir and all parent dirs for .timetrap-sheet
+    #
+    class NestedDotfiles
+      def check_sheet(dir)
+        dotfile = File.join(dir, '.timetrap-sheet')
+        File.read(dotfile).chomp if File.exist?(dotfile)
+      end
+
+      def sheet
+        dir = Dir.pwd
+        while true do
+            sheet = check_sheet dir
+            break if nil != sheet
+            new_dir = File.expand_path("..", dir)
+            break if new_dir == dir
+            dir = new_dir
+        end
+        return sheet
+      end
+    end
+  end
+end

data/lib/timetrap/cli.rb

@@ -19,6 +19,7 @@ COMMAND is one of:
     usage: t archive [--start DATE] [--end DATE] [SHEET]
     -s, --start <date:qs>     Include entries that start on this date or later
     -e, --end <date:qs>       Include entries that start on this date or earlier
+    -g, --grep <regexp>       Include entries where the note matches this regexp.
 
   * backend - Open an sqlite shell to the database.
     usage: t backend
@@ -54,6 +55,7 @@ COMMAND is one of:
                               Documentation on defining custom formats can be
                               found in the README included in this
                               distribution.
+    -g, --grep <regexp>       Include entries where the note matches this regexp.
 
   * edit - Alter an entry's note, start, or end time. Defaults to the active
     entry. Defaults to the last entry to be checked out of if no entry is active.
@@ -193,7 +195,7 @@ COMMAND is one of:
     def archive
       ee = selected_entries
       if ask_user "Archive #{ee.count} entries? "
-        ee.all.each do |e|
+        ee.each do |e|
           next unless e.end
           e.update :sheet => "_#{e.sheet}"
         end
@@ -277,7 +279,7 @@ COMMAND is one of:
                 entry
               when Timer.last_checkout
                 last = Timer.last_checkout
-                warn "Resuming last enrty you checked out of (#{last.note})"
+                warn "Resuming last entry you checked out of (#{last.note})"
                 last
               end
 
@@ -334,7 +336,7 @@ COMMAND is one of:
     end
 
     def display
-      entries = selected_entries.order(:start).all
+      entries = selected_entries
       if entries == []
         warn "No entries were selected to display."
       else

data/lib/timetrap/helpers.rb

@@ -50,6 +50,11 @@ module Timetrap
       end
       ee = ee.filter('start >= ?', Date.parse(Timer.process_time(args['-s']).to_s)) if args['-s']
       ee = ee.filter('start <= ?', Date.parse(Timer.process_time(args['-e']).to_s) + 1) if args['-e']
+      ee = ee.order(:start)
+      if args['-g']
+        re = Regexp::new(args['-g'])
+        ee = ee.find_all{|e| re.match(e.note)}
+      end
       ee
     end
 

data/lib/timetrap/version.rb

@@ -1,3 +1,3 @@
 module Timetrap
-  VERSION = '1.9.0'
+  VERSION = '1.10.0'
 end

data/spec/dotfile/nested/.timetrap-sheet

@@ -0,0 +1 @@
+nested-sheet

data/spec/timetrap_spec.rb

@@ -87,11 +87,26 @@ describe Timetrap do
 
       describe 'archive' do
         before do
+          3.times do |i|
+            create_entry({:note => 'grep'})
+          end
           3.times do |i|
             create_entry
           end
         end
 
+        it "should only archive entries matched by the provided regex" do
+          $stdin.string = "yes\n"
+          invoke 'archive --grep [g][r][e][p]'
+          Timetrap::Entry.each do |e|
+            if e.note == 'grep'
+              e.sheet.should == '_default'
+            else
+              e.sheet.should == 'default'
+            end
+          end
+        end
+
         it "should put the entries in a hidden sheet" do
           $stdin.string = "yes\n"
           invoke 'archive'
@@ -277,6 +292,32 @@ describe Timetrap do
             end
           end
         end
+
+        describe "using nested_dotfiles auto_sheet" do
+          describe 'with a .timetrap-sheet in cwd' do
+            it 'should use sheet defined in dotfile' do
+              Dir.chdir('spec/dotfile') do
+                with_stubbed_config('auto_sheet' => 'nested_dotfiles')
+                Timetrap::Timer.current_sheet.should == 'dotfile-sheet'
+              end
+            end
+            it 'should use top-most sheet found in dir heirarchy' do
+              Dir.chdir('spec/dotfile/nested') do
+                with_stubbed_config('auto_sheet' => 'nested_dotfiles')
+                Timetrap::Timer.current_sheet.should == 'nested-sheet'
+              end
+            end
+          end
+
+          describe 'with no .timetrap-sheet in cwd' do
+            it 'should use sheet defined in ancestor\'s dotfile' do
+              Dir.chdir('spec/dotfile/nested/no-sheet') do
+                with_stubbed_config('auto_sheet' => 'nested_dotfiles')
+                Timetrap::Timer.current_sheet.should == 'nested-sheet'
+              end
+            end
+          end
+        end
       end
 
       describe "backend" do
@@ -332,6 +373,17 @@ Timesheet: SpecSheet
     Total                                    8:00:00
             OUTPUT
 
+            @desired_output_grepped = <<-OUTPUT
+Timesheet: SpecSheet
+    Day                Start      End        Duration   Notes
+    Fri Oct 03, 2008   12:00:00 - 14:00:00   2:00:00    entry 1
+                                             2:00:00
+    Sun Oct 05, 2008   16:00:00 - 18:00:00   2:00:00    entry 3
+                                             2:00:00
+    -----------------------------------------------------------
+    Total                                    4:00:00
+            OUTPUT
+
             @desired_output_with_ids = <<-OUTPUT
 Timesheet: SpecSheet
 Id  Day                Start      End        Duration   Notes
@@ -408,6 +460,12 @@ Grand Total                                 10:00:00
             $stdout.string.should include("entry 5")
           end
 
+          it "should only display entries that are matched by the provided regex" do
+            Timetrap::Timer.current_sheet = 'SpecSheet'
+            invoke 'display --grep [13]'
+            $stdout.string.should == @desired_output_grepped
+          end
+
           it "should display a timesheet with ids" do
             invoke 'display S --ids'
             $stdout.string.should == @desired_output_with_ids

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timetrap
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Sam Goldstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,7 @@ files:
 - lib/timetrap.rb
 - lib/timetrap/auto_sheets.rb
 - lib/timetrap/auto_sheets/dotfiles.rb
+- lib/timetrap/auto_sheets/nested_dotfiles.rb
 - lib/timetrap/auto_sheets/yaml_cwd.rb
 - lib/timetrap/cli.rb
 - lib/timetrap/config.rb
@@ -179,6 +180,8 @@ files:
 - lib/timetrap/timer.rb
 - lib/timetrap/version.rb
 - spec/dotfile/.timetrap-sheet
+- spec/dotfile/nested/.timetrap-sheet
+- spec/dotfile/nested/no-sheet/.gitkeep
 - spec/timetrap_spec.rb
 - timetrap.gemspec
 homepage: https://github.com/samg/timetrap
@@ -207,4 +210,6 @@ specification_version: 4
 summary: Command line time tracker
 test_files:
 - spec/dotfile/.timetrap-sheet
+- spec/dotfile/nested/.timetrap-sheet
+- spec/dotfile/nested/no-sheet/.gitkeep
 - spec/timetrap_spec.rb