add passing in the current_sheet, in case anybody needs it

samg · Jan 28, 2014 · 37351e5 · 37351e5
1 parent a991a93
commit 37351e5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/timetrap/auto_sheets/dotfiles.rb b/lib/timetrap/auto_sheets/dotfiles.rb
@@ -1,6 +1,11 @@
 module Timetrap
   module AutoSheets
     class Dotfiles
+      attr_accessor :current_sheet
+
+      def initialize(current_sheet)
+        self.current_sheet = current_sheet
+      end
 
       def sheet
         dotfile = File.join(Dir.pwd, '.timetrap-sheet')

diff --git a/lib/timetrap/timer.rb b/lib/timetrap/timer.rb
@@ -62,12 +62,15 @@ def current_sheet= sheet
     end
 
     def current_sheet
-      return auto_sheet if auto_sheet
-
       unless Meta.find(:key => 'current_sheet')
         Meta.create(:key => 'current_sheet', :value => 'default')
       end
-      Meta.find(:key => 'current_sheet').value
+
+      if the_auto_sheet = auto_sheet
+        the_auto_sheet
+      else
+        Meta.find(:key => 'current_sheet').value
+      end
     end
 
     def last_sheet
@@ -128,7 +131,7 @@ def start note, time = nil
 
     def auto_sheet
       if Timetrap::Config['auto_sheet']
-        load_auto_sheet(Config['auto_sheet']).new.sheet
+        load_auto_sheet(Config['auto_sheet']).new(Meta.find(:key => 'current_sheet').value).sheet
       end
     end
   end