pipemaster 0.4.1 → 0.4.2

data/CHANGELOG

@@ -1,4 +1,7 @@
-0.4.1
+0.4.2 (2010-02-19)
+* Fix: Pipe command exits with retcode on successful completion.
+
+0.4.1 (2010-02-19)
 * Added: Service control file in etc/pipemaster (puts this in your /etc/init.d directory)
 * Added: pipe command gets --retcode/-c option to return exit code in case of failure.
 * Added: Pipefile uses app { } for application loading block.

data/README.rdoc

@@ -36,13 +36,13 @@ Step 1:  Create a Pipemaster file.  For example:
 
 Step 2:  Fire up the Pipemaster server:
 
-  $ pipemaster --server
+  $ pipemaster
   I, [2010-02-18T12:57:57.739230 #5460]  INFO -- : master process ready
   I, [2010-02-18T12:57:57.739606 #5460]  INFO -- : listening on addr=127.0.0.1:7887 fd=3
   
 Step 3:  For a new shell, execute a command:
 
-  $ echo "Stand down!" | ruby -Ilib bin/pipemaster echo upside
+  $ echo "Stand down!" | pipe echo upside
   Stand upside down!
 
 

data/bin/pipe

@@ -5,7 +5,7 @@ require "optparse"
 
 ENV["PIPE_ENV"] ||= "development"
 address = nil
-ret_code = nil
+retcode = nil
 tty = false
 
 opts = OptionParser.new("", 24, '  ') do |opts|
@@ -22,7 +22,7 @@ opts = OptionParser.new("", 24, '  ') do |opts|
   end
 
   opts.on("-c", "--retcode CODE", "return code in case of failure (default: raise exception)") do |r|
-    ret_code = r
+    retcode = r
   end
 
   opts.on("-h", "--help", "Show this message") do
@@ -40,11 +40,8 @@ end
 
 begin
   input = $stdin if tty || !$stdin.isatty 
-  exit Pipemaster::Client.new(address).capture(input, $stdout).run(*ARGV)
+  retcode = Pipemaster::Client.new(address).capture(input, $stdout).run(*ARGV)
 rescue Exception=>ex
-  if ret_code
-    exit ret_code.to_i
-  else
-    raise
-  end
+  raise unless retcode
 end
+exit retcode.to_i

data/etc/pipemaster

@@ -42,6 +42,7 @@ upgrade)
 status)
     sig 0 && echo >&2 "Running" && exit 0
 	echo >&2 "Not running"
+    exit 1
     ;;
 *)
 	echo >&2 "Usage: $0 <start|stop|status|restart|upgrade|force-stop>"

data/lib/pipemaster/server.rb

@@ -402,10 +402,10 @@ module Pipemaster
         ARGV.replace args
         command = commands[name.to_sym] or raise ArgumentError, "No command #{name}"
         command.call *args
-        logger.info "#{Process.pid} completed"
+        logger.info "#{Process.pid} exit"
         socket.write 0.chr
       rescue SystemExit => ex
-        logger.info "#{Process.pid} completed"
+        logger.info "#{Process.pid} exit with #{ex.status}"
         socket.write ex.status.chr
       rescue Exception => ex
         logger.info "#{Process.pid} failed: #{ex.message}" 

data/pipemaster.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name           = "pipemaster"
-  spec.version        = "0.4.1"
+  spec.version        = "0.4.2"
   spec.author         = "Assaf Arkin"
   spec.email          = "assaf@labnotes.org"
   spec.homepage       = "http://github.com/assaf/pipemaster"

data/test/unit/test_server.rb

@@ -60,10 +60,10 @@ class ServerTest < Test::Unit::TestCase
   end
 
   def test_return_code
-    start :commands => { :success => lambda { "hi" }, :fail => lambda { fail }, :exit => lambda { exit 5 } }
+    start :commands => { :success => lambda { "hi" }, :fail => lambda { fail }, :exit => lambda { exit 8 } }
     assert_equal 0, hit("127.0.0.1:#@port", :success).first
     assert_equal 127, hit("127.0.0.1:#@port", :fail).first
-    assert_equal 5, hit("127.0.0.1:#@port", :exit).first
+    assert_equal 8, hit("127.0.0.1:#@port", :exit).first
   end
 
   def test_exit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pipemaster
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 -08:00
+date: 2010-02-20 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -51,7 +51,7 @@ licenses: []
 post_install_message: To get started run pipemaster --help
 rdoc_options: 
 - --title
-- Pipemaster 0.4.1
+- Pipemaster 0.4.2
 - --main
 - README.rdoc
 - --webcvs