timetrap 1.5.1 → 1.5.2

data/VERSION.yml

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

data/lib/timetrap/cli.rb

@@ -30,7 +30,7 @@ COMMAND is one of:
                               the -r flag
       database_file:          The file path of the sqlite database
       append_notes_delimiter: delimiter used when appending notes via
-                              t edit --append``
+                              t edit --append
 
   * display - Display the current timesheet or a specific. Pass `all' as
       SHEET to display all sheets.
@@ -49,6 +49,7 @@ COMMAND is one of:
     -z, --append              Append to the current note instead of replacing it
                                 the delimiter between appended notes is
                                 configurable (see configure)
+    -m, --move <sheet>        Move to another sheet
 
   * format - Deprecated: alias for display.
 
@@ -145,6 +146,16 @@ COMMAND is one of:
       say "can't find entry" && return unless entry
       entry.update :start => args['-s'] if args['-s'] =~ /.+/
       entry.update :end => args['-e'] if args['-e'] =~ /.+/
+
+      # update sheet
+      if args['-m'] =~ /.+/
+        if entry == Timetrap.active_entry
+          Timetrap.current_sheet = args['-m']
+        end
+        entry.update :sheet => args['-m']
+      end
+
+      # update notes
       if unused_args =~ /.+/
         note = unused_args
         if args['-z']

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/spec/timetrap_spec.rb

@@ -12,6 +12,7 @@ module Timetrap::StubConfig
 end
 
 describe Timetrap do
+  include Timetrap::StubConfig
   def create_entry atts = {}
     Timetrap::Entry.create({
       :sheet => 'default',
@@ -88,8 +89,31 @@ describe Timetrap do
           Timetrap.active_entry.note.should == 'new description'
         end
 
+        it "should allow you to move an entry to another sheet" do
+          invoke 'edit --move blahblah'
+          Timetrap.active_entry[:sheet].should == 'blahblah'
+          invoke 'edit -m blahblahblah'
+          Timetrap.active_entry[:sheet].should == 'blahblahblah'
+        end
+
+        it "should change the current sheet if the current entry's sheet is changed" do
+          Timetrap.current_sheet.should_not == 'blahblahblah'
+          invoke 'edit -m blahblahblah'
+          Timetrap.active_entry[:sheet].should == 'blahblahblah'
+          Timetrap.current_sheet.should == 'blahblahblah'
+        end
+
+        it "should change the current sheet if a non current entry's sheet is changed" do
+          sheet = Timetrap.current_sheet
+          id = Timetrap.active_entry[:id]
+          invoke 'out'
+          invoke "edit -m blahblahblah -i #{id}"
+          Timetrap.current_sheet.should == sheet
+          Timetrap::Entry[id][:sheet].should == 'blahblahblah'
+        end
+
         it "should allow appending to the description of the active period" do
-          Timetrap::Config.stub(:[]).with('append_notes_delimiter').and_return('//')
+          with_stubbed_config('append_notes_delimiter' => '//')
           Timetrap.active_entry.note.should == 'running entry'
           invoke 'edit --append new'
           Timetrap.active_entry.note.should == 'running entry//new'

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrap}
-  s.version = "1.5.1"
+  s.version = "1.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2010-10-31}
+  s.date = %q{2010-11-15}
   s.default_executable = %q{t}
   s.description = %q{Command line time tracker}
   s.email = %q{sgrock@gmail.com}
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "lib/timetrap/formatters/text.rb",
      "lib/timetrap/helpers.rb",
      "lib/timetrap/models.rb",
+     "spec/spec.opts",
      "spec/timetrap_spec.rb",
      "timetrap.gemspec"
   ]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timetrap
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.1
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 -07:00
+date: 2010-11-15 00:00:00 -08:00
 default_executable: t
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,6 +123,7 @@ files:
 - lib/timetrap/formatters/text.rb
 - lib/timetrap/helpers.rb
 - lib/timetrap/models.rb
+- spec/spec.opts
 - spec/timetrap_spec.rb
 - timetrap.gemspec
 has_rdoc: true