rubyhaze 0.0.5-jruby → 0.0.6-jruby

data/README.rdoc

@@ -32,7 +32,7 @@ Let's open another console to check how this distributed hash works:
 
 == Distributed Objects
 
-Check out the [rubyhaze-persisted|http://github.com/aemadrid/rubyhaze-persisted] gem to get your own distributed ruby objects:
+Check out the http://github.com/aemadrid/rubyhaze-persisted gem to get your own distributed ruby objects:
 
   shell> rvm jruby
   shell> gem install rubyhaze-persisted

data/Rakefile

@@ -7,8 +7,8 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "rubyhaze"
-    gem.summary = %Q{JRuby wrapper to play with Hazelcast}
-    gem.description = %Q{RubyHaze is a little gem that wraps the Java Hazelcast library into a more comfortable Ruby package (in JRuby, of course).}
+    gem.summary = %Q{Hazelcast distributed objects in my JRuby}
+    gem.description = %Q{RubyHaze is a little gem that wraps the Java Hazelcast library into a more comfortable JRuby package.}
     gem.email = "aemadrid@gmail.com"
     gem.homepage = "http://github.com/aemadrid/rubyhaze"
     gem.authors = ["Adrian Madrid"]

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/rubyhaze/client.rb

@@ -4,7 +4,7 @@ require 'java'
 module RubyHaze
 
   MODE         = "client" unless defined? MODE
-  GEM_JAR_PATH = File.expand_path(File.dirname(__FILE__) + '/../../jars/hazelcast-client-1.8.5.jar')  unless defined? GEM_JAR_PATH
+  GEM_JAR_PATH = File.expand_path(File.dirname(__FILE__) + '/../../jars/hazelcast-client-1.9-RC.jar') unless defined? GEM_JAR_PATH
   JAR_PATH     = (ENV['HAZELCAST_CLIENT_JAR_PATH'] || GEM_JAR_PATH) unless defined? JAR_PATH
 
 end

data/lib/rubyhaze/node.rb

@@ -4,7 +4,7 @@ require 'java'
 module RubyHaze
 
   MODE         = "node" unless defined? MODE
-  GEM_JAR_PATH = File.expand_path(File.dirname(__FILE__) + '/../../jars/hazelcast-1.8.5.jar')  unless defined? GEM_JAR_PATH
+  GEM_JAR_PATH = File.expand_path(File.dirname(__FILE__) + '/../../jars/hazelcast-1.9-RC.jar') unless defined? GEM_JAR_PATH
   JAR_PATH     = (ENV['HAZELCAST_NODE_JAR_PATH'] || GEM_JAR_PATH) unless defined? JAR_PATH
 
 end

data/lib/rubyhaze/queue.rb

@@ -9,4 +9,8 @@ class RubyHaze::Queue
     @proxy_object = Hazelcast.get_queue @name
   end
 
+  def poll(timeout = 5, unit = :seconds)
+    @proxy_object.poll timeout, java.util.concurrent.TimeUnit.const_get(unit.to_s.upcase)
+  end
+
 end

data/lib/rubyhaze.rb

@@ -27,22 +27,30 @@ module RubyHaze
 
     java_import 'com.hazelcast.core.Hazelcast'
 
+    def connected?
+      !!@connected
+    end
+
     # To start a cluster we can pass a hash of options or nil to load it from ./hazelcast.yml if available and a Config
     # object will be generated.
     def init(options = nil)
-      unless @connected
+      if connected?
+        puts ">> Already connected with Hazelcast ..."
+        false
+      else
         if options
           config = RubyHaze::Config.new(options).proxy_object
           Hazelcast.init config
-        end
-        at_exit do
-          puts ">> Shutting down Hazelcast ..."
-          Hazelcast.shutdown
-          puts ">>  ... done!"
+        else
+          Hazelcast.cluster
         end
         @connected = true
       end
-      Hazelcast.cluster      
+    end
+
+    def shutdown
+      @connected = false
+      Hazelcast.shutdown
     end
 
     def random_uuid
@@ -73,6 +81,14 @@ module RubyHaze
 
 end
 
+at_exit do
+  if RubyHaze.connected?
+    puts ">> Shutting down Hazelcast before closing shop ..."
+    RubyHaze.shutdown
+    puts ">>  ... done!"
+  end
+end
+
 require 'rubyhaze/mixins/proxy'
 require 'rubyhaze/mixins/compare'
 require 'rubyhaze/mixins/native_exception'

data/test/helper.rb

@@ -1,8 +1,35 @@
-require File.expand_path(File.dirname(__FILE__) + '/../lib/rubyhaze')
-require 'test/unit'
-require 'forwardable'
-require 'date'
+unless HELPER_LOADED
 
-RubyHaze.init :group => { :username => "test", :password => "test" }
+  require File.expand_path(File.dirname(__FILE__) + '/../lib/rubyhaze')
+  require 'test/unit'
+  require 'forwardable'
+  require 'date'
 
+  # Load the Hazelcast cluster
+  RubyHaze.init :group => { :username => "test", :password => "test" }
 
+  # Grab notices
+  class Notices
+    class << self
+      extend Forwardable
+      def all
+        @all ||= []
+      end
+      def_delegators :all, :size, :<<, :first, :last, :clear, :map
+    end
+  end
+
+  # Listen on messages
+  class TestListener
+    def initialize(name)
+      @name = name
+    end
+    def on_message(msg)
+      Notices << "[#{@name}] #{msg}"
+    end
+  end
+
+  # Finished loading helpers
+  HELPER_LOADED = true
+
+end

data/test/test_queue.rb

@@ -4,14 +4,15 @@ class TestRubyHazeQueue < Test::Unit::TestCase
 
   def test_single_queing
     tasks = RubyHaze::Queue[:test_single]
-    50.times { |idx| tasks.put [idx, Process.pid] }
+    qty = 50
+    qty.times { |idx| tasks.put [idx, Process.pid] }
     found = []
     while !tasks.empty? do
-      task = tasks.poll 5, java.util.concurrent.TimeUnit::SECONDS
+      task = tasks.poll
       found << task
     end
     assert !found.empty?
-    assert_equal found.size, 50
+    assert_equal found.size, qty
   end
 
 end

data/test/test_topic.rb

@@ -1,23 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
-
-class Notices
-  class << self
-    extend Forwardable
-    def all
-      @all ||= []
-    end
-    def_delegators :all, :size, :<<, :first, :last, :clear, :map
-  end
-end unless defined? Notices
-
-class TestListener
-  def initialize(name)
-    @name = name
-  end
-  def on_message(msg)
-    Notices << "[#{@name}] #{msg}"
-  end
-end
+require File.expand_path(File.dirname(__FILE__) + '/helper') unless defined?(HELPER_LOADED)
 
 class TestRubyHazeTopic < Test::Unit::TestCase
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 5
-  version: 0.0.5
+    - 6
+  version: 0.0.6
 platform: jruby
 authors: 
   - Adrian Madrid
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -06:00
+date: 2010-09-08 00:00:00 -06:00
 default_executable: rubyhaze_console
 dependencies: []
 
-description: RubyHaze is a little gem that wraps the Java Hazelcast library into a more comfortable Ruby package (in JRuby, of course).
+description: RubyHaze is a little gem that wraps the Java Hazelcast library into a more comfortable JRuby package.
 email: aemadrid@gmail.com
 executables: 
   - rubyhaze_console
@@ -33,8 +33,8 @@ files:
   - Rakefile
   - VERSION
   - bin/rubyhaze_console
-  - jars/hazelcast-1.8.5.jar
-  - jars/hazelcast-client-1.8.5.jar
+  - jars/hazelcast-1.9-RC.jar
+  - jars/hazelcast-client-1.9-RC.jar
   - lib/rubyhaze.rb
   - lib/rubyhaze/client.rb
   - lib/rubyhaze/configs/config.rb
@@ -88,7 +88,7 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: JRuby wrapper to play with Hazelcast
+summary: Hazelcast distributed objects in my JRuby
 test_files: 
   - test/test_hash.rb
   - test/test_queue.rb