zk-server 0.8.0 → 0.8.1

data/Gemfile

@@ -1,13 +1,15 @@
 source :rubygems
 
-gem 'zk', :path => '~/zk'
-
-
+# gem 'zk', :path => '~/zk'
 
 group :development do
   gem 'pry'
 end
 
+group :test do
+  gem 'rspec', '~> 2.9.0'
+end
+
 group :docs do
   gem 'yard', '~> 0.7.5'
 

data/lib/zk-server.rb

@@ -9,16 +9,16 @@ require 'socket'
 
 Bundler.require
 
-require 'zk'
+# require 'zk'
 
 #ZK.logger = Logger.new($stderr).tap { |l| l.level = Logger::DEBUG }
 
 module ZK
   module Server
+
     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
     #
@@ -91,6 +91,7 @@ module ZK
 end
 
 require 'zk-server/version'
+require 'zk-server/logging'
 require 'zk-server/config'
 require 'zk-server/process'
 

data/lib/zk-server/logging.rb

@@ -0,0 +1,23 @@
+module ZK
+  module Server
+    # default logger instance
+    @logger ||= Logger.new($stderr).tap { |l| l.level = Logger::FATAL }
+
+    class << self
+      attr_accessor :logger
+    end
+
+    # we might not have ZK::Logging, so we define our own
+    module Logging
+      def self.included(mod)
+        mod.extend(ZK::Server::Logging)
+        super
+      end
+
+      def logger
+        ZK::Server.logger
+      end
+    end
+  end
+end
+

data/lib/zk-server/process.rb

@@ -8,9 +8,9 @@ module ZK
     # to store our data under (configurable). 
     #
     class Process
-      include ZK::Logging
       extend Forwardable
       include FileUtils
+      include Logging
 
       def_delegators :config,
         :base_dir, :data_dir, :log4j_props_path, :log_dir, :command_args,
@@ -93,6 +93,7 @@ module ZK
       rescue
         false
       end
+      alias pingable? ping?
 
       # the pid of our child process
       def pid
@@ -155,11 +156,23 @@ module ZK
         end
 
         def fork_and_exec!
-          @pid ||= (
-            args = command_args()
-            args << {:err => [:child, :out], :out => [stdio_redirect_path, File::APPEND|File::CREAT|File::WRONLY]}
-            spawn({}, *command_args)
-          )
+          @pid ||= 
+            fork do                 # gah, use fork because 1.8.7 sucks
+              3.upto(255) do |fd|
+                begin
+                  if io = IO.new(fd)
+                    io.close
+                  end
+                rescue
+                end
+              end
+
+              $stderr.puts "stdio_redirect_path: #{stdio_redirect_path.inspect}"
+              $stdout.reopen($stderr)
+              $stderr.reopen(stdio_redirect_path, 'a')
+
+              exec(*command_args)
+            end
         end
 
         def create_files!

data/lib/zk-server/version.rb

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

data/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+require 'rubygems'
+require 'bundler/setup'
+
+Bundler.require(:default, :development, :test)
+
+require 'zk-server'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.expand_path("../{support,shared}/**/*.rb", __FILE__)].sort.each {|f| require f}
+
+ZK::Server.logger = Logger.new($stderr).tap { |l| l.level = Logger::DEBUG }
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+end
+

data/spec/zk-server/process_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+require 'tempfile'
+
+describe ZK::Server::Process do
+  let(:tmpdir) { 
+    '/tmp/zookeeper'
+  }
+
+  subject do 
+    ZK::Server::Process.new(:client_port => 21812, :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
+    subject.run
+    subject.should be_pingable
+    subject.should be_running
+    subject.should be_spawned
+    subject.pid.should_not be_nil
+
+    subject.shutdown
+
+    subject.should_not be_pingable
+    subject.should_not be_running
+  end
+end
+

data/zk-server.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |s|
   s.homepage      = "http://github.com/slyphon/zk-server"
 
   s.add_runtime_dependency 'bundler', '~> 1.1.3'
-  s.add_runtime_dependency 'zk', '>= 1.0.0'
   s.add_runtime_dependency 'slyphon-log4j', '= 1.2.15'
   s.add_runtime_dependency 'slyphon-zookeeper_jar', '~> 3.3.5'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk-server
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -33,26 +33,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: zk
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: slyphon-log4j
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -64,11 +48,11 @@ dependencies:
         - 15
         version: 1.2.15
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: slyphon-zookeeper_jar
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,7 +64,7 @@ dependencies:
         - 5
         version: 3.3.5
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 description: runs a standalone zookeeper server
 email: 
 - slyphon@gmail.com
@@ -102,8 +86,11 @@ files:
 - lib/zk-server.rb
 - lib/zk-server/config.rb
 - lib/zk-server/log4j.properties
+- lib/zk-server/logging.rb
 - lib/zk-server/process.rb
 - lib/zk-server/version.rb
+- spec/spec_helper.rb
+- spec/zk-server/process_spec.rb
 - zk-server.gemspec
 homepage: http://github.com/slyphon/zk-server
 licenses: []
@@ -138,5 +125,6 @@ rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: runs a standalone zookeeper server
-test_files: []
-
+test_files: 
+- spec/spec_helper.rb
+- spec/zk-server/process_spec.rb