scriptcrmod 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/scriptcrmod.rb

@@ -10,7 +10,13 @@ class CodeRunner
 	# here is how to use it from the command line
 	# to submit a ruby script:
 	# 	coderunner sub -W 60 -n 1x32 -C script -X '/usr/bin/env ruby' \
-	# 		-p '{file_name: "my_script.rb", arguments: "my command line args"}'
+	# 		-p '{file_name: "my_script.rb", arguments: "my command line args", \
+	# 			replace_tokens: {"TOKEN" => "replace"}'
+	#
+	# The parameter replace_tokens takes a hash of {string => string}
+	# which will be used to modify the text in the script via
+	# 	text.gsub!(Regexp.new(Regexp.escape("TOKEN")), replace)
+	# Symbols may be used instead of strings
 	
 	class Script < Run
 
@@ -21,7 +27,9 @@ class CodeRunner
 		
 # @code = 'cubecalc'
 
-@variables = [:file_name, :arguments]
+@code_module_folder = File.expand_path(File.dirname(__FILE__))
+
+@variables = [:file_name, :arguments, :preamble, :replace_tokens]
 
 @naming_pars = []
 
@@ -29,7 +37,7 @@ class CodeRunner
 
 # e.g. number of iterations
 
-@run_info = []
+@run_info = [ :percent_complete]
 
 # @@executable_name = 'cubecalc'
 
@@ -45,27 +53,50 @@ class CodeRunner
 
 def process_directory_code_specific
 	if @running
-		@status = :Incomplete
+		@status ||= :Incomplete
 	else
 		@status = :Complete
 	end
+	eval(File.read('script_outputs.rb')) if FileTest.exist? 'script_outputs.rb'
 end
 
 def print_out_line
-		return sprintf("%d:%d %30s %10s", @id, @job_no, @run_name, @status)
+		line =  sprintf("%d:%d %30s %10s %s", @id, @job_no, @run_name, @status, @nprocs.to_s) 
+		line += sprintf(" %3.1f\%", @percent_complete) if @percent_complete
+		line += " -- #@comment" if @comment
+		return line
 end
 
 def parameter_string
-	return sprintf("%s %s", @file_name, @arguments)
+	return sprintf("%s %s", @file_name.to_s, @arguments.to_s)
 end
 
 def generate_input_file
-	FileUtils.cp(@file_name, @directory + File.basename(@directory))
+
+	if @file_name
+		ep ['Copying:', rcp.runner.root_folder + '/' + @file_name, @directory + '/' + File.basename(@file_name)]
+		#FileUtils.cp(rcp.runner.root_folder + '/' + @file_name, @directory + '/' + File.basename(@file_name))
+		text = File.read(rcp.runner.root_folder + '/' + @file_name)
+		if @replace_tokens
+			@replace_tokens.each do |token, replace_str|
+				text.gsub!(Regexp.new(Regexp.escape(token)), replace_str.to_s)
+			end
+		end
+		File.open(@directory + '/' + File.basename(@file_name), 'w'){|file| file.puts text}
+	else
+		eputs 'Running without a script file...'
+	end
 end
 # @run_class.variables.keys[0]
 def parameter_transition(run)
 end
 
+# Override whatever is in the system module
+def run_command
+	eputs "Warning: preamble does not end in a new line" unless !preamble or preamble =~ /\n\s*\Z/
+	"#{preamble} #{executable_location}/#{executable_name} #{parameter_string}"
+end
+
 #def executable_location
 	
 #end
@@ -76,6 +107,7 @@ end
 
 def graphkit(name, options)
 	case name
+	when 'empty'
 	else
 		raise 'Unknown graph'
 	end

data/scriptcrmod.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "scriptcrmod"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2012-12-29"
+  s.date = "2012-12-30"
   s.description = "A module for CodeRunner to allow arbitrary scripts to be run. Installed automatically with the coderunner gem."
   s.email = "github@edmundhighcock.com"
   s.extra_rdoc_files = [
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/edmundhighcock/scriptcrmod"
   s.licenses = ["GPLv3"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "A module for CodeRunner to allow arbitrary scripts to be run."
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scriptcrmod
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3677990674877173425
+      hash: 3601816563671045039
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A module for CodeRunner to allow arbitrary scripts to be run.