zk-server 0.9.0 → 0.9.1

data/lib/zk-server/{server.rb → base.rb}

@@ -1,7 +1,7 @@
 module ZK
   module Server
     # common base class for Process and JavaEmbedded classes
-    class Server
+    class Base
       extend Forwardable
       include FileUtils
       include Logging

data/lib/zk-server/{process.rb → sub_process.rb}

@@ -7,7 +7,7 @@ module ZK
     # By default, we will create a directory in the current working directory called 'zk-server'
     # to store our data under (configurable). 
     #
-    class Process < Server
+    class SubProcess < Base
       attr_reader :exit_status
 
       # how long should we wait for the child to start responding to 'ruok'?
@@ -24,7 +24,7 @@ module ZK
 
       # true if the process was started and is still running
       def running?
-        spawned? and !@exit_status and !!::Process.kill(0, @pid)
+        spawned? and !@exit_status and false|Process.kill(0, @pid)
       rescue Errno::ESRCH
         false
       end
@@ -46,7 +46,7 @@ module ZK
               return unless running? # jruby doesn't seem to get @exit_status ?
 
               begin
-                ::Process.kill(signal, @pid)
+                Process.kill(signal, @pid)
               rescue Errno::ESRCH
                 return true
               end
@@ -99,7 +99,7 @@ module ZK
       protected
         def spawn_exit_watching_thread
           @exit_watching_thread ||= Thread.new do
-            _, @exit_status = ::Process.wait2(@pid)
+            _, @exit_status = Process.wait2(@pid)
             @mutex.synchronize do
               @exit_cond.broadcast
             end

data/lib/zk-server/version.rb

@@ -1,5 +1,5 @@
 module ZK
   module Server
-    VERSION = "0.9.0" unless defined?(::ZK::Server::VERSION)
+    VERSION = "0.9.1" unless defined?(::ZK::Server::VERSION)
   end
 end

data/lib/zk-server.rb

@@ -48,7 +48,7 @@ module ZK
     #
     # @yield [Config] server config instance if block given
     def self.new(opts={})
-      ZK::Server::Process.new(opts).tap do |server|
+      SubProcess.new(opts).tap do |server|
         yield server.config if block_given?
       end
     end
@@ -59,6 +59,11 @@ module ZK
       @server ||= new(opts, &blk).tap { |s| s.run }
     end
 
+    # a singleton server instance (if start was called)
+    def self.server
+      @server
+    end
+    
     def self.shutdown
       @server and @server.shutdown
     end
@@ -117,8 +122,8 @@ end
 require 'zk-server/version'
 require 'zk-server/logging'
 require 'zk-server/config'
-require 'zk-server/server'
-require 'zk-server/process'
+require 'zk-server/base'
+require 'zk-server/sub_process'
 
 # if defined?(::JRUBY_VERSION)
 #   require 'zk-server/java_embedded'

data/spec/zk-server/process_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ZK::Server::Process do
+describe ZK::Server::SubProcess do
   let(:tmpdir) { '/tmp/zookeeper' }
 
   subject do 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk-server
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -84,11 +84,11 @@ files:
 - README.md
 - Rakefile
 - lib/zk-server.rb
+- lib/zk-server/base.rb
 - lib/zk-server/config.rb
 - lib/zk-server/log4j.properties
 - lib/zk-server/logging.rb
-- lib/zk-server/process.rb
-- lib/zk-server/server.rb
+- lib/zk-server/sub_process.rb
 - lib/zk-server/version.rb
 - spec/spec_helper.rb
 - spec/zk-server/process_spec.rb