timetrap 1.7.4 → 1.7.5

data/Gemfile

@@ -6,8 +6,13 @@ gem 'chronic', "~> 0.3.0"
 gem 'getopt-declare', ">= 1.28"
 gem 'json', "~>1.4.6"
 gem 'icalendar', "~>1.1.5"
+gem 'rake'
 
 group :test do
   gem "rspec", "~>2"
   gem 'fakefs'
 end
+
+group :development do
+  gem 'jeweler'
+end

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rake/rdoctask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rspec/core/rake_task'
 
 desc 'Default: run specs.'
@@ -24,7 +24,6 @@ begin
 
     s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
     s.authors = ["Sam Goldstein"]
-    s.date = %q{2009-04-14}
     s.description = %q{Command line time tracker}
     s.email = %q{sgrock@gmail.com}
     s.has_rdoc = true
@@ -40,6 +39,6 @@ begin
     s.add_dependency("getopt-declare", ">= 1.28")
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available."
 end
 

data/VERSION.yml

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

data/lib/timetrap/cli.rb

@@ -306,6 +306,7 @@ COMMAND is one of:
         end
       end.sort_by{|sheet| sheet[:name].downcase}
       width = sheets.sort_by{|h|h[:name].length }.last[:name].length + 4
+      width = 10 if width < 10
       puts " %-#{width}s%-12s%-12s%s" % ["Timesheet", "Running", "Today", "Total Time"]
       sheets.each do |sheet|
         star = sheet[:name] == Timer.current_sheet ? '*' : ' '
@@ -322,9 +323,9 @@ COMMAND is one of:
         puts "*#{Timer.current_sheet}: not running"
       end
       Timer.running_entries.each do |entry|
-        current = entry[:sheet] == Timer.current_sheet
+        current = entry.sheet == Timer.current_sheet
         out = current ? '*' : ' '
-        out << "#{entry[:sheet]}: #{format_duration(entry.duration)}".gsub(/  /, ' ')
+        out << "#{entry.sheet}: #{format_duration(entry.duration)}".gsub(/  /, ' ')
         out << " (#{entry.note})" if entry.note =~ /.+/
         puts out
       end

data/lib/timetrap/models.rb

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

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
+      Meta.find(:key => 'current_sheet').value.to_s
     end
 
     def last_sheet

data/spec/timetrap_spec.rb

@@ -561,6 +561,20 @@ END:VCALENDAR
             invoke "kill --id #{entry.id} --yes"
           end.should change(Timetrap::Entry, :count).by(-1)
         end
+
+        describe "with a numeric sheet name" do
+          before do
+            Time.stub!(:now).and_return local_time("2008-10-05 18:00:00")
+            create_entry( :sheet => 1234, :start => local_time_cli('2008-10-03 12:00:00'),
+                         :end => local_time_cli('2008-10-03 14:00:00'))
+          end
+
+          it "should kill the sheet" do
+            lambda do
+              invoke 'kill -y 1234'
+            end.should change(Timetrap::Entry, :count).by(-1)
+          end
+        end
       end
 
       describe "list" do
@@ -571,6 +585,30 @@ END:VCALENDAR
           end
         end
 
+        describe "with a numeric sheet name" do
+          before do
+            Time.stub!(:now).and_return local_time("2008-10-05 18:00:00")
+            create_entry( :sheet => '1234', :start => local_time_cli('2008-10-03 12:00:00'),
+                         :end => local_time_cli('2008-10-03 14:00:00'))
+          end
+
+          it "should list the sheet" do
+            invoke 'list'
+            $stdout.string.should == " Timesheet  Running     Today       Total Time\n 1234        0:00:00     0:00:00     2:00:00\n*default     0:00:00     0:00:00     0:00:00\n"
+          end
+        end
+
+        describe "with a numeric current_sheet" do
+          before do
+            Timetrap::Timer.current_sheet = '1234'
+          end
+
+          it "should list the sheet" do
+            invoke 'list'
+            $stdout.string.should ==  " Timesheet Running     Today       Total Time\n*1234       0:00:00     0:00:00     0:00:00\n"
+          end
+        end
+
         describe "with sheets defined" do
           before do
             Time.stub!(:now).and_return local_time("2008-10-05 18:00:00")

data/timetrap.gemspec

@@ -1,61 +1,56 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{timetrap}
-  s.version = "1.7.4"
+  s.version = "1.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2011-03-07}
+  s.date = %q{2011-06-17}
   s.default_executable = %q{t}
   s.description = %q{Command line time tracker}
   s.email = %q{sgrock@gmail.com}
   s.executables = ["t"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
-     "README.md"
+    "README.md"
   ]
   s.files = [
-    ".gitignore",
-     ".rspec",
-     "CONTRIBUTORS",
-     "Gemfile",
-     "LICENSE.txt",
-     "README.md",
-     "Rakefile",
-     "VERSION.yml",
-     "bin/dev_t",
-     "bin/t",
-     "lib/timetrap.rb",
-     "lib/timetrap/cli.rb",
-     "lib/timetrap/config.rb",
-     "lib/timetrap/formatters.rb",
-     "lib/timetrap/formatters/csv.rb",
-     "lib/timetrap/formatters/factor.rb",
-     "lib/timetrap/formatters/ical.rb",
-     "lib/timetrap/formatters/ids.rb",
-     "lib/timetrap/formatters/json.rb",
-     "lib/timetrap/formatters/text.rb",
-     "lib/timetrap/helpers.rb",
-     "lib/timetrap/models.rb",
-     "lib/timetrap/timer.rb",
-     "spec/timetrap_spec.rb",
-     "timetrap.gemspec"
+    ".rspec",
+    "CONTRIBUTORS",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION.yml",
+    "bin/dev_t",
+    "bin/t",
+    "lib/timetrap.rb",
+    "lib/timetrap/cli.rb",
+    "lib/timetrap/config.rb",
+    "lib/timetrap/formatters.rb",
+    "lib/timetrap/formatters/csv.rb",
+    "lib/timetrap/formatters/factor.rb",
+    "lib/timetrap/formatters/ical.rb",
+    "lib/timetrap/formatters/ids.rb",
+    "lib/timetrap/formatters/json.rb",
+    "lib/timetrap/formatters/text.rb",
+    "lib/timetrap/helpers.rb",
+    "lib/timetrap/models.rb",
+    "lib/timetrap/timer.rb",
+    "spec/timetrap_spec.rb",
+    "timetrap.gemspec"
   ]
   s.homepage = %q{http://github.com/samg/timetrap/tree/master}
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Command line time tracker}
-  s.test_files = [
-    "spec/timetrap_spec.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -63,17 +58,41 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sqlite3>, ["~> 1.3.3"])
       s.add_runtime_dependency(%q<chronic>, ["~> 0.3.0"])
       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"])
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      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<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<getopt-declare>, [">= 1.28"])
+      s.add_dependency(%q<json>, ["~> 1.4.6"])
+      s.add_dependency(%q<icalendar>, ["~> 1.1.5"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      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<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<getopt-declare>, [">= 1.28"])
+    s.add_dependency(%q<json>, ["~> 1.4.6"])
+    s.add_dependency(%q<icalendar>, ["~> 1.1.5"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    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<getopt-declare>, [">= 1.28"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timetrap
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 1
   - 7
-  - 4
-  version: 1.7.4
+  - 5
+  version: 1.7.5
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -15,13 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -08:00
+date: 2011-06-17 00:00:00 -07:00
 default_executable: t
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sequel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +31,12 @@ dependencies:
         - 9
         - 0
         version: 3.9.0
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,12 +47,12 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: chronic
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,12 +63,135 @@ dependencies:
         - 3
         - 0
         version: 0.3.0
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: getopt-declare
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 1
+        - 28
+        version: "1.28"
+  prerelease: false
+  type: :runtime
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  name: json
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
+  prerelease: false
+  type: :runtime
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  name: icalendar
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 1
+        - 5
+        version: 1.1.5
+  prerelease: false
+  type: :runtime
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :runtime
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  name: sequel
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 3
+        - 9
+        - 0
+        version: 3.9.0
+  prerelease: false
+  type: :runtime
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
+        version: 1.3.3
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  name: chronic
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  prerelease: false
+  type: :runtime
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  name: getopt-declare
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,8 +201,9 @@ dependencies:
         - 1
         - 28
         version: "1.28"
+  prerelease: false
   type: :runtime
-  version_requirements: *id004
+  requirement: *id012
 description: Command line time tracker
 email: sgrock@gmail.com
 executables: 
@@ -91,7 +214,6 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files: 
-- .gitignore
 - .rspec
 - CONTRIBUTORS
 - Gemfile
@@ -147,9 +269,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Command line time tracker
-test_files: 
-- spec/timetrap_spec.rb
+test_files: []
+

data/.gitignore

@@ -1,5 +0,0 @@
-tags
-pkg
-*.swp
-Gemfile.lock
-.bundle