Permalink
Browse files

Merge remote branch 'bierbaum/master'

  • Loading branch information...
2 parents e0a1e74 + e6a254e commit 7c75812243b662b9e3994316144e563e12282011 @ryanking ryanking committed Mar 23, 2010
Showing with 6 additions and 52 deletions.
  1. +6 −5 Rakefile
  2. +0 −47 cassandra.gemspec
View
@@ -15,7 +15,8 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER']
end
end
-CASSANDRA_HOME = "#{ENV['HOME']}/cassandra"
+CASSANDRA_HOME = ENV['CASSANDRA_HOME'] || "#{ENV['HOME']}/cassandra"
+DOWNLOAD_DIR = "/tmp"
DIST_URL = "http://apache.osuosl.org/incubator/cassandra/0.6.0/apache-cassandra-0.6.0-beta2-bin.tar.gz"
DIST_FILE = DIST_URL.split('/').last
@@ -36,19 +37,19 @@ task :cassandra => [:java, File.join(CASSANDRA_HOME, 'server'), File.join(CASSAN
end
end
-file File.join(CASSANDRA_HOME, 'server') => File.join(CASSANDRA_HOME, DIST_FILE) do
+file File.join(CASSANDRA_HOME, 'server') => File.join(DOWNLOAD_DIR, DIST_FILE) do
Dir.chdir(CASSANDRA_HOME) do
- sh "tar xzvf #{DIST_FILE}"
+ sh "tar xzf #{DIST_FILE}"
sh "mv #{DIST_FILE.split('.')[0..2].join('.').sub('-bin', '')} server"
Dir.chdir('server') do
sh "ant ivy-retrieve"
end
end
end
-file File.join(CASSANDRA_HOME, DIST_FILE) => CASSANDRA_HOME do
+file File.join(DOWNLOAD_DIR, DIST_FILE) => CASSANDRA_HOME do
puts "downloading"
- cmd = "curl -L -o #{File.join(CASSANDRA_HOME, DIST_FILE)} #{DIST_URL}"
+ cmd = "curl -L -o #{File.join(DOWNLOAD_DIR, DIST_FILE)} #{DIST_URL}"
sh cmd
end
View
@@ -1,47 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
- s.name = %q{cassandra}
- s.version = "0.7.6"
-
- s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
- s.authors = ["Evan Weaver, Ryan King"]
- s.cert_chain = ["/Users/ryan/.gemkeys/gem-public_cert.pem"]
- s.date = %q{2010-03-01}
- s.default_executable = %q{cassandra_helper}
- s.description = %q{A Ruby client for the Cassandra distributed database.}
- s.email = %q{}
- s.executables = ["cassandra_helper"]
- s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc", "bin/cassandra_helper", "lib/cassandra.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/debug.rb", "lib/cassandra/helpers.rb", "lib/cassandra/long.rb", "lib/cassandra/mock.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.rb"]
- s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "bin/cassandra_helper", "conf/cassandra.in.sh", "conf/log4j.properties", "conf/storage-conf.xml", "lib/cassandra.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/debug.rb", "lib/cassandra/helpers.rb", "lib/cassandra/long.rb", "lib/cassandra/mock.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.rb", "test/cassandra_mock_test.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb", "vendor/gen-rb/cassandra.rb", "vendor/gen-rb/cassandra_constants.rb", "vendor/gen-rb/cassandra_types.rb", "cassandra.gemspec"]
- s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/cassandra/}
- s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.rdoc"]
- s.require_paths = ["lib"]
- s.rubyforge_project = %q{fauna}
- s.rubygems_version = %q{1.3.5}
- s.signing_key = %q{/Users/ryan/.gemkeys/gem-private_key.pem}
- s.summary = %q{A Ruby client for the Cassandra distributed database.}
- s.test_files = ["test/cassandra_mock_test.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb"]
-
- if s.respond_to? :specification_version then
- current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
- s.specification_version = 3
-
- if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<thrift_client>, [">= 0", "= 0.4.0"])
- s.add_runtime_dependency(%q<json>, [">= 0"])
- s.add_runtime_dependency(%q<rake>, [">= 0"])
- s.add_runtime_dependency(%q<simple_uuid>, [">= 0", "= 0.1.0"])
- else
- s.add_dependency(%q<thrift_client>, [">= 0", "= 0.4.0"])
- s.add_dependency(%q<json>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<simple_uuid>, [">= 0", "= 0.1.0"])
- end
- else
- s.add_dependency(%q<thrift_client>, [">= 0", "= 0.4.0"])
- s.add_dependency(%q<json>, [">= 0"])
- s.add_dependency(%q<rake>, [">= 0"])
- s.add_dependency(%q<simple_uuid>, [">= 0", "= 0.1.0"])
- end
-end

0 comments on commit 7c75812

Please sign in to comment.