foreground 0.0.3 → 0.0.4

data/bin/foreground_sample_daemon

@@ -1,12 +1,14 @@
 #!/usr/bin/env ruby
 
 # Files
-pid_file = "/tmp/#{File.basename($PROGRAM_NAME)}.pid"
-log_file = "/tmp/#{File.basename($PROGRAM_NAME)}.log"
+name = File.basename($PROGRAM_NAME)
+$PROGRAM_NAME=name
+pid_file = "/tmp/#{name}.pid"
+log_file = "/tmp/#{name}.log"
 
 # Run only run one daemon at a time.
 if File.exists?(pid_file)
-  puts "PID file exists already!" 
+  File.open(log_file, 'a') { |f| f.puts "PID file exists already!" }
   exit
 end
 

data/features/start_stop.feature

@@ -4,12 +4,28 @@ Feature: Start and stop
   As a funky user
   I want foreground to start and stop that background daemon
 
-  Scenario: Start and stop sample daemon
+  Scenario: Run sample daemon via foreground
     When I run the sample daemon via foreground
-    Then the sample daemon should run
+    Then foreground should run
+    And the sample daemon should run
 
-    When I kill foreground
+  Scenario Outline: Kill sample daemon via foreground
+    Given I run the sample daemon via foreground
+    When I send foreground a <signal> signal
     And I run `sleep 1`
     Then foreground should not run
     And the sample daemon should not run
     And the sample daemon should have received a TERM signal
+
+    Examples:
+      | signal |
+      | TERM   |
+      | INT    |
+
+  Scenario: Refresh sample daemon via foreground
+    Given I run the sample daemon via foreground
+    When I send foreground a HUP signal
+    And I run `sleep 1`
+    Then foreground should run
+    And the sample daemon should run
+    And the sample daemon should have received a HUP signal

data/features/steps/sample_daemon_steps.rb

@@ -2,14 +2,20 @@ STDOUT.sync = true # for debugging
 
 def sample_daemons
   proclist = `/bin/ps -A -o pid,command`
-  proclist.to_a.grep(%r{^\s*\d+\s+ruby\s+.*foreground_sample_daemon$}) { |l| l[/^\s*(\d+)\s+/,1].to_i }
+  proclist.to_a.grep(%r{^\s*\d+\s+foreground_sample_daemon\s*$}) { |l| l[/^\s*(\d+)\s+/,1].to_i }
 end
 
-def kill_foreground
+def kill_foreground(signal = :TERM)
   if @foreground
+    #TODO: Replace sleep with a timeout!
+    sleep 2 # Give foreground some time to setup signal handling... or tests might break.
     begin
-      Process.kill(:TERM, @foreground)
-      Process.waitpid(@foreground)
+      Process.kill(signal, @foreground)
+      if signal.to_sym == :HUP
+        sleep 1
+      else
+        Process.waitpid(@foreground)
+      end
     rescue Errno::ESRCH, Errno::ECHILD
     end
   end
@@ -17,6 +23,7 @@ end
 
 def kill_all_sample_daemons(signal=:TERM)
   sample_daemons.each { |pid| system("kill -#{signal} #{pid}") }
+  #TODO: Replace sleep with a timeout!
   sleep 1 # Give the process time to say goodbye.
 end
 
@@ -46,8 +53,18 @@ When /^I send the sample daemon a (\w+) signal$/ do |signal|
 end
 
 When /^I kill foreground$/ do
-  sleep 1 # Give foreground some time to setup signal handling... or tests will break.
-  kill_foreground
+  steps %q{
+    When I send foreground a TERM signal
+  }
+end
+
+When /^I send foreground a (\w+) signal$/ do |signal|
+  kill_foreground(signal)
+end
+
+Then /^foreground should run$/ do
+  lambda { Process.kill(0, @foreground) }.should_not raise_error(Errno::ESRCH),
+    "No such foreground process with PID #{@foreground}"
 end
 
 Then /^foreground should not run$/ do
@@ -70,6 +87,8 @@ Then /^the sample daemon should not run$/ do
 end
 
 Then /^(\d+) sample daemons? should run$/ do |expected|
+  #TODO: Replace sleep with a timeout!
+  sleep 2 # some time to start the daemon
   expected = expected.to_i
   actual = sample_daemons.count
   actual.should eql(expected),

data/lib/foreground/signal_handlers.rb

@@ -1,6 +1,13 @@
 module Foreground
-  trap(:TERM) do
-    Daemon.kill(:TERM)
-    exit
+  [:TERM, :INT].each do |signal|
+    trap(signal) do
+      Daemon.kill(:TERM)
+      exit
+    end
+  end
+
+  trap(:HUP) do
+    sleep 1
+    Daemon.kill(:HUP)
   end
 end

data/lib/foreground/version.rb

@@ -1,3 +1,3 @@
 module Foreground
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,143 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: foreground
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
-- "Bjo\xCC\x88rn Albers"
+authors:
+- Björn Albers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-09-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mixlib-cli
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 2
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.2.2
-  prerelease: false
   type: :runtime
-  name: mixlib-cli
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 4
-        - 11
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.11
-  prerelease: false
   type: :development
-  name: aruba
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.11
+- !ruby/object:Gem::Dependency
+  name: aruba-doubles
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 2
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.2.1
-  prerelease: false
   type: :development
-  name: aruba-doubles
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 7
-        - 5
-        version: 0.7.5
   prerelease: false
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
   name: guard-cucumber
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 5
-        - 1
-        version: 0.5.1
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.5
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.5
+- !ruby/object:Gem::Dependency
   name: guard-rspec
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
-        version: 0.9.0
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rb-fsevent
-  version_requirements: *id007
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 description: Control daemonizing background processes with launchd.
-email: 
+email:
 - bjoernalbers@googlemail.com
-executables: 
+executables:
 - foreground
 - foreground_sample_daemon
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Guardfile
@@ -162,38 +156,35 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/bjoernalbers/foreground
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3093177780394288803
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3093177780394288803
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: foreground-0.0.3
-test_files: 
+summary: foreground-0.0.4
+test_files:
 - features/sample_daemon.feature
 - features/start_stop.feature
 - features/steps/sample_daemon_steps.rb