basic_daemon 0.9.0 → 0.9.1

data/History.rdoc

@@ -0,0 +1,57 @@
+= 0.9.0 - 20100216
+
+* Bumped the version to 0.9.0 because it's just about ready for a 1.0 release.
+* cleaned up tests and added a restart test to oo and function
+* Still need to work on documentation and fix the Rakefile
+
+= 0.1.5 - 20100118
+
+Doing some refactoring and broke out code which determines the PID into its
+own method "pid".
+
+Added LICENSE and updated TODO
+
+Updated Rakefile and tests
+
+= 0.1.4 - 20100115
+
+Provided basic documentation for the methods.
+
+= 0.1.3 - 20091230
+
+Breaking out tests
+
+* Broke out tests to organize by functionality
+
+= 0.1.2 - 20091230
+
+Switched back to Test::Unit
+
+* Migrated all RSpec tests to Test::Unit
+* Expanded tests to handle calling blocks
+
+= 0.1.1 - 20090925
+
+RSpec testing expansion.
+
+* continuing to add tests to the spec.
+* added a method to the library to determine if a PID is alive
+
+= 0.1.0 - 20090923
+
+Major bug fixes 
+
+* The daemon now correctly forks off from the calling process.
+* The procedural means of executing a daemon have been eliminated.
+
+= 0.0.5 - 20090921
+
+Began moving tests to RSpec. 
+
+= 0.0.5 - 20090812
+
+Started recording changes to the repository in to line up with git commit
+messages.
+
+* addition of License.txt and History.txt, though mostly empty
+* Initial gemspec was created. The daemon is now gemable

data/LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2010 Samuel Mullen
+ 
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+ 
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/{README → README.rdoc}

@@ -5,6 +5,10 @@ A basic library for creating daemonized processes
 
 This library works with Ruby 1.8, Ruby 1.9, and JRuby and is licensed under the MIT License.
 
+Installation
+
+sudo gem install basic_daemon
+
 Gettings Started
 
 There are currently two ways of using the basic_daemon library: 1) Objected Oriented; 2) Functional.
@@ -88,7 +92,3 @@ Example:
 Most Linux users will want to instantiate thusly:
 
   BasicDaemon.new(:piddir => '/var/lock')
-
-Installation
-
-pending

data/Rakefile

@@ -0,0 +1,52 @@
+$:.unshift File.expand_path("../lib", __FILE__)
+
+require 'rubygems'
+require 'lib/basic_daemon'
+require 'rake/testtask'
+require 'rake/gempackagetask'
+ 
+lib_dir = File.expand_path('lib')
+test_dir = File.expand_path('test')
+
+gem_spec = Gem::Specification.new do |s|
+  s.name = "basic_daemon"
+  s.version = BasicDaemon::VERSION
+  s.authors = ["Samuel Mullen"]
+  s.email = "samullen@gmail.com"
+  s.homepage = "http://github.com/samullen/basic_daemon"
+  s.summary = "A simple ruby library for daemonizing processes"
+  s.authors = ["Samuel Mullen"]
+  s.email = "samullen@gmail.com"
+  s.test_files = Dir['test/**/*.rb']
+  s.description = false
+  s.files = [
+    "History.rdoc",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "examples/functional.rb",
+    "examples/objectoriented.rb",
+    "lib/basic_daemon.rb"
+  ] + s.test_files
+end
+
+Rake::TestTask.new(:test) do |test|
+  test.libs = [lib_dir, test_dir]
+  test.pattern = 'test/**/*rb'
+  test.verbose = true
+end
+
+Rake::GemPackageTask.new(gem_spec) do |pkg|
+  pkg.need_zip = false
+  pkg.need_tar = false
+end
+
+desc "Install the gem locally"
+task :install => [:test, :gem] do
+  sh %{gem install pkg/#{gem_spec.name}-#{gem_spec.version}}
+end
+
+desc "Remove the pkg directory and all of its contents."
+task :clean => :clobber_package
+
+task :default => [:test, :gem]

data/examples/functional.rb

@@ -1,8 +1,5 @@
 #!/usr/bin/ruby
 
-# STDERR.puts "this won't work until I get the block stuff working."
-# exit
-
 require File.join(File.dirname(__FILE__), '..', 'lib','basic_daemon')
 
 basedir = "/tmp" # change this to where you want to deal with things
@@ -10,29 +7,29 @@ pidfile = File.basename($PROGRAM_NAME, File.extname($PROGRAM_NAME))
 
 d = BasicDaemon.new({:pidfile => pidfile, :piddir => basedir, :workingdir => basedir})
 
-if ARGV[0] == 'start'
-  puts "should print 'got here' on the next line"
-  d.start do
-    i = 1
-    foo = open(basedir + "/out", "w")
-
-    while true do
-      foo.puts "loop: #{i}"
-      foo.flush
-      sleep 5
-
-      i += 1
-    end
+process = Proc.new do
+  i = 1
+  foo = open(basedir + "/out", "w")
+
+  while true do
+    foo.puts "loop: #{i}"
+    foo.flush
+    sleep 5
+
+    i += 1
   end
+end
+
+if ARGV[0] == 'start'
+  d.start &process
 elsif ARGV[0] == 'stop'
   d.stop
   exit!
 elsif ARGV[0] == 'restart'
-  d.restart
+  d.restart &process
 else
-  STDERR.puts "wrong! use start or stop."
+  STDERR.puts "wrong! Use start, stop, or restart."
   exit!
 end
 
-puts 'got here'
 exit

data/examples/objectoriented.rb

@@ -25,7 +25,6 @@ end
 d = MyDaemon.new(:pidfile => pidfile, :piddir => basedir, :workingdir => basedir)
 
 if ARGV[0] == 'start'
-  puts "Should print 'got here' on the next line"
   d.start
 elsif ARGV[0] == 'stop'
   d.stop
@@ -37,5 +36,4 @@ else
   exit!
 end
 
-puts 'got here'
 exit

data/lib/basic_daemon.rb

@@ -1,7 +1,7 @@
 class BasicDaemon
   attr_accessor :workingdir, :pidfile, :piddir, :process
 
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 
   DEFAULT_OPTIONS = {
     :pidfile => File.basename($PROGRAM_NAME, File.extname($PROGRAM_NAME)),
@@ -38,7 +38,6 @@ class BasicDaemon
     @pidfile    = opts[:pidfile]
     @workingdir = opts[:workingdir]
     @pid        = nil
-    @process    = nil
   end
 
   # Returns the fullpath to the file containing the process ID (PID)
@@ -71,10 +70,6 @@ class BasicDaemon
       exit!
     end
 
-    if block_given?
-      @process = block
-    end
-
     #----- Fork off from the calling process -----#
     begin
       fork do
@@ -103,8 +98,8 @@ class BasicDaemon
         STDOUT.reopen("/dev/null", "w")
         STDERR.reopen("/dev/null", "w")
 
-        unless @process.nil?
-          @process.call
+        if block_given?
+          block.call
         else
           self.run
         end
@@ -139,14 +134,14 @@ class BasicDaemon
   # restarts the daemon by first killing it and then restarting. 
   #
   # Warning: does not work if block is initially passed to start.
-  def restart
+  def restart(&block)
     self.stop
     @pid = nil
 
-    unless @process.nil?
+    unless block_given?
       self.start
     else
-      self.start &@process
+      self.start &block
     end
   end
 

data/test/functional_basic_daemon_test.rb

@@ -68,7 +68,7 @@ class TestFunctionalBasicDaemon < Test::Unit::TestCase
     assert @daemon.process_exists?
     previous_pid = @daemon.pid
 
-    @daemon.restart
+    @daemon.restart &@process
     sleep 0.1
     assert @daemon.process_exists?
     assert previous_pid != @daemon.pid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: basic_daemon
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Samuel Mullen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -06:00
+date: 2010-02-22 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -22,7 +22,10 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README
+- History.rdoc
+- LICENSE
+- README.rdoc
+- Rakefile
 - examples/functional.rb
 - examples/objectoriented.rb
 - lib/basic_daemon.rb