From 31515f344b6e684c0b330d8682b1bc4685c80d86 Mon Sep 17 00:00:00 2001 From: felix Date: Fri, 28 Oct 2011 14:55:00 +0700 Subject: cleanup --- CHANGELOG | 11 +++++++++ Gemfile | 4 +-- Gemfile.lock | 33 +++++++++++++------------ LICENSE | 20 +++++++++++++++ LICENSE.txt | 20 --------------- Manifest | 16 ++++++++++++ README | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.mkd | 81 ------------------------------------------------------------ Rakefile | 44 ++------------------------------- 9 files changed, 148 insertions(+), 162 deletions(-) create mode 100644 CHANGELOG create mode 100644 LICENSE delete mode 100644 LICENSE.txt create mode 100644 Manifest create mode 100644 README delete mode 100644 README.mkd diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..f395198 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,11 @@ +v0.2.0. 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 diff --git a/Gemfile b/Gemfile index 65d7e49..3df2a63 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,6 @@ source 'http://rubygems.org' group :development do - gem 'shoulda', '>= 0' gem 'bundler', '>= 1.0.0' - gem 'jeweler', '>= 1.5.2' - gem 'rcov', '>= 0' + gem 'echoe' end diff --git a/Gemfile.lock b/Gemfile.lock index 997a943..d8cca28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,24 +1,25 @@ 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) + allison (2.0.3) + echoe (4.6.3) + allison (>= 2.0.3) + gemcutter (>= 0.7.0) + rake (>= 0.9.2) + rdoc (>= 3.6.1) + rubyforge (>= 2.0.4) + gemcutter (0.7.0) + json (1.6.1) + json_pure (1.6.1) + rake (0.9.2.2) + rdoc (3.11) + json (~> 1.4) + rubyforge (2.0.4) + json_pure (>= 1.1.7) PLATFORMS ruby DEPENDENCIES - bundler (~> 1.0.0) - jeweler (~> 1.5.2) - json - rcov - shoulda - sqlite3 + bundler (>= 1.0.0) + echoe diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..eb76b3c --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +Copyright (c) 2011 felix + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index eb76b3c..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2011 felix - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Manifest b/Manifest new file mode 100644 index 0000000..b6acd94 --- /dev/null +++ b/Manifest @@ -0,0 +1,16 @@ +CHANGELOG +Gemfile +Gemfile.lock +LICENSE +README +Rakefile +VERSION +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 +Manifest diff --git a/README b/README new file mode 100644 index 0000000..5d0577b --- /dev/null +++ b/README @@ -0,0 +1,81 @@ +# timetrackr + +A simple CLI time tracking utility. + +## Example + +(with a Bash alias of 'tt') + +start a task: + + $ tt start something + +...view durations: + + $ tt + something * 0h 0m 4s + +...have two running tasks: + + $ tt start another-thing + + $ tt log + 2011-05-18 something * 22:11 0h 0m 30s + another-thing * 22:11 0h 0m 15s + +...start with a note: + + $ tt start one-more with a note + + $ tt log + 2011-05-18 something * 22:11 0h 0m 45s + another-thing * 22:11 0h 0m 30s + one-more * 22:13 0h 0m 15s with a note + +...restrict some: + + $ tt log something + 2011-05-18 something * 22:11 0h 1m 00s + +...exclude some: + + $ tt log something -n another-thing + 2011-05-18 something * 22:11 0h 1m 15s + one-more * 22:13 0h 0m 45s with a note + +...stop one (or more): + + $ tt stop something + + $ tt + something 0h 1m 20s + another-thing * 0h 1m 30s + one-more * 0h 1m 15s + +...and delete one: + + $ tt clear something + another-thing * 0h 1m 45s + one-more * 0h 1m 30s + + +## 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 +* 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. + + +## Copyright + +Copyright (c) 2011 Felix Hanley. See LICENSE.txt for +further details. diff --git a/README.mkd b/README.mkd deleted file mode 100644 index 5d0577b..0000000 --- a/README.mkd +++ /dev/null @@ -1,81 +0,0 @@ -# timetrackr - -A simple CLI time tracking utility. - -## Example - -(with a Bash alias of 'tt') - -start a task: - - $ tt start something - -...view durations: - - $ tt - something * 0h 0m 4s - -...have two running tasks: - - $ tt start another-thing - - $ tt log - 2011-05-18 something * 22:11 0h 0m 30s - another-thing * 22:11 0h 0m 15s - -...start with a note: - - $ tt start one-more with a note - - $ tt log - 2011-05-18 something * 22:11 0h 0m 45s - another-thing * 22:11 0h 0m 30s - one-more * 22:13 0h 0m 15s with a note - -...restrict some: - - $ tt log something - 2011-05-18 something * 22:11 0h 1m 00s - -...exclude some: - - $ tt log something -n another-thing - 2011-05-18 something * 22:11 0h 1m 15s - one-more * 22:13 0h 0m 45s with a note - -...stop one (or more): - - $ tt stop something - - $ tt - something 0h 1m 20s - another-thing * 0h 1m 30s - one-more * 0h 1m 15s - -...and delete one: - - $ tt clear something - another-thing * 0h 1m 45s - one-more * 0h 1m 30s - - -## 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 -* 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. - - -## Copyright - -Copyright (c) 2011 Felix Hanley. See LICENSE.txt for -further details. diff --git a/Rakefile b/Rakefile index bafc719..93c1489 100644 --- a/Rakefile +++ b/Rakefile @@ -9,45 +9,5 @@ rescue Bundler::BundlerError => e 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') -end +require 'echoe' +Echoe.new('timtrackr') -- cgit v1.2.3