zk-server 1.0.1 → 1.1.0

data/bin/zk-server

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require File.expand_path('../../lib/zk-server', __FILE__)
+
+ZK::Server::Command.new.run
+
+# vim:ft=ruby

data/lib/zk-server/base.rb

@@ -7,10 +7,10 @@ module ZK
       include Logging
 
       def_delegators :config,
-        :base_dir, :data_dir, :log4j_props_path, :log_dir, :command_args,
-        :tick_time, :snap_count, :force_sync, :zoo_cfg_hash, :client_port,
-        :max_client_cnxns, :stdio_redirect_path, :zoo_cfg_path
-      
+        :base_dir, :data_dir, :log4j_props_path, :command_args,
+        :client_port, :stdio_redirect_path, :zoo_cfg_path,
+        :zoo_myid_path, :myid
+
       # the {Config} object that will be used to configure this Process
       attr_accessor :config
 
@@ -18,7 +18,7 @@ module ZK
         @child_startup_timeout = opts.delete(:child_startup_timeout) || 6
 
         @run_called = false
-        @config     = Config.new(opts)
+        @config     = opts[:config] || Config.new(opts)
 
         @mutex      = Monitor.new
         @exit_cond  = @mutex.new_cond
@@ -69,6 +69,7 @@ module ZK
         def create_files!
           mkdir_p base_dir
           mkdir_p data_dir
+          write_myid!
           write_zoo_cfg!
           write_log4j_properties!
           mkdir_p(File.dirname(stdio_redirect_path))
@@ -80,21 +81,15 @@ module ZK
           end
         end
 
+        def write_myid!
+          File.open(zoo_myid_path, 'w') do |io|
+            io.puts myid
+          end
+        end
+
         def write_zoo_cfg!
           File.open(zoo_cfg_path, 'w') do |fp|
-            fp.puts <<-EOS
-tickTime=#{tick_time}
-dataDir=#{data_dir}
-clientPort=#{client_port}
-maxClientCnxns=#{max_client_cnxns}
-            EOS
-
-            fp.puts("forceSync=#{force_sync}") if force_sync
-            fp.puts("snapCount=#{snap_count}") if snap_count
-            zoo_cfg_hash.each do |k,v|
-              fp.puts("#{k}=#{v}")
-            end
-
+            fp.puts(config.to_config_file_str)
             fp.fsync
           end
         end

data/lib/zk-server/cluster.rb

@@ -0,0 +1,96 @@
+module ZK
+  module Server
+    # Cluster simplifies the case when you want to test a 3+ node cluster
+    # You give the base_dir, and number of nodes, and it will construct a
+    # cluster for you. It's less configurable than the SubProcess class, but
+    # that's the price of convenience! 
+    class Cluster
+      FOLLOWER_PORT_OFFSET  = 100
+      LEADER_PORT_OFFSET    = 200
+      DEFAULT_BASE_PORT     = 21811
+
+      attr_accessor :base_dir
+
+      # defaults to 21811, used as the lowest port number for the cluster,
+      # all others will be offsets of this number
+      attr_accessor :base_port
+
+      # access to the SubProcess instances that make up this cluster
+      attr_reader :processes
+
+      # how many nodes in the cluster
+      attr_reader :num_members
+
+      def initialize(num_members, opts={})
+        @num_members  = num_members
+        @base_dir     = Config.default_base_dir
+        @base_port    = DEFAULT_BASE_PORT
+        @processes    = nil
+        @running      = false
+        opts.each { |k,v| __send__(:"#{k}=", v) }
+      end
+
+      def running?
+        !!@running
+      end
+
+      def run
+        return if running?
+        @running = true
+
+        processes.each { |p| p.run }
+      rescue Exception
+        processes.each { |p| p.shutdown }
+        raise
+      end
+
+      def shutdown
+        return unless running?
+        @running = false
+
+        pary, @processes = @processes, nil
+
+        pary.each(&:shutdown)
+        pary
+      end
+
+      def clobber!
+        processes.each(&:clobber!)
+      end
+
+      def all_running?
+        processes.all?(&:running?)
+      end
+
+      def ping_all?
+        processes.all?(&:ping?)
+      end
+
+      def processes
+        @processes ||= [].tap do |ary|
+          num_members.times do |idx|
+            ary << SubProcess.new.tap do |sp|
+              c = sp.config
+
+              c.myid          = idx
+              c.base_dir      = File.join(@base_dir, "server-#{idx}")
+              c.client_port   = base_port + idx
+              c.zoo_cfg_hash  = server_hash
+            end
+          end
+        end
+      end
+
+      # terrible name, the list of 'servers' lines in the config
+      #
+      def server_hash
+        @server_hash ||= {}.tap do |h|
+          num_members.times do |idx|
+            h["server.#{idx}"] = "127.0.0.1:#{base_port + FOLLOWER_PORT_OFFSET + idx}:#{base_port + LEADER_PORT_OFFSET + idx}"
+          end
+        end
+      end
+
+    end # Cluster
+  end # Server
+end # ZK

data/lib/zk-server/command.rb

@@ -0,0 +1,69 @@
+require 'thread'
+
+module ZK
+  module Server
+    class Command 
+      include Logging
+
+      def initialize
+        @mutex  = Mutex.new
+        @cond   = ConditionVariable.new
+        @shutdown_requested = false
+      end
+
+      def spawn_shutdown_handler
+        @shutdown_thread ||= Thread.new do
+          @mutex.synchronize do
+            @cond.wait until @shutdown_requested
+            logger.debug { "shutdown thread awakened! shutting down server!" }
+            @server.shutdown if @server
+          end
+        end
+      end
+
+      def run
+        opts = Slop.parse(:help => true, :strict => true) do
+          banner "zk-server [opts] runs a ZooKeeper server in the foreground"
+          on :d,  :base_dir=,   "defaults to #{ZK::Server::Config.default_base_dir}" 
+          on      :force_sync,  'force fsync on every snapshot'
+          on      :skip_acl,    'skip acl checks'
+          on :p,  :port=,       'port to listen on', :as => :integer
+          on      :jvm_flags=,  'additional JVM flags to pass'
+          on      :snap_count=, 'how often to take a snapshot, default 100_000', :as => :integer
+        end
+
+        return if opts.help?
+
+        hash = opts.to_hash
+
+        hash.delete(:help)
+        hash.reject! { |k,v| v.nil? }
+
+        config = ZK::Server::Config.new(hash)
+
+        spawn_shutdown_handler
+
+
+        %w[HUP INT].each do |sig|
+          trap(sig) do
+            @mutex.synchronize do
+              $stderr.puts "trapped #{sig}, shutting down"
+              @shutdown_requested = true
+              @cond.broadcast
+            end
+          end
+        end
+
+        @server = ZK::Server.new(:config => config)
+        @server.run
+
+        unless @server.join
+          $stderr.puts "server exited with status #{@server.status.inspect}"
+          st = @server.status
+          exit st.exited? ? st.exitstatus : 42
+        end
+      end
+    end
+  end
+end
+

data/lib/zk-server/config.rb

@@ -1,10 +1,15 @@
 module ZK
   module Server
+    # Note that this supports all of the 3.3.5 options, but __will not__ do any
+    # sanity checking for you. All options specifyable here (especially those that
+    # require directories to be created outside of {#base_dir}) may not be handled
+    # properly by {Base} and subclasses.
+    #
     class Config
       DEFAULT_JVM_FLAGS = %w[
-        -server 
+        -server
         -Xmx256m
-        -Dzookeeper.serverCnxnFactory=org.apache.zookeeper.server.NettyServerCnxnFactory 
+        -Dzookeeper.serverCnxnFactory=org.apache.zookeeper.server.NettyServerCnxnFactory
       ].freeze
 
       # the com.sun.managemnt.jmxremote.port arg will be filled in dynamically
@@ -23,12 +28,32 @@ module ZK
       # basis for all other path generation. Defaults to `File.join(Dir.getwd, 'zookeeper')`
       attr_accessor :base_dir
 
+      # defaults to `#{base_dir}/data`. use this to override the default
+      #
+      # > the location where ZooKeeper will store the in-memory database
+      # > snapshots and, unless specified otherwise, the transaction log of
+      # > updates to the database.
+      #
+      # be aware that the {ZK::Server::Base} class will not create any
+      # directories but {#base_dir}.
+      #
+      attr_writer :data_dir
+
+      # defaults to nil, and zookeeper will just use the default value (being the
+      # same as {#data_dir}
+      #
+      # > This option will direct the machine to write the transaction log to the
+      # > dataLogDir rather than the dataDir. This allows a dedicated log device
+      # > to be used, and helps avoid competition between logging and snaphots.
+      #
+      attr_accessor :data_log_dir
+
       # a hash that will be used to provide extra values for the zoo.cfg file.
-      # keys are written as-is to the file, so they should be camel-cased. 
+      # keys are written as-is to the file, so they should be camel-cased.
       #
       # dataDir will be set relative to {#base_dir} and clientPort will either use
       # the default of 2181, or can be adjusted by {#client_port=}
-      # 
+      #
       attr_accessor :zoo_cfg_hash
 
       # what port should the server listen on for connections? (default 2181)
@@ -42,6 +67,36 @@ module ZK
       # defaults to 2000
       attr_accessor :tick_time
 
+      # what cluster id should this zookeeper use for itself? (default 1)
+      attr_accessor :myid
+
+      # default is nil, and will not be specified in the config
+      #
+      # > Clients can submit requests faster than ZooKeeper can process them,
+      # > especially if there are a lot of clients. To prevent ZooKeeper from
+      # > running out of memory due to queued requests, ZooKeeper will throttle
+      # > clients so that there is no more than globalOutstandingLimit
+      # > outstanding requests in the system. The default limit is 1,000.
+      #
+      attr_accessor :global_outstanding_limit
+
+      # necessary for cluster nodes (default 5)
+      #
+      # from the zookeeper admin guide:
+      # > Amount of time, in ticks (see tickTime), to allow followers to connect
+      # > and sync to a leader. Increased this value as needed, if the amount of data
+      # > managed by ZooKeeper is large.
+      #
+      attr_accessor :init_limit
+
+      # necessary for cluster nodes (default 2)
+      #
+      # > Amount of time, in ticks (see tickTime), to allow followers to sync
+      # > with ZooKeeper. If followers fall too far behind a leader, they will be
+      # > dropped.
+      #
+      attr_accessor :sync_limit
+
       # from the [admin guide](http://zookeeper.apache.org/doc/r3.3.5/zookeeperAdmin.html)
       #
       # > ZooKeeper logs transactions to a transaction log. After snapCount
@@ -50,7 +105,7 @@ module ZK
       #
       # For testing, to speed up disk IO, I generally set this to 1_000_000 and
       # force_sync to false. YMMV, understand what this does before messing with it
-      # if you care about your data. 
+      # if you care about your data.
       #
       # default: unset
       attr_accessor :snap_count
@@ -59,9 +114,74 @@ module ZK
       # an fsync() call for each snapshot write. It is however DANGEROUS if you
       # care about the data. (I set it to false for running tests)
       #
+      # if true: 'yes', false: 'no', nil not specified in the config
+      #
       # default: no value set
       attr_accessor :force_sync
 
+      # default: nil
+      #
+      # > To avoid seeks ZooKeeper allocates space in the transaction log file in
+      # > blocks of preAllocSize kilobytes. The default block size is 64M. One
+      # > reason for changing the size of the blocks is to reduce the block size
+      # > if snapshots are taken more often. (Also, see snapCount).
+      attr_accessor :pre_alloc_size
+
+      # default: nil
+      #
+      # > the address (ipv4, ipv6 or hostname) to listen for client
+      # > connections; that is, the address that clients attempt to connect to.
+      # > This is optional, by default we bind in such a way that any connection
+      # > to the clientPort for any address/interface/nic on the server will be
+      # > accepted.
+      #
+      attr_accessor :client_port_address
+
+      # default: nil
+      #
+      # > the minimum session timeout in milliseconds that the server will allow
+      # > the client to negotiate. Defaults to 2 times the tickTime
+      #
+      attr_accessor :min_session_timeout
+
+      # default: nil
+      #
+      # > the maximum session timeout in milliseconds that the server will allow
+      # > the client to negotiate. Defaults to 20 times the tickTime.
+      attr_accessor :max_session_timeout
+
+      # default: nil
+      #
+      # If true, the value 'yes' will be used for this value, false will write 'no'
+      # to the config file. The default (nil) is not to specify a value in the config.
+      #
+      # > Leader accepts client connections. Default value is "yes". The leader
+      # > machine coordinates updates. For higher update throughput at thes
+      # > slight expense of read throughput the leader can be configured to not
+      # > accept clients and focus on coordination. The default to this option is
+      # > yes, which means that a leader will accept client connections
+      #
+      attr_accessor :leader_serves
+
+      # default: nil 
+      #
+      # by default this is not specified
+      #
+      # > Sets the timeout value for opening connections for leader election
+      # > notifications.
+      #
+      attr_accessor :cnx_timeout
+
+      # default: nil
+      #
+      # if true: 'yes', false: 'no', nil not specified in the config
+      #
+      # this is listed as a DANGEROUS setting
+      #
+      # > Skips ACL checks. This results in a boost in throughput, but opens up
+      # > full access to the data tree to everyone.
+      attr_accessor :skip_acl
+
       # if truthy, will enable jmx (defaults to false)
       # note that our defualt jmx config has all security and auth turned off
       # if you want to customize this, then use jvm_flags and set this to false
@@ -75,8 +195,13 @@ module ZK
       # default is {DEEFAULT_JVM_FLAGS}
       attr_accessor :jvm_flags
 
+      def self.default_base_dir
+        File.join(Dir.getwd, 'zookeeper')
+      end
+
       def initialize(opts={})
-        @base_dir = File.join(Dir.getwd, 'zookeeper')
+        $stderr.puts "#{self.class}#initialize #{opts.inspect}" 
+        @base_dir     = self.class.default_base_dir
         @zoo_cfg_hash = {}
         @tick_time    = 2000
         @client_port  = 2181
@@ -85,6 +210,9 @@ module ZK
         @jmx_port     = 22222
         @enable_jmx   = false
         @jvm_flags    = DEFAULT_JVM_FLAGS.dup
+        @myid         = 1
+        @init_limit   = 5
+        @sync_limit   = 2
 
         @max_client_cnxns = 100
 
@@ -96,6 +224,11 @@ module ZK
         File.join(base_dir, 'zoo.cfg')
       end
 
+      # @private
+      def zoo_myid_path
+        File.join(base_dir, 'data', 'myid')
+      end
+
       # @private
       def log4j_props_path
         File.join(base_dir, 'log4j.properties')
@@ -113,7 +246,7 @@ module ZK
 
       # @private
       def data_dir
-        File.join(base_dir, 'data')
+        @data_dir ||= File.join(base_dir, 'data')
       end
 
       # @private
@@ -132,6 +265,40 @@ module ZK
         cmd += jvm_flags
         cmd += %W[-cp #{classpath.join(':')} #{ZOO_MAIN} #{zoo_cfg_path}]
       end
+
+      # renders this config as a string that can be written to zoo.cfg
+      def to_config_file_str
+        config = {
+          'dataDir'                 => data_dir,
+          'skipACL'                 => skip_acl,
+          'tickTime'                => tick_time,
+          'initLimit'               => init_limit,
+          'syncLimit'               => sync_limit,
+          'forceSync'               => force_sync,
+          'snapCount'               => snap_count,
+          'clientPort'              => client_port,
+          'dataLogDir'              => data_log_dir,
+          'preAllocSize'            => pre_alloc_size,
+          'leaderServes'            => leader_serves,
+          'maxClientCnxns'          => max_client_cnxns,
+          'clientPortAddress'       => client_port_address,
+          'minSessionTimeout'       => min_session_timeout,
+          'maxSessionTimeout'       => max_session_timeout,
+          'globalOutstandingLimit'  => global_outstanding_limit,
+        }
+        
+        config = config.merge(zoo_cfg_hash)
+
+        config.delete_if { |k,v| v.nil? }
+
+        %w[leaderServes skipACL forceSync].each do |yorn_key|
+          if config.has_key?(yorn_key)
+            config[yorn_key] = config[yorn_key] ? 'yes' : 'no'
+          end
+        end
+
+        config.sort.map {|kv| kv.join("=") }.join("\n")
+      end
     end
   end
 end

data/lib/zk-server/sub_process.rb

@@ -8,7 +8,7 @@ module ZK
     # to store our data under (configurable). 
     #
     class SubProcess < Base
-      attr_reader :exit_status
+      attr_reader :status
 
       # how long should we wait for the child to start responding to 'ruok'?
       attr_accessor :child_startup_timeout
@@ -17,14 +17,28 @@ module ZK
         @exit_watching_thread = nil
 
         @pid = nil
-        @exit_status = nil
+        @status = nil
 
         super
       end
 
+      # wait for sub-process to exit
+      def join
+        @mutex.synchronize do
+          logger.debug { "spawned process #{@pid}" }
+          @exit_cond.wait_until { @status }
+        end
+        @status.success?
+      end
+      
       # true if the process was started and is still running
       def running?
-        spawned? and !@exit_status and false|Process.kill(0, @pid)
+        spawned? and !@status and alive?
+      end
+
+      def alive?
+        return false unless spawned?
+        false|kill(0)
       rescue Errno::ESRCH
         false
       end
@@ -37,16 +51,16 @@ module ZK
       # shutdown the child, wait for it to exit, ensure it is dead
       def shutdown
         if @pid
-          return if @exit_status
+          return if @status
 
           @mutex.synchronize do
             %w[HUP TERM KILL].each do |signal|
               logger.debug { "sending #{signal} to #{@pid}" }
 
-              return unless running? # jruby doesn't seem to get @exit_status ?
+              return unless running? # jruby doesn't seem to get @status ?
 
               begin
-                Process.kill(signal, @pid)
+                kill(signal)
               rescue Errno::ESRCH
                 return true
               end
@@ -55,7 +69,13 @@ module ZK
             end
           end
 
-          logger.debug { "@exit_status: #{@exit_status}" }
+          unless @exit_watching_thread.join(3) == @exit_watching_thread
+            logger.warn { "exit watching thread didn't exit after 3 sec" }
+          end
+
+          @pid = @exit_watching_thread = nil
+
+          logger.debug { "@status: #{@status}" }
         end
         true
       end
@@ -65,6 +85,11 @@ module ZK
         @pid
       end
 
+      def kill(signal)
+        raise "No pid yet!" unless @pid
+        Process.kill(signal, @pid)
+      end
+
       # start the child, using the {#config}. we create the files necessary,
       # fork the child, and wait 5s for the child to start responding to pings
       #
@@ -99,7 +124,7 @@ module ZK
       protected
         def spawn_exit_watching_thread
           @exit_watching_thread ||= Thread.new do
-            _, @exit_status = Process.wait2(@pid)
+            _, @status = Process.wait2(@pid)
             @mutex.synchronize do
               @exit_cond.broadcast
             end
@@ -124,7 +149,9 @@ module ZK
           @pid ||= (
             args = command_args()
             args << { :err => [:child, :out], :out => [stdio_redirect_path, 'w'] }
-            ::Kernel.spawn({}, *command_args)
+            ::Kernel.spawn({}, *command_args).tap do |pid|
+              logger.debug { "Spawned process #{pid}" }
+            end
           )
         end
 

data/lib/zk-server/version.rb

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

data/lib/zk-server.rb

@@ -9,6 +9,8 @@ require 'socket'
 
 Bundler.require
 
+require 'slop'
+
 # require 'zk'
 
 #ZK.logger = Logger.new($stderr).tap { |l| l.level = Logger::DEBUG }
@@ -130,6 +132,8 @@ require 'zk-server/logging'
 require 'zk-server/config'
 require 'zk-server/base'
 require 'zk-server/sub_process'
+require 'zk-server/cluster'
+require 'zk-server/command'
 
 if defined?(::JRUBY_VERSION)
   require 'zk-server/java_embedded'

data/spec/spec_helper.rb

@@ -13,5 +13,7 @@ ZK::Server.logger = Logger.new($stderr).tap { |l| l.level = Logger::DEBUG }
 
 RSpec.configure do |config|
   config.mock_with :rspec
+  config.include(WaitWatchers)
+  config.extend(WaitWatchers)
 end
 

data/spec/support/wait_watchers.rb

@@ -0,0 +1,55 @@
+module WaitWatchers
+  class TimeoutError < StandardError; end
+
+  # method to wait until block passed returns truthy (false will not work) or
+  # timeout (default is 2 seconds) is reached raises TiemoutError on timeout
+  #
+  # @returns the truthy value
+  #
+  # @example 
+  #     
+  #   @a = nil
+  #
+  #   th = Thread.new do
+  #     sleep(1)
+  #     @a = :fudge
+  #   end
+  #
+  #   wait_until(2) { @a }.should == :fudge
+  #
+  def wait_until(timeout=2)
+    if ENV['TRAVIS'] and timeout and timeout < 5
+      timeout = 5
+    end
+
+    time_to_stop = Time.now + timeout
+    while true
+      rval = yield
+      return rval if rval
+      raise TimeoutError, "timeout of #{timeout}s exceeded" if Time.now > time_to_stop
+      Thread.pass
+    end
+  end
+
+  # inverse of wait_until
+  def wait_while(timeout=2)
+    if ENV['travis'] and timeout and timeout < 5
+      timeout = 5
+    end
+
+    time_to_stop = Time.now + timeout
+    while true
+      rval = yield
+      return rval unless rval
+      raise TimeoutError, "timeout of #{timeout}s exceeded" if Time.now > time_to_stop
+      Thread.pass
+    end
+  end
+
+  def report_realtime(what)
+    return yield
+    t = Benchmark.realtime { yield }
+    $stderr.puts "#{what}: %0.3f" % [t.to_f]
+  end
+end
+

data/spec/zk-server/cluster_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe ZK::Server::Cluster do
+  let(:tmpdir) { '/tmp/zookeeper' }
+
+  let(:num_members) { 5 }
+
+  subject do 
+    described_class.new(num_members, :base_dir => tmpdir)
+  end
+
+  after do 
+    subject.shutdown
+#     subject.clobber!
+#     FileUtils.rm_rf(tmpdir)
+  end
+
+  it %[should spawn a ZK server, ping, and then shutdown properly] do
+    pending "cannot run this under JRuby" if defined?(::JRUBY_VERSION)
+
+    subject.run
+
+    wait_until { subject.all_running? }
+
+    subject.should be_ping_all
+    subject.should be_running
+
+    subject.shutdown
+
+    subject.should_not be_ping_all
+    subject.should_not be_running
+  end
+end
+

data/zk-server.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'bundler', '~> 1.1.3'
   s.add_runtime_dependency 'slyphon-log4j', '= 1.2.15'
   s.add_runtime_dependency 'slyphon-zookeeper_jar', '~> 3.3.5'
+  s.add_runtime_dependency 'slop', '~> 3.2.0'
 
   s.files         = `git ls-files`.split($\)
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk-server
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-04 00:00:00 Z
+date: 2012-05-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -65,11 +65,27 @@ dependencies:
         version: 3.3.5
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: slop
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 3
+        - 2
+        - 0
+        version: 3.2.0
+  type: :runtime
+  version_requirements: *id004
 description: runs a standalone zookeeper server
 email: 
 - slyphon@gmail.com
-executables: []
-
+executables: 
+- zk-server
 extensions: []
 
 extra_rdoc_files: []
@@ -83,8 +99,11 @@ files:
 - MIT_LICENSE
 - README.md
 - Rakefile
+- bin/zk-server
 - lib/zk-server.rb
 - lib/zk-server/base.rb
+- lib/zk-server/cluster.rb
+- lib/zk-server/command.rb
 - lib/zk-server/config.rb
 - lib/zk-server/java_embedded.rb
 - lib/zk-server/log4j.properties
@@ -92,6 +111,8 @@ files:
 - lib/zk-server/sub_process.rb
 - lib/zk-server/version.rb
 - spec/spec_helper.rb
+- spec/support/wait_watchers.rb
+- spec/zk-server/cluster_spec.rb
 - spec/zk-server/java_embedded_spec.rb
 - spec/zk-server/process_spec.rb
 - zk-server.gemspec
@@ -124,11 +145,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: runs a standalone zookeeper server
 test_files: 
 - spec/spec_helper.rb
+- spec/support/wait_watchers.rb
+- spec/zk-server/cluster_spec.rb
 - spec/zk-server/java_embedded_spec.rb
 - spec/zk-server/process_spec.rb