From bd4afd3ca5fc0c6795c267677eec1620cb077b1b Mon Sep 17 00:00:00 2001 From: Michael Baldry Date: Mon, 21 Jan 2013 13:09:20 +0000 Subject: [PATCH 1/2] Updating thrift_client gem dependency version --- Rakefile | 2 +- cassandra.gemspec | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Rakefile b/Rakefile index 64cd51f..edb0357 100755 --- a/Rakefile +++ b/Rakefile @@ -9,7 +9,7 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER'] p.url = 'http://github.com/twitter/cassandra' p.summary = "A Ruby client for the Cassandra distributed database." p.rubygems_version = ">= 0.8" - p.dependencies = ['thrift_client >=0.7.0 <0.9', 'json', 'rake', 'simple_uuid ~>0.2.0'] + p.dependencies = ['thrift_client >=0.7.0 <0.10', 'json', 'rake', 'simple_uuid ~>0.2.0'] p.development_dependencies = ['echoe'] p.ignore_pattern = /^(data|vendor\/cassandra|cassandra|vendor\/thrift|.*\.rbc)/ p.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/ diff --git a/cassandra.gemspec b/cassandra.gemspec index 1524a17..08f444e 100644 --- a/cassandra.gemspec +++ b/cassandra.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version= s.authors = ["Evan Weaver, Ryan King"] - s.date = "2012-09-26" + s.date = "2013-01-21" s.description = "A Ruby client for the Cassandra distributed database." s.email = "" s.executables = ["cassandra_helper"] @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.md"] s.require_paths = ["lib", "ext"] s.rubyforge_project = "cassandra" - s.rubygems_version = "1.8.17" + s.rubygems_version = "1.8.24" s.summary = "A Ruby client for the Cassandra distributed database." s.test_files = ["test/cassandra_client_test.rb", "test/cassandra_mock_test.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/composite_type_test.rb", "test/eventmachine_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb"] @@ -25,20 +25,20 @@ Gem::Specification.new do |s| s.specification_version = 3 if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, ["< 0.9", ">= 0.7.0"]) + s.add_runtime_dependency(%q, ["< 0.10", ">= 0.7.0"]) s.add_runtime_dependency(%q, [">= 0"]) s.add_runtime_dependency(%q, [">= 0"]) s.add_runtime_dependency(%q, ["~> 0.2.0"]) s.add_development_dependency(%q, [">= 0"]) else - s.add_dependency(%q, ["< 0.9", ">= 0.7.0"]) + s.add_dependency(%q, ["< 0.10", ">= 0.7.0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, ["~> 0.2.0"]) s.add_dependency(%q, [">= 0"]) end else - s.add_dependency(%q, ["< 0.9", ">= 0.7.0"]) + s.add_dependency(%q, ["< 0.10", ">= 0.7.0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, ["~> 0.2.0"]) From 3bedcd28302ba2149eb9f9e8b6e1c7be2f2f85c9 Mon Sep 17 00:00:00 2001 From: Michael Baldry Date: Mon, 21 Jan 2013 13:36:59 +0000 Subject: [PATCH 2/2] Updating version requested in gem --- lib/cassandra.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cassandra.rb b/lib/cassandra.rb index b8e00fb..ab368d3 100755 --- a/lib/cassandra.rb +++ b/lib/cassandra.rb @@ -1,5 +1,5 @@ require 'rubygems' -gem 'thrift_client', '>= 0.7.0', '< 0.9' +gem 'thrift_client', '>= 0.7.0', '< 0.10' require 'thrift_client' gem 'simple_uuid' , '~> 0.2.0' require 'simple_uuid'