coderunner 0.13.32 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1be47bdc136d03d6d96fc4144a49e887fb259ea7
-  data.tar.gz: e2656cecd7e642e104d5f43e106619b35ea90d71
+  metadata.gz: eee1c0c5559da6b53befae6f8cc6324408bc731d
+  data.tar.gz: eb3da6aaf1ca4be11a21f0b3c50b44cb19aba695
 SHA512:
-  metadata.gz: 50a9728e726cfa5f58b11f688abdf6bfb4bbc62c6ad482ce8bd63169965349a1915235c2d050ba9757b4a923ca6c0ed5c39ccf391e90316145b7df0e978e8c04
-  data.tar.gz: 504b22920667f66766322e3a3cc8777ed91a28ac5ffca082e5c8d98ddbdb53eec0ee42eb7156749f7c0563be20bde87b628f3fbe8ac98d6277715e877e26d8d0
+  metadata.gz: c8648f2cfbcf554a1d6edb11ce403b57dc1fbd65f6445b09c132d04983a0316ef81c7e09e3e15a001dfe4e547350ad1bcc5b0e1ee3b3eeb1aa8e3bdcbccac6ec
+  data.tar.gz: 10723843e323fb8dbcc06f963a490ee1dab8e95a635a668a8b00b9a00b6827fb4e418f5ca1d8f9ee2659317441f9fb9a8cc14b75c1cd7e25e100eb5d5dbceb9c

data/VERSION

@@ -1 +1 @@
-0.13.32
+0.14.0

data/coderunner.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: coderunner 0.13.32 ruby lib
+# stub: coderunner 0.14.0 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.13.32"
+  s.version = "0.14.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Edmund Highcock"]
-  s.date = "2014-01-29"
+  s.date = "2014-02-04"
   s.description = "CodeRunner is a framework for the automated running and analysis of simulations. It automatically generates any necessary input files, organises the output data and analyses it. Because it is a modular system, it can easily be customised to work with any system and any simulation code. One of its greatest strengths is that it is independent of any one simulation code; thus it can easily plot and compare the data from different codes."
   s.email = "edmundhighcock@sourceforge.net"
   s.executables = ["coderunner"]

data/lib/coderunner.rb

@@ -143,7 +143,7 @@ class CodeRunner
 	["--run-graph", "-g", GetoptLong::REQUIRED_ARGUMENT, %[Specify a run_graphkit to plot. A run_graphkit is one that is plotted for an individual run. The run graphkits available depend on the code module. The syntax is graphkit shorthand:\n       -g '<graph_name>[ ; <graph_options> [ ; <conditions> [ ; <sort> ] ] ]'\n where conditions (i.e. filter) and sort will override the -f and -O flags respectively. The -g flag can be specified multiple times, which will plot multiple graphs on the same page.]],
 	["--graph", "-G", GetoptLong::REQUIRED_ARGUMENT, %[Specify a graphkit to plot. A graphkit combines data for every filtered run. The syntax is graphkit shorthand:\n        -G '<axis1>[ : <axis2> [ : <axis3 [ : <axis4> ] ] ] [ ; <graph_options> [ ; <conditions> [ ; <sort> ] ] ]'\n        where conditions (i.e. filter) and sort will override the -f and -O flags respectively. <axis1> etc are strings which can be evaluated by the runs. The -G flag can be specified multiple times, which will plot multiple graphs on the same page. For example\n                   -G 'width : 2*height ; {} ; depth == 2 ; width'\n          will plot twice the height against the width for every run where the depth is equal to 2, and will order the data points by width.]],
 	["--heuristic-analysis", "-H", GetoptLong::NO_ARGUMENT, %[Should be specified whenever CodeRunner is being used to analyse simulations which did not originally submit (and which will therefore not have the usual CodeRunner meta data stored with them).] ],
-	["--use-phantom", "-h", GetoptLong::OPTIONAL_ARGUMENT, %[Specify whether to use real or phantom runs]],
+	["--use-component", "-h", GetoptLong::OPTIONAL_ARGUMENT, %[Specify whether to use real or component runs]],
 	["--just", "-j",  GetoptLong::REQUIRED_ARGUMENT, %[Specify individual run ids. For example -j 45,63,128 is shorthand for -f 'id==45 or id==63 or id==128']],
 	["--job_chain", "-J",  GetoptLong::NO_ARGUMENT, %[Chain multiple simulations into one batch/submission job. Most useful for HPC systems.]],
 	["--skip-similar-jobs-off", "-k", GetoptLong::NO_ARGUMENT, %[Normally CodeRunner will not submit a run whose input parameters identical to a previous run (to avoid wasting computer time). Specifying the flag will override that behaviour and force submission of an identical run.]],
@@ -294,8 +294,8 @@ EOF
 			copts[:u]=true
 		when "--wall-mins"
 			copts[:W] = arg.to_i
-		when "--use-phantom"
-			copts[:h] = (arg and arg =~ /\S/) ? arg.to_sym : :phantom 
+		when "--use-component"
+			copts[:h] = (arg and arg =~ /\S/) ? arg.to_sym : :component 
 		when "--terminal-size"
 			array = eval arg
 			ENV['ROWS'], ENV['COLS'] = array[0].to_s, array[1].to_s 

data/lib/coderunner/class_methods.rb

@@ -481,7 +481,7 @@ EOF
 		runner.filtered_ids.each do |id|
 			run = runner.combined_run_list[id]
 			
-			if no_save or run.is_phantom
+			if no_save or run.is_component
 				if copts[:M]
 					fork{run.instance_eval(string)}
 				else

data/lib/coderunner/instance_methods.rb

@@ -69,7 +69,7 @@ class CodeRunner
 	
 	# A hash containing the defaults for most runner options. They are overridden by any options provided during initialisation. They are mostly set at the command line (in practice, the command line flags are read into the command options, which set these defaults in the function CodeRunner.process_command_options which calls CodeRunner.set_runner_defaults). However, if Code Runner is being scripted, these defaults must be set manually or else the options they specify must be provided when initialising a runner.
 	
-	DEFAULT_RUNNER_OPTIONS = ([:conditions, :sort, :debug, :script_folder, :recalc_all, :multiple_processes, :heuristic_analysis, :test_submission, :reprocess_all, :use_large_cache, :use_large_cache_but_recheck_incomplete, :use_phantom, :no_run, :server, :version, :parameters] + SUBMIT_OPTIONS + FOLDER_DEFAULTS).inject({}){|hash, option| hash[option] = nil; hash}
+	DEFAULT_RUNNER_OPTIONS = ([:conditions, :sort, :debug, :script_folder, :recalc_all, :multiple_processes, :heuristic_analysis, :test_submission, :reprocess_all, :use_large_cache, :use_large_cache_but_recheck_incomplete, :use_component, :no_run, :server, :version, :parameters] + SUBMIT_OPTIONS + FOLDER_DEFAULTS).inject({}){|hash, option| hash[option] = nil; hash}
 	
 	# Options that apply across the CodeRunner class 
 	
@@ -100,7 +100,7 @@ class CodeRunner
 # 		end
 # 	end
 
-	DEFAULT_RUNNER_OPTIONS[:use_phantom] = :real
+	DEFAULT_RUNNER_OPTIONS[:use_component] = :real
 	DEFAULT_RUNNER_OPTIONS[:script_folder] = SCRIPT_FOLDER  #File.dirname(File.expand_path(__FILE__)) 
 
 	# These are properties of the run class that must be defined. For more details see CodeRunner::Run.
@@ -153,7 +153,7 @@ class CodeRunner
 	
 	
 
-	attr_accessor :run_list, :phantom_run_list, :combined_run_list, :ids, :phantom_ids, :combined_ids, :current_status, :run_class, :requests, :current_request, :root_folder, :print_out_size, :cache, :modlet, :code, :executable, :defaults_file
+	attr_accessor :run_list, :component_run_list, :combined_run_list, :ids, :component_ids, :combined_ids, :current_status, :run_class, :requests, :current_request, :root_folder, :print_out_size, :cache, :modlet, :code, :executable, :defaults_file
 	attr_reader :max_id, :maxes, :cmaxes, :mins, :cmins, :start_id
 
 	# Instantiate a new runner. The root folder contains a set of simulations, each of which has a unique ID. There is a one-to-one correspondence between a runner and a root folder: no two runners should ever be given the same root folder in the same script (there are safeguards to prevent this causing much trouble, but it should still be avoided on philosophical grounds), and no runner should be given a folder which has more than one set of simulations within it (as these simulations will contain duplicate IDs).
@@ -190,8 +190,8 @@ class CodeRunner
 		@run_list = {}; @ids = []
 		set_max_id(0)
 
-		@phantom_run_list = {}; @phantom_ids = []
-		@phantom_id = -1
+		@component_run_list = {}; @component_ids = []
+		@component_id = -1
 
 		@combined_run_list = {}; @combined_ids = []
 	
@@ -615,9 +615,9 @@ EOF
 	#
 	# Then the runs will be sorted according to first height, then (descending) weight, then colour. What actually happens is that the variable <tt>@ids</tt> is sorted, rather than <tt>@run_list</tt>. For this to work, height, weight and colour must be either variables or results or instance methods of the run class.
 	#
-	# Type can be either '' or 'phantom', in which case the variable sorted will be either <tt>@ids</tt> or <tt>@phantom_ids</tt> respectively.
+	# Type can be either '' or 'component', in which case the variable sorted will be either <tt>@ids</tt> or <tt>@component_ids</tt> respectively.
 
-	def sort_runs(type = @use_phantom.to_s.sub(/real/, ''))
+	def sort_runs(type = @use_component.to_s.sub(/real/, ''))
 		logf(:sort_runs)
 		log(:type, type)
 		#ep 'sort', @sort
@@ -714,11 +714,11 @@ EOF
 	
 # 	def filtered_run_list
 # 		logf :filtered_run_list
-# 		unless @use_phantom == :phantom
+# 		unless @use_component == :component
 # 			return @run_list.find_all{|id, run| filter(run)}
 # 		else
-# 			log 'using phantom'
-# 			return @phantom_run_list.find_all{|id, run| filter(run)}
+# 			log 'using component'
+# 			return @component_run_list.find_all{|id, run| filter(run)}
 # 		end
 # 	end
 	
@@ -742,7 +742,7 @@ EOF
 		@run = run
 # 		to_instance_variables(directory)
 		return true unless conditions 
-#		p conditions, @run.id, @run.is_phantom
+#		p conditions, @run.id, @run.is_component
 		conditions = conditions.dup	
 		raise CRFatal.new("
 -----------------------------
@@ -817,8 +817,8 @@ Conditions contain a single = sign: #{conditions}
 
 		@run_list={}
 		@ids=[]
-		@phantom_run_list = {}
-		@phantom_ids = []
+		@component_run_list = {}
+		@component_ids = []
 		@run_store =[]
 # 		@multiple_processes_directories = []
 		set_max_id 0
@@ -877,9 +877,9 @@ Conditions contain a single = sign: #{conditions}
 # 							raise CRFatal.new("Directory #{run.directory} not found")
 # 						end
 # 					end
-# 					eputs @use_phantom
-					#run.generate_phantom_runs #if @use_phantom.to_s =~ /phantom/i
-					run.phantom_runs.each{|r| add_phantom_run(r)} if run.phantom_runs
+# 					eputs @use_component
+					#run.generate_component_runs #if @use_component.to_s =~ /component/i
+					run.component_runs.each{|r| add_component_run(r)} if run.component_runs
 				end
 				eputs if @write_status_dots
 				save_large_cache if fix_directories
@@ -899,8 +899,8 @@ Conditions contain a single = sign: #{conditions}
 		log("not using large cache")
 		@run_list={}
 		@ids=[]
-		@phantom_run_list = {}
-		@phantom_ids = []
+		@component_run_list = {}
+		@component_ids = []
 		@run_store =[]
 # 		@multiple_processes_directories = []
 		set_max_id 0
@@ -921,7 +921,7 @@ Conditions contain a single = sign: #{conditions}
 		@recalc_all = false
 # 		pp @run_list
 		save_large_cache
-		#@run_list.each{|id, run| run.generate_phantom_runs}
+		#@run_list.each{|id, run| run.generate_component_runs}
 		#trap(2, old_trap2)
 		#Process.kill(2, 0) if interrupted
 		return self
@@ -938,7 +938,7 @@ Conditions contain a single = sign: #{conditions}
 		instance_vars[:@run_list].values.each{|run| run.runner=nil}
 		#Kernel.puts server_dump(instance_vars)
 		instance_vars[:@cache]={}
-		instance_vars[:@phantom_run_list].values.each{|run| run.runner = nil}
+		instance_vars[:@component_run_list].values.each{|run| run.runner = nil}
 		#ep 'marsh2'
 		#eputs instance_vars.pretty_inspect
 		#instance_vars.each do |var, val|
@@ -958,9 +958,9 @@ Conditions contain a single = sign: #{conditions}
 # 		pp @run_list.values.map{|run| run.instance_variables.map{|var| [var, run.instance_variable_get(var).class]}}
 		
 		generate_combined_ids
-		@combined_run_list.each{|id, run| run.runner = nil; run.phantom_runs.each{|pr| pr.runner=nil} if run.phantom_runs}
+		@combined_run_list.each{|id, run| run.runner = nil; run.component_runs.each{|pr| pr.runner=nil} if run.component_runs}
 		File.open(@root_folder + "/.CODE_RUNNER_TEMP_RUN_LIST_CACHE", 'w'){|file| file.puts Marshal.dump @run_list}
-		@combined_run_list.each{|id, run| run.runner = self; run.phantom_runs.each{|pr| pr.runner=self} if run.phantom_runs}
+		@combined_run_list.each{|id, run| run.runner = self; run.component_runs.each{|pr| pr.runner=self} if run.component_runs}
 	end
 
 	# Self-explanatory! Call CodeRunner::Run#process_directory for every run whose status is not either :Complete or :Failed. (Note, for historical reasons traverse_directories is called rather than CodeRunner::Run#process_directory directly but the effect is nearly the same).
@@ -1029,7 +1029,7 @@ Conditions contain a single = sign: #{conditions}
 	def respond_to_requests
 		logf(:respond_to_requests)
 		logi(:@requests, @requests)
-		log('@phantom_run_list.class', @phantom_run_list.class)
+		log('@component_run_list.class', @component_run_list.class)
 		while @requests[0]
 			old_requests = @requests.uniq
 			@requests = []
@@ -1038,8 +1038,8 @@ Conditions contain a single = sign: #{conditions}
 				if request == :traverse_directories # a special case
 					@ids = []
 					@run_list = {}
-					@phantom_run_list = {}
-					@phantom_ids = []
+					@component_run_list = {}
+					@component_ids = []
 
 					Dir.chdir(@root_folder){traverse_directories}
 				else
@@ -1446,7 +1446,7 @@ EOF
 	def similar_runs(exclude_variables=[], run=@run) #all runs for which variables are the same as 'run', with the exception of exclude_variables
 		logf(:similar_runs)
 		raise CRFatal.new("generate_combined_ids must be called before this function is called") unless (@combined_run_list.size > 0 and @combined_ids.size > 0) or @ids.size ==0
-		command = (run.class.rcp.variables+run.class.rcp.run_info-exclude_variables  - [:output_file, :error_file, :runner, :phantom_runs]).inject("@combined_ids.find_all{|id| @combined_run_list[id].class == run.class}"){ |s,v|	
+		command = (run.class.rcp.variables+run.class.rcp.run_info-exclude_variables  - [:output_file, :error_file, :runner, :component_runs]).inject("@combined_ids.find_all{|id| @combined_run_list[id].class == run.class}"){ |s,v|	
 			s + %<.find_all{|id| @combined_run_list[id].#{v}.class == #{run.send(v).inspect}.class and @combined_run_list[id].#{v} == #{run.send(v).inspect}}>} #the second send call retrieves the type conversion
 
 #  		log command
@@ -1528,8 +1528,8 @@ EOF
 	def dup
 		logf(:dup)
 		new_one = self.class.new(@code, @root_folder, modlet: @modlet, version: @version)
-		new_one.ids = @ids.dup; new_one.phantom_ids = @phantom_ids.dup;
-		new_one.run_list = @run_list.dup; new_one.phantom_run_list = @phantom_run_list.dup
+		new_one.ids = @ids.dup; new_one.component_ids = @component_ids.dup;
+		new_one.run_list = @run_list.dup; new_one.component_run_list = @component_run_list.dup
 		new_one.run_class = @run_class
 		return new_one
 	end
@@ -1600,12 +1600,12 @@ EOF
 # 		@recalc_all = old_recalc
 # 	end
 
-	def add_phantom_run(run)
-		@phantom_run_list[@phantom_id] = run
-		@phantom_ids.push @phantom_id
+	def add_component_run(run)
+		@component_run_list[@component_id] = run
+		@component_ids.push @component_id
 		#run.real_id = run.id
-		run.id = @phantom_id
-		@phantom_id += -1
+		run.id = @component_id
+		@component_id += -1
 	end
 
 	def generate_combined_ids(kind= nil)
@@ -1613,28 +1613,28 @@ EOF
 # 		case purpose
 # 		when :print_out
 # 			@combined_ids = []
-# 			@combined_ids += @phantom_ids if @run_class.print_out_phantom_run_list
+# 			@combined_ids += @component_ids if @run_class.print_out_component_run_list
 # 			@combined_ids += @ids if @run_class.print_out_real_run_list
 # 		when :readout
 # 			@combined_ids = []
-# 			@combined_ids += @phantom_ids if @run_class.readout_phantom_run_list
+# 			@combined_ids += @component_ids if @run_class.readout_component_run_list
 # 			@combined_ids += @ids if @run_class.readout_real_run_list
 # 		when :submitting
 # 			@combined_ids = @ids
-		kind ||= @use_phantom
+		kind ||= @use_component
 		case kind
 		when :real
 			@combined_ids = @ids
-		when :phantom
-			@combined_ids = @phantom_ids
+		when :component
+			@combined_ids = @component_ids
 		when :both
-			@combined_ids = @ids + @phantom_ids
+			@combined_ids = @ids + @component_ids
 		else
-			raise CRFatal.new("Bad use phantom variable: #{kind.inspect}")
+			raise CRFatal.new("Bad use component variable: #{kind.inspect}")
 		end
-		log('@phantom_run_list.class', @phantom_run_list.class)
-		#puts 'crlist', @phantom_run_list.keys, @run_list.keys
-		@combined_run_list = @phantom_run_list + @run_list
+		log('@component_run_list.class', @component_run_list.class)
+		#puts 'crlist', @component_run_list.keys, @run_list.keys
+		@combined_run_list = @component_run_list + @run_list
 		log(:kind, kind)
 # 		log(:combined_ids, @combined_ids)
 		sort_runs(:combined)

data/lib/coderunner/remote_code_runner.rb

@@ -24,11 +24,11 @@ class RemoteCodeRunner < CodeRunner
 # 	end	
 # 	end
 		
-	attr_accessor :combined_ids, :phantom_ids, :ids, :combined_run_list, :phantom_run_list, :run_list, :remote_cache, :libraries
+	attr_accessor :combined_ids, :component_ids, :ids, :combined_run_list, :component_run_list, :run_list, :remote_cache, :libraries
 	
 # 	include Log
 # 	puts instance_methods; exit
-# 	SHOULD_NOT_BE_CALLED = :add_phantom
+# 	SHOULD_NOT_BE_CALLED = :add_component
 	class << self
 		aliold :new
 		def new(host, folder, copts = {})
@@ -158,7 +158,7 @@ cd #@folder
 export ROWS=#{Terminal.terminal_size[0]}
 export COLS=#{Terminal.terminal_size[1]} 
 source /etc/bashrc /etc/profile > /dev/null 2> /dev/null
-source ~/.bashrc ~/.bash_login ~/.bash_profile ~/.profile > /dev/null 2> /dev/null
+#{%w{ ~/.bashrc ~/.bash_login ~/.bash_profile ~/.profile}.map{|w| "source #{w} > /dev/null 2> /dev/null "}.join(" && ")}
 if [ "$CODE_RUNNER_COMMAND" ]
 	then
 		$CODE_RUNNER_COMMAND runner_eval #{string.inspect} -Z #{@copts.inspect.inspect}	
@@ -224,12 +224,6 @@ EOF
 			eputs data[0..100] if err.class == TypeError
 			raise err unless err.message =~ /undefined class/
 			self.class.repair_marshal_run_class_not_found_error(err)
-			#NB this means that all code_names have to contain only lowercase letters:
-# 			code, modlet = err.message.scan(/CodeRunner\:\:([A-Z][a-z0-9]+)([A-Z][\w]+)?Run/)[0]
-# 			ep code, modlet
-# 			modlet.gsub!(/\B([A-Z])/, '_\1') if modlet 
-# 			modlet = modlet.downcase if modlet
-# 			@run_class = CodeRunner.setup_run_class(code.downcase, modlet: modlet)
 			retry
 		end
 
@@ -241,43 +235,23 @@ EOF
 
 	end
 	def update
-# 		ep '@server1', @server
-
 		instance_vars = retrieve_method(:marshalled_variables) #.sub(/\A\s*/, '')
-		#begin
-			#instance_vars = Marshal.load(data)
-		#rescue TypeError, ArgumentError => err
-			#eputs err
-			#eputs data [0..100] if err.class == TypeError
-			#raise err unless err.message =~ /undefined class/
-			#self.class.repair_marshal_run_class_not_found_error(err)
-			##NB this means that all code_names have to contain only lowercase letters:
-## 			code, modlet = err.message.scan(/CodeRunner\:\:([A-Z][a-z0-9]+)([A-Z][\w]+)?Run/)[0]
-## 			ep code, modlet
-## 			modlet.gsub!(/\B([A-Z])/, '_\1') if modlet 
-## 			modlet = modlet.downcase if modlet
-## 			@run_class = CodeRunner.setup_run_class(code.downcase, modlet: modlet)
-			#retry
-		#end
-# 		ep @run_class.executable
 		instance_vars[:@run_list].values.each{|run| run.runner=self}
-# 		class_vars.each do |var, val|
-# # 		  		        raise 'found it ' + var.to_s if val.class == CodeRunner
-# 			next if [:@@global_binding, :@@server, :SCRIPT_FOLDER, :@@sys].include? var
-# 			self.class.class_variable_set(var, val)
-# 		end
 		instance_vars.each do |var, val|
-# 		        puts val.class
-# 		        raise 'found it ' + var.to_s if val.class == CodeRunner
-			next if [:@server, :@sys].include? var
-			instance_variable_set(var, val)
+			case var
+			when :@server, :@sys
+				next
+			when	:@use_phantom
+			  # For backwards compatbility with versions < 0.14
+				instance_variable_set(:@use_component, val)
+			when :@phantom_run_list
+			  # For backwards compatbility with versions < 0.14
+				instance_variable_set(:@component_run_list, val)
+			else
+				instance_variable_set(var, val)
+			end
 		end
-# 		@run_class.executable = instance_vars[:@executable]
-
-		# 		ep @run_class.executable
-# 		ep '@sort', @sort
 		sort_runs
-# 		ep '@server', @server
 		return self
 	end
 end

data/lib/coderunner/run.rb

@@ -26,11 +26,11 @@ class Run
 # 
 # @@readout_real_run_list = true
 # @@print_out_real_run_list = true
-# @@readout_phantom_run_list = false
-# @@print_out_phantom_run_list = false
+# @@readout_component_run_list = false
+# @@print_out_component_run_list = false
 
 
-# class_accessor :readout_real_run_list, :print_out_real_run_list, :readout_phantom_run_list, :print_out_phantom_run_list, 
+# class_accessor :readout_real_run_list, :print_out_real_run_list, :readout_component_run_list, :print_out_component_run_list, 
 
 class_accessor :current_status, :runner
 
@@ -293,7 +293,7 @@ def process_directory
 	raise CRFatal.new("status must be one of #{PERMITTED_STATI.inspect}") unless PERMITTED_STATI.include? @status
 	@max = {}
 	write_results
-	generate_phantom_runs
+	generate_component_runs
 	save
 	return self
 end
@@ -337,7 +337,7 @@ def results_file
 # ID:		#{@id}
 
 # Results:
-#{(rcp.results+rcp.run_info - [:phantom_runs]).inject({}){|hash, (var,type_co)| hash[var] = send(var); hash}.pretty_inspect}
+#{(rcp.results+rcp.run_info - [:component_runs]).inject({}){|hash, (var,type_co)| hash[var] = send(var); hash}.pretty_inspect}
 
 # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 EOF
@@ -360,16 +360,18 @@ end
 # Cache the run object in the file <tt>.code_runner_run_data</tt>
 
 def save
+	
 	logf(:save)
 	raise CRFatal.new("Something has gone horribly wrong: runner.class is #{@runner.class} instead of CodeRunner") unless @runner.class.to_s == "CodeRunner"
 	runner, @runner = @runner, nil
 	@system_triers, old_triers = nil, @system_triers
-	@phantom_runs.each{|run| run.runner = nil} if @phantom_runs
-	#@phantom_runs.each{|run| run.runner = nil} if @phantom_runs
+	@component_runs.each{|run| run.runner = nil} if @component_runs
+	#@component_runs.each{|run| run.runner = nil} if @component_runs
 # 	logi(self)
+	#pp self
 	Dir.chdir(@directory){File.open(".code_runner_run_data", 'w'){|file| file.puts Marshal.dump(self)}}
 	@runner = runner
-	@phantom_runs.each{|run| run.runner = runner} if @phantom_runs
+	@component_runs.each{|run| run.runner = runner} if @component_runs
 	@system_triers = old_triers 
 end
 
@@ -398,8 +400,10 @@ def self.load(dir, runner)
 	run.runner = runner
 	raise CRFatal.new("Something has gone horribly wrong: runner.class is #{run.runner.class} instead of CodeRunner") unless run.runner.class.to_s == "CodeRunner"
 	run.directory = dir
-	run.phantom_runs.each{|r| runner.add_phantom_run(r)} if run.phantom_runs
-	#@phantom_runs = []
+	# For backwards compatibility with versions < 0.14
+	run.instance_variable_set(:@component_run_list, run.instance_variable_get(:@phantom_run_list)) if run.instance_variable_get(:@phantom_run_list) 
+	run.component_runs.each{|r| runner.add_component_run(r)} if run.component_runs
+	#@component_runs = []
 	return run
 end
 
@@ -689,7 +693,7 @@ def info_file
 # #{@job_no ? "Job_No:		#{@job_no}" : ""}
 
 # Parameters:
-#{(rcp.variables + rcp.run_info + [:version, :code, :modlet, :sys] - [:phantom_runs]).inject({}){|hash, var| hash[var] = send(var) unless (!send(var) and send(var) ==  nil); hash}.pretty_inspect}
+#{(rcp.variables + rcp.run_info + [:version, :code, :modlet, :sys] - [:component_runs]).inject({}){|hash, var| hash[var] = send(var) unless (!send(var) and send(var) ==  nil); hash}.pretty_inspect}
 
 
 # Actual Command:
@@ -804,7 +808,7 @@ to your code module.
 
 		@run_info = rcp.run_info || [] # Run info can optionally be defined in the code module.
 # 		ep @run_info
-		@run_info = rcp.run_info + ([:preamble, :job_no, :running, :id, :status, :sys, :is_phantom, :naming_pars, :run_name, :resubmit_id, :real_id, :phantom_runs, :parameter_hash, :output_file, :error_file] + SUBMIT_OPTIONS) #.each{|v| RUN_INFO.push v} unless RUN_INFO.include? :job_no
+		@run_info = rcp.run_info + ([:preamble, :job_no, :running, :id, :status, :sys, :is_component, :naming_pars, :run_name, :resubmit_id, :real_id, :component_runs, :parameter_hash, :output_file, :error_file] + SUBMIT_OPTIONS) #.each{|v| RUN_INFO.push v} unless RUN_INFO.include? :job_no
 		@all = (rcp.variables + rcp.results + rcp.run_info) #.each{|v| ALL.push v}
 # 		ep "GOT HERE"
 		(@all + [:directory, :run_name, :modlet, :relative_directory]).each{|var| send(:attr_accessor, var)}
@@ -841,13 +845,13 @@ def dup
 	return self.class.new(@runner).learn_from(self)
 end
 
-def create_phantom
-	@phantom_runs ||= []
+def create_component
+	@component_runs ||= []
 	new_run = dup
-	new_run.is_phantom = true
+	new_run.is_component = true
 	new_run.real_id = @id
-	@runner.add_phantom_run(new_run)
-	@phantom_runs.push new_run
+	@runner.add_component_run(new_run)
+	@component_runs.push new_run
 	new_run
 end
 
@@ -890,7 +894,7 @@ def recheck
 	end
 end
 
-def generate_phantom_runs
+def generate_component_runs
 end
 	
 def generate_combined_ids(type)

data/test/test_coderunner.rb

@@ -1,6 +1,7 @@
 
 require 'helper'
 require 'rbconfig'
+CodeRunner::RemoteCodeRunner::DISPLAY_REMOTE_INVOCATION = true
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.13.32
+  version: 0.14.0
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit