navy 1.1.1 → 1.1.2

data/.rvmrc

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use 1.9.3" > .rvmrc
+environment_id="ruby-1.9.3-p194@navy"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.15.0 (master)" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
+fi
+
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && {
+#   ! builtin command -v bundle >/dev/null ||
+#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
+# }
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# then
+#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
+# fi

data/lib/navy/captain.rb

@@ -12,7 +12,7 @@ class Navy::Captain < Navy::Rank
   # list of signals we care about and trap in admiral.
   QUEUE_SIGS = [ :WINCH, :QUIT, :INT, :TERM, :USR1, :USR2, :HUP, :TTIN, :TTOU ]
 
-  attr_accessor :label, :captain_pid, :officer_count, :officer_job
+  attr_accessor :label, :captain_pid, :officer_count, :officer_job, :officer_fire_and_forget
   attr_reader   :admiral, :options
 
   def initialize(admiral, label, config, options = {})
@@ -124,7 +124,7 @@ class Navy::Captain < Navy::Rank
     before_stop.call(self, graceful) if before_stop
     limit = Time.now + patience
     until OFFICERS.empty? || (n = Time.now) > limit
-      kill_each_officer(graceful ? :QUIT : :TERM)
+      kill_each_officer(graceful ? :QUIT : :TERM, officer_fire_and_forget)
       sleep(0.1)
       reap_all_officers
     end
@@ -221,16 +221,20 @@ class Navy::Captain < Navy::Rank
 
   # delivers a signal to a officer and fails gracefully if the officer
   # is no longer running.
-  def kill_officer(signal, opid)
+  def kill_officer(signal, opid, detach = false)
     logger.debug "captain[#{label}] sending #{signal} to #{opid}" if $DEBUG
     Process.kill(signal, opid)
+    if detach
+      Process.detach(opid)
+      officer = OFFICERS.delete(opid) rescue nil
+    end
   rescue Errno::ESRCH
     officer = OFFICERS.delete(opid) rescue nil
   end
 
   # delivers a signal to each officer
-  def kill_each_officer(signal)
-    OFFICERS.keys.each { |opid| kill_officer(signal, opid) }
+  def kill_each_officer(signal, detach = false)
+    OFFICERS.keys.each { |opid| kill_officer(signal, opid, detach) }
   end
 
   def init_self_pipe!

data/lib/navy/captain/orders.rb

@@ -18,6 +18,7 @@ class Navy::Captain::Orders < Navy::Orders
     end,
     officer_job: -> { trap(:QUIT) { exit }; trap(:TERM) { exit }; loop { sleep 1 } },
     officer_count: 0,
+    officer_fire_and_forget: false,
     patience: 30,
     post_fork: ->(captain, officer) do
       captain.logger.debug("(#{captain.label}) officer=#{officer.number} post-fork") if $DEBUG

data/lib/navy/captain/speak.rb

@@ -1,8 +1,10 @@
 class Navy::Captain::Speak < Navy::Speak
 
   def officers(officer_count = 1, *args, &block)
+    options = args.last.is_a?(Hash) ? args.last : {}
     orders.set[:officer_count] = officer_count
     orders.set[:officer_job]   = block_given? ? block : args[0]
+    orders.set[:officer_fire_and_forget] = options[:fire_and_forget] if options.has_key?(:fire_and_forget)
   end
 
 end

data/lib/navy/version.rb

@@ -1,3 +1,3 @@
 module Navy
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navy
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -84,6 +84,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rvmrc
 - Gemfile
 - LICENSE
 - README.md
@@ -118,17 +119,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1258671307750517922
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1258671307750517922
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby daemon inspired by Unicorn.
 test_files: []
-has_rdoc: