condor 1.0.0 → 1.1.0

data/README

@@ -6,13 +6,21 @@ It consists of a wrapper for a Condor submit file and a program, <tt>condor-exec
 
 	condor-exec prog --option arg1 arg2
 
-queues up a job for the +prog+ with arguments <tt>--option arg1 arg2</tt>.  To pass options to <tt>condor-exec</tt> itself, place them before +prog+.  For example:
+queues up a job for the program +prog+ with arguments <tt>--option arg1 arg2</tt>.  To pass options to <tt>condor-exec</tt> itself, place them before +prog+.  For example:
 
 	condor-exec --universe=MPI prog --option arg1 arg2
 
+Alternately arguments may be specified in a separate arguments file, and one
+Condor job will be queued for each line in the file
+
+	condor-exec --argfile=args prog
+
+See <tt>condor-exec --help</tt> for more information.
+
 = History
 
 1.0.0:: Basic submit file wrapper; <tt>condor-exec</tt> program
+1.1.0:: Additional options in <tt>condor-exec</tt>, including argument files; Add logging support
 
 = Copyright
 

data/bin/condor-exec

@@ -38,7 +38,7 @@ class CommandPassingOptionParser < OptionParser
   end
 end
 
-options = {}
+options = {:submit => true}
 p = CommandPassingOptionParser.new do |opts|
   opts.banner = <<EOS
 Usage: #{File.basename(__FILE__)} [options] command [arguments]
@@ -51,12 +51,32 @@ It creates a condor_submit.nnn file in the current directory along with
 a Condor log file in the system temporary directory.
 
 Switch options appearing before the first non-switch argument are passed to
-#{File.basename(__FILE__)}.  Switch optios appearing after the first
-non-switch argument are treated as arguments to the command.
+#{File.basename(__FILE__)}. There must be no spaces in these arguments (e.g.
+'--universe=vanilla' and not '--universe vanilla'). Switch options appearing
+after the first non-switch argument are treated as arguments to the command.
+
+If an argument file is specified, one Condor job is created for each line in
+the file, using the text of the line as arguments.  These arguments are
+appended after any specified on the command line.
 
-Options:
 EOS
   
+  opts.on("-aVALUE", "--argfile VALUE", "Argument filename") do |value|
+    options[:argfile] = value
+  end
+
+  opts.on("-l", "--logging LEVEL", "Logging level") do |level|
+    Condor.set_log_level(eval("Logger::#{level.upcase}"))
+  end
+
+  opts.on("-oVALUE", "--output VALUE", "Output filename") do |value|
+    options[:output] = value
+  end
+
+  opts.on("-eVALUE", "--error VALUE", "Error filename") do |value|
+    options[:error] = value
+  end
+
   opts.on("-gVALUE", "--getenv VALUE", "Get environment") do |value|
     options[:getenv] = value
   end
@@ -69,6 +89,10 @@ EOS
     options[:universe] = value
   end
   
+  opts.on("-s", "--[no-]submit", "no-submit generates the submit file but does not call condor_submit") do |value|
+    options[:submit] = value
+  end
+
 end
 
 command_line = p.parse_command_line

data/lib/condor.rb

@@ -17,12 +17,34 @@
 # St, Fifth Floor, Boston, MA 02110-1301 USA
 
 require "erb"
+require "logger"
 require "tempfile"
 
 # Wrapper for the Condor distributed computing system.
 module Condor
+  VERSION = "1.1.0"
 
-  VERSION = "1.0.0"
+  # Create the logger and set its default log level to ERROR.  This function
+  # is called when the module is loaded.
+  def Condor.initialize_logger
+    logger = Logger.new(STDOUT)
+    logger.level = Logger::ERROR
+    logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+    logger
+  end
+
+  private_class_method :initialize_logger
+
+  # Logger used by all objects in this module.  This is initialized at module
+  # load time.  The default log level is ERROR.
+  LOGGER = initialize_logger
+
+  # Set the logging level.  For example:
+  #
+  #   > Condor.set_log_level(Logger::DEBUG)
+  def Condor.set_log_level(level)
+    Condor::LOGGER.level = level
+  end
 
   # The text of a file that can be sent to the condor_submit program.
   class SubmitFile < ERB
@@ -39,8 +61,8 @@ module Condor
       @executable = executable
       @argument_list = argument_list
       @log = File.join(Dir::tmpdir, "#{ENV['USER']}.condor.$(Cluster).$(Process)")
-      @output = current_dir_log_file("output")
-      @error = current_dir_log_file("error")
+      @output = options.fetch(:output, current_dir_log_file("output"))
+      @error = options.fetch(:error, current_dir_log_file("error"))
       # Create the header common to all the jobs.
       template = <<-EOTEXT
 Universe   = <%= @options[:universe] %>
@@ -81,13 +103,14 @@ Queue
   # and STDERR are routed to *.output and *.error files with the names of the
   # executable and the process ID in the name.  The Condor log file is written
   # to the system's temporary directory.
-  def Condor.submit(executable, arguments, options = {})
+  def Condor.submit(executable, command_line_arguments, options = {})
     if executable.nil? or executable.empty?
       raise "You must specify a command to run"
     end
-    # Get full path to the command.  BUGBUG This is UNIX specific.
+    # Condor needs the full path to the command.
+    # BUGBUG This is UNIX specific.
     executable = `which #{executable} 2> /dev/null`.strip
-    raise "Invalid executable #{executable}" if executable.empty? 
+    not executable.empty? or raise "#{executable} is not executable."
     # Create a unique submit file name of the form condor_submit.nnn.
     n = 0
     while n < 1000
@@ -97,12 +120,24 @@ Queue
       n += 1
     end
     raise "Cannot create unique submit file name" if n == 1000
+    # Optionally read arguments from a file.
+    arguments_list = if options.has_key?(:argfile)
+      open(options[:argfile]) do |file|
+        file.collect do |line|
+          line.strip!
+          next if line.empty?
+          command_line_arguments + line.split
+        end
+      end
+    else
+      [command_line_arguments]
+    end
     # Write Condor information to the submit file.
     File.open(submit_name, "w") do |file|
-      file << Condor::SubmitFile.new(executable, [arguments], options).to_s
+      file << Condor::SubmitFile.new(executable, arguments_list, options)
     end
-    # Submit the Condor job.
-    `condor_submit #{submit_name}`
+    # Optionally submit the Condor job.
+    `condor_submit #{submit_name}` if options[:submit]
   end
 
 end # Condor

data/test/test_condor.rb

@@ -30,6 +30,6 @@ require "condor"
 
 class CondorTestCase < Test::Unit::TestCase
   def test_submit_file
-    s = Condor::SubmitFile.new("ruby", "arg1 arg2")
+    s = Condor::SubmitFile.new("ruby", [["arg1", "arg2"]])
   end
 end # CondorTestCase

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: condor
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2009-01-16 00:00:00 -08:00
+  version: 1.1.0
+date: 2009-02-12 00:00:00 -08:00
 summary: Ruby wrapper for the Condor distributed computing system
 require_paths: 
 - lib