dante 0.1.3 → 0.1.4

data/README.md

@@ -129,7 +129,7 @@ You can also use dante programmatically to start, stop and restart arbitrary cod
 
 ```ruby
 # daemon start
-Dante::Runner.new('gitdocs').execute(:daemonize => true, :pid\_path => @pid, :log\_path => @log\_path) { something! }
+Dante::Runner.new('gitdocs').execute(:daemonize => true, :pid_path => @pid, :log_path => @log_path) { something! }
 # daemon stop
 Dante::Runner.new('gitdocs').execute(:kill => true, :pid_path => @pid)
 # daemon restart

data/lib/dante/runner.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'optparse'
 require 'yaml'
 require 'erb'
+require 'etc'
 
 =begin
 
@@ -53,8 +54,20 @@ module Dante
         self.stop
       else # create process
         self.stop if options.include?(:restart)
-        Process.euid = options[:user] if options[:user]
-        Process.egid = options[:group] if options[:group]
+
+        # If a username, uid, groupname, or gid is passed,
+        # drop privileges accordingly.
+
+        if options[:group]
+          gid = options[:group].is_a?(Integer) ? options[:group] : Etc.getgrnam(options[:group]).gid
+          Process::GID.change_privilege(gid)
+        end
+
+        if options[:user]
+          uid = options[:user].is_a?(Integer) ? options[:user] : Etc.getpwnam(options[:user]).uid
+          Process::UID.change_privilege(uid)
+        end
+
         @startup_command = block if block_given?
         options[:daemonize] ? daemonize : start
       end
@@ -115,8 +128,12 @@ module Dante
     end
 
     def interrupt
-      raise Interrupt
-      sleep(1)
+      # begin
+        raise Interrupt
+        sleep(1)
+      # rescue Interrupt
+      #  log "Interrupt received; stopping #{@name}"
+      # end
     end
 
     # Returns true if process is not running
@@ -207,10 +224,10 @@ module Dante
     def redirect_output!
       if log_path = options[:log_path]
         FileUtils.touch log_path
-        File.open(log_path, 'a') do |f|
-          $stdout.reopen(f)
-          $stderr.reopen(f)
-        end
+        STDOUT.reopen(log_path, 'a')
+        STDERR.reopen STDOUT
+        File.chmod(0644, log_path)
+        STDOUT.sync = true
       else # redirect to /dev/null
         STDIN.reopen "/dev/null"
         STDOUT.reopen "/dev/null", "a"
@@ -235,4 +252,4 @@ module Dante
     end
 
   end
-end
+end

data/lib/dante/version.rb

@@ -1,3 +1,3 @@
 module Dante
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dante
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
-  version: 0.1.3
+  segments: 
+  - 0
+  - 1
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-31 00:00:00 Z
+date: 2012-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -20,6 +25,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -31,6 +39,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -42,6 +53,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -80,17 +94,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: dante
-rubygems_version: 1.8.12
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Turn any process into a demon