rbdaemon 0.0.1 → 0.0.2

data/lib/rbdaemon/daemon.rb

@@ -5,8 +5,6 @@ require 'etc'
 require 'syslog'
 
 module RBDaemon
-  class DaemonError < StandardError; end
-
   class Daemon
     def initialize(options = {}, *args)
       exit!(0) if fork
@@ -37,7 +35,7 @@ module RBDaemon
       ident = options[:pid_file] ? options[:pid_file] : $0
       ident = File.basename(ident).split(/\./)[0]
 
-      Signal.trap('EXIT') do
+      at_exit do
         Syslog::log(Syslog::LOG_INFO, "#{ident} exited")
         options[:change_root] or (@pid_file and @pid_file.delete) rescue nil
       end

data/lib/rbdaemon/version.rb

@@ -1,4 +1,4 @@
 
 module RBDaemon
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/rbdaemon.gemspec

@@ -16,4 +16,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.license       = 'MIT'
+  gem.add_development_dependency 'bundler'
+  gem.add_development_dependency 'rake'
 end

data/test/tc_daemon.rb

@@ -2,6 +2,7 @@
 require 'test/unit'
 require 'rbdaemon/daemon'
 require 'tempfile'
+require 'pathname'
 
 class TC_Daemon < Test::Unit::TestCase
   def test_smoke
@@ -9,7 +10,7 @@ class TC_Daemon < Test::Unit::TestCase
     tmpfile = ::Tempfile.new('tc_daemon', '/tmp')
     File::chmod(0666, tmpfile.path)
     Process.fork do 
-      RBDaemon::Daemon.new({:user => 'nobody', :groups => 'nobody',
+      RBDaemon::Daemon.new({:user => 'daemon', :groups => ['daemon'],
                             :change_root => '/tmp'},
                            3, "ok\n", tmpfile.path) do |daemon, times, str, path|
         tmpfile = File.new(File.basename(path), 'w')
@@ -55,8 +56,8 @@ class TC_Daemon < Test::Unit::TestCase
     assert_equal("ok\n", lines[0])
 
     # check uid and gid
-    uid = Etc.getpwnam('nobody').uid
-    gid = Etc.getgrnam('nobody').gid
+    uid = Etc.getpwnam('daemon').uid
+    gid = Etc.getgrnam('daemon').gid
     status['Uid'].split(/\s+/).each do |s|
       assert_equal(uid, s.to_i)
     end
@@ -65,17 +66,23 @@ class TC_Daemon < Test::Unit::TestCase
     end
 
     # check fds
+    major, minor, patch = RUBY_VERSION.split(/\./).map{|i| i.to_i}
+    if major > 1 or (major == 1 and minor > 8)
+      offset = 2
+    else
+      offset = 0
+    end
     Dir["#{proc_root}/fd/*"].each do |fn|
       fd = File.basename(fn).to_i
-      assert((0..5).to_a.include?(fd))
+      assert((0..(5+offset)).to_a.include?(fd))
       case fd
       when 0, 1, 2
         assert_equal('/dev/null', File::readlink(fn))
-      when 3
-        assert_equal(pid_file, File::readlink(fn))
-      when 4
+      when 3 + offset
+        assert_equal(Pathname.new(pid_file).realpath.to_s, File::readlink(fn))
+      when 4 + offset
         assert_match(/socket:\[\d+\]/, File::readlink(fn))
-      when 5
+      when 5 + offset
         assert_equal(tmpfile.path, File::readlink(fn))
       end
     end

metadata

@@ -1,34 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rbdaemon
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.0.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Changli Gao
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-30 00:00:00 +08:00
-default_executable: 
-dependencies: []
-
+date: 2012-12-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A daemon library in Ruby
-email: 
+email:
 - xiaosuo@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -42,40 +63,31 @@ files:
 - rbdaemon.gemspec
 - test/tc_daemon.rb
 - test/tc_pidfile.rb
-has_rdoc: true
 homepage: http://github.com/xiaosuo/rbdaemon
-licenses: 
+licenses:
 - MIT
 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.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Yet another daemon library in Ruby
-test_files: 
+test_files:
 - test/tc_daemon.rb
 - test/tc_pidfile.rb