From cab7ed5633420c88c987610311a39aa7758f4455 Mon Sep 17 00:00:00 2001 From: Ariel Salomon Date: Wed, 23 Feb 2011 07:42:58 -0800 Subject: [PATCH 1/5] Fix for use with Active Support 2.3.x --- lib/redistat.rb | 2 +- lib/redistat/result.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/redistat.rb b/lib/redistat.rb index 2e4e64a..f95cefc 100644 --- a/lib/redistat.rb +++ b/lib/redistat.rb @@ -1,7 +1,7 @@ require 'rubygems' require 'active_support' -require 'active_support/hash_with_indifferent_access' if !Hash.respond_to?(:with_indifferent_access) # Active Support 2.x and 3.x +require 'active_support/hash_with_indifferent_access' if !{}.respond_to?(:with_indifferent_access) # Active Support 2.x and 3.x require 'redis' require 'date' require 'time' diff --git a/lib/redistat/result.rb b/lib/redistat/result.rb index 68dea24..777221b 100644 --- a/lib/redistat/result.rb +++ b/lib/redistat/result.rb @@ -1,5 +1,5 @@ module Redistat - class Result < ::ActiveSupport::HashWithIndifferentAccess + class Result < HashWithIndifferentAccess attr_accessor :from attr_accessor :till From 4808a97d194b55fc3c35bc00317bb1ff20300952 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 23 Feb 2011 18:08:21 +0000 Subject: [PATCH 2/5] added .rvmrc file for development ease --- .rvmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .rvmrc diff --git a/.rvmrc b/.rvmrc new file mode 100644 index 0000000..5fd5f10 --- /dev/null +++ b/.rvmrc @@ -0,0 +1 @@ +rvm gemset use redistat From ec54385192ae4c0b3ae8f857550a6d2f00b1f1b8 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 23 Feb 2011 18:09:19 +0000 Subject: [PATCH 3/5] updated activesupport dependency to ">= 2.3.6" as redistat breaks with earlier versions --- redistat.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redistat.gemspec b/redistat.gemspec index 83968ca..d50b9db 100644 --- a/redistat.gemspec +++ b/redistat.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| 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 'activesupport', '>= 2.3.6' s.add_runtime_dependency 'json', '>= 1.4.0' s.add_runtime_dependency 'redis', '>= 2.1.0' s.add_runtime_dependency 'time_ext', '>= 0.2.8' From f8ec62676272d65c1211e6534740f82308742286 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 23 Feb 2011 18:10:09 +0000 Subject: [PATCH 4/5] removed Gemfile.lock from git repo (this is a gem not an application ^_^) --- Gemfile.lock | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 0c40429..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,41 +0,0 @@ -PATH - remote: . - specs: - redistat (0.0.8) - activesupport (>= 2.3.0) - json (>= 1.4.0) - redis (>= 2.1.0) - time_ext (>= 0.2.8) - -GEM - remote: http://rubygems.org/ - specs: - activesupport (3.0.3) - diff-lcs (1.1.2) - i18n (0.4.2) - json (1.4.6) - redis (2.1.1) - rspec (2.1.0) - rspec-core (~> 2.1.0) - rspec-expectations (~> 2.1.0) - rspec-mocks (~> 2.1.0) - rspec-core (2.1.0) - rspec-expectations (2.1.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.1.0) - time_ext (0.2.8) - activesupport (>= 2.3.0) - i18n (>= 0.4.2) - yard (0.6.3) - -PLATFORMS - ruby - -DEPENDENCIES - activesupport (>= 2.3.0) - json (>= 1.4.0) - redis (>= 2.1.0) - redistat! - rspec (>= 2.1.0) - time_ext (>= 0.2.8) - yard (>= 0.6.3) From 4692780d1ee973a35a955b1fd92f12945d8e1080 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 23 Feb 2011 18:11:15 +0000 Subject: [PATCH 5/5] Version bump to 0.0.9 --- lib/redistat/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/redistat/version.rb b/lib/redistat/version.rb index f712ff1..509166f 100644 --- a/lib/redistat/version.rb +++ b/lib/redistat/version.rb @@ -1,3 +1,3 @@ module Redistat - VERSION = "0.0.8" + VERSION = "0.0.9" end