with_pid 0.1.0 → 0.1.1

data/README.markdown

@@ -15,7 +15,7 @@ sudo gem install with_pid
 Ruby script
 -----------
 
-<code>/data/my_app/current/bin/dj</code>:
+### /data/my_app/current/bin/dj
 
 <pre>
 #!/usr/bin/env ruby

data/lib/with_pid.rb

@@ -2,16 +2,25 @@ require 'rubygems'
 require 'erb'
 
 def with_pid(options)
+  # Path to bash script
+  bash_path = options[:tmp] + "/" + options[:name]
+  
+  # Add pid_dir option
   options[:pid_dir] = File.dirname(options[:pid])
+  
+  # Render bash script
   template = File.dirname(__FILE__) + '/../templates/bash.erb'
   template = File.expand_path(template)
   template = File.read(template)
   template = ERB.new(template).result(binding)
-  bash_path = options[:tmp] + "/" + options[:name]
+  
+  # Write bash script to tmp
   FileUtils.mkdir_p(options[:tmp])
   File.open(bash_path, 'w') do |f|
     f.write(template)
   end
+  
+  # Execute bash script
   `chmod +x #{bash_path}`
   `#{bash_path}`
 end

data/require.rb

@@ -13,7 +13,7 @@ Require do
     name 'with_pid'
     homepage "http://github.com/winton/#{name}"
     summary "The simple way to create and monitor a Ruby daemon"
-    version '0.1.0'
+    version '0.1.1'
   end
   
   rakefile do

data/spec/with_pid_spec.rb

@@ -17,8 +17,7 @@ describe :with_pid do
       :command => "ps",
       :name => "test",
       :pid => @tmp + "/test.pid",
-      :tmp => @tmp,
-      :user => "winton"
+      :tmp => @tmp
     )
     output.include?('PID').should == true
     File.read(@tmp + "/test.pid").to_i.should > 0

data/templates/bash.erb

@@ -4,8 +4,6 @@ PATH=/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH
 CURDIR=`pwd`
 COMMAND="<%= options[:command] %>"
 PID_FILE="<%= options[:pid] %>"
-USER="<%= options[:user] %>"
-HOME="/home/$USER" ; export HOME
 
 mkdir -p <%= options[:pid_dir] %>
 
@@ -21,22 +19,16 @@ case "<%= options[:action] %>" in
       rm -f $PID_FILE
     fi
     echo $$ > $PID_FILE;
-<% if RUBY_PLATFORM.include?('darwin') %>
-    exec 2<&1 sudo -u$USER "$COMMAND"
-<% else %>
-    exec 2<&1 su -c"$COMMAND" $USER
-<% end %>
+		exec 2<&1 $COMMAND
     ;;
   stop)
     echo "Stopping <%= options[:name] %>"
     if [ -f $PID_FILE ]; then
       kill -15 `cat $PID_FILE` 2>/dev/null; true
     fi
-
     [ -e "$PIDFILE" ] && rm -f $PIDFILE
     ;;
   *)
-    usage
     ;;
       esac
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: with_pid
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-18 00:00:00 -07:00
+date: 2010-04-26 00:00:00 -07:00
 default_executable: 
 dependencies: []