timetrap 1.6.1 → 1.7.0

data/CONTRIBUTORS

@@ -1,3 +1,4 @@
 * Sam Goldstein
 * Ian Smith-Heisters
 * Ammar Ali
+* Brian V. Hughes

data/README.md

@@ -64,6 +64,31 @@ You check out with the `out` command.
     $ t out
     Checked out of sheet "coding"
 
+You can edit entries that aren't running using `edit`'s `--id` or `-i` flag.
+`t display --verbose` will tell you the ids.
+
+    $ # note id column in output
+    $ t d -v
+    Timesheet: coding
+    Id  Day                Start      End        Duration   Notes
+    43  Sun Nov 28, 2010   12:26:10 - 13:41:03   1:14:53    writing readme
+                                                 1:14:53
+        ---------------------------------------------------------
+        Total                                    1:14:53
+
+    $ # -i43 to edit entry 43
+    $ t e -i43 --end "2010-11-28 13:45"
+    editing entry #43
+
+    $ t d
+    Timesheet: coding
+        Day                Start      End        Duration   Notes
+        Sun Nov 28, 2010   12:26:10 - 13:45:00   1:18:50    writing readme
+                                                 1:18:50
+        ---------------------------------------------------------
+        Total                                    1:18:50
+
+
 ### Natural Language Times
 
 Commands such as `in`, `out`, `edit`, and `display` have flags that accept
@@ -91,7 +116,14 @@ list of parsable time formats, but all of these should work.
 
 ### Output Formats
 
-Timetrap supports several output formats.  The default is a plain text format.
+#### Built-in Formatters
+
+Timetrap has built-in support for 5 output formats.
+
+These are **text**, **csv**, **ical**, **json**, and **ids**
+
+The default is a plain **text** format.  (You can change the default format using
+`t configure`).
 
     $ t display
     Timesheet: coding
@@ -107,7 +139,7 @@ Timetrap supports several output formats.  The default is a plain text format.
         ---------------------------------------------------------
         Total                                    3:46:05
 
-You can also output csv for easy import into a spreadsheet.
+The **CSV** formatters is easy to import into a spreadsheet.
 
     $ t display --format csv
     start,end,note,sheet
@@ -120,10 +152,73 @@ You can also output csv for easy import into a spreadsheet.
     "2010-08-29 21:15:58","2010-08-29 21:30:31","backups","coding"
     "2010-08-29 21:40:56","2010-08-29 22:32:26","backups","coding"
 
-Or to ical format for import into a calendar program (remember commands can be abbreviated).
+**iCal** format lets you get your time into your favorite calendar program
+(remember commands can be abbreviated).
 
     $ t d -f ical > MyTimeSheet.ics
 
+The **ids** formatter is provided to facilitate scripting within timetrap.  It only
+outputs numeric id for the entries.  This is handy if you want to move all entries
+from one sheet to another sheet.  You could do something like this:
+
+    $ for id in `t display sheet1 -f ids`; do t edit --id $id --move sheet2; done
+    editing entry #36
+    editing entry #37
+    editing entry #44
+    editing entry #46
+
+A *json* formatter is also provided, because hackers love json.
+
+    $ t d -fjson
+
+#### Custom Formatters
+
+Timetrap tries to make it easy to define custom output formats.
+
+You're encouraged to submit these back to timetrap for inclusion in a future
+version.
+
+To create a custom formatter you create a ruby class and implement two methods
+on it.
+
+As an example we'll create a formatter that only outputs the notes from
+entries.
+
+To ensure that timetrap can find your formatter put it in
+`~/.timetrap/formatters/notes.rb`.  The filename should be the same as the
+string you will pass to `t d --format` to invoke it.  If you want to put your
+formatter in a different place you can run `t configure` and edit the
+`formatter_search_paths` option.
+
+All timetrap formatters live under the namespace `Timetrap::Formatters` so
+define your class like this:
+
+    class Timetrap::Formatters::Notes
+    end
+
+When `t display` is invoked, timetrap initializes a new instance of the
+formatter passing it an Array of entries.  It then calls `#output` which should
+return a string to be printed to the screen.
+
+This means we need to implement an `#initialize` method and an `#output`
+method for the class.  Something like this:
+
+    class Timetrap::Formatters::Notes
+      def initialize(entries)
+        @entries = entries
+      end
+
+      def output
+        @entries.map{|entry| entry[:note]}.join("\n")
+      end
+    end
+
+Now when I invoke it:
+
+    $ t d -f notes
+    working on issue #123
+    working on issue #234
+
 Commands
 --------
 **archive**
@@ -139,9 +234,9 @@ Commands
 
 **configure**
   Creates a config file at  ``~/.timetrap.yml`` or ``ENV['TIMETRAP_CONFIG_FILE']`` if
-  one doesn't exist.  Prints path to config file.  Currently allows configuration
-  of path to database file, and the number of seconds used when the `--round`
-  flag is set (defaults to 15 minutes.)
+  one doesn't exist.  If one does exist it will update it with new
+  configuration options preserving any user overrides. Prints path to config
+  file.  This file may contain ERB.
 
   usage: ``t configure``
 
@@ -153,7 +248,7 @@ Commands
 
   Display is designed to support a variety of export formats that can be
   specified by passing the ``--format`` flag.  This currently defaults to
-  text.  iCal and csv output are also supported.
+  text.  iCal, csv, json, and numeric id output are also supported.
 
   Display also allows the use of a ``--round`` or ``-r`` flag which will round
   all times in the output. See global options below.
@@ -227,14 +322,20 @@ Global Options
 Configuration
 --------
 
-Configuration of TimeTrap's behavior can be done through a YAML config file.
+Configuration of TimeTrap's behavior can be done through an ERB interpolated
+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
+  **round_in_seconds**: The duration of time to use for rounding with the -r flag
+
+  **database_file**: The file path of the sqlite database
+
+  **append_notes_delimiter**: delimiter used when appending notes via `t edit --append`
 
- ``database_file``: The file path of the sqlite database
+  **formatter_search_paths**: an array of directories to search for user defined fomatter classes
 
- ``append_notes_delimiter``: delimiter used when appending notes via ``t edit --append``
+  **default_formatter**: The format to use when display is invoked without a `--format` option
 
 Special Thanks
 --------------

data/Rakefile

@@ -36,7 +36,6 @@ begin
     s.add_dependency("sqlite3-ruby", ">= 1.2.5")
     s.add_dependency("chronic", "~> 0.3.0")
     s.add_dependency("getopt-declare", ">= 1.28")
-    s.add_dependency("icalendar", ">= 1.1.2")
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

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

data/lib/timetrap.rb

@@ -2,22 +2,20 @@ require 'rubygems'
 require 'chronic'
 require 'sequel'
 require 'yaml'
+require 'erb'
 require 'sequel/extensions/inflector'
 require 'Getopt/Declare'
 require File.join(File.dirname(__FILE__), 'timetrap', 'config')
 require File.join(File.dirname(__FILE__), 'timetrap', 'helpers')
 require File.join(File.dirname(__FILE__), 'timetrap', 'cli')
 require File.join(File.dirname(__FILE__), 'timetrap', 'timer')
-DB_NAME = defined?(TEST_MODE) ? nil : Timetrap::Config['database_file']
-# connect to database.  This will create one if it doesn't exist
-DB = Sequel.sqlite DB_NAME
-require File.join(File.dirname(__FILE__), 'timetrap', 'models')
-Dir["#{File.dirname(__FILE__)}/timetrap/formatters/*.rb"].each do |path|
-  require path
-end
-
+require File.join(File.dirname(__FILE__), 'timetrap', 'formatters')
 module Timetrap
+  DB_NAME = defined?(TEST_MODE) ? nil : Timetrap::Config['database_file']
+  # connect to database.  This will create one if it doesn't exist
+  DB = Sequel.sqlite DB_NAME
   CLI.args = Getopt::Declare.new(<<-EOF)
     #{CLI::USAGE}
   EOF
 end
+require File.join(File.dirname(__FILE__), 'timetrap', 'models')

data/lib/timetrap/cli.rb

@@ -23,7 +23,8 @@ COMMAND is one of:
   * backend - Open an sqlite shell to the database.
     usage: t backend
 
-  * configure - Write out a config file. print path to config file.
+  * configure - Write out a YAML config file. Print path to config file.  The
+      file may contain ERB.
     usage: t configure
     Currently supported options are:
       round_in_seconds:       The duration of time to use for rounding with
@@ -38,8 +39,11 @@ COMMAND is one of:
     -v, --ids                 Print database ids (for use with edit)
     -s, --start <date:qs>     Include entries that start on this date or later
     -e, --end <date:qs>       Include entries that start on this date or earlier
-    -f, --format <format>     The output format.  Currently supports ical, csv, and
-                                text (default).
+    -f, --format <format>     The output format.  Valid built-in formats are
+                              ical, csv, json, ids, and text (default).
+                              Documentation on defining custom formats can be
+                              found in the README included in this
+                              distribution.
 
   * edit - Alter an entry's note, start, or end time. Defaults to the active entry.
     usage: t edit [--id ID] [--start TIME] [--end TIME] [--append] [NOTES]
@@ -106,7 +110,7 @@ COMMAND is one of:
 
     def invoke
       args['-h'] ? puts(USAGE) : invoke_command_if_valid
-    rescue => e
+    rescue StandardError, LoadError => e
       raise e if args['--debug']
       warn e.message
       exit 1 unless defined? TEST_MODE
@@ -240,21 +244,11 @@ COMMAND is one of:
     end
 
     def display
-      begin
-        fmt_klass = if args['-f']
-          Timetrap::Formatters.const_get("#{args['-f'].classify}")
-        else
-          Timetrap::Formatters::Text
-        end
-      rescue
-        warn "Invalid format #{args['-f'].inspect} specified."
-        return
-      end
       entries = selected_entries.order(:start).all
       if entries == []
         warn "No entries were selected to display."
       else
-        puts fmt_klass.new(entries).output
+        puts load_formatter(args['-f'] || Config['default_formatter']).new(entries).output
       end
     end
 

data/lib/timetrap/config.rb

@@ -16,12 +16,18 @@ module Timetrap
         # Unit of time for rounding (-r) in seconds
         'round_in_seconds' => 900,
         # delimiter used when appending notes with `t edit --append`
-        'append_notes_delimiter' => ' '
+        'append_notes_delimiter' => ' ',
+        # an array of directories to search for user defined fomatter classes
+        'formatter_search_paths' => [
+          "#{ENV['HOME']}/.timetrap/formatters"
+        ],
+        # formatter to use when display is invoked without a --format option
+        'default_formatter' => 'text'
       }
     end
 
     def [](key)
-      overrides = File.exist?(PATH) ? YAML.load(File.read(PATH)) : {}
+      overrides = File.exist?(PATH) ? YAML.load(erb_render(File.read(PATH))) : {}
       defaults.merge(overrides)[key]
     rescue => e
       warn "invalid config file"
@@ -29,6 +35,10 @@ module Timetrap
       defaults[key]
     end
 
+    def erb_render(content)
+      ERB.new(content).result
+    end
+
     def configure!
       configs = if File.exist?(PATH)
         defaults.merge(YAML.load_file(PATH))

data/lib/timetrap/formatters.rb

@@ -0,0 +1,3 @@
+# Namespace for formatter classes
+module Timetrap::Formatters
+end

data/lib/timetrap/formatters/ical.rb

@@ -1,4 +1,13 @@
-require 'icalendar'
+begin
+  require 'icalendar'
+rescue LoadError
+  raise <<-ERR
+The icalendar gem must be installed for ical output.
+To install it:
+$ [sudo] gem install icalendar -v"~>1.1.5"
+  ERR
+end
+
 require 'date'
 module Timetrap
   module Formatters

data/lib/timetrap/formatters/ids.rb

@@ -0,0 +1,11 @@
+module Timetrap
+  module Formatters
+    class Ids
+      attr_reader :output
+
+      def initialize entries
+        @output = entries.map(&:id).join(' ')
+      end
+    end
+  end
+end

data/lib/timetrap/formatters/json.rb

@@ -0,0 +1,24 @@
+begin
+  require 'json'
+rescue LoadError
+  raise <<-ERR
+The json gem must be installed for json output.
+To install it:
+$ [sudo] gem install json -v"~>1.4.6"
+  ERR
+end
+
+module Timetrap
+  module Formatters
+    class Json
+      attr_accessor :output
+
+      def initialize entries
+        @output = entries.map do |e|
+          next unless e.end
+          e.values
+        end.compact.to_json
+      end
+    end
+  end
+end

data/lib/timetrap/helpers.rb

@@ -1,6 +1,33 @@
 module Timetrap
   module Helpers
 
+    def load_formatter(formatter)
+      err_msg = "Can't load #{formatter.inspect} formatter."
+      begin
+        paths = (
+          Array(Config['formatter_search_paths']) +
+          [ File.join( File.dirname(__FILE__), 'formatters') ]
+        )
+       if paths.detect do |path|
+           begin
+             fp = File.join(path, formatter)
+             require File.join(path, formatter)
+             true
+           rescue LoadError
+             nil
+           end
+         end
+       else
+         raise LoadError, "Couldn't find #{formatter}.rb in #{paths.inspect}"
+       end
+       Timetrap::Formatters.const_get(formatter.camelize)
+      rescue LoadError, NameError => e
+        err = e.class.new("#{err_msg} (#{e.message})")
+        err.set_backtrace(e.backtrace)
+        raise err
+      end
+    end
+
     def selected_entries
       ee = if (sheet = sheet_name_from_string(unused_args)) == 'all'
         Timetrap::Entry.filter('sheet not like ? escape "!"', '!_%')
@@ -9,8 +36,8 @@ module Timetrap
       else
         Timetrap::Entry.filter('sheet = ?', Timer.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(Chronic.parse(args['-s']).to_s)) if args['-s']
+      ee = ee.filter('start <= ?', Date.parse(Chronic.parse(args['-e']).to_s) + 1) if args['-e']
       ee
     end
 

data/spec/timetrap_spec.rb

@@ -161,31 +161,44 @@ describe Timetrap do
 
       describe "backend" do
         it "should open an sqlite console to the db" do
-          Timetrap::CLI.should_receive(:exec).with("sqlite3 #{DB_NAME}")
+          Timetrap::CLI.should_receive(:exec).with("sqlite3 #{Timetrap::DB_NAME}")
           invoke 'backend'
         end
       end
 
-      describe "display" do
+      describe "format" do
         before do
-          Timetrap::Entry.create( :sheet => 'another',
-            :note => 'entry 4', :start => '2008-10-05 18:00:00'
-          )
-          Timetrap::Entry.create( :sheet => 'SpecSheet',
-            :note => 'entry 2', :start => '2008-10-03 16:00:00', :end => '2008-10-03 18:00:00'
-          )
-          Timetrap::Entry.create( :sheet => 'SpecSheet',
-            :note => 'entry 1', :start => '2008-10-03 12:00:00', :end => '2008-10-03 14:00:00'
-          )
-          Timetrap::Entry.create( :sheet => 'SpecSheet',
-            :note => 'entry 3', :start => '2008-10-05 16:00:00', :end => '2008-10-05 18:00:00'
-          )
-          Timetrap::Entry.create( :sheet => 'SpecSheet',
-            :note => 'entry 4', :start => '2008-10-05 18:00:00'
-          )
+          create_entry
+        end
+        it "should be deprecated" do
+          invoke 'format'
+          $stderr.string.should == <<-WARN
+The "format" command is deprecated in favor of "display". Sorry for the inconvenience.
+          WARN
+        end
+      end
 
-          Time.stub!(:now).and_return Time.at(1223254800 + (60*60*2))
-          @desired_output = <<-OUTPUT
+      describe "display" do
+        describe "text" do
+          before do
+            Timetrap::Entry.create( :sheet => 'another',
+              :note => 'entry 4', :start => '2008-10-05 18:00:00'
+            )
+            Timetrap::Entry.create( :sheet => 'SpecSheet',
+              :note => 'entry 2', :start => '2008-10-03 16:00:00', :end => '2008-10-03 18:00:00'
+            )
+            Timetrap::Entry.create( :sheet => 'SpecSheet',
+              :note => 'entry 1', :start => '2008-10-03 12:00:00', :end => '2008-10-03 14:00:00'
+            )
+            Timetrap::Entry.create( :sheet => 'SpecSheet',
+              :note => 'entry 3', :start => '2008-10-05 16:00:00', :end => '2008-10-05 18:00:00'
+            )
+            Timetrap::Entry.create( :sheet => 'SpecSheet',
+              :note => 'entry 4', :start => '2008-10-05 18:00:00'
+            )
+
+            Time.stub!(:now).and_return Time.at(1223254800 + (60*60*2))
+            @desired_output = <<-OUTPUT
 Timesheet: SpecSheet
     Day                Start      End        Duration   Notes
     Fri Oct 03, 2008   12:00:00 - 14:00:00   2:00:00    entry 1
@@ -196,9 +209,9 @@ Timesheet: SpecSheet
                                              4:00:00
     ---------------------------------------------------------
     Total                                    8:00:00
-          OUTPUT
+            OUTPUT
 
-          @desired_output_with_ids = <<-OUTPUT
+            @desired_output_with_ids = <<-OUTPUT
 Timesheet: SpecSheet
 Id  Day                Start      End        Duration   Notes
 3   Fri Oct 03, 2008   12:00:00 - 14:00:00   2:00:00    entry 1
@@ -209,9 +222,9 @@ Id  Day                Start      End        Duration   Notes
                                              4:00:00
     ---------------------------------------------------------
     Total                                    8:00:00
-          OUTPUT
+            OUTPUT
 
-          @desired_output_for_all = <<-OUTPUT
+            @desired_output_for_all = <<-OUTPUT
 Timesheet: SpecSheet
     Day                Start      End        Duration   Notes
     Fri Oct 03, 2008   12:00:00 - 14:00:00   2:00:00    entry 1
@@ -231,72 +244,116 @@ Timesheet: another
     Total                                    2:00:00
 -------------------------------------------------------------
 Grand Total                                 10:00:00
-          OUTPUT
-        end
+            OUTPUT
+          end
 
-        it "should display the current timesheet" do
-          Timetrap::Timer.current_sheet = 'SpecSheet'
-          invoke 'display'
-          $stdout.string.should == @desired_output
-        end
+          it "should display the current timesheet" do
+            Timetrap::Timer.current_sheet = 'SpecSheet'
+            invoke 'display'
+            $stdout.string.should == @desired_output
+          end
 
-        it "should display a non current timesheet" do
-          Timetrap::Timer.current_sheet = 'another'
-          invoke 'display SpecSheet'
-          $stdout.string.should == @desired_output
-        end
+          it "should display a non current timesheet" do
+            Timetrap::Timer.current_sheet = 'another'
+            invoke 'display SpecSheet'
+            $stdout.string.should == @desired_output
+          end
 
-        it "should display a non current timesheet based on a partial name match" do
-          Timetrap::Timer.current_sheet = 'another'
-          invoke 'display S'
-          $stdout.string.should == @desired_output
-        end
+          it "should display a non current timesheet based on a partial name match" do
+            Timetrap::Timer.current_sheet = 'another'
+            invoke 'display S'
+            $stdout.string.should == @desired_output
+          end
 
-        it "should prefer an exact match of a named sheet to a partial match" do
-          Timetrap::Timer.current_sheet = 'Spec'
-          Timetrap::Entry.create( :sheet => 'Spec',
-            :note => 'entry 5', :start => '2008-10-05 18:00:00'
-          )
-          invoke 'display Spec'
-          $stdout.string.should include("entry 5")
-        end
+          it "should prefer an exact match of a named sheet to a partial match" do
+            Timetrap::Timer.current_sheet = 'Spec'
+            Timetrap::Entry.create( :sheet => 'Spec',
+              :note => 'entry 5', :start => '2008-10-05 18:00:00'
+            )
+            invoke 'display Spec'
+            $stdout.string.should include("entry 5")
+          end
 
-        it "should display a timesheet with ids" do
-          invoke 'display S --ids'
-          $stdout.string.should == @desired_output_with_ids
-        end
+          it "should display a timesheet with ids" do
+            invoke 'display S --ids'
+            $stdout.string.should == @desired_output_with_ids
+          end
 
-        it "should display all timesheets" do
-          Timetrap::Timer.current_sheet = 'another'
-          invoke 'display all'
-          $stdout.string.should == @desired_output_for_all
+          it "should display all timesheets" do
+            Timetrap::Timer.current_sheet = 'another'
+            invoke 'display all'
+            $stdout.string.should == @desired_output_for_all
+          end
+
+          it "should not display archived for all timesheets" do
+            $stdin.string = "yes\n"
+            invoke 'archive SpecSheet'
+            $stdout.string = ''
+            invoke 'display all'
+            $stdout.string.should_not =~ /_SpecSheet/
+          end
+
+          it "it should find a user provided formatter class and require it" do
+            create_entry
+            create_entry
+            dir = '/tmp/timetrap/foo/bar'
+            with_stubbed_config('formatter_search_paths' => dir)
+            FileUtils.mkdir_p(dir)
+            File.open(dir + '/baz.rb', 'w') do |f|
+              f.puts <<-RUBY
+                class Timetrap::Formatters::Baz
+                  def initialize(entries); end
+                  def output
+                    "yeah I did it"
+                  end
+                end
+              RUBY
+            end
+            invoke 'd -fbaz'
+            $stderr.string.should == ''
+            $stdout.string.should == "yeah I did it\n"
+            FileUtils.rm_r dir
+          end
         end
 
-        it "should not display archived for all timesheets" do
-          $stdin.string = "yes\n"
-          invoke 'archive SpecSheet'
-          $stdout.string = ''
-          invoke 'display all'
-          $stdout.string.should_not =~ /_SpecSheet/
+        describe "default" do
+          before do
+            create_entry(:start => '2008-10-03 12:00:00', :end => '2008-10-03 14:00:00')
+            create_entry(:start => '2008-10-05 12:00:00', :end => '2008-10-05 14:00:00')
+          end
+
+          it "should allow another formatter to be set as the default" do
+            with_stubbed_config 'default_formatter' => 'ids',
+              'formatter_search_paths' => nil
+
+            invoke 'd'
+            $stdout.string.should == Timetrap::Entry.all.map(&:id).join(" ") + "\n"
+          end
         end
-      end
 
-      describe "format" do
-        before do
-          create_entry(:start => '2008-10-03 12:00:00', :end => '2008-10-03 14:00:00')
-          create_entry(:start => '2008-10-05 12:00:00', :end => '2008-10-05 14:00:00')
+        describe 'ids' do
+          before do
+            create_entry(:start => '2008-10-03 12:00:00', :end => '2008-10-03 14:00:00')
+            create_entry(:start => '2008-10-05 12:00:00', :end => '2008-10-05 14:00:00')
+          end
+
+          it "should not export running items" do
+            invoke 'in'
+            invoke 'display --format ids'
+            $stdout.string.should == Timetrap::Entry.all.map(&:id).join(" ") + "\n"
+          end
+
         end
+
         describe 'csv' do
-          it "should be deprecated" do
-            invoke 'format'
-            $stderr.string.should == <<-WARN
-The "format" command is deprecated in favor of "display". Sorry for the inconvenience.
-            WARN
+          before do
+            create_entry(:start => '2008-10-03 12:00:00', :end => '2008-10-03 14:00:00')
+            create_entry(:start => '2008-10-05 12:00:00', :end => '2008-10-05 14:00:00')
           end
 
           it "should not export running items" do
             invoke 'in'
-            invoke 'format --format csv'
+            invoke 'display --format csv'
             $stdout.string.should == <<-EOF
 start,end,note,sheet
 "2008-10-03 12:00:00","2008-10-03 14:00:00","note","default"
@@ -305,7 +362,7 @@ start,end,note,sheet
           end
 
           it "should filter events by the passed dates" do
-            invoke 'format --format csv --start 2008-10-03 --end 2008-10-03'
+            invoke 'display --format csv --start 2008-10-03 --end 2008-10-03'
             $stdout.string.should == <<-EOF
 start,end,note,sheet
 "2008-10-03 12:00:00","2008-10-03 14:00:00","note","default"
@@ -313,7 +370,7 @@ start,end,note,sheet
           end
 
           it "should not filter events by date when none are passed" do
-            invoke 'format --format csv'
+            invoke 'display --format csv'
             $stdout.string.should == <<-EOF
 start,end,note,sheet
 "2008-10-03 12:00:00","2008-10-03 14:00:00","note","default"
@@ -322,26 +379,45 @@ start,end,note,sheet
           end
         end
 
+        describe 'json' do
+          before do
+            create_entry(:start => '2008-10-03 12:00:00', :end => '2008-10-03 14:00:00')
+            create_entry(:start => '2008-10-05 12:00:00', :end => '2008-10-05 14:00:00')
+          end
+
+          it "should export to json not including running items" do
+            invoke 'in'
+            invoke 'display -f json'
+            JSON.parse($stdout.string).should == JSON.parse(<<-EOF)
+[{\"sheet\":\"default\",\"end\":\"Fri Oct 03 14:00:00 -0700 2008\",\"start\":\"Fri Oct 03 12:00:00 -0700 2008\",\"note\":\"note\",\"id\":1},{\"sheet\":\"default\",\"end\":\"Sun Oct 05 14:00:00 -0700 2008\",\"start\":\"Sun Oct 05 12:00:00 -0700 2008\",\"note\":\"note\",\"id\":2}]
+            EOF
+          end
+        end
+
         describe 'ical' do
+          before do
+            create_entry(:start => '2008-10-03 12:00:00', :end => '2008-10-03 14:00:00')
+            create_entry(:start => '2008-10-05 12:00:00', :end => '2008-10-05 14:00:00')
+          end
 
           it "should not export running items" do
             invoke 'in'
-            invoke 'format --format ical'
+            invoke 'display --format ical'
             $stdout.string.scan(/BEGIN:VEVENT/).should have(2).item
           end
 
           it "should filter events by the passed dates" do
-            invoke 'format --format ical --start 2008-10-03 --end 2008-10-03'
+            invoke 'display --format ical --start 2008-10-03 --end 2008-10-03'
             $stdout.string.scan(/BEGIN:VEVENT/).should have(1).item
           end
 
           it "should not filter events by date when none are passed" do
-            invoke 'format --format ical'
+            invoke 'display --format ical'
             $stdout.string.scan(/BEGIN:VEVENT/).should have(2).item
           end
 
           it "should export a sheet to an ical format" do
-            invoke 'format --format ical --start 2008-10-03 --end 2008-10-03'
+            invoke 'display --format ical --start 2008-10-03 --end 2008-10-03'
             desired = <<-EOF
 BEGIN:VCALENDAR
 VERSION:2.0

data/timetrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrap}
-  s.version = "1.6.1"
+  s.version = "1.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2010-11-29}
+  s.date = %q{2010-12-08}
   s.default_executable = %q{t}
   s.description = %q{Command line time tracker}
   s.email = %q{sgrock@gmail.com}
@@ -30,8 +30,11 @@ Gem::Specification.new do |s|
      "lib/timetrap.rb",
      "lib/timetrap/cli.rb",
      "lib/timetrap/config.rb",
+     "lib/timetrap/formatters.rb",
      "lib/timetrap/formatters/csv.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",
@@ -58,20 +61,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
       s.add_runtime_dependency(%q<chronic>, ["~> 0.3.0"])
       s.add_runtime_dependency(%q<getopt-declare>, [">= 1.28"])
-      s.add_runtime_dependency(%q<icalendar>, [">= 1.1.2"])
     else
       s.add_dependency(%q<sequel>, [">= 3.9.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
       s.add_dependency(%q<chronic>, ["~> 0.3.0"])
       s.add_dependency(%q<getopt-declare>, [">= 1.28"])
-      s.add_dependency(%q<icalendar>, [">= 1.1.2"])
     end
   else
     s.add_dependency(%q<sequel>, [">= 3.9.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
     s.add_dependency(%q<chronic>, ["~> 0.3.0"])
     s.add_dependency(%q<getopt-declare>, [">= 1.28"])
-    s.add_dependency(%q<icalendar>, [">= 1.1.2"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timetrap
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 1
-  - 6
-  - 1
-  version: 1.6.1
+  - 7
+  - 0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 -08:00
+date: 2010-12-08 00:00:00 -08:00
 default_executable: t
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,22 +81,6 @@ dependencies:
         version: "1.28"
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: icalendar
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
-        version: 1.1.2
-  type: :runtime
-  version_requirements: *id005
 description: Command line time tracker
 email: sgrock@gmail.com
 executables: 
@@ -118,8 +102,11 @@ files:
 - lib/timetrap.rb
 - lib/timetrap/cli.rb
 - lib/timetrap/config.rb
+- lib/timetrap/formatters.rb
 - lib/timetrap/formatters/csv.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