cassandra 0.5 → 0.5.1

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.5.1. Add bin/cassandra_helper script, to build and start the server for you. Improve build error reporting.
+
 v0.5. More API changes. Working temporal comparators.
 
 v0.4. Use new comparator API. Namespace Thrift bindings; rename gem and class to Cassandra. Make tokens and limits actually work. Retry UnavailableExceptions.

data/Manifest

@@ -1,3 +1,4 @@
+bin/cassandra_helper
 CHANGELOG
 conf/cassandra.in.sh
 conf/log4j.properties

data/README

@@ -25,12 +25,14 @@ You need Ruby 1.8 or 1.9. If you have those, just run:
 
   sudo gem install cassandra
   
-== Usage
-
-Cassandra is a rapidly moving target. In order to get a working server, change to the checkout or gem directory, and run:
+Cassandra is a rapidly moving target. In order to get a working server, use the <tt>bin/cassandra_helper</tt> script (requires <tt>git</tt>):
 
-  rake cassandra 
+  cassandra_helper cassandra
+  
+A server will be installed in <tt>$HOME/cassandra/r$REVISION</tt>, and started in debug mode.
 
+== Usage
+  
 Now, start IRb and require the library:
   
   require 'cassandra'

data/Rakefile

@@ -1,48 +1,91 @@
-require 'echoe'
 
-Echoe.new("cassandra") do |p|
-  p.author = "Evan Weaver"
-  p.project = "fauna"
-  p.summary = "A Ruby client for the Cassandra distributed database."
-  p.rubygems_version = ">= 0.8"
-  p.dependencies = ['json', 'thrift']
-  p.ignore_pattern = /^(data|vendor\/cassandra|cassandra|vendor\/thrift)/
-  p.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
-  p.url = "http://blog.evanweaver.com/files/doc/fauna/cassandra/"
-  p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"
-end
+unless ENV['FROM_BIN_CASSANDRA_HELPER']
+  require 'rubygems'
+  require 'echoe'
 
-desc "Start Cassandra"
-task :cassandra => [:checkout, :patch, :build] do
-  env = "CASSANDRA_INCLUDE=#{Dir.pwd}/conf/cassandra.in.sh" unless ENV["CASSANDRA_INCLUDE"]
-  exec("env #{env} cassandra/bin/cassandra -f")
+  Echoe.new("cassandra") do |p|
+    p.author = "Evan Weaver"
+    p.project = "fauna"
+    p.summary = "A Ruby client for the Cassandra distributed database."
+    p.rubygems_version = ">= 0.8"
+    p.dependencies = ['thrift', 'rake']
+    p.ignore_pattern = /^(data|vendor\/cassandra|cassandra|vendor\/thrift)/
+    p.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
+    p.url = "http://blog.evanweaver.com/files/doc/fauna/cassandra/"
+    p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"
+  end
 end
 
 REVISION = "15354b4906fd654d58fe50fd01ebf95b69434ba9"
+
 PATCHES = [
   "http://issues.apache.org/jira/secure/attachment/12416014/0001-CASSANDRA-356-rename-clean-up-collectColumns-methods.txt",
   "http://issues.apache.org/jira/secure/attachment/12416073/0002-v3.patch",
   "http://issues.apache.org/jira/secure/attachment/12416074/357-v2.patch",
   "http://issues.apache.org/jira/secure/attachment/12416086/357-3.patch"]
-  
+
+CASSANDRA_HOME = "#{ENV['HOME']}/cassandra/r#{REVISION[0, 8]}"
+
+CASSANDRA_TEST = "#{ENV['HOME']}/cassandra/test"
+
+desc "Start Cassandra"
+task :cassandra => [:java, :checkout, :patch, :build] do
+  # Construct environment
+  env = ""
+  if !ENV["CASSANDRA_INCLUDE"]
+    env << "CASSANDRA_INCLUDE=#{Dir.pwd}/conf/cassandra.in.sh "
+    env << "CASSANDRA_HOME=#{CASSANDRA_HOME} "
+    env << "CASSANDRA_CONF=#{File.expand_path(File.dirname(__FILE__))}/conf" 
+  end  
+  # Create data dir
+  Dir.mkdir(CASSANDRA_TEST) if !File.exist?(CASSANDRA_TEST)
+  # Start server
+  Dir.chdir(CASSANDRA_TEST) do
+    exec("env #{env} #{CASSANDRA_HOME}/bin/cassandra -f")
+  end
+end
+
+desc "Check Java version"
+task :java do
+  unless `java -version 2>&1`.split("\n").first =~ /java version "1.6/ #"
+    puts "You need to configure your environment for Java 1.6."
+    puts "If you're on OS X, just export the following environment variables:"
+    puts '  JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home"'
+    puts '  PATH="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/bin:$PATH"'
+    exit(1)
+  end
+end
+
+desc "Checkout Cassandra from git"
 task :checkout do
-  # Like a git submodule, but all in one obvious place
-  unless File.exist?("cassandra")
-    system("git clone git://git.apache.org/cassandra.git") 
+  # Check git version
+  unless `git --version 2>&1` =~ /git version 1.6/
+    puts "You need to install git 1.6."
+    exit(1)
+  end
+  # Like a git submodule, but all in one more obvious place
+  unless File.exist?(CASSANDRA_HOME)
+    cmd = "git clone git://git.apache.org/cassandra.git #{CASSANDRA_HOME}"
+    if !system(cmd)
+      put "Checkout failed. Try:\n  #{cmd}"
+      exit(1)
+    end
     ENV["RESET"] = "true"
   end
 end
 
+desc "Apply patches to Cassandra checkout; use RESET=1 to force"
 task :patch do
   if ENV["RESET"]
-    Dir.chdir("cassandra") do
+    system("rm -rf #{CASSANDRA_TEST}/data")
+    Dir.chdir(CASSANDRA_HOME) do
       system("ant clean && git fetch && git reset #{REVISION} --hard")
       # Delete untracked files, so that the patchs can apply again
       Array(`git status`[/Untracked files:(.*)$/m, 1].to_s.split("\n")[3..-1]).each do |file|
         File.unlink(file.sub(/^.\s+/, "")) rescue nil
       end
       # Patch, with a handy commit for each one
-      PATCHES.each do |url| 
+      PATCHES.each do |url|
         raise "#{url} failed" unless system("curl #{url} | patch -p1")
         system("git commit -a -m 'Applied patch: #{url.inspect}'")
       end
@@ -50,19 +93,38 @@ task :patch do
   end
 end
 
+desc "Rebuild Cassandra"
 task :build do
-  Dir.chdir("cassandra") { system("ant") } unless File.exist?("cassandra/build")
+  unless File.exist?("#{CASSANDRA_HOME}/build")
+    cmd = "cd #{CASSANDRA_HOME} && ant"
+    if !system(cmd)
+      puts "Could not build Casssandra. Try:\n  #{cmd}"
+      exit(1)
+    end
+  end
 end
 
+desc "Clean Cassandra build"
 task :clean do
-  Dir.chdir("cassandra") { system("ant clean") }
+  if File.exist?(CASSANDRA_HOME)
+    Dir.chdir(CASSANDRA_HOME) do
+      system("ant clean")
+    end
+  end      
+end
+
+namespace :data do
+  desc "Reset test data"
+  task :reset do
+    system("rm -rf #{CASSANDRA_TEST}/data")
+  end
 end
 
-desc "Regenerate thrift bindings for Cassandra"
+# desc "Regenerate thrift bindings for Cassandra" # Dev only
 task :thrift do
   system(
     "cd vendor &&
     rm -rf gen-rb &&
-    thrift -gen rb ../cassandra/interface/cassandra.thrift")
+    thrift -gen rb #{CASSANDRA_HOME}/interface/cassandra.thrift")
 end
 

data/bin/cassandra_helper

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'rake'
+require 'cassandra'
+
+gem_path = $LOAD_PATH.last.sub(/lib$/, "")
+
+Dir.chdir(gem_path) do
+  if !ENV["CASSANDRA_INCLUDE"]
+    puts "Set the CASSANDRA_INCLUDE environment variable to use a non-default cassandra.in.sh and friends."
+  end
+
+  ARGV << "-T" if ARGV.empty?
+  exec("env FROM_BIN_CASSANDRA_HELPER=1 rake #{ARGV.join(' ')}")
+end

data/cassandra.gemspec

@@ -2,16 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.5"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
   s.date = %q{2009-08-18}
+  s.default_executable = %q{cassandra_helper}
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/safe_client.rb", "lib/cassandra/time.rb", "lib/cassandra/uuid.rb", "lib/cassandra.rb", "LICENSE", "README"]
-  s.files = ["CHANGELOG", "conf/cassandra.in.sh", "conf/log4j.properties", "conf/storage-conf.xml", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/safe_client.rb", "lib/cassandra/time.rb", "lib/cassandra/uuid.rb", "lib/cassandra.rb", "LICENSE", "Manifest", "Rakefile", "README", "test/cassandra_test.rb", "test/comparable_types_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.executables = ["cassandra_helper"]
+  s.extra_rdoc_files = ["bin/cassandra_helper", "CHANGELOG", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/safe_client.rb", "lib/cassandra/time.rb", "lib/cassandra/uuid.rb", "lib/cassandra.rb", "LICENSE", "README"]
+  s.files = ["bin/cassandra_helper", "CHANGELOG", "conf/cassandra.in.sh", "conf/log4j.properties", "conf/storage-conf.xml", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/safe_client.rb", "lib/cassandra/time.rb", "lib/cassandra/uuid.rb", "lib/cassandra.rb", "LICENSE", "Manifest", "Rakefile", "README", "test/cassandra_test.rb", "test/comparable_types_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"]
   s.require_paths = ["lib"]
@@ -26,14 +28,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<thrift>, [">= 0"])
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
     else
-      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<thrift>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
     end
   else
-    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<thrift>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
   end
 end

data/conf/cassandra.in.sh

@@ -14,26 +14,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-cassandra_home=`pwd`/cassandra
-
 # The directory where Cassandra's configs live (required)
-CASSANDRA_CONF=`pwd`/conf
+CASSANDRA_CONF=$CASSANDRA_CONF
 
 # This can be the path to a jar file, or a directory containing the 
-# compiled classes. NOTE: This isn't needed by the startup script,
-# it's just used here in constructing the classpath.
-cassandra_bin=$cassandra_home/build/classes
-#cassandra_bin=$cassandra_home/build/cassandra.jar
+# compiled classes.
+cassandra_bin=$CASSANDRA_HOME/build/classes
 
 # The java classpath (required)
 CLASSPATH=$CASSANDRA_CONF:$cassandra_bin
 
-for jar in $cassandra_home/lib/*.jar; do
+for jar in $CASSANDRA_HOME/lib/*.jar; do
     CLASSPATH=$CLASSPATH:$jar
 done
 
-echo $cassandra_home
+echo "CASSANDRA_HOME: $CASSANDRA_HOME"
+echo "CASSANDRA_CONF: $CASSANDRA_CONF"
 
 # Arguments to pass to the JVM
 JVM_OPTS=" \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: 0.5.1
 platform: ruby
 authors: 
 - Evan Weaver
@@ -34,7 +34,7 @@ date: 2009-08-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: thrift
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -44,7 +44,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: thrift
+  name: rake
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -55,11 +55,12 @@ dependencies:
     version: 
 description: A Ruby client for the Cassandra distributed database.
 email: ""
-executables: []
-
+executables: 
+- cassandra_helper
 extensions: []
 
 extra_rdoc_files: 
+- bin/cassandra_helper
 - CHANGELOG
 - lib/cassandra/array.rb
 - lib/cassandra/cassandra.rb
@@ -76,6 +77,7 @@ extra_rdoc_files:
 - LICENSE
 - README
 files: 
+- bin/cassandra_helper
 - CHANGELOG
 - conf/cassandra.in.sh
 - conf/log4j.properties