timetrackr 0.1.2 → 0.1.3

data/Gemfile

@@ -1,6 +1,7 @@
 source 'http://rubygems.org'
 
 group :development do
+  gem 'sqlite3'
   gem 'shoulda', '>= 0'
   gem 'bundler', '~> 1.0.0'
   gem 'jeweler', '~> 1.5.2'

data/Gemfile.lock

@@ -9,6 +9,7 @@ GEM
     rake (0.8.7)
     rcov (0.9.9)
     shoulda (2.11.3)
+    sqlite3 (1.3.3)
 
 PLATFORMS
   ruby
@@ -18,3 +19,4 @@ DEPENDENCIES
   jeweler (~> 1.5.2)
   rcov
   shoulda
+  sqlite3

data/README.mkd

@@ -4,19 +4,23 @@ A simple CLI time tracking utility.
 
 ## Example
 
-    >tt start work
+    $ tt start work
 
-    >tt switch play
+    $ tt switch play
 
-    >tt
+    $ tt
     work                            0h  0m  3s
     play *                          0h  0m  1s
 
-    >tt clear work
+    $ tt clear work
 
-    >tt time
+    $ tt time
     play *                          0h  0m  5s
 
+    $ tt log
+    2011-05-17   work           08:05   08:20    0h 15m 41s
+                 something *    09:05            0h  0m  4s
+
 
 
 ## Contributing to timetrackr

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/timetrackr

@@ -6,13 +6,13 @@ require 'timetrackr'
 require 'timetrackr/period'
 
 DEFAULTS = {
-  :backend => 'yaml',
-  :verbose => false,
-  :single_task => false,
-  :path => File.join(ENV['HOME'],'.timetrackr.db'),
-  :relative_format => "%2<hours>dh %2<minutes>dm %2<seconds>ds",
-  :absolute_time => "%H:%m",
-  :absolute_day => "%Y-%m-%d"
+  'backend' => 'yaml',
+  'verbose' => false,
+  'single_task' => false,
+  'path' => File.join(ENV['HOME'],'.timetrackr.db'),
+  'relative_format' => "%2<hours>dh %2<minutes>dm %2<seconds>ds",
+  'absolute_time' => "%H:%M",
+  'absolute_day' => "%Y-%m-%d"
 }
 
 def show_help
@@ -56,7 +56,7 @@ end
 # global options
 while (cmd = ARGV.shift) && cmd.start_with?('-')
   if ['-v','--verbose'].include? cmd
-    config[:verbose] = true
+    config['verbose'] = true
   end
   if ['-h','--help'].include? cmd
     show_help
@@ -65,8 +65,8 @@ while (cmd = ARGV.shift) && cmd.start_with?('-')
 end
 
 config = DEFAULTS.merge(config || {})
-$verbose = config[:verbose]
-trackr = TimeTrackr.create(config[:backend], config)
+$verbose = config['verbose']
+trackr = TimeTrackr.create(config['backend'], config)
 
 # 
 # commands
@@ -76,7 +76,7 @@ when 'start','in','s'
   task = ARGV.shift
   notes = ARGV.join(' ')
   # switch tasks if config says so
-  if config[:single_task] && trackr.current != task
+  if config['single_task'] && trackr.current != task
     trackr.current.each { |t|
       trackr.stop(t) unless t == task
     }
@@ -118,7 +118,7 @@ when 'time','status',nil
       t = t + period.length
     }
     name = trackr.current.include?(task) ? task+' *' : task
-    puts name.ljust(15) << format_time(total,config[:relative_format])
+    puts name.ljust(15) << format_time(total,config['relative_format'])
   end
 
 when 'log'
@@ -131,16 +131,16 @@ when 'log'
   periods = tasks.each.collect{ |t| trackr.history(t) }.flatten
   lastday = nil
   table << periods.sort{|x,y| x.start <=> y.start}.collect{ |period|
-    currday = period.start.strftime(config[:absolute_day])
+    currday = period.start.strftime(config['absolute_day'])
     day = (currday == lastday) ? ' ' : currday
     lastday = currday
     name = period.current? ? period.task+' *' : period.task
-    start = period.start.strftime(config[:absolute_time])
-    stop = period.current? ? ' ' : period.stop.strftime(config[:absolute_time])
-    length = format_time(period.length, config[:relative_format])
+    start = period.start.strftime(config['absolute_time'])
+    stop = period.current? ? ' ' : period.stop.strftime(config['absolute_time'])
+    length = format_time(period.length, config['relative_format'])
     "#{day.ljust(12)} #{name.ljust(15)} #{start.ljust(7)} #{stop.ljust(7)} #{length}"
   }
-  puts table.join("\n")
+  puts table
 
 
 when 'clear','delete','del'

data/lib/timetrackr/period.rb

@@ -15,7 +15,7 @@ class Period
   end
 
   def current?
-    stop.nil?
+    @stop.nil?
   end
 
 end

data/lib/timetrackr/sqlite.rb

@@ -0,0 +1,65 @@
+class SqliteTimeTrackr < TimeTrackr
+
+  def initialize(path)
+    @log_path = path
+    if !File.exist? @log_path
+      @db = SQLite3::Database.new(@log_path)
+      sql_events = "CREATE TABLE events (
+      id INTEGER PRIMARY KEY,
+      task TEXT,
+      start TIME,
+      stop TIME,
+      notes TEXT);"
+      @db.execute(sql_events)
+    else
+      @db = SQLite3::Database.open(@log_path)
+    end
+    @db.type_translation = true
+    puts "Using DB file '#{@log_path}'" if $verbose
+  end
+
+  def current
+    sql = "SELECT DISTINCT task FROM events WHERE stop IS NULL;"
+    @db.execute(sql).collect{|row|
+      row.first
+    }
+  end
+
+  def tasks
+    sql = "SELECT DISTINCT task FROM events;"
+    @db.execute(sql).collect{ |row|
+      row.first
+    }
+  end
+
+  def start(task, notes)
+    sql = "SELECT id FROM events WHERE task = :task AND stop IS NULL;"
+    exists = @db.get_first_value(sql, 'task' => task)
+    if !exists
+      sql = "INSERT INTO events (task,start,notes) VALUES (:task,:start,:notes);"
+      @db.execute(sql,'task' => task, 'start' => Time.now.to_s, 'notes' => notes)
+    end
+  end
+
+  def stop(task)
+    sql = "SELECT id FROM events WHERE task = :task AND stop IS NULL;"
+    exists = @db.get_first_value(sql, 'task' => task)
+    if exists
+      sql = "UPDATE events SET stop = :stop WHERE id = :current;"
+      @db.execute(sql, 'current' => exists, 'stop' => Time.now.to_s)
+    end
+  end
+
+  def history(task, p_begin=nil, p_end=nil)
+    sql = "SELECT start, stop, notes FROM events WHERE task = :task ORDER BY start;"
+    @db.execute(sql,'task' => task).collect{ |row|
+      Period.new(task,row[0],row[1],row[2])
+    }
+  end
+
+  def clear(task)
+    sql = "DELETE FROM events WHERE task = :task;"
+    @db.execute(sql, 'task' => task)
+  end
+
+end

data/lib/timetrackr.rb

@@ -2,12 +2,12 @@ autoload 'YamlTimeTrackr', 'timetrackr/yaml'
 autoload 'SqliteTimeTrackr', 'timetrackr/sqlite'
 
 class TimeTrackr
-  def self.create(type,options={})
+  def self.create(type, options={})
     case type.to_s
     when 'yaml'
       begin
         require 'yaml'
-        log = YamlTimeTrackr.new(options[:path])
+        log = YamlTimeTrackr.new(options['path'])
         puts 'Loaded yaml tracker' if $verbose
       rescue LoadError
         puts 'Yaml not found'
@@ -15,7 +15,7 @@ class TimeTrackr
     when 'sqlite'
       begin
         require 'sqlite3'
-        log = SqliteTimeTrackr.new(options[:path])
+        log = SqliteTimeTrackr.new(options['path'])
         puts 'Loaded sqlite tracker' if $verbose
       rescue LoadError
         puts 'Sqlite not found'
@@ -34,7 +34,7 @@ class TimeTrackr
   end
 
   #
-  # start a period
+  # start a period with optional notes
   #
   def start(task,notes)
     raise 'Not implemented'

data/test/test_timetrackr.rb

@@ -50,4 +50,41 @@ class TestTimetrackr < Test::Unit::TestCase
 
     end
   end
+
+  context 'an Sqlite based tracker' do
+    setup do
+      @config = {:path => '/tmp/timetracker.test'}
+      @t = TimeTrackr.create('sqlite',@config)
+    end
+
+    def teardown
+      File.unlink(@config[:path]) rescue nil
+    end
+
+    should 'initialise a log file' do
+      assert File.exist?(@config[:path])
+    end
+
+    context 'with empty db' do
+
+      should 'not fail on current command' do
+        assert_nothing_raised Exception do
+          @t.current
+        end
+      end
+
+      should 'not fail on tasks command' do
+        assert_nothing_raised Exception do
+          @t.tasks
+        end
+      end
+
+      should 'not fail on close command' do
+        assert_nothing_raised Exception do
+          @t.close
+        end
+      end
+
+    end
+  end
 end

data/timetrackr.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrackr}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Felix Hanley"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "bin/timetrackr",
     "lib/timetrackr.rb",
     "lib/timetrackr/period.rb",
+    "lib/timetrackr/sqlite.rb",
     "lib/timetrackr/yaml.rb",
     "test/helper.rb",
     "test/test_timetrackr.rb",
@@ -47,17 +48,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
+      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
+    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

metadata

@@ -2,7 +2,7 @@
 name: timetrackr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Felix Hanley
@@ -14,7 +14,7 @@ date: 2011-05-17 00:00:00 +07:00
 default_executable: timetrackr
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: sqlite3
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -25,8 +25,19 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: shoulda
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -34,10 +45,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,10 +56,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -56,7 +67,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 description: A simple time tracking utility
 email: felix@seconddrawer.com.au
 executables: 
@@ -76,6 +87,7 @@ files:
 - bin/timetrackr
 - lib/timetrackr.rb
 - lib/timetrackr/period.rb
+- lib/timetrackr/sqlite.rb
 - lib/timetrackr/yaml.rb
 - test/helper.rb
 - test/test_timetrackr.rb
@@ -94,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3115143978170493963
+      hash: -4194975739738215101
       segments: 
       - 0
       version: "0"