class_methods.rb in coderunner-0.14.8

- old
+ new

@@ -82,11 +82,11 @@
 		runner = fetch_runner(copts)
 		runner.destroy
 	end
 	def self.differences_between(copts = {})
 		runner = fetch_runner(copts)
-		runs = runner.filtered_ids.map{|id| runner.run_list[id]}
+		runs = runner.filtered_ids.map{|id| runner.combined_run_list[id]}
 		rcp_fetcher = (runs[0] || runner.run_class).rcp
 		vars = rcp_fetcher.variables.dup + rcp_fetcher.run_info.dup
 		vars.delete_if{|var| runs.map{|r| r.send(var)}.uniq.size == 1}
 		vars.delete :id
 		vars.delete :run_name
@@ -703,10 +703,16 @@
 # 		if copts[:p] and copts[:p].class == String # should be a hash or an inspected hash
 # 			copts[:p] = eval(copts[:p])
 # 		end
 		copts[:p] = [copts[:p]].compact unless copts[:p].class == Array
 		#for i in 0...copts[:p].size
+		case copts[:h]
+		when :c
+			copts[:h] = :component
+		when :r
+			copts[:h] = :real
+		end
 
 		copts[:Y] ||= DEFAULT_COMMAND_OPTIONS[:Y] if DEFAULT_COMMAND_OPTIONS[:Y]
 		if copts[:Y] and copts[:Y] =~ /:/ 
 			set_class_defaults(copts)
 			copts[:running_remotely] = true
@@ -720,10 +726,11 @@
 # 		ep Log.log_file
 		#copts[:code_copts].each{|k,v| CODE_OPTIONS[k] = v} if copts[:code_copts]
 		copts.keys.map{|k| k.to_s}.grep(/_options$/).map{|k| k.to_sym}.each do |k|
 	 		CODE_OPTIONS[k.to_s.sub('_options','').to_sym] = copts[k]
 		end	
+
 			
 	end
 
 	CODE_OPTIONS={}
 	
@@ -738,10 +745,10 @@
 				fetch_runner(new_copts)
 			end
 			return Merged.new(*runners)
 		end
 		process_command_options(copts)
-# 		ep copts
+ 		ep copts
 		@runners ||= {}
 		runner = nil
 		if copts[:Y] and copts[:Y] =~ /:/ 
 			copts_r = copts.dup
 			host, folder = copts[:Y].split(':')