daemon_controller 1.1.0 → 1.1.1

data/daemon_controller.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = "daemon_controller"
   # Don't forget to update version.rb too.
-  s.version = "1.1.0"
-  s.date = "2012-10-27"
+  s.version = "1.1.1"
+  s.date = "2013-01-20"
   s.summary = "A library for implementing daemon management capabilities"
   s.email = "hongli@phusion.nl"
   s.homepage = "https://github.com/FooBarWidget/daemon_controller"
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
       "spec/test_helper.rb",
       "spec/daemon_controller_spec.rb",
       "spec/echo_server.rb",
-      "spec/unresponsive_daemon.rb"
+      "spec/unresponsive_daemon.rb",
+      "spec/run_echo_server"
   ]
 end

data/lib/daemon_controller.rb

@@ -1,5 +1,5 @@
 # daemon_controller, library for robust daemon management
-# Copyright (c) 2010, 2011, 2012 Phusion
+# Copyright (c) 2010-2013 Phusion
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -777,6 +777,12 @@ private
 						begin
 							socket.connect_nonblock(sockaddr)
 						rescue Errno::EISCONN
+						rescue Errno::EINVAL
+							if RUBY_PLATFORM =~ /freebsd/i
+								raise Errno::ECONNREFUSED
+							else
+								raise
+							end
 						end
 					else
 						raise Errno::ECONNREFUSED
@@ -792,10 +798,15 @@ private
 	end
 
 	def ruby_interpreter
+		if defined?(RbConfig)
+			rb_config = RbConfig::CONFIG
+		else
+			rb_config = Config::CONFIG
+		end
 		File.join(
-			Config::CONFIG['bindir'],
-			Config::CONFIG['RUBY_INSTALL_NAME']
-		) + Config::CONFIG['EXEEXT']
+			rb_config['bindir'],
+			rb_config['RUBY_INSTALL_NAME']
+		) + rb_config['EXEEXT']
 	end
 
 	def safe_fork(double_fork)

data/lib/daemon_controller/version.rb

@@ -1,5 +1,5 @@
 # daemon_controller, library for robust daemon management
-# Copyright (c) 2010, 2011, 2012 Phusion
+# Copyright (c) 2010-2013 Phusion
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,6 @@
 class DaemonController
 	MAJOR = 1
 	MINOR = 1
-	TINY  = 0
+	TINY  = 1
 	VERSION_STRING = "#{MAJOR}.#{MINOR}.#{TINY}"
 end # class DaemonController

data/spec/echo_server.rb

@@ -1,8 +1,5 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 # A simple echo server, used by the unit test.
-# The hashbang is explicitly set to /usr/bin/ruby because we need
-# a Ruby implementation that starts fast and supports forking. The
-# Ruby in $PATH may be JRuby which is neither.
 require 'socket'
 require 'optparse'
 
@@ -89,7 +86,7 @@ def main(options)
 	if options[:pid_file]
 		sleep(options[:wait1])
 		File.open(options[:pid_file], 'w') do |f|
-			f.write(Process.pid)
+			f.puts(Process.pid)
 		end
 		at_exit do
 			File.unlink(options[:pid_file]) rescue nil

data/spec/run_echo_server

@@ -0,0 +1,9 @@
+#!/bin/sh
+dir=`dirname "$0"`
+dir=`cd "$dir"; pwd`
+if test "$MRI_RUBY" != ""; then
+	exec $MRI_RUBY "$dir/echo_server.rb" "$@"
+else
+	echo 'In order to run echo_server, you must set the environment variable $MRI_RUBY.' >&2
+	exit 1
+fi

data/spec/test_helper.rb

@@ -2,9 +2,24 @@ root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $LOAD_PATH.unshift(File.join(root, "lib"))
 Dir.chdir(root)
 
+if !ENV['MRI_RUBY']
+	if RUBY_PLATFORM =~ /java/
+		# We need a Ruby implementation that starts fast and supports forking.
+		# JRuby is neither.
+		abort "In order to run these tests in JRuby, you must set " +
+			"the environment variable $MRI_RUBY to an MRI Ruby interpeter."
+	else
+		require 'rbconfig'
+		rb_config = defined?(RbConfig) ? RbConfig::CONFIG : Config::CONFIG
+		ENV['MRI_RUBY'] = rb_config['bindir'] + '/' + rb_config['RUBY_INSTALL_NAME'] +
+			rb_config['EXEEXT']
+		puts ENV['MRI_RUBY']
+	end
+end
+
 module TestHelper
 	def new_controller(options = {})
-		@start_command = './spec/echo_server.rb -l spec/echo_server.log -P spec/echo_server.pid'
+		@start_command = './spec/run_echo_server -l spec/echo_server.log -P spec/echo_server.pid'
 		if options[:wait1]
 			@start_command << " --wait1 #{options[:wait1]}"
 		end

metadata

@@ -1,32 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: daemon_controller
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.1.1
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Hongli Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-27 00:00:00 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies: []
-
 description: A library for robust daemon management.
 email: hongli@phusion.nl
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.markdown
 - LICENSE.txt
 - daemon_controller.gemspec
@@ -38,39 +28,29 @@ files:
 - spec/daemon_controller_spec.rb
 - spec/echo_server.rb
 - spec/unresponsive_daemon.rb
+- spec/run_echo_server
 homepage: https://github.com/FooBarWidget/daemon_controller
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A library for implementing daemon management capabilities
 test_files: []
-
-has_rdoc: true