daemon-spawn 0.4.1 → 0.4.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.4.2 / 2011-04-01
+
+* Merged patches from Tilo Prütz
+
 === 0.4.1 / 2011-03-03
 
 * Merged patch from oruen to fix https://github.com/alexvollmer/daemon-spawn/issues/5

data/Rakefile

@@ -15,7 +15,7 @@ begin
     gemspec.rubyforge_project = "daemon-spawn"
     gemspec.email = "alex.vollmer@gmail.com"
     gemspec.homepage = "http://github.com/alexvollmer/daemon-spawn"
-    gemspec.authors = ["Alex Vollmer", "Seamus Abshere", "Emmanual Gomez", "Seth Falcon", "Woody Peterson"]
+    gemspec.authors = ["Alex Vollmer", "Seamus Abshere", "Emmanual Gomez", "Seth Falcon", "Woody Peterson", "Tilo Prütz"]
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/daemon_spawn.rb

@@ -11,7 +11,7 @@ module DaemonSpawn
     puts "Where <command> is one of start, stop, restart or status"
     puts "[options] are additional options passed to the underlying process"
   end
-  
+
   def self.alive?(pid)
     Process.kill 0, pid
   rescue Errno::ESRCH
@@ -40,8 +40,9 @@ module DaemonSpawn
       exit if fork
       open(daemon.pid_file, 'w') { |f| f << Process.pid }
       Dir.chdir daemon.working_dir
-      File.umask 0000
+      old_umask = File.umask 0000
       log = File.new(daemon.log_file, "a")
+      File.umask old_umask
       log.sync = daemon.sync_log
       STDIN.reopen "/dev/null"
       STDOUT.reopen log
@@ -179,7 +180,7 @@ module DaemonSpawn
       else
         build(opts).map { |d| DaemonSpawn.start(d, args) }
       end
-    end      
+    end
 
     def self.stop(opts, args)
       daemons = find(opts)

data/test/daemon_spawn_test.rb

@@ -7,7 +7,7 @@ class DaemonSpawnTest < Test::Unit::TestCase
 
   # Try to make sure no pidfile (or process) is left over from another test.
   def setup
-    %w{ echo_server deaf_server stubborn_server }.each do |server|
+    %w{ echo_server deaf_server stubborn_server simple_server }.each do |server|
       begin
         Process.kill 9, possible_pid(server)
       rescue Errno::ESRCH
@@ -38,20 +38,20 @@ class DaemonSpawnTest < Test::Unit::TestCase
     `./echo_server.rb #{args.join(' ')}`
   end
 
-  def while_running
+  def while_running(&block)
     Dir.chdir(SERVERS) do
       `./echo_server.rb stop`
       assert_match(/EchoServer started./, `./echo_server.rb start 5150`)
       sleep 1
       begin
-        with_socket
+        with_socket &block
       ensure
         assert_match(//, `./echo_server.rb stop`)
         assert_raises(Errno::ECONNREFUSED) { TCPSocket.new('127.0.0.1', 5150) }
       end
     end
   end
-  
+
   def after_daemon_dies_leaving_pid_file
     Dir.chdir(SERVERS) do
       `./echo_server.rb stop`
@@ -129,7 +129,7 @@ class DaemonSpawnTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_start_after_daemon_dies_leaving_pid_file
     after_daemon_dies_leaving_pid_file do |leftover_pid|
       assert_match /EchoServer started/, `./echo_server.rb start 5150`
@@ -149,7 +149,7 @@ class DaemonSpawnTest < Test::Unit::TestCase
       assert alive?(new_pid)
     end
   end
-  
+
   def test_stop_using_custom_signal
     Dir.chdir(SERVERS) do
       `./deaf_server.rb start`
@@ -181,4 +181,30 @@ class DaemonSpawnTest < Test::Unit::TestCase
       assert dead?(pid)
     end
   end
+
+  def test_umask_unchanged
+    Dir.chdir(SERVERS) do
+      old_umask = File.umask 0124
+      log_file = File.join(Dir.tmpdir, 'should_not_be_world_writable')
+      begin
+        `./simple_server.rb stop`
+        FileUtils.rm_f log_file
+        `./simple_server.rb start #{log_file}`
+        sleep 1
+        assert_equal 0100642, File.stat(log_file).mode
+      ensure
+        `./simple_server.rb stop`
+        FileUtils.rm_f log_file
+        File.umask old_umask
+      end
+    end
+  end
+
+  def test_log_file_is_world_writable
+    log_file = File.join(Dir.tmpdir, 'echo_server.log')
+    FileUtils.rm_f log_file
+    while_running do
+      assert_equal 0100666, File.stat(log_file).mode
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daemon-spawn
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Alex Vollmer
@@ -15,11 +15,12 @@ authors:
 - Emmanual Gomez
 - Seth Falcon
 - Woody Peterson
+- "Tilo Pr\xC3\xBCtz"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -08:00
+date: 2011-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -41,7 +42,6 @@ files:
 - README.txt
 - Rakefile
 - VERSION
-- daemon-spawn.gemspec
 - lib/daemon_spawn.rb
 - test/daemon_spawn_test.rb
 - test/helper.rb
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: daemon-spawn
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Daemon launching and management made dead simple

data/daemon-spawn.gemspec

@@ -1,64 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{daemon-spawn}
-  s.version = "0.4.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alex Vollmer", "Seamus Abshere", "Emmanual Gomez", "Seth Falcon", "Woody Peterson"]
-  s.date = %q{2011-03-03}
-  s.description = %q{With daemon-spawn you can start, stop and restart processes that run
-    in the background. Processed are tracked by a simple PID file written
-    to disk.}
-  s.email = %q{alex.vollmer@gmail.com}
-  s.extra_rdoc_files = [
-    "README.txt"
-  ]
-  s.files = [
-    ".autotest",
-    "History.txt",
-    "Manifest.txt",
-    "README.txt",
-    "Rakefile",
-    "VERSION",
-    "daemon-spawn.gemspec",
-    "lib/daemon_spawn.rb",
-    "test/daemon_spawn_test.rb",
-    "test/helper.rb",
-    "test/multi_daemon_spawn_test.rb",
-    "test/servers/deaf_server.rb",
-    "test/servers/echo_server.rb",
-    "test/servers/simple_server.rb",
-    "test/servers/stubborn_server.rb",
-    "test/servers/taps_server.rb"
-  ]
-  s.homepage = %q{http://github.com/alexvollmer/daemon-spawn}
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{daemon-spawn}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Daemon launching and management made dead simple}
-  s.test_files = [
-    "test/daemon_spawn_test.rb",
-    "test/helper.rb",
-    "test/multi_daemon_spawn_test.rb",
-    "test/servers/deaf_server.rb",
-    "test/servers/echo_server.rb",
-    "test/servers/simple_server.rb",
-    "test/servers/stubborn_server.rb",
-    "test/servers/taps_server.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end
-