Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update thrift_client version dependency #173

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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$/
Expand Down
10 changes: 5 additions & 5 deletions cassandra.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -17,28 +17,28 @@ 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"]

if s.respond_to? :specification_version then
s.specification_version = 3

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<thrift_client>, ["< 0.9", ">= 0.7.0"])
s.add_runtime_dependency(%q<thrift_client>, ["< 0.10", ">= 0.7.0"])
s.add_runtime_dependency(%q<json>, [">= 0"])
s.add_runtime_dependency(%q<rake>, [">= 0"])
s.add_runtime_dependency(%q<simple_uuid>, ["~> 0.2.0"])
s.add_development_dependency(%q<echoe>, [">= 0"])
else
s.add_dependency(%q<thrift_client>, ["< 0.9", ">= 0.7.0"])
s.add_dependency(%q<thrift_client>, ["< 0.10", ">= 0.7.0"])
s.add_dependency(%q<json>, [">= 0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<simple_uuid>, ["~> 0.2.0"])
s.add_dependency(%q<echoe>, [">= 0"])
end
else
s.add_dependency(%q<thrift_client>, ["< 0.9", ">= 0.7.0"])
s.add_dependency(%q<thrift_client>, ["< 0.10", ">= 0.7.0"])
s.add_dependency(%q<json>, [">= 0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<simple_uuid>, ["~> 0.2.0"])
Expand Down
2 changes: 1 addition & 1 deletion lib/cassandra.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down