forker 1.0.2 → 1.1.0

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](http://travis-ci.org/bmarini/forker.png)](http://travis-ci.org/bmarini/forker)
+
 # Goals
 
 * Simplest code possible to daemonize code, redirect output and manage the
@@ -6,7 +8,7 @@
 ## Usage
 
     require 'forker'
-    Forker.fork(
+    Forker.fork!(
       :log   => "/dev/null",                         # Default value
       :pid   => "/var/run/#{File.basename($0)}.pid", # Default value
       :chdir => false,                               # Default value

data/Rakefile

@@ -0,0 +1,14 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+task :default => [:test]
+
+task :test do
+  Rake::TestTask.new do |t|
+    t.libs << "spec"
+    t.pattern = 'spec/*_spec.rb'
+    t.verbose = true
+  end
+end

data/forker.gemspec

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "forker/version"
+
+Gem::Specification.new do |s|
+  s.name        = "forker"
+  s.version     = Forker::VERSION
+  s.date        = "2010-09-27"
+  s.summary     = "Fork your ruby code with confidence"
+  s.email       = "bmarini@gmail.com"
+  s.homepage    = "http://github.com/bmarini/forker"
+  s.description = "Fork your ruby code with confidence"
+  s.authors     = ["Ben Marini"]
+  s.files       = Dir.glob("lib/**/*") + %w(forker.gemspec Gemfile Rakefile README.md)
+  s.test_files  = Dir.glob("spec/*")
+  s.add_dependency "SystemTimer", "~> 1.2" if RUBY_VERSION < "1.9"
+  s.add_development_dependency "minitest", "~> 2.0.2"
+end

data/lib/forker.rb

@@ -14,7 +14,13 @@
 # $$ = Process.pid
 
 require 'thread'
-require 'system_timer'
+
+if RUBY_VERSION < '1.9'
+  require 'system_timer'
+  module Forker; Timeout = SystemTimer; end
+else
+  require 'timeout'
+end
 
 module Forker
   module CLI
@@ -100,7 +106,7 @@ module Forker
       Process.kill("TERM", pid)
 
       begin
-        SystemTimer.timeout(sec) do
+        Timeout.timeout(sec) do
           loop do
             puts "waiting #{sec} seconds for #{pid} before sending KILL"
             Process.kill(0, pid) # See if proc exists

data/lib/forker/version.rb

@@ -1,3 +1,3 @@
 module Forker
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/spec/forker_spec.rb

@@ -0,0 +1,93 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'minitest/autorun'
+require 'minitest/spec'
+require 'fileutils'
+require 'forker'
+
+class Harness
+  attr_accessor :output
+
+  def run(args="")
+    @output = `spec/harness #{args}`
+  end
+
+  def start(args="")
+    run("start #{args}")
+  end
+
+  def stop(args="")
+    run("stop #{args}")
+  end
+
+  def pid
+    @output[/forked process is (\d+)/, 1]
+  end
+
+  def lsof
+    `lsof -p #{pid} | awk '{print $4, $9}'`.split("\n").grep(/^(0r|1w|2w) /)
+  end
+
+  FD = Struct.new(:name, :path)
+  def open_file_descriptors
+    @open_file_descriptors = lsof.map { |l| FD.new(*l.split) }
+  end
+end
+
+class ForkerSpec < MiniTest::Spec
+
+  describe "Forker::CLI" do
+    before { @harness = Harness.new }
+
+    it "should provide a helpful usage banner" do
+      @harness.run
+
+      @harness.output.must_equal <<-EOS.lstrip
+Usage: harness [start|stop] -p /path/to/pidfile.pid
+    -l, --logfile LOGFILE            redirect output to this location
+    -p, --pidfile PIDFILE            save pidfile to this location
+      EOS
+    end
+  end
+
+  describe "forking" do
+    before do
+      @harness = Harness.new
+    end
+
+    after do
+      @harness.stop "-p spec/harness.pid"
+      FileUtils.rm_f "spec/harness.log"
+    end
+
+    it "should announce the pid and logfile location" do
+      @harness.start "-p spec/harness.pid"
+
+      line1, line2 = @harness.output.split("\n")
+      line1.must_match /forked process is (\d+)/
+      line2.must_equal "output redirected to /dev/null"
+    end
+
+    it "should redirect stdin, stdout and stderr to dev/null by default" do
+      @harness.start "-p spec/harness.pid"
+
+      @harness.open_file_descriptors.each do |fd|
+        fd.path.must_equal "/dev/null"
+      end
+    end
+
+    it "should allow you to specify a logfile" do
+      @harness.start "-l spec/harness.log -p spec/harness.pid"
+
+      sleep 0.1
+      File.exist?("spec/harness.log").must_equal true
+      File.read("spec/harness.log").must_match /I love tests/
+    end
+
+    it "should allow you to specify a pidfile" do
+      @harness.start "-p spec/harness.pid"
+      File.exist?("spec/harness.pid").must_equal true
+      @harness.pid.must_equal File.read("spec/harness.pid")
+    end
+  end
+end

data/spec/harness

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'bundler/setup'
+require 'forker'
+
+Forker::CLI.run(ARGV)
+loop do
+  puts "I love tests"
+  sleep 0.1
+end

metadata

@@ -2,12 +2,12 @@
 name: forker
 version: !ruby/object:Gem::Version 
   hash: 19
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ben Marini
@@ -60,7 +60,12 @@ extra_rdoc_files: []
 files: 
 - lib/forker/version.rb
 - lib/forker.rb
+- forker.gemspec
+- Gemfile
+- Rakefile
 - README.md
+- spec/forker_spec.rb
+- spec/harness
 has_rdoc: true
 homepage: http://github.com/bmarini/forker
 licenses: []
@@ -91,9 +96,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Fork your ruby code with confidence
-test_files: []
-
+test_files: 
+- spec/forker_spec.rb
+- spec/harness