zk-server 0.0.1 → 0.8.0

data/lib/zk-server/process.rb

@@ -10,7 +10,7 @@ module ZK
     class Process
       include ZK::Logging
       extend Forwardable
-      include FileUtils::Verbose
+      include FileUtils
 
       def_delegators :config,
         :base_dir, :data_dir, :log4j_props_path, :log_dir, :command_args,
@@ -26,7 +26,7 @@ module ZK
       attr_accessor :child_startup_timeout
 
       def initialize(opts={})
-        @child_startup_timeout = opts.delete(:child_startup_timeout, 5)
+        @child_startup_timeout = opts.delete(:child_startup_timeout) || 6
         @run_called = false
         @config = Config.new(opts)
         @exit_watching_thread = nil
@@ -113,7 +113,7 @@ module ZK
         fork_and_exec!
         spawn_exit_watching_thread
 
-        unless wait_until_ping
+        unless wait_until_ping(@child_startup_timeout)
           raise "Oh noes! something went wrong!" unless running?
         end
 

data/lib/zk-server/version.rb

@@ -1,5 +1,5 @@
 module ZK
   module Server
-    VERSION = "0.0.1"
+    VERSION = "0.8.0"
   end
 end

data/lib/zk-server.rb

@@ -18,6 +18,7 @@ module ZK
     ZK_JAR_GEM  = 'slyphon-zookeeper_jar'
     LOG4J_GEM   = 'slyphon-log4j'
 
+
     # Create a new {ZK::Server::Process} instance. if a block is given
     # then yield the {Config} object to the block
     #
@@ -28,6 +29,20 @@ module ZK
       end
     end
 
+    # runs a server as a singleton instance. use ZK::Server.shutdown to stop and ZK::Server.clear
+    # to reset
+    def self.run(opts={}, &blk)
+      @server ||= new(opts, &blk).tap { |s| s.run }
+    end
+
+    def self.shutdown
+      @server and @server.shutdown
+    end
+
+    def self.clear
+      @server = nil if @server and not @server.running?
+    end
+
     def self.zk_jar_path
       # in future revisions of the zookeeper jar, we'll make it easier to get
       # at this information without needing rubygems and bundler to get at it,

data/zk-server.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.email         = ["slyphon@gmail.com"]
   s.description   = %q{runs a standalone zookeeper server}
   s.summary       = s.description + "\n"
-  s.homepage      = ""
+  s.homepage      = "http://github.com/slyphon/zk-server"
 
   s.add_runtime_dependency 'bundler', '~> 1.1.3'
   s.add_runtime_dependency 'zk', '>= 1.0.0'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk-server
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 63
   prerelease: 
   segments: 
   - 0
+  - 8
   - 0
-  - 1
-  version: 0.0.1
+  version: 0.8.0
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -105,7 +105,7 @@ files:
 - lib/zk-server/process.rb
 - lib/zk-server/version.rb
 - zk-server.gemspec
-homepage: ""
+homepage: http://github.com/slyphon/zk-server
 licenses: []
 
 post_install_message: