coderunner 0.12.10 → 0.12.11

data/VERSION

@@ -1 +1 @@
-0.12.10
+0.12.11

data/coderunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.12.10"
+  s.version = "0.12.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2013-06-26"
+  s.date = "2013-06-27"
   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/instance_methods.rb

@@ -382,10 +382,11 @@ class CodeRunner
 
 # 		p run_class_name
 
+		return recursive_const_get(run_class_name) if SETUP_RUN_CLASSES.include?(run_class_name) #constants.include? (run_class_name).to_sym unless options[:force] #and const_get(run_class_name).rcp.code?
+		#return const_get(run_class_name) if constants.include? (run_class_name).to_sym unless options[:force] #and const_get(run_class_name).rcp.code?
+		SETUP_RUN_CLASSES.push run_class_name #.downcase
 		FileUtils.makedirs(ENV['HOME'] + "/.coderunner/#{code}crmod/")
 		FileUtils.makedirs(ENV['HOME'] + "/.coderunner/#{code}crmod/defaults_files")
-		return const_get(run_class_name) if constants.include? (run_class_name).to_sym unless options[:force]
-		SETUP_RUN_CLASSES.push run_class_name.downcase
 
 		#Create the run_class, a special dynamically created class which knows how to process runs of the given code on the current system.
 		#run.rb contains the basic methods of the class
@@ -409,6 +410,7 @@ class CodeRunner
 # 		ep get_run_class_name(code, nil)
 		run_class = const_get(get_run_class_name(code, nil))
 		run_class.instance_variable_set(:@code, code)
+		run_class.instance_variable_set(:@sys, SYS)
 
 		raise "#{run_class} must inherit from CodeRunner::Run: its ancestors are: #{run_class.ancestors}" unless run_class.ancestors.include? Run
 		

data/lib/coderunner/run.rb

@@ -105,18 +105,24 @@ end
 			@my_class = the_class
 		end
 		def method_missing(method, value=nil)
+			#eputs 'STARTING'
 			if method.to_s =~ /=$/
 				raise 'rcps should not be set outside class methods'
 				@my_class.instance_variable_set("@"+method.to_s.sub(/=/, ''), value)
 			else
 				the_class = @my_class
 				loop do 
-# 					p the_class, method
+ 					#p the_class, method
 # 					p the_class.instance_variables
 # 					p the_class.instance_variables.map{|v| the_class.instance_variable_get(v)}
-					return the_class.instance_variable_get("@"+method.to_s) if the_class.instance_variables.include?(("@"+method.to_s).to_sym)
-					the_class = the_class.superclass
-					return nil unless the_class
+					if method.to_s =~ /\?$/
+						return false unless the_class
+						return true if the_class.instance_variables.include?(("@"+method.to_s.sub(/\?$/,'')).to_sym)
+					else
+						raise NoMethodError.new("Run class property #{method} not found.") unless the_class
+						return the_class.instance_variable_get("@"+method.to_s) if the_class.instance_variables.include?(("@"+method.to_s).to_sym)
+					end
+						the_class = the_class.superclass
 				end
 					
 			end
@@ -645,7 +651,7 @@ def prepare_submission(options={})
 		generate_input_file
 		
 		File.open(".code_runner_version.txt", 'w'){|file| file.puts CODE_RUNNER_VERSION}
-		File.open("code_runner_modlet.rb", 'w'){|file| file.puts rcp.modlet_source} if rcp.modlet_required
+		#File.open("code_runner_modlet.rb", 'w'){|file| file.puts rcp.modlet_source} if rcp.modlet_required
 	end
 	@dir_name = nil
 
@@ -768,7 +774,7 @@ def self.check_and_update
 			raise CRFatal.new("#{v} not defined correctly: class is #{rcp[v].class} instead of one of #{class_list.to_s}") unless class_list.include? rcp[v].class
 		end
 		
-		@readout_list = (rcp.variables+rcp.results) unless rcp.readout_list
+		@readout_list = (rcp.variables+rcp.results) unless rcp.readout_list?
 
 		raise "
 
@@ -802,7 +808,9 @@ to your code module.
 		@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)}
-    @user_defaults_location = ENV['HOME'] + "/.coderunner/#{@code}crmod/defaults_files"
+		eputs "Checking and updating"
+    @user_defaults_location = ENV['HOME'] + "/.coderunner/#{rcp.code}crmod/defaults_files"
+		eputs ' user_defaults_location', rcp.user_defaults_location
 		define_method(:output_file) do 
 			return @output_file if @output_file
 			@output_file = super()

data/lib/cubecalccrmod/cubecalc.rb

@@ -25,6 +25,8 @@ class CodeRunner
 
 @uses_mpi = false
 
+#@readout_list = @variables + @results
+
 @code_module_folder = folder = File.dirname(File.expand_path(__FILE__)) # i.e. the directory this file is in
 
 def process_directory_code_specific

data/test/helper.rb

@@ -13,6 +13,9 @@ require 'shoulda'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'coderunner'
+require 'cubecalccrmod'
+require 'cubecalccrmod/sleep'
+
 
 class Test::Unit::TestCase
 end

data/test/test_coderunner.rb

@@ -25,6 +25,12 @@ class TestSubmission  < Test::Unit::TestCase
 		string = $cpp_command + ' ../cubecalc.cc -o cubecalc'
 		FileUtils.makedirs('test/submission_results')
 		Dir.chdir('test/submission_results'){assert_system string}
+		CodeRunner.setup_run_class('cubecalc', modlet: 'sleep')
+	end
+	def test_setup_run_class
+		assert(CodeRunner::Cubecalc::Sleep.ancestors.include?(CodeRunner::SYSTEM_MODULE), "CodeRunner::Cubecalc.ancestors.include? CodeRunner::SYS, ancestors: #{CodeRunner::Cubecalc.ancestors}")
+		assert(CodeRunner::Cubecalc::Sleep.rcp.user_defaults_location?, "CodeRunner::Cubecalc::Sleep.rcp.user_defaults_location? #{CodeRunner::Cubecalc::Sleep.rcp.user_defaults_location?}")
+		assert_equal(ENV['HOME'] + '/.coderunner/cubecalccrmod/defaults_files', CodeRunner::Cubecalc::Sleep.rcp.user_defaults_location)
 	end
 	def test_submission
 		CodeRunner.submit(Y: 'test/submission_results', C: 'cubecalc', m: 'empty', X: Dir.pwd + '/test/submission_results/cubecalc')
@@ -235,6 +241,7 @@ class TestCodeRunner < Test::Unit::TestCase
 	end
 	
 	def test_graphkit_multiplot
+		unless ENV['SHORT_TEST']
 		Dir.chdir('test/results') do
 		
 		######################
@@ -310,6 +317,7 @@ EOF
 
 		end # Dir.chdir 
 
+		end # unless
 		
 		
 	end # def 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.12.10
+  version: 0.12.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit