jobby 0.1.3 → 0.2.0

data/bin/jobby

@@ -38,7 +38,7 @@ OptionParser.new do |opts|
   end
 
   opts.on("--version", "Show version") do
-    puts "0.1.3"
+    puts "0.2.0"
     exit
   end
 

data/lib/runner.rb

@@ -32,6 +32,14 @@ module Jobby
         message "--input not supplied, reading from STDIN (use ctrl-d to end input)"
         @options[:input] = $stdin.read
       end
+      create_prerun_proc
+    end
+
+    # Makes a Proc that loads the given filepath, passing in the logger object.
+    def create_prerun_proc
+      if @options[:prerun]
+        @options[:prerun_proc] = Proc.new { |logger| load File.expand_path(@options[:prerun]) }
+      end
     end
 
     # Tries to connect a client to the server. If there isn't a server detected on
@@ -66,7 +74,7 @@ module Jobby
         exit if @options[:flush] or @options[:wipe]
         fork do
           begin
-            Jobby::Server.new(@options[:socket], @options[:max_child_processes], @options[:log], @options[:prerun]).run(&get_proc_from_options)
+            Jobby::Server.new(@options[:socket], @options[:max_child_processes], @options[:log], @options[:prerun_proc]).run(&get_proc_from_options)
           rescue Exception => exception
             return error(exception.message)
           end

data/lib/server.rb

@@ -71,7 +71,7 @@ module Jobby
         terminate
       end
       if @prerun
-        load File.expand_path(@prerun)
+        @prerun.call(@logger)
       end
       start_forking_thread(block)
       loop do

data/spec/server_spec.rb

@@ -179,7 +179,7 @@ describe Jobby::Server do
 
   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
+    run_server(@socket, 1, @log_filepath, Proc.new { |logger| load "spec/file_for_prerunning.rb" }) do
       sleep 2
       if defined?(Preran)
         File.open(@child_filepath, "a+") do |file|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jobby
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Mark Somerville
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-08 00:00:00 +01:00
+date: 2008-07-09 00:00:00 +01:00
 default_executable: 
 dependencies: []