jobby 0.1.2 → 0.1.3

data/bin/jobby

@@ -38,7 +38,7 @@ OptionParser.new do |opts|
   end
 
   opts.on("--version", "Show version") do
-    puts "0.1.2"
+    puts "0.1.3"
     exit
   end
 
@@ -69,11 +69,11 @@ OptionParser.new do |opts|
     options[:max_child_processes] = forked_children.to_i
   end
 
-  opts.on("-u", "--user [USER]", "Run the processes as this user (probably requires superuser priviledges)") do |user|
+  opts.on("-u", "--user [USER]", "Run the processes as this user (probably requires superuser privileges)") do |user|
     options[:user] = user
   end
 
-  opts.on("-g", "--group [GROUP]", "Run the processes as this group (probably requires superuser priviledges)") do |group|
+  opts.on("-g", "--group [GROUP]", "Run the processes as this group (probably requires superuser privileges)") do |group|
     options[:group] = group
   end
 
@@ -84,6 +84,10 @@ OptionParser.new do |opts|
   opts.on("-c", "--command [COMMAND]", "Run this shell code in the forked children") do |command|
     options[:command] = command
   end
+
+  opts.on("-p", "--prerun [FILEPATH]", "Run this Ruby code before forking any children") do |filepath|
+    options[:prerun] = filepath
+  end
 end.parse!
 
 Jobby::Runner.new(options).run

data/lib/runner.rb

@@ -66,7 +66,7 @@ module Jobby
         exit if @options[:flush] or @options[:wipe]
         fork do
           begin
-            Jobby::Server.new(@options[:socket], @options[:max_child_processes], @options[:log]).run(&get_proc_from_options)
+            Jobby::Server.new(@options[:socket], @options[:max_child_processes], @options[:log], @options[:prerun]).run(&get_proc_from_options)
           rescue Exception => exception
             return error(exception.message)
           end

data/lib/server.rb

@@ -53,11 +53,12 @@ module Jobby
   #   % pkill -USR1 -f jobby
   #
   class Server
-    def initialize(socket_path, max_forked_processes, log)
+    def initialize(socket_path, max_forked_processes, log, prerun = nil)
       @socket_path = socket_path
       @max_forked_processes = max_forked_processes.to_i
       @log = log
       @queue = Queue.new
+      @prerun = prerun
     end
 
     # Starts the server and listens for connections. The specified block is run in 
@@ -69,6 +70,9 @@ module Jobby
         @logger.error "No block given, exiting"
         terminate
       end
+      if @prerun
+        load File.expand_path(@prerun)
+      end
       start_forking_thread(block)
       loop do
         client = @socket.accept

data/spec/file_for_prerunning.rb

@@ -0,0 +1,2 @@
+module Preran
+end

data/spec/server_spec.rb

@@ -11,9 +11,9 @@ $0 = "jobby spec"
 
 describe Jobby::Server do
 
-  def run_server(socket, max_child_processes, log_filepath, &block)
+  def run_server(socket, max_child_processes, log_filepath, prerun = nil, &block)
     @server_pid = fork do
-      Jobby::Server.new(socket, max_child_processes, log_filepath).run(&block)
+      Jobby::Server.new(socket, max_child_processes, log_filepath, prerun).run(&block)
     end
     sleep 0.2
   end
@@ -176,4 +176,19 @@ describe Jobby::Server do
     lambda { Jobby::Client.new(@socket) { |c| c.send("hello?") } }.should raise_error(Errno::ENOENT)
     `pgrep -f 'jobby spec'`.strip.should eql("#{Process.pid}")
   end
+
+  it "should be able to run a Ruby file before any forking" do
+    terminate_server
+    run_server(@socket, 1, @log_filepath, "spec/file_for_prerunning.rb") do
+      sleep 2
+      if defined?(Preran)
+        File.open(@child_filepath, "a+") do |file|
+          file << "preran OK"
+        end
+      end
+    end
+    Jobby::Client.new(@socket) { |c| c.send("hiya") }
+    sleep 3
+    File.read(@child_filepath).should eql("preran OK")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jobby
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Mark Somerville
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-07 00:00:00 +01:00
+date: 2008-07-08 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,7 @@ files:
 - lib/client.rb
 - spec/server_spec.rb
 - spec/run_all.rb
+- spec/file_for_prerunning.rb
 - README
 has_rdoc: true
 homepage: http://mark.scottishclimbs.com/