coderunner 0.12.16 → 0.12.17

data/VERSION

@@ -1 +1 @@
-0.12.16
+0.12.17

data/coderunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.12.16"
+  s.version = "0.12.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2013-07-30"
+  s.date = "2013-07-31"
   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/class_methods.rb

@@ -42,16 +42,22 @@ class CodeRunner
 		process_command_options(copts)
 		puts "\nAvailable defaults files for #{copts[:C]}:"
 		entries = []
-		begin
-			entries += Dir.entries(SCRIPT_FOLDER + "/code_modules/#{copts[:C]}/my_defaults_files")
-		rescue
-		end
-		begin
-			entries += Dir.entries(SCRIPT_FOLDER + "/code_modules/#{copts[:C]}/defaults_files")
-		rescue
-		end
+		#begin
+			##entries += Dir.entries(SCRIPT_FOLDER + "/code_modules/#{copts[:C]}/my_defaults_files")
+			#entries += 
+		#rescue
+		#end
+		#begin
+		#run_class = setup_run_class(copts[:C], modlet: copts[:m])
+		rc = run_class(copts)
+		entries = [rc.rcp.user_defaults_location, rc.rcp.code_module_folder	+ "/defaults_files"].map{|folder|  Dir.entries(folder).grep(/_defaults\.rb$/) rescue []}.sum
+			#entries += Dir.entries(SCRIPT_FOLDER + "/code_modules/#{copts[:C]}/defaults_files")
+			#entries += Dir.entries(SCRIPT_FOLDER + "/code_modules/#{copts[:C]}/defaults_files")
+		#rescue
+		#end
 		entries.each do |defaults_file|
-			puts "\t" + File.basename(defaults_file, '.rb').sub(/_defaults/, '') unless ['.', '..', '.svn', '.directory'].include? defaults_file
+			#puts "\t" + File.basename(defaults_file, '.rb').sub(/_defaults/, '') unless ['.', '..', '.svn', '.directory'].include? defaults_file
+			puts "\t" + File.basename(defaults_file, '.rb').sub(/_defaults/, '')
 		end
 	end
 	
@@ -438,7 +444,7 @@ EOF
 		runner.run_list[copts[:R]].recheck
 		runner.respond_to_requests
 	end
-	def self.code_command(string, copts = {})
+	def self.run_class(copts={})
 		process_command_options(copts)
 		copts[:no_update] = true
 		unless copts[:C]
@@ -452,8 +458,10 @@ EOF
 		end
 		#ep ['code', 'modlet is', copts[:C], copts[:m]]
 		            
-		run_class = setup_run_class(copts[:C], modlet: copts[:m])
-		run_class.class_eval(string)
+		return setup_run_class(copts[:C], modlet: copts[:m])
+	end
+	def self.code_command(string, copts = {})
+		run_class(copts).class_eval(string)
 		                            
 # 		 runner = fetch_runner(copts)
 # 		 runner.run_class.class_eval(string)
@@ -772,6 +780,7 @@ EOF
 
 
    def self.runner
+		@runners ||={}
 		@runners.values[0]
 	end
 

data/test/test_coderunner.rb

@@ -15,6 +15,7 @@ unless $cpp_command = ENV['CPP']
 end
 
 $ruby_command = "#{RbConfig::CONFIG['bindir']}/#{RbConfig::CONFIG['ruby_install_name']}"
+$coderunner_command = "#{$ruby_command}  -I lib/ lib/coderunner.rb"
 
 #Dir.chdir('test') do 
 	#raise "Couldn't build test program using #{string}" unless system string
@@ -131,6 +132,18 @@ class TestCodeRunner < Test::Unit::TestCase
 		wdvh.close
 		puts 'testing remote coderunner complete'
 	end
+
+	def test_available_defauls
+		pipe = IO.popen("#$coderunner_command avd -Y test/results -C cubecalc -m empty")
+		str = ""
+	 	while line = pipe.gets
+			str += line
+		end	
+		assert_match(/sleep/, str)
+		assert_match(/cubecalc/, str)
+		assert_match(/Available/, str)
+		#STDIN.gets
+	end
 	
 	def test_run_eval_saving
 		puts "\nTesting run command saving"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.12.16
+  version: 0.12.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit