From 20280f2c5d36691e3e9ea3e559be325cf610dfe9 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 24 Nov 2010 13:46:03 +0000 Subject: [PATCH 1/5] switched to using bundle's own gemspec format instead of jeweler --- .gitignore | 8 ++++---- Gemfile | 9 ++------- Gemfile.lock | 24 ++++++++++++++---------- Rakefile | 40 ++++++++++++---------------------------- lib/redistat/version.rb | 3 +++ redistat.gemspec | 27 +++++++++++++++++++++++++++ 6 files changed, 62 insertions(+), 49 deletions(-) create mode 100644 lib/redistat/version.rb create mode 100644 redistat.gemspec diff --git a/.gitignore b/.gitignore index 399cbf0..4a34ae3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,11 +16,11 @@ tmtags ## PROJECT::GENERAL coverage rdoc -pkg +pkg/* +*.gem +.bundle ## PROJECT::SPECIFIC -.bundle/* .yardoc/* spec/db/* -doc -redistat.gemspec +doc/* diff --git a/Gemfile b/Gemfile index 8276abf..8f14386 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,9 @@ source 'http://rubygems.org/' -gem 'activesupport', '>= 2.3.0' -gem 'json', '>= 1.4.6' -gem 'redis', '>= 2.1.1' -gem 'system_timer', '>= 1.0.0' -gem 'time_ext', '>= 0.2.6' +# Specify your gem's dependencies in redistat.gemspec +gemspec group :development do - gem 'jeweler', '>= 1.5.1' gem 'rspec', '>= 2.1.0' gem 'yard', '>= 0.6.3' - gem 'i18n' end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index e226764..d7ddaa5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,16 +1,20 @@ +PATH + remote: . + specs: + redistat (0.0.3) + activesupport (>= 2.3.0) + json (>= 1.4.6) + redis (>= 2.1.1) + system_timer (>= 1.0.0) + time_ext (>= 0.2.8) + GEM remote: http://rubygems.org/ specs: activesupport (3.0.3) diff-lcs (1.1.2) - git (1.2.5) i18n (0.4.2) - jeweler (1.5.1) - bundler (~> 1.0.0) - git (>= 1.2.5) - rake json (1.4.6) - rake (0.8.7) redis (2.1.1) rspec (2.1.0) rspec-core (~> 2.1.0) @@ -21,8 +25,9 @@ GEM diff-lcs (~> 1.1.2) rspec-mocks (2.1.0) system_timer (1.0) - time_ext (0.2.6) + time_ext (0.2.8) activesupport (>= 2.3.0) + i18n (>= 0.4.2) yard (0.6.3) PLATFORMS @@ -30,11 +35,10 @@ PLATFORMS DEPENDENCIES activesupport (>= 2.3.0) - i18n - jeweler (>= 1.5.1) json (>= 1.4.6) redis (>= 2.1.1) + redistat! rspec (>= 2.1.0) system_timer (>= 1.0.0) - time_ext (>= 0.2.6) + time_ext (>= 0.2.8) yard (>= 0.6.3) diff --git a/Rakefile b/Rakefile index 76bdbcf..d68a742 100644 --- a/Rakefile +++ b/Rakefile @@ -1,31 +1,11 @@ -require 'rubygems' -require 'rake' - -begin - require 'jeweler' - Jeweler::Tasks.new do |gem| - gem.name = 'redistat' - gem.summary = 'A Redis-backed statistics storage and querying library written in Ruby.' - gem.description = 'A Redis-backed statistics storage and querying library written in Ruby.' - gem.email = 'contact@jimeh.me' - gem.homepage = 'http://github.com/jimeh/redistat' - gem.authors = ['Jim Myhrberg'] - gem.add_dependency 'activesupport', '>= 2.3.0' - gem.add_dependency 'json', '>= 1.4.6' - gem.add_dependency 'redis', '>= 2.1.1' - gem.add_dependency 'system_timer', '>= 1.0.0' - gem.add_dependency 'time_ext', '>= 0.2.6' - gem.add_development_dependency 'jeweler', '>= 1.5.1' - gem.add_development_dependency 'rspec', '>= 2.1.0' - gem.add_development_dependency 'yard', '>= 0.6.1' - end - Jeweler::GemcutterTasks.new -rescue LoadError - puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler" -end +require 'bundler' +Bundler::GemHelper.install_tasks +# # Rspec +# + require 'rspec/core/rake_task' RSpec::Core::RakeTask.new(:spec) do |spec| spec.pattern = 'spec/**/*_spec.rb' @@ -36,12 +16,13 @@ RSpec::Core::RakeTask.new(:rcov) do |spec| spec.rcov = true end -task :spec => :check_dependencies - task :default => [:start, :spec, :stop] +# # Start/stop Redis test server +# + REDIS_DIR = File.expand_path(File.join("..", "spec"), __FILE__) REDIS_CNF = File.join(REDIS_DIR, "redis-test.conf") REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid") @@ -62,7 +43,10 @@ task :stop do end -# YARD Documentation +# +# Yard +# + begin require 'yard' YARD::Rake::YardocTask.new diff --git a/lib/redistat/version.rb b/lib/redistat/version.rb new file mode 100644 index 0000000..71ca7c6 --- /dev/null +++ b/lib/redistat/version.rb @@ -0,0 +1,3 @@ +module Redistat + VERSION = "0.0.3" +end diff --git a/redistat.gemspec b/redistat.gemspec new file mode 100644 index 0000000..972f639 --- /dev/null +++ b/redistat.gemspec @@ -0,0 +1,27 @@ +# -*- encoding: utf-8 -*- +$:.push File.expand_path("../lib", __FILE__) +require "redistat/version" + +Gem::Specification.new do |s| + s.name = "redistat" + s.version = Redistat::VERSION + s.platform = Gem::Platform::RUBY + s.authors = ["Jim Myhrberg"] + s.email = ["contact@jimeh.me"] + s.homepage = "http://github.com/jimeh/redistat" + s.summary = %q{A Redis-backed statistics storage and querying library written in Ruby.} + s.description = %q{A Redis-backed statistics storage and querying library written in Ruby.} + + s.rubyforge_project = "redistat" + + s.files = `git ls-files`.split("\n") + s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") + s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } + s.require_paths = ["lib"] + + s.add_runtime_dependency 'activesupport', '>= 2.3.0' + s.add_runtime_dependency 'json', '>= 1.4.6' + s.add_runtime_dependency 'redis', '>= 2.1.1' + s.add_runtime_dependency 'system_timer', '>= 1.0.0' + s.add_runtime_dependency 'time_ext', '>= 0.2.8' +end From 81ee2ec0b662b9aaef2e51baca3b8accb8adac9e Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 24 Nov 2010 13:46:11 +0000 Subject: [PATCH 2/5] added console rake task --- Rakefile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Rakefile b/Rakefile index d68a742..fdba182 100644 --- a/Rakefile +++ b/Rakefile @@ -55,3 +55,14 @@ rescue LoadError abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard" end end + + +# +# Misc. +# + +desc "Start an irb console with TimeExt pre-loaded." +task :console do + exec "irb -r spec/spec_helper" +end +task :c => :console From 8f6a4a6820944b114efd18cafcd263b8ba32d1fd Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 24 Nov 2010 13:47:51 +0000 Subject: [PATCH 3/5] fixed a typo --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index fdba182..119a65c 100644 --- a/Rakefile +++ b/Rakefile @@ -61,7 +61,7 @@ end # Misc. # -desc "Start an irb console with TimeExt pre-loaded." +desc "Start an irb console with Redistat pre-loaded." task :console do exec "irb -r spec/spec_helper" end From 85ba61b2cc0820fefc4309731745175d5f6607cf Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 24 Nov 2010 13:48:48 +0000 Subject: [PATCH 4/5] removed jeweler's VERSION file --- VERSION | 1 - 1 file changed, 1 deletion(-) delete mode 100644 VERSION diff --git a/VERSION b/VERSION deleted file mode 100644 index 6812f81..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.0.3 \ No newline at end of file From 490356ee96ead47bca0be6447be00104cc2e7d9a Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 24 Nov 2010 13:50:36 +0000 Subject: [PATCH 5/5] Bumped version to 0.0.4 --- Gemfile.lock | 2 +- lib/redistat/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d7ddaa5..6db9944 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - redistat (0.0.3) + redistat (0.0.4) activesupport (>= 2.3.0) json (>= 1.4.6) redis (>= 2.1.1) diff --git a/lib/redistat/version.rb b/lib/redistat/version.rb index 71ca7c6..ab2c53d 100644 --- a/lib/redistat/version.rb +++ b/lib/redistat/version.rb @@ -1,3 +1,3 @@ module Redistat - VERSION = "0.0.3" + VERSION = "0.0.4" end