timetrackr 0.1.6 → 0.2.0

data/CHANGELOG

@@ -0,0 +1,21 @@
+= v0.2
+
+  * clean up and simplify
+  * removed JSON and SQLite support, only YAML
+  * added 'notes' command
+
+= v0.1.6
+
+  * group by days or tasks
+
+= v0.1.5
+
+  * added JSON database
+
+= v0.1.4
+
+  * more commands
+
+= v0.1.3
+
+  * stop playing with jeweller and release

data/Gemfile

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

data/Gemfile.lock

@@ -1,24 +1,13 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    json (1.5.1)
-    rake (0.8.7)
-    rcov (0.9.9)
-    shoulda (2.11.3)
-    sqlite3 (1.3.3)
+    gemcutter (0.7.0)
+    rake (0.9.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  json
-  rcov
-  shoulda
-  sqlite3
+  bundler (>= 1.0.0)
+  gemcutter
+  rake

data/Manifest

@@ -0,0 +1,16 @@
+CHANGELOG
+Gemfile
+Gemfile.lock
+LICENSE
+Manifest
+README
+Rakefile
+TODO
+bin/timetrackr
+lib/timetrackr.rb
+lib/timetrackr/cli.rb
+lib/timetrackr/database.rb
+lib/timetrackr/period.rb
+test/helper.rb
+test/test_timetrackr.rb
+timetrackr.gemspec

data/{README.mkd → README}

@@ -61,13 +61,18 @@ start a task:
 
 ## Contributing to timetrackr
 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Check out the latest master to make sure the feature hasn't been implemented
+  or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it
+  and/or contributed it
 * Fork the project
 * Start a feature/bugfix branch
 * Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+* Make sure to add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to
+  have your own version, or is otherwise necessary, that is fine, but please
+  isolate to its own commit so I can cherry-pick around it.
 
 
 ## Copyright

data/Rakefile

@@ -1,53 +1,102 @@
 require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "timetrackr"
-  gem.homepage = "http://github.com/felix/timetrackr"
-  gem.license = "MIT"
-  gem.summary = "A simple time tracking utility"
-  gem.description = "A simple time tracking utility"
-  gem.email = "felix@seconddrawer.com.au"
-  gem.authors = ["Felix Hanley"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "timetrackr #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+require "rubygems/package_task"
+require "rdoc/task"
+require "rake/testtask"
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/**/*_test.rb"]
+  t.verbose = true
+end
+
+task :default => ["test"]
+
+# This builds the actual gem. For details of what all these options
+# mean, and other ones you can add, check the documentation here:
+#
+#   http://rubygems.org/read/chapter/20
+#
+spec = Gem::Specification.new do |s|
+
+  # Change these as appropriate
+  s.name              = "timetrackr"
+  s.version           = "0.2.0"
+  s.summary           = "A simple time tracking utility"
+  s.author            = "Felix Hanley"
+  s.email             = "felix@seconddrawer.com.au"
+  s.homepage          = "http://github.com/felix/timetrackr"
+
+  s.has_rdoc          = true
+  s.extra_rdoc_files  = %w(README)
+  s.rdoc_options      = %w(--main README)
+
+  # Add any extra files to include in the gem
+  s.files             = %w(Rakefile Gemfile Gemfile.lock LICENSE README CHANGELOG Manifest TODO) + Dir.glob("{bin,test,lib}/**/*")
+  s.executables       = FileList["bin/**"].map { |f| File.basename(f) }
+  s.require_paths     = ["lib"]
+
+  # If you want to depend on other gems, add them here, along with any
+  # relevant versions
+  # s.add_dependency("some_other_gem", "~> 0.1.0")
+
+  # If your tests use any gems, include them here
+  # s.add_development_dependency("mocha") # for example
+end
+
+desc 'Tag the repository in git with gem version number'
+task :tag => [:gemspec, :package] do
+  if `git diff --cached`.empty?
+    if `git tag`.split("\n").include?("v#{spec.version}")
+      raise "Version #{spec.version} has already been released"
+    end
+    `git add #{File.expand_path("../#{spec.name}.gemspec",
+      __FILE__)}`
+      `git commit -m "Released version #{spec.version}"`
+      `git tag v#{spec.version}`
+      `git push --tags`
+      `git push`
+  else
+    raise "Unstaged changes still waiting to be committed"
+  end
+end
+
+desc "Tag and publish the gem to rubygems.org"
+task :publish => :tag do
+  `gem push pkg/#{spec.name}-#{spec.version}.gem`
+end
+
+# This task actually builds the gem. We also regenerate a static
+# .gemspec file, which is useful if something (i.e. GitHub) will
+# be automatically building a gem for this project. If you're not
+# using GitHub, edit as appropriate.
+#
+# To publish your gem online, install the 'gemcutter' gem; Read more 
+# about that here: http://gemcutter.org/pages/gem_docs
+Gem::PackageTask.new(spec) do |pkg|
+  pkg.gem_spec = spec
+end
+
+desc "Build the gemspec file #{spec.name}.gemspec"
+task :gemspec do
+  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
+  File.open(file, "w") {|f| f << spec.to_ruby }
+end
+
+# If you don't want to generate the .gemspec file, just remove this line. Reasons
+# why you might want to generate a gemspec:
+#  - using bundler with a git source
+#  - building the gem without rake (i.e. gem build blah.gemspec)
+#  - maybe others?
+task :package => :gemspec
+
+# Generate documentation
+RDoc::Task.new do |rd|
+  rd.main = "README"
+  rd.rdoc_files.include("README", "lib/**/*.rb")
+  rd.rdoc_dir = "rdoc"
+end
+
+desc 'Clear out RDoc and generated packages'
+task :clean => [:clobber_rdoc, :clobber_package] do
+  rm "#{spec.name}.gemspec"
 end

data/TODO

@@ -0,0 +1,2 @@
+- add some tests
+

data/lib/timetrackr.rb

@@ -1,10 +1,5 @@
 module TimeTrackr
-
   require 'time'
   require 'timetrackr/database'
   require 'timetrackr/period'
-
-  autoload 'YamlDatabase', 'timetrackr/yaml'
-  autoload 'SqliteDatabase', 'timetrackr/sqlite'
-  autoload 'JsonDatabase', 'timetrackr/json'
 end

data/lib/timetrackr/cli.rb

@@ -1,9 +1,8 @@
 module TimeTrackr
   class CLI
     DEFAULTS = {
-      'backend' => 'yaml',
       'verbose' => false,
-      'single_task' => false,
+      'single_task' => true,
       'path' => File.join(ENV['HOME'],'.timetrackr.db'),
       'relative_format' => "%2<hours>dh %2<minutes>dm %2<seconds>ds",
       'absolute_time' => "%H:%M",
@@ -38,8 +37,7 @@ module TimeTrackr
 
     def initialize(config)
       @config = config
-      @verbose = config['verbose']
-      @trackr = TimeTrackr::Database.create(config['backend'], config)
+      @trackr = TimeTrackr::Database.new(config)
     end
 
     #
@@ -56,17 +54,16 @@ module TimeTrackr
           @trackr.current.each { |t|
             @trackr.stop(t) unless t == task
           }
-          puts "Switched to task '#{task}'" if @verbose
+          puts "Switched to task '#{task}'" if @config['verbose']
         else
-          puts "Started task '#{task}'" if @verbose
+          puts "Started task '#{task}'" if @config['verbose']
         end
         @trackr.start(task, notes)
 
       when 'stop','out','kill','k'
-        tasks = get_tasks(args)
-        tasks.each do |task|
+        get_tasks(args).each do |task|
           @trackr.stop(task)
-          puts "Stopped task '#{task}'" if @verbose
+          puts "Stopped task '#{task}'" if @config['verbose']
         end
 
       when 'switch','sw'
@@ -76,34 +73,44 @@ module TimeTrackr
           @trackr.stop(t) unless t == task
         end
         @trackr.start(task, notes)
-        puts "Switched to task '#{task}'" if @verbose
+        puts "Switched to task '#{task}'" if @config['verbose']
 
       when 'time','status',nil
         tasks = get_tasks(args)
         puts create_log(tasks,'t')
 
       when 'log'
-        group = args.shift[1] if ['-d','-t'].include?(args[0])
+        group = args.shift[1] if ['-d','-t','-s'].include?(args[0])
 
         tasks = get_tasks(args)
         puts create_log(tasks,group)
 
       when 'clear','delete','del'
-        tasks = get_tasks(args)
-        tasks.each do |task|
+        get_tasks(args).each do |task|
           @trackr.clear(task)
-          puts "Task '#{task}' cleared" if @verbose
+          puts "Task '#{task}' cleared" if @config['verbose']
         end
 
       when 'rename','mv'
         from = args.shift
         to = args.shift
         @trackr.rename(from,to)
-        puts "Renamed '#{from}' to '#{to}'" if @verbose
+        puts "Renamed '#{from}' to '#{to}'" if @config['verbose']
+
+      when 'mark','note','n'
+        notes = args.join(' ')
+        @trackr.current.each do |t|
+          @trackr.stop(t)
+          @trackr.start(t, notes)
+        end
+        puts "Annotated task(s) '#{@trackr.current.join(' ')}'" if @config['verbose']
 
       when 'help'
         show_help
 
+      when 'config'
+        puts @config.to_yaml
+
       else
         puts "'#{cmd}' is not a valid command"
         show_help
@@ -115,10 +122,12 @@ module TimeTrackr
     protected
 
     def get_tasks(args)
+      # if 'all' add them all to the start
       if args[0].nil? || args[0] == 'all' || args[0] == '-n'
         args.unshift(@trackr.tasks).flatten!.delete('all')
       end
 
+      # any negated tasks?
       split = args.index('-n') || args.length
       show = args.slice(0...split).compact.uniq
       ignore =[*args.slice(split+1..-1)].compact.uniq
@@ -136,40 +145,49 @@ module TimeTrackr
     end
 
     def create_log(tasks,group=nil)
-      totals = Hash.new(0)
-      days = {}
+      unless group.nil?
+        totals = Hash.new(0)
+        days = {}
+      end
       table = []
-      # get all periods for selected tasks
-      periods = tasks.each.collect{ |t| @trackr.history(t) }.flatten
       lastday = nil
-      periods.sort{|x,y| x.start <=> y.start}.collect do |period|
+
+      # get all periods for selected tasks
+      tasks.each.collect{ |t| @trackr.history(t) }.flatten.sort{ |x,y| x.start <=> y.start }.collect do |period|
         currday = period.start.strftime(@config['absolute_day'])
         if currday == lastday
           day = ''
         else
           day = currday
-          days[day] = Hash.new(0)
+          days[day] = Hash.new(0) unless group.nil?
         end
         lastday = currday
 
-        start = period.start.strftime(@config['absolute_time'])
-        stop = period.current? ? ' ' : period.stop.strftime(@config['absolute_time'])
-        name = period.current? ? period.task+' *' : period.task
-        notes = period.notes
-        length = format_time(period.length, @config['relative_format'])
-
-        totals[period.task] = totals[period.task] + period.length if group == 't'
-        days[currday][period.task] = days[currday][period.task] + period.length if group == 'd'
-        # for full log
-        table << "#{day.ljust(12)} #{name.ljust(15)} #{start} - #{stop.ljust(5)}  #{length}  #{notes}" if group.nil?
+        if group.nil?
+          # full log
+          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'])
+          notes = period.notes
+          table << "#{day.ljust(12)} #{name.ljust(15)} #{start} - #{stop.ljust(5)}  #{length}  #{notes}"
+
+        elsif group == 's'
+          days[currday]['summary'] = days[currday]['summary'] + period.length
+        else
+          totals[period.task] = totals[period.task] + period.length
+          days[currday][period.task] = days[currday][period.task] + period.length
+        end
       end
 
+      # build the table for groupings
       case group
       when 't'
         tasks.each do |task|
           name = @trackr.current.include?(task) ? task+' *' : task
           table <<  name.ljust(15) + format_time(totals[task],@config['relative_format'])
         end
+
       when 'd'
         prev_date = ''
         days.each_pair do |date,tasks|
@@ -180,7 +198,14 @@ module TimeTrackr
             table << "#{date_string.ljust(12)} #{name.ljust(15)}  " + format_time(length, @config['relative_format'])
           end
         end
+
+      when 's'
+        days.each_pair do |date,day|
+          table << "#{date.ljust(12)}  " + format_time(day['summary'], @config['relative_format'])
+        end
       end
+
+      # spit it out
       table
     end
 
@@ -193,11 +218,17 @@ module TimeTrackr
 
   Available commands:
 
-      start [task]   start a task
-      stop [task]    stop a task (or 'all')
-      switch TASK    switch tasks
-      time [task]    show time for a task (or 'all')
-      log [task]     show time log for a task (or 'all')
+      start  TASK     start a task
+      stop   [TASK]   stop a task (or 'all')
+      switch TASK     switch tasks
+      log    [TASK]   show time log for a task (or 'all')
+        -d            group by day
+        -t            group by task
+        -s            summary (by day, no tasks)
+      time   [TASK]   same as 'log -t'
+      mark   NOTES    add notes to all current tasks
+      rename OLD NEW  rename a task
+      config          current config
 
   Global options
       -h --help      show this help

data/lib/timetrackr/database.rb

@@ -1,103 +1,109 @@
+#
+# keeps the following format in a yaml file:
+#
+# :current: []
+#
+# :tasks:
+#   foo:
+#   - :start: 2011-05-16 14:26:26.263449 +07:00
+#     :stop: 2011-05-16 14:26:27 +07:00
+#     :notes: "blah blah blah"
+#
 
 module TimeTrackr
   class Database
-    def self.create(type, options={})
-      case type.to_s
-      when 'yaml'
-        begin
-          require 'yaml'
-          db = TimeTrackr::YamlDatabase.new(options['path'])
-          puts 'Loaded YAML tracker' if options['verbose']
-        rescue LoadError
-          puts 'YAML not found'
+    def initialize(options={})
+      @options = options
+      begin
+        require 'yaml'
+        @log_path = options['path']
+        if !File.exist? @log_path
+          @db = {:current => [], :tasks => {}}
+          write_file
         end
-
-      when 'sqlite'
-        begin
-          require 'sqlite3'
-          db = TimeTrackr::SqliteDatabase.new(options['path'])
-          puts 'Loaded sqlite tracker' if options['verbose']
-        rescue LoadError
-          puts 'Sqlite not found'
-        end
-
-      when 'json'
-        begin
-          require 'json'
-          db = TimeTrackr::JsonDatabase.new(options['path'])
-          puts 'Loaded JSON database' if options['verbose']
-        rescue LoadError
-          puts 'JSON not found'
-        end
-
-      else
-        raise "Bad log type: #{type}"
+        @db = YAML.load_file(@log_path)
+        puts 'Loaded database' if options['verbose']
+      rescue LoadError
+        puts 'YAML not found'
       end
-      db
     end
 
     #
     # return an array of current tasks
     #
     def current
-      raise 'Not Implemented'
+      @db[:current]
     end
 
     #
-    # start a period with optional notes
-    #
-    def start(task,notes)
-      raise 'Not implemented'
-    end
-
-    #
-    # stop a period
+    # return an array of all tasks
     #
-    def stop(task)
-      raise 'Not implemented'
+    def tasks
+      @db[:tasks].keys.compact.uniq || []
     end
 
     #
-    # return an array of all tasks
+    # start a period with optional notes
     #
-    def tasks
-      raise 'Not Implemented'
+    def start(task, notes)
+      @db[:tasks][task] = Array[] unless @db[:tasks][task]
+      if !@db[:current].include?(task)
+        @db[:current].unshift(task)
+        @db[:tasks][task].push({:start => Time.now, :notes => notes})
+      end
     end
 
     #
-    # time in task in seconds
+    # stop a period
     #
-    def time(task)
-      raise 'Not implemented'
+    def stop(task)
+      if @db[:current].include?(task)
+        @db[:current].delete(task)
+        @db[:tasks][task].last[:stop] = Time.now
+      end
     end
 
     #
     # get task history as an array of Periods
     #
-    def history(task)
-      raise 'Not Implemented'
+    def history(task, p_begin=nil, p_end=nil)
+      @db[:tasks][task].sort{|x,y| x[:start] <=> y[:start]}.collect {|p|
+        Period.new(task,p[:start],p[:stop],p[:notes])
+      } unless !@db[:tasks].include? task
     end
 
     #
     # rename a task
     #
     def rename(from, to)
-      raise 'Not implemented'
+      @db[:tasks][to] = @db[:tasks].delete(from)
+      if @db[:current].delete(from)
+        @db[:current].unshift(to)
+      end
     end
 
     #
-    # clear an task
+    # cleanup and close
     #
-    def clear(task)
-      raise 'Not Implemented'
+    def close
+      write_file
     end
 
     #
-    # cleanup and close
+    # clear an task
     #
-    def close
+    def clear(task)
+      @db[:current].delete(task)
+      @db[:tasks].delete(task)
     end
 
+    private
+
+    def write_file
+      File.open(@log_path,'w') do |fh|
+        YAML.dump(@db,fh)
+        puts 'Saved database' if @options['verbose']
+      end
+    end
   end
 end
-

metadata

@@ -2,7 +2,7 @@
 name: timetrackr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors: 
 - Felix Hanley
@@ -10,109 +10,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 +07:00
-default_executable: timetrackr
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
-  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: shoulda
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id006
-description: A simple time tracking utility
+date: 2011-10-28 00:00:00 Z
+dependencies: []
+
+description: 
 email: felix@seconddrawer.com.au
 executables: 
 - timetrackr
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE.txt
-- README.mkd
+- README
 files: 
+- Rakefile
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
-- README.mkd
-- Rakefile
-- VERSION
+- LICENSE
+- README
+- CHANGELOG
+- Manifest
+- TODO
 - bin/timetrackr
-- lib/timetrackr.rb
-- lib/timetrackr/cli.rb
-- lib/timetrackr/database.rb
-- lib/timetrackr/json.rb
-- lib/timetrackr/period.rb
-- lib/timetrackr/sqlite.rb
-- lib/timetrackr/yaml.rb
 - test/helper.rb
 - test/test_timetrackr.rb
-- timetrackr.gemspec
-has_rdoc: true
+- lib/timetrackr/period.rb
+- lib/timetrackr/database.rb
+- lib/timetrackr/cli.rb
+- lib/timetrackr.rb
 homepage: http://github.com/felix/timetrackr
-licenses: 
-- MIT
-post_install_message: 
-rdoc_options: []
+licenses: []
 
+post_install_message: 
+rdoc_options: 
+- --main
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -120,9 +51,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4452594232215196430
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -133,10 +61,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A simple time tracking utility
-test_files: 
-- test/helper.rb
-- test/test_timetrackr.rb
+test_files: []
+

data/VERSION

@@ -1 +0,0 @@
-0.1.6

data/lib/timetrackr/json.rb

@@ -1,68 +0,0 @@
-module TimeTrackr
-  class JsonDatabase < TimeTrackr::Database
-
-    def initialize(path)
-      @log_path = path
-      if !File.exist? @log_path
-        @db = {'current' => [], 'tasks' => {}}
-        write_file
-      end
-      File.open(@log_path,'r') do |fh|
-        @db = JSON.load(fh)
-      end
-    end
-
-    def current
-      @db['current']
-    end
-
-    def tasks
-      @db['tasks'].keys.compact.uniq || []
-    end
-
-    def start(task, notes)
-      @db['tasks'][task] = Array[] unless @db['tasks'][task]
-      if !@db['current'].include?(task)
-        @db['current'].unshift(task)
-        @db['tasks'][task].push({'start' => Time.now, 'notes' => notes})
-      end
-    end
-
-    def stop(task)
-      if @db['current'].include?(task)
-        @db['current'].delete(task)
-        @db['tasks'][task].last['stop'] = Time.now
-      end
-    end
-
-    def history(task, p_begin=nil, p_end=nil)
-      @db['tasks'][task].sort{|x,y| x['start'] <=> y['start']}.collect {|p|
-        Period.new(task,p['start'],p['stop'],p['notes'])
-      } unless !@db['tasks'].include? task
-    end
-
-    def rename(from, to)
-      @db['tasks'][to] = @db['tasks'].delete(from)
-      if @db['current'].delete(from)
-        @db['current'].unshift(to)
-      end
-    end
-
-    def close
-      write_file
-    end
-
-    def clear(task)
-      @db['current'].delete(task)
-      @db['tasks'].delete(task)
-    end
-
-    private
-
-    def write_file
-      File.open(@log_path,'w') do |fh|
-        JSON.dump(@db,fh)
-      end
-    end
-  end
-end

data/lib/timetrackr/sqlite.rb

@@ -1,71 +0,0 @@
-module TimeTrackr
-  class SqliteDatabase < TimeTrackr::Database
-
-    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
-    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 rename(from, to)
-      sql = "UPDATE events SET task = :to WHERE task = :from;"
-      @db.execute(sql, 'to' => to, 'from' => from)
-    end
-
-    def clear(task)
-      sql = "DELETE FROM events WHERE task = :task;"
-      @db.execute(sql, 'task' => task)
-    end
-
-  end
-end

data/lib/timetrackr/yaml.rb

@@ -1,78 +0,0 @@
-#
-# keeps the following format in a yaml file:
-#
-# :current: []
-#
-# :tasks:
-#   foo:
-#   - :start: 2011-05-16 14:26:26.263449 +07:00
-#     :stop: 2011-05-16 14:26:27 +07:00
-#     :notes: "blah blah blah"
-#
-
-module TimeTrackr
-  class YamlDatabase < TimeTrackr::Database
-
-    def initialize(path)
-      @log_path = path
-      if !File.exist? @log_path
-        @db = {:current => [], :tasks => {}}
-        write_file
-      end
-      @db = YAML.load_file(@log_path)
-    end
-
-    def current
-      @db[:current]
-    end
-
-    def tasks
-      @db[:tasks].keys.compact.uniq || []
-    end
-
-    def start(task, notes)
-      @db[:tasks][task] = Array[] unless @db[:tasks][task]
-      if !@db[:current].include?(task)
-        @db[:current].unshift(task)
-        @db[:tasks][task].push({:start => Time.now, :notes => notes})
-      end
-    end
-
-    def stop(task)
-      if @db[:current].include?(task)
-        @db[:current].delete(task)
-        @db[:tasks][task].last[:stop] = Time.now
-      end
-    end
-
-    def history(task, p_begin=nil, p_end=nil)
-      @db[:tasks][task].sort{|x,y| x[:start] <=> y[:start]}.collect {|p|
-        Period.new(task,p[:start],p[:stop],p[:notes])
-      } unless !@db[:tasks].include? task
-    end
-
-    def rename(from, to)
-      @db[:tasks][to] = @db[:tasks].delete(from)
-      if @db[:current].delete(from)
-        @db[:current].unshift(to)
-      end
-    end
-
-    def close
-      write_file
-    end
-
-    def clear(task)
-      @db[:current].delete(task)
-      @db[:tasks].delete(task)
-    end
-
-    private
-
-    def write_file
-      File.open(@log_path,'w') do |fh|
-        YAML.dump(@db,fh)
-      end
-    end
-  end
-end

data/timetrackr.gemspec

@@ -1,77 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{timetrackr}
-  s.version = "0.1.6"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Felix Hanley"]
-  s.date = %q{2011-06-02}
-  s.default_executable = %q{timetrackr}
-  s.description = %q{A simple time tracking utility}
-  s.email = %q{felix@seconddrawer.com.au}
-  s.executables = ["timetrackr"]
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.mkd"
-  ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.mkd",
-    "Rakefile",
-    "VERSION",
-    "bin/timetrackr",
-    "lib/timetrackr.rb",
-    "lib/timetrackr/cli.rb",
-    "lib/timetrackr/database.rb",
-    "lib/timetrackr/json.rb",
-    "lib/timetrackr/period.rb",
-    "lib/timetrackr/sqlite.rb",
-    "lib/timetrackr/yaml.rb",
-    "test/helper.rb",
-    "test/test_timetrackr.rb",
-    "timetrackr.gemspec"
-  ]
-  s.homepage = %q{http://github.com/felix/timetrackr}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A simple time tracking utility}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_timetrackr.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    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<json>, [">= 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<json>, [">= 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<json>, [">= 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
-end
-