timetrap 1.7.5 → 1.7.6

data/CONTRIBUTORS

@@ -4,3 +4,4 @@
 * Brian V. Hughes
 * Thorben Schröder
 * Ryan Funduk
+* Christopher Peplin

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'sequel', ">= 3.9.0"
 gem 'sqlite3', "~> 1.3.3"
-gem 'chronic', "~> 0.3.0"
+gem 'chronic', ">= 0.6.4"
 gem 'getopt-declare', ">= 1.28"
 gem 'json', "~>1.4.6"
 gem 'icalendar', "~>1.1.5"

data/Rakefile

@@ -1,6 +1,12 @@
 require 'rake/rdoctask'
 require 'rubygems/package_task'
 require 'rspec/core/rake_task'
+begin
+  # use psych for YAML parsing if available
+  require 'psych'
+rescue LoadError
+  # use syck
+end
 
 desc 'Default: run specs.'
 task :default => :spec
@@ -35,7 +41,7 @@ begin
     s.summary = %q{Command line time tracker}
     s.add_dependency("sequel", ">= 3.9.0")
     s.add_dependency("sqlite3", "~> 1.3.3")
-    s.add_dependency("chronic", "~> 0.3.0")
+    s.add_dependency("chronic", ">= 0.6.4")
     s.add_dependency("getopt-declare", ">= 1.28")
   end
 rescue LoadError

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 7
-:patch: 5
+:patch: 6

data/lib/timetrap/models.rb

@@ -29,12 +29,6 @@ module Timetrap
       round? ? rounded_end : self[:end]
     end
 
-    # work around sequel's behavior of returning numeric values in string
-    # fields as integers
-    def sheet
-      self[:sheet].to_s
-    end
-
     def duration
       @duration ||= self.end_or_now.to_i - self.start.to_i
     end
@@ -73,10 +67,10 @@ module Timetrap
     # do a quick pseudo migration.  This should only get executed on the first run
     set_schema do
       primary_key :id
-      column :note, :string
-      column :start, :timestamp
-      column :end, :timestamp
-      column :sheet, :string
+      column :note, String
+      column :start, DateTime
+      column :end, DateTime
+      column :sheet, String
     end
     create_table unless table_exists?
   end
@@ -86,8 +80,8 @@ module Timetrap
 
     set_schema do
       primary_key :id
-      column :key, :string
-      column :value, :string
+      column :key, String
+      column :value, String
     end
     create_table unless table_exists?
   end

data/lib/timetrap/timer.rb

@@ -56,7 +56,7 @@ module Timetrap
       unless Meta.find(:key => 'current_sheet')
         Meta.create(:key => 'current_sheet', :value => 'default')
       end
-      Meta.find(:key => 'current_sheet').value.to_s
+      Meta.find(:key => 'current_sheet').value
     end
 
     def last_sheet

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrap}
-  s.version = "1.7.5"
+  s.version = "1.7.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2011-06-17}
+  s.date = %q{2011-09-30}
   s.default_executable = %q{t}
   s.description = %q{Command line time tracker}
   s.email = %q{sgrock@gmail.com}
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_runtime_dependency(%q<sqlite3>, ["~> 1.3.3"])
-      s.add_runtime_dependency(%q<chronic>, ["~> 0.3.0"])
+      s.add_runtime_dependency(%q<chronic>, [">= 0.6.4"])
       s.add_runtime_dependency(%q<getopt-declare>, [">= 1.28"])
       s.add_runtime_dependency(%q<json>, ["~> 1.4.6"])
       s.add_runtime_dependency(%q<icalendar>, ["~> 1.1.5"])
@@ -64,12 +64,12 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_runtime_dependency(%q<sqlite3>, ["~> 1.3.3"])
-      s.add_runtime_dependency(%q<chronic>, ["~> 0.3.0"])
+      s.add_runtime_dependency(%q<chronic>, [">= 0.6.4"])
       s.add_runtime_dependency(%q<getopt-declare>, [">= 1.28"])
     else
       s.add_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
-      s.add_dependency(%q<chronic>, ["~> 0.3.0"])
+      s.add_dependency(%q<chronic>, [">= 0.6.4"])
       s.add_dependency(%q<getopt-declare>, [">= 1.28"])
       s.add_dependency(%q<json>, ["~> 1.4.6"])
       s.add_dependency(%q<icalendar>, ["~> 1.1.5"])
@@ -77,13 +77,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
-      s.add_dependency(%q<chronic>, ["~> 0.3.0"])
+      s.add_dependency(%q<chronic>, [">= 0.6.4"])
       s.add_dependency(%q<getopt-declare>, [">= 1.28"])
     end
   else
     s.add_dependency(%q<sequel>, [">= 3.9.0"])
     s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
-    s.add_dependency(%q<chronic>, ["~> 0.3.0"])
+    s.add_dependency(%q<chronic>, [">= 0.6.4"])
     s.add_dependency(%q<getopt-declare>, [">= 1.28"])
     s.add_dependency(%q<json>, ["~> 1.4.6"])
     s.add_dependency(%q<icalendar>, ["~> 1.1.5"])
@@ -91,7 +91,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<sequel>, [">= 3.9.0"])
     s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
-    s.add_dependency(%q<chronic>, ["~> 0.3.0"])
+    s.add_dependency(%q<chronic>, [">= 0.6.4"])
     s.add_dependency(%q<getopt-declare>, [">= 1.28"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timetrap
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 7
-  - 5
-  version: 1.7.5
+  - 6
+  version: 1.7.6
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 -07:00
+date: 2011-09-30 00:00:00 -07:00
 default_executable: t
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,14 +55,14 @@ dependencies:
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 15
         segments: 
         - 0
-        - 3
-        - 0
-        version: 0.3.0
+        - 6
+        - 4
+        version: 0.6.4
   prerelease: false
   type: :runtime
   requirement: *id003
@@ -178,14 +178,14 @@ dependencies:
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 15
         segments: 
         - 0
-        - 3
-        - 0
-        version: 0.3.0
+        - 6
+        - 4
+        version: 0.6.4
   prerelease: false
   type: :runtime
   requirement: *id011