From 874406c3fe8dbbd9f58e7ab2a2311335cce84775 Mon Sep 17 00:00:00 2001 From: felix Date: Fri, 28 Oct 2011 16:15:24 +0700 Subject: clean up all the gem stuff --- .gitignore | 2 +- CHANGELOG | 24 ++++++++++----- Gemfile | 3 +- Gemfile.lock | 16 ++-------- Manifest | 1 - Rakefile | 90 +++++++++++++++++++++++++++++++++++++++++++++--------- VERSION | 1 - timetrackr.gemspec | 13 +++----- 8 files changed, 103 insertions(+), 47 deletions(-) delete mode 100644 VERSION diff --git a/.gitignore b/.gitignore index e71c90a..c65d43c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ rdoc .bundle -pkg +pkg \ No newline at end of file diff --git a/CHANGELOG b/CHANGELOG index f395198..c88d13b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,11 +1,21 @@ -v0.2.0. clean up and simplify - removed JSON and SQLite support, only YAML - added 'notes' command += v0.2 -v0.1.6. group by days or tasks + * clean up and simplify + * removed JSON and SQLite support, only YAML + * added 'notes' command -v0.1.5. added JSON database += v0.1.6 -v0.1.4. more commands + * group by days or tasks -v0.1.3. stop playing with jeweller and release += 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 3df2a63..199afe3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,7 @@ source 'http://rubygems.org' group :development do + gem 'rake' gem 'bundler', '>= 1.0.0' - gem 'echoe' + gem 'gemcutter' end diff --git a/Gemfile.lock b/Gemfile.lock index d8cca28..37effb3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,13 @@ GEM remote: http://rubygems.org/ specs: - 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) - echoe + gemcutter + rake diff --git a/Manifest b/Manifest index f79a534..9548151 100644 --- a/Manifest +++ b/Manifest @@ -6,7 +6,6 @@ Manifest README Rakefile TODO -VERSION bin/timetrackr lib/timetrackr.rb lib/timetrackr/cli.rb diff --git a/Rakefile b/Rakefile index 7176883..f121d33 100644 --- a/Rakefile +++ b/Rakefile @@ -1,18 +1,80 @@ 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 +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 -require 'rake' - -require 'echoe' -Echoe.new('timetrackr') do |g| - g.author = 'Felix Hanley' - g.email = 'felix@seconddrawer.com.au' - g.summary = 'A simple time tracking utility' - g.url = 'https://github.com/felix/timetrackr' + +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 + +# 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 diff --git a/VERSION b/VERSION deleted file mode 100644 index a192233..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.1.6 \ No newline at end of file diff --git a/timetrackr.gemspec b/timetrackr.gemspec index c6d8eb4..a368094 100644 --- a/timetrackr.gemspec +++ b/timetrackr.gemspec @@ -4,21 +4,18 @@ Gem::Specification.new do |s| s.name = %q{timetrackr} s.version = "0.2.0" - s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version= + s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = [%q{Felix Hanley}] s.date = %q{2011-10-28} - s.description = %q{A simple time tracking utility} s.email = %q{felix@seconddrawer.com.au} s.executables = [%q{timetrackr}] - s.extra_rdoc_files = [%q{CHANGELOG}, %q{LICENSE}, %q{README}, %q{TODO}, %q{bin/timetrackr}, %q{lib/timetrackr.rb}, %q{lib/timetrackr/cli.rb}, %q{lib/timetrackr/database.rb}, %q{lib/timetrackr/period.rb}] - s.files = [%q{CHANGELOG}, %q{Gemfile}, %q{Gemfile.lock}, %q{LICENSE}, %q{Manifest}, %q{README}, %q{Rakefile}, %q{TODO}, %q{VERSION}, %q{bin/timetrackr}, %q{lib/timetrackr.rb}, %q{lib/timetrackr/cli.rb}, %q{lib/timetrackr/database.rb}, %q{lib/timetrackr/period.rb}, %q{test/helper.rb}, %q{test/test_timetrackr.rb}, %q{timetrackr.gemspec}] - s.homepage = %q{https://github.com/felix/timetrackr} - s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Timetrackr}, %q{--main}, %q{README}] + s.extra_rdoc_files = [%q{README}] + s.files = [%q{Rakefile}, %q{Gemfile}, %q{Gemfile.lock}, %q{LICENSE}, %q{README}, %q{CHANGELOG}, %q{Manifest}, %q{TODO}, %q{bin/timetrackr}, %q{test/helper.rb}, %q{test/test_timetrackr.rb}, %q{lib/timetrackr}, %q{lib/timetrackr/period.rb}, %q{lib/timetrackr/database.rb}, %q{lib/timetrackr/cli.rb}, %q{lib/timetrackr.rb}] + s.homepage = %q{http://github.com/felix/timetrackr} + s.rdoc_options = [%q{--main}, %q{README}] s.require_paths = [%q{lib}] - s.rubyforge_project = %q{timetrackr} s.rubygems_version = %q{1.8.5} s.summary = %q{A simple time tracking utility} - s.test_files = [%q{test/test_timetrackr.rb}] if s.respond_to? :specification_version then s.specification_version = 3 -- cgit v1.2.3