timetrap 1.2.1 → 1.3.0

data/README.md

@@ -197,6 +197,7 @@ 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

data/Rakefile

@@ -33,25 +33,25 @@ begin
     s.bindir = "bin"
     s.executables = ['t']
     s.summary = %q{Command line time tracker}
-    s.add_dependency("sequel", ">= 2.12.0")
+    s.add_dependency("sequel", ">= 3.9.0")
     s.add_dependency("sqlite3-ruby", ">= 1.2.5")
     s.add_dependency("chronic", ">= 0.2.3")
     s.add_dependency("getopt-declare", ">= 1.28")
-    s.add_dependency("icalendar", ">= 1.1.0")
+    s.add_dependency("icalendar", ">= 1.1.2")
 
     if s.respond_to? :specification_version then
       current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
       s.specification_version = 2
 
       if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-        s.add_runtime_dependency(%q<mime-types>, [">= 1.15"])
+        s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
         s.add_runtime_dependency(%q<diff-lcs>, [">= 1.1.2"])
       else
-        s.add_dependency(%q<mime-types>, [">= 1.15"])
+        s.add_dependency(%q<mime-types>, [">= 1.16"])
         s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
       end
     else
-      s.add_dependency(%q<mime-types>, [">= 1.15"])
+      s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
     end
   end

data/VERSION.yml

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

data/lib/timetrap/formatters/ical.rb

@@ -16,6 +16,14 @@ module Timetrap
         entries.each do |e|
           next unless e.end
           calendar.event do
+
+            # hack around an issue in ical gem in ruby 1.9
+            unless respond_to? :<=>
+              def <=> other
+                dtstart > other.dtstart ? 1 : 0
+              end
+            end
+
             dtstart DateTime.parse(e.start.to_s)
             dtend DateTime.parse(e.end.to_s)
             summary e.note

data/lib/timetrap/formatters/text.rb

@@ -29,7 +29,7 @@ module Timetrap
               e.note
             ]
 
-            nxt = sheets[sheet].map[i+1]
+            nxt = sheets[sheet].to_a[i+1]
             if nxt == nil or !same_day?(e.start, nxt.start)
               self.output <<  "%52s\n" % format_total(from_current_day)
               from_current_day = []

data/lib/timetrap/helpers.rb

@@ -9,8 +9,8 @@ module Timetrap
       else
         Timetrap::Entry.filter('sheet = ?', Timetrap.current_sheet)
       end
-      ee = ee.filter(:start >= Date.parse(args['-s'])) if args['-s']
-      ee = ee.filter(:start <= Date.parse(args['-e']) + 1) if args['-e']
+      ee = ee.filter('start >= ?', Date.parse(args['-s'])) if args['-s']
+      ee = ee.filter('start <= ?', Date.parse(args['-e']) + 1) if args['-e']
       ee
     end
 

data/lib/timetrap.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'chronic'
 require 'sequel'
+require 'yaml'
 require 'sequel/extensions/inflector'
 require 'Getopt/Declare'
 require File.join(File.dirname(__FILE__), 'timetrap', 'config')

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrap}
-  s.version = "1.2.1"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2009-12-20}
+  s.date = %q{2010-03-14}
   s.default_executable = %q{t}
   s.description = %q{Command line time tracker}
   s.email = %q{sgrock@gmail.com}
@@ -52,29 +52,29 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sequel>, [">= 2.12.0"])
+      s.add_runtime_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
       s.add_runtime_dependency(%q<chronic>, [">= 0.2.3"])
       s.add_runtime_dependency(%q<getopt-declare>, [">= 1.28"])
-      s.add_runtime_dependency(%q<icalendar>, [">= 1.1.0"])
-      s.add_runtime_dependency(%q<mime-types>, [">= 1.15"])
+      s.add_runtime_dependency(%q<icalendar>, [">= 1.1.2"])
+      s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_runtime_dependency(%q<diff-lcs>, [">= 1.1.2"])
     else
-      s.add_dependency(%q<sequel>, [">= 2.12.0"])
+      s.add_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
       s.add_dependency(%q<chronic>, [">= 0.2.3"])
       s.add_dependency(%q<getopt-declare>, [">= 1.28"])
-      s.add_dependency(%q<icalendar>, [">= 1.1.0"])
-      s.add_dependency(%q<mime-types>, [">= 1.15"])
+      s.add_dependency(%q<icalendar>, [">= 1.1.2"])
+      s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
     end
   else
-    s.add_dependency(%q<sequel>, [">= 2.12.0"])
+    s.add_dependency(%q<sequel>, [">= 3.9.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
     s.add_dependency(%q<chronic>, [">= 0.2.3"])
     s.add_dependency(%q<getopt-declare>, [">= 1.28"])
-    s.add_dependency(%q<icalendar>, [">= 1.1.0"])
-    s.add_dependency(%q<mime-types>, [">= 1.15"])
+    s.add_dependency(%q<icalendar>, [">= 1.1.2"])
+    s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: timetrap
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-20 00:00:00 -08:00
+date: 2010-03-14 00:00:00 -08:00
 default_executable: t
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.12.0
+        version: 3.9.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 1.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.15"
+        version: "1.16"
     version: 
 - !ruby/object:Gem::Dependency 
   name: diff-lcs