timetrap 1.2.0 → 1.2.1

data/README.md

@@ -103,7 +103,7 @@ Commands
   usage: ``t backend``
 
 **configure**
-  Creates a config file at  ~/.timetrap.yml or ENV['TIMETRAP_CONFIG_FILE'] if
+  Creates a config file at  ``~/.timetrap.yml`` or ``ENV['TIMETRAP_CONFIG_FILE']`` if
   one doesn't exist.  Prints path to config file.  Currently allows configuration
   of path to database file.
 
@@ -190,6 +190,15 @@ Global Options
   display commands (e.g. display, list, week, etc.) and is non-destructive.
   The actual start and end time stored by Timetrap are unaffected.
 
+Configuration
+--------
+
+Configuration of TimeTrap's behavior can be done through a YAML config file.
+See ``t configure`` for details.  Currently supported options are:
+
+ round_in_seconds: The duration of time to use for rounding with the -r flag
+ database_file: The file path of the sqlite databese
+
 Bugs and Feature Requests
 --------
 Submit to http://github.com/samg/timetrap/issues

data/VERSION.yml

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

data/lib/timetrap/config.rb

@@ -3,9 +3,18 @@ module Timetrap
     extend self
     PATH = ENV['TIMETRAP_CONFIG_FILE'] || File.join(ENV['HOME'], '.timetrap.yml')
 
+    # Application defaults.
+    #
+    # These are written to a config file by invoking:
+    # <code>
+    # t configure
+    # </code>
     def defaults
       {
-        'database_file' => "#{ENV['HOME']}/.timetrap.db"
+        # Path to the sqlite db
+        'database_file' => "#{ENV['HOME']}/.timetrap.db",
+        # Unit of time for rounding (-r) in seconds
+        'round_in_seconds' => 900
       }
     end
 

data/lib/timetrap/models.rb

@@ -44,10 +44,10 @@ module Timetrap
     def round time
       return nil unless time
       Time.at(
-        if (r = time.to_i % 900) < 450
+        if (r = time.to_i % Timetrap::Config['round_in_seconds']) < 450
           time.to_i - r
         else
-          time.to_i + (900 - r)
+          time.to_i + (Timetrap::Config['round_in_seconds'] - r)
         end
       )
     end

data/spec/timetrap_spec.rb

@@ -3,6 +3,14 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'timetrap')
 require 'spec'
 require 'fakefs/safe'
 
+module Timetrap::StubConfig
+  def with_stubbed_config options
+    options.each do |k, v|
+      Timetrap::Config.stub(:[]).with(k).and_return v
+    end
+  end
+end
+
 describe Timetrap do
   def create_entry atts = {}
     Timetrap::Entry.create({
@@ -12,6 +20,7 @@ describe Timetrap do
       :note => 'note'}.merge(atts))
   end
 
+
   before :each do
     Timetrap::Entry.create_table!
     Timetrap::Meta.create_table!
@@ -548,6 +557,8 @@ current sheet: 0:01:00 (a timesheet that is running)
 end
 
 describe Timetrap::Entry do
+
+  include Timetrap::StubConfig
   describe "with an instance" do
     before do
       @time = Time.now
@@ -575,10 +586,10 @@ describe Timetrap::Entry do
         @entry.sheet.should == 'name'
       end
 
-      def with_global_round_set_to val
+      def with_rounding_on
         old_val = Timetrap::Entry.round
         begin
-          Timetrap::Entry.round = val
+          Timetrap::Entry.round = true
           block_return_value = yield
         ensure
           Timetrap::Entry.round = old_val
@@ -586,25 +597,31 @@ describe Timetrap::Entry do
       end
 
       it "should use round start if the global round attribute is set" do
-        with_global_round_set_to true do
-          @time = Chronic.parse("12:55am")
-          @entry.start = @time
-          @entry.start.should == Chronic.parse("1am")
+        with_rounding_on do
+          with_stubbed_config('round_in_seconds' => 900) do
+            @time = Chronic.parse("12:55am")
+            @entry.start = @time
+            @entry.start.should == Chronic.parse("1am")
+          end
         end
       end
 
       it "should use round start if the global round attribute is set" do
-        with_global_round_set_to true do
-          @time = Chronic.parse("12:50am")
-          @entry.start = @time
-          @entry.start.should == Chronic.parse("12:45am")
+        with_rounding_on do
+          with_stubbed_config('round_in_seconds' => 900) do
+            @time = Chronic.parse("12:50am")
+            @entry.start = @time
+            @entry.start.should == Chronic.parse("12:45am")
+          end
         end
       end
 
       it "should have a rounded start" do
-        @time = Chronic.parse("12:50am")
-        @entry.start = @time
-        @entry.rounded_start.should == Chronic.parse("12:45am")
+        with_stubbed_config('round_in_seconds' => 900) do
+          @time = Chronic.parse("12:50am")
+          @entry.start = @time
+          @entry.rounded_start.should == Chronic.parse("12:45am")
+        end
       end
 
       it "should not round nil times" do

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrap}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2009-12-06}
+  s.date = %q{2009-12-20}
   s.default_executable = %q{t}
   s.description = %q{Command line time tracker}
   s.email = %q{sgrock@gmail.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: timetrap
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-06 00:00:00 -08:00
+date: 2009-12-20 00:00:00 -08:00
 default_executable: t
 dependencies: 
 - !ruby/object:Gem::Dependency