zk-server 0.8.1 → 0.9.0

data/.gitignore

@@ -17,3 +17,5 @@ test/version_tmp
 tmp
 .rvmrc
 zookeeper/
+.ctags_paths
+Gemfile.*

data/Gemfile

@@ -2,6 +2,8 @@ source :rubygems
 
 # gem 'zk', :path => '~/zk'
 
+gem 'rake', '>= 0.9'
+
 group :development do
   gem 'pry'
 end

data/Rakefile

@@ -10,4 +10,52 @@ end
 
 task :clean => 'yard:clean'
 
+gemset_name = 'zk-server'
+
+%w[1.8.7 1.9.2 jruby 1.9.3].each do |ns_name|
+  rvm_ruby = (ns_name == 'rbx') ? "rbx-2.0.testing" : ns_name
+
+  ruby_with_gemset        = "#{rvm_ruby}@#{gemset_name}"
+  create_gemset_task_name = "mb:#{ns_name}:create_gemset"
+  bundle_task_name        = "mb:#{ns_name}:bundle_install"
+  rspec_task_name         = "mb:#{ns_name}:run_rspec"
+
+  phony_gemfile_link_name = "Gemfile.#{ns_name}"
+  phony_gemfile_lock_name = "#{phony_gemfile_link_name}.lock"
+
+  file phony_gemfile_link_name do
+    # apparently, rake doesn't deal with symlinks intelligently :P
+    ln_s('Gemfile', phony_gemfile_link_name) unless File.symlink?(phony_gemfile_link_name)
+  end
+
+  task :clean do
+    rm_rf [phony_gemfile_lock_name, phony_gemfile_lock_name]
+  end
+
+  task create_gemset_task_name do
+    sh "rvm #{rvm_ruby} do rvm gemset create #{gemset_name}"
+  end
+
+  task bundle_task_name => [phony_gemfile_link_name, create_gemset_task_name] do
+    sh "rvm #{ruby_with_gemset} do bundle install --gemfile #{phony_gemfile_link_name}"
+  end
+
+  task rspec_task_name => bundle_task_name do
+    sh "rvm #{ruby_with_gemset} do env JRUBY_OPTS='--1.9' BUNDLE_GEMFILE=#{phony_gemfile_link_name} bundle exec rspec spec --fail-fast"
+  end
+
+  task "mb:#{ns_name}" => rspec_task_name
+
+  task "mb:test_all_rubies" => rspec_task_name
+end
+
+task 'mb:test_all' do
+  require 'benchmark'
+  tm = Benchmark.realtime do
+    Rake::Task['mb:test_all_rubies'].invoke
+  end
+
+  $stderr.puts "Test run took: #{tm}"
+end
+
 

data/lib/zk-server.rb

@@ -19,12 +19,36 @@ module ZK
     ZK_JAR_GEM  = 'slyphon-zookeeper_jar'
     LOG4J_GEM   = 'slyphon-log4j'
 
+    def self.mri_187?
+      ruby_187? and not rubinius? and not jruby?
+    end
+
+    def self.ruby_19?
+      false|(RUBY_VERSION =~ /\A1\.9/)
+    end
+
+    def self.ruby_187?
+      RUBY_VERSION == '1.8.7'
+    end
+
+    def self.jruby?
+      defined?(::JRUBY_VERSION)
+    end
+
+    def self.jruby_19?
+      jruby? and ruby_19?
+    end
+
+    def self.rubinius?
+      defined?(::Rubinius)
+    end
+
     # Create a new {ZK::Server::Process} instance. if a block is given
     # then yield the {Config} object to the block
     #
     # @yield [Config] server config instance if block given
     def self.new(opts={})
-      Server::Process.new(opts).tap do |server|
+      ZK::Server::Process.new(opts).tap do |server|
         yield server.config if block_given?
       end
     end
@@ -93,5 +117,10 @@ end
 require 'zk-server/version'
 require 'zk-server/logging'
 require 'zk-server/config'
+require 'zk-server/server'
 require 'zk-server/process'
 
+# if defined?(::JRUBY_VERSION)
+#   require 'zk-server/java_embedded'
+# end
+

data/lib/zk-server/config.rb

@@ -118,12 +118,12 @@ module ZK
 
       # @private
       def classpath
-        @classpath ||= [Server.zk_jar_path, Server.log4j_jar_path, base_dir]
+        @classpath ||= [ZK::Server.zk_jar_path, ZK::Server.log4j_jar_path, base_dir]
       end
 
       # @private
       def command_args
-        cmd = [Server.java_binary_path]
+        cmd = [ZK::Server.java_binary_path]
         cmd += %W[-Dzookeeper.log.dir=#{log_dir} -Dzookeeper.root.logger=INFO,CONSOLE]
         if enable_jmx
           cmd += DEFAULT_JMX_ARGS

data/lib/zk-server/process.rb

@@ -7,42 +7,19 @@ 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
-      extend Forwardable
-      include FileUtils
-      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
-
-      # the {Config} object that will be used to configure this Process
-      attr_accessor :config
-
+    class Process < Server
       attr_reader :exit_status
 
       # how long should we wait for the child to start responding to 'ruok'?
       attr_accessor :child_startup_timeout
 
       def initialize(opts={})
-        @child_startup_timeout = opts.delete(:child_startup_timeout) || 6
-        @run_called = false
-        @config = Config.new(opts)
         @exit_watching_thread = nil
 
         @pid = nil
         @exit_status = nil
 
-        @mutex      = Monitor.new
-        @exit_cond  = @mutex.new_cond
-      end
-
-      # removes all files related to this instance
-      # runs {#shutdown} first
-      def clobber!
-        shutdown
-        FileUtils.rm_rf(base_dir)
+        super
       end
 
       # true if the process was started and is still running
@@ -66,16 +43,15 @@ module ZK
             %w[HUP TERM KILL].each do |signal|
               logger.debug { "sending #{signal} to #{@pid}" }
 
+              return unless running? # jruby doesn't seem to get @exit_status ?
+
               begin
                 ::Process.kill(signal, @pid)
               rescue Errno::ESRCH
-                break
+                return true
               end
 
-              if @exit_status or @exit_cond.wait(5)
-                logger.debug { "process exited" }
-                break
-              end
+              @exit_cond.wait(5) # check running? on next pass
             end
           end
 
@@ -84,17 +60,6 @@ module ZK
         true
       end
 
-      # can we connect to the server, issue an 'ruok', and receive an 'imok'?
-      def ping?
-        TCPSocket.open('localhost', client_port) do |sock|
-          sock.puts('ruok')
-          sock.read == 'imok'
-        end
-      rescue
-        false
-      end
-      alias pingable? ping?
-
       # the pid of our child process
       def pid
         @pid
@@ -111,7 +76,15 @@ module ZK
         @run_called = true
 
         create_files!
-        fork_and_exec!
+
+        if ZK::Server.mri_187?
+          fork_and_exec!
+        elsif ZK::Server.jruby? and not ZK::Server.ruby_19?
+          raise "You must run Jruby in 1.9 compatibility mode! I'm very sorry, i need Kernel.spawn"
+        else
+          spawn!
+        end
+
         spawn_exit_watching_thread
 
         unless wait_until_ping(@child_startup_timeout)
@@ -124,14 +97,6 @@ module ZK
       end
 
       protected
-        def wait_until_ping(timeout=5)
-          times_up = timeout ? Time.now + timeout : 0
-          while Time.now < times_up
-            return true if ping?
-          end
-          false
-        end
-
         def spawn_exit_watching_thread
           @exit_watching_thread ||= Thread.new do
             _, @exit_status = ::Process.wait2(@pid)
@@ -155,6 +120,14 @@ module ZK
           nil
         end
 
+        def spawn!
+          @pid ||= (
+            args = command_args()
+            args << { :err => [:child, :out], :out => [stdio_redirect_path, 'w'] }
+            ::Kernel.spawn({}, *command_args)
+          )
+        end
+
         def fork_and_exec!
           @pid ||= 
             fork do                 # gah, use fork because 1.8.7 sucks
@@ -175,37 +148,6 @@ module ZK
             end
         end
 
-        def create_files!
-          mkdir_p base_dir
-          mkdir_p data_dir
-          write_zoo_cfg!
-          write_log4j_properties!
-        end
-
-        def write_log4j_properties!
-          unless File.exists?(log4j_props_path)
-            cp Server.default_log4j_props_path, log4j_props_path
-          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.fsync
-          end
-        end
     end
   end
 end

data/lib/zk-server/server.rb

@@ -0,0 +1,105 @@
+module ZK
+  module Server
+    # common base class for Process and JavaEmbedded classes
+    class Server
+      extend Forwardable
+      include FileUtils
+      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
+      
+      # the {Config} object that will be used to configure this Process
+      attr_accessor :config
+
+      def initialize(opts={})
+        @child_startup_timeout = opts.delete(:child_startup_timeout) || 6
+
+        @run_called = false
+        @config     = Config.new(opts)
+
+        @mutex      = Monitor.new
+        @exit_cond  = @mutex.new_cond
+      end
+
+      # removes all files related to this instance
+      # runs {#shutdown} first
+      def clobber!
+        shutdown
+        FileUtils.rm_rf(base_dir)
+      end
+
+      # is the server running?
+      def running?
+        raise NotImplementedError
+      end
+
+      # shut down the server, gracefully if possible, with force if necessary
+      def shutdown
+        raise NotImplementedError
+      end
+
+      # can we connect to the server, issue an 'ruok', and receive an 'imok'?
+      def ping?
+        TCPSocket.open('localhost', client_port) do |sock|
+          sock.puts('ruok')
+          sock.read == 'imok'
+        end
+      rescue
+        false
+      end
+      alias pingable? ping?
+
+      # start the server
+      def run
+        raise NotImplementedError
+      end
+
+      protected
+        def wait_until_ping(timeout=5)
+          times_up = timeout ? Time.now + timeout : 0
+          while Time.now < times_up
+            return true if ping?
+          end
+          false
+        end
+
+        def create_files!
+          mkdir_p base_dir
+          mkdir_p data_dir
+          write_zoo_cfg!
+          write_log4j_properties!
+          mkdir_p(File.dirname(stdio_redirect_path))
+        end
+
+        def write_log4j_properties!
+          unless File.exists?(log4j_props_path)
+            cp ZK::Server.default_log4j_props_path, log4j_props_path
+          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.fsync
+          end
+        end
+    end
+  end
+end
+
+

data/lib/zk-server/version.rb

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

data/spec/zk-server/process_spec.rb

@@ -1,13 +1,10 @@
 require 'spec_helper'
-require 'tempfile'
 
 describe ZK::Server::Process do
-  let(:tmpdir) { 
-    '/tmp/zookeeper'
-  }
+  let(:tmpdir) { '/tmp/zookeeper' }
 
   subject do 
-    ZK::Server::Process.new(:client_port => 21812, :base_dir => tmpdir)
+    described_class.new(:client_port => 21812, :base_dir => tmpdir)
   end
 
   after do 
@@ -17,6 +14,8 @@ describe ZK::Server::Process do
   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
     subject.should be_pingable
     subject.should be_running

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk-server
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
-  - 1
-  version: 0.8.1
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -88,6 +88,7 @@ files:
 - lib/zk-server/log4j.properties
 - lib/zk-server/logging.rb
 - lib/zk-server/process.rb
+- lib/zk-server/server.rb
 - lib/zk-server/version.rb
 - spec/spec_helper.rb
 - spec/zk-server/process_spec.rb