coderunner 0.14.14 → 0.14.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aad2a214f4a9410e35e16648bfe8f9f44c743c7
-  data.tar.gz: 59630056068136b87edfa72a0baaf89a441c2aca
+  metadata.gz: 79dd936b90d793d72c0b3852c6589ce580f0fd62
+  data.tar.gz: 73e3671177c9bc6c8ee8f80d82d59b2d2caae776
 SHA512:
-  metadata.gz: b4987e5668ca76a543dff9d0a2998d0f9ea6ab38c7bb270dea722d72f6878059539766bb086f6709818af25adead62bd18e5791234acc70441025648e12c837c
-  data.tar.gz: a1b0de2b05ce52b364fdf5c0e153b5935ea5a395a5edad5379753c609dd0c0638f0e09bb9db3602f4ae1bf4a961b0a7afeb9b4b0463fcb605d4d3518aa95eaa1
+  metadata.gz: a4977e1dd0355b34f24ba289f791e5696407912fff638a207598b15a6a10066cfa99e8b7c263ad857bd7cb361001f3c21240b73261a5e5c1739bbc341fedaacb
+  data.tar.gz: ae64511fc428a7eac52406a0abbb0acb64db01157f7a9fccba36051aac947dd7418343dadc6c4120c7f9141b7f26fd6001e1ffec0330645f33a60ab71fb67225

data/VERSION

@@ -1 +1 @@
-0.14.14
+0.14.15

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.14.14 ruby lib
+# stub: coderunner 0.14.15 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.14.14"
+  s.version = "0.14.15"
 
   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-04-01"
+  s.date = "2014-04-10"
   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

@@ -369,6 +369,7 @@ EOF
 	end
 	
 	def self.run_script
+		set_default_command_options_from_command_line
 		if DEFAULT_COMMAND_OPTIONS[:Z]
 			DEFAULT_COMMAND_OPTIONS.absorb(eval(DEFAULT_COMMAND_OPTIONS[:Z])) 
 			puts "Begin Output"
@@ -389,7 +390,7 @@ $stderr.puts unless $has_put_startup_message_for_code_runner
 $has_put_startup_message_for_code_runner = true
 
 
-CodeRunner.set_default_command_options_from_command_line
+#CodeRunner.set_default_command_options_from_command_line
 
 do_profile = (ENV['CODE_RUNNER_PROFILE'] and ENV['CODE_RUNNER_PROFILE'].size > 0) ?  ENV['CODE_RUNNER_PROFILE'] : false
 

data/lib/coderunner/class_methods.rb

@@ -564,10 +564,11 @@ EOF
 			runs = runner.filtered_ids.map do |id|
 				eputs id
 				run = runner.run_list[id].dup
+
+			  run.resubmit_id = run.id
 				if copts[:smart_resubmit_name]
 					eputs "Smart name"
 					run.set(:naming_pars,  [:resubmit_id])
-					run.resubmit_id = run.id
 				end
 				run.update_submission_parameters(copts[:p][0], false)
 				run.run_name = nil unless copts[:rerun]
@@ -712,6 +713,8 @@ EOF
 			copts[:h] = :component
 		when :r
 			copts[:h] = :real
+		else
+			copts[:h] = :real
 		end
 
 		copts[:Y] ||= DEFAULT_COMMAND_OPTIONS[:Y] if DEFAULT_COMMAND_OPTIONS[:Y]

data/lib/coderunner/run.rb

@@ -524,6 +524,7 @@ EOF
 		evaluate_defaults_file(defaults_file_name)
 	end
 	return unless parameters
+	@parameter_hash_string = parameters
 	raise "parameters: #{parameters.inspect} must be a string which evaluates to a hash" unless parameters.class == String and parameters = eval(parameters) and parameters.class == Hash # parameters.class == String and parameters =~ /\S/
 	@parameter_hash = parameters 
 	parameters.each do |var, value|
@@ -823,7 +824,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_component, :naming_pars, :run_name, :resubmit_id, :real_id, :component_runs, :parameter_hash, :output_file, :error_file, :extra_files] + 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, :parameter_hash_string, :output_file, :error_file, :extra_files] + 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)}

metadata

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