timetrap 1.1.3 → 1.2.0

data/CONTRIBUTORS

@@ -0,0 +1,3 @@
+* Sam Goldstein
+* Ian Smith-Heisters
+* Ammar Ali

data/README.md

@@ -102,6 +102,13 @@ Commands
 
   usage: ``t backend``
 
+**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.
+
+  usage: ``t configure``
+
 **display**
   Display a given timesheet. If no timesheet is specified, show the current
   timesheet. If ``all`` is passed as SHEET display all timesheets. Accepts

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
-:minor: 1
-:patch: 3
+:minor: 2
+:patch: 0

data/lib/timetrap.rb

@@ -3,15 +3,17 @@ require 'chronic'
 require 'sequel'
 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')
-DB_NAME = defined?(TEST_MODE) ? nil : "#{ENV['HOME']}/.timetrap.db"
+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
+
 module Timetrap
   extend self
 

data/lib/timetrap/cli.rb

@@ -18,6 +18,7 @@ where COMMAND is one of:
     -e, --end <date:qs>       Include entries that start on this date or earlier
   * backend - open an sqlite shell to the database
     usage: t backend
+  * configure - write out a config file. print path to config file.
   * display - display the current timesheet or a specific. Pass `all' as
       SHEET to display all sheets.
     usage: t display [--ids] [--start DATE] [--end DATE] [--format FMT] [SHEET | all]
@@ -106,6 +107,11 @@ where COMMAND is one of:
       end
     end
 
+    def configure
+      Config.configure!
+      say "Config file is at #{Config::PATH.inspect}"
+    end
+
     def edit
       entry = args['-i'] ? Entry[args['-i']] : Timetrap.active_entry
       say "can't find entry" && return unless entry

data/lib/timetrap/config.rb

@@ -0,0 +1,29 @@
+module Timetrap
+  module Config
+    extend self
+    PATH = ENV['TIMETRAP_CONFIG_FILE'] || File.join(ENV['HOME'], '.timetrap.yml')
+
+    def defaults
+      {
+        'database_file' => "#{ENV['HOME']}/.timetrap.db"
+      }
+    end
+
+    def [](key)
+      overrides = File.exist?(PATH) ? YAML.load(File.read(PATH)) : {}
+      defaults.merge(overrides)[key]
+    rescue => e
+      puts "invalid config file"
+      puts e.message
+      defaults[key]
+    end
+
+    def configure!
+      unless File.exist?(PATH)
+        File.open(PATH, 'w') do |fh|
+          fh.puts(defaults.to_yaml)
+        end
+      end
+    end
+  end
+end

data/spec/timetrap_spec.rb

@@ -1,6 +1,7 @@
 TEST_MODE = true
 require File.join(File.dirname(__FILE__), '..', 'lib', 'timetrap')
 require 'spec'
+require 'fakefs/safe'
 
 describe Timetrap do
   def create_entry atts = {}
@@ -48,6 +49,25 @@ describe Timetrap do
         end
       end
 
+      describe 'config' do
+        it "should write a config file" do
+          FakeFS do
+            FileUtils.mkdir_p(ENV['HOME'])
+            FileUtils.rm(ENV['HOME'] + '/.timetrap.yml')
+            File.exist?(ENV['HOME'] + '/.timetrap.yml').should be_false
+            invoke "configure"
+            File.exist?(ENV['HOME'] + '/.timetrap.yml').should be_true
+          end
+        end
+
+        it "should descirve config file" do
+          FakeFS do
+            invoke "configure"
+            $stdout.string.should == "Config file is at \"#{ENV['HOME']}/.timetrap.yml\"\n"
+          end
+        end
+      end
+
       describe 'edit' do
         before do
           Timetrap.start "running entry", nil

data/timetrap.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{timetrap}
-  s.version = "1.1.3"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Goldstein"]
-  s.date = %q{2009-11-27}
+  s.date = %q{2009-12-06}
   s.default_executable = %q{t}
-  s.description = %q{Timetrap is a lightweight command line time tracker, written in ruby.  See http://github.com/samg/timetrap for more details}
+  s.description = %q{Command line time tracker}
   s.email = %q{sgrock@gmail.com}
   s.executables = ["t"]
   s.extra_rdoc_files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "CONTRIBUTORS",
      "LICENSE.txt",
      "README.md",
      "Rakefile",
@@ -28,6 +29,7 @@ Gem::Specification.new do |s|
      "bin/t",
      "lib/timetrap.rb",
      "lib/timetrap/cli.rb",
+     "lib/timetrap/config.rb",
      "lib/timetrap/formatters/csv.rb",
      "lib/timetrap/formatters/ical.rb",
      "lib/timetrap/formatters/text.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: timetrap
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors: 
 - Sam Goldstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-27 00:00:00 -08:00
+date: 2009-12-06 00:00:00 -08:00
 default_executable: t
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.2
     version: 
-description: Timetrap is a lightweight command line time tracker, written in ruby.  See http://github.com/samg/timetrap for more details
+description: Command line time tracker
 email: sgrock@gmail.com
 executables: 
 - t
@@ -93,6 +93,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- CONTRIBUTORS
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -101,6 +102,7 @@ files:
 - bin/t
 - lib/timetrap.rb
 - lib/timetrap/cli.rb
+- lib/timetrap/config.rb
 - lib/timetrap/formatters/csv.rb
 - lib/timetrap/formatters/ical.rb
 - lib/timetrap/formatters/text.rb