coderunner 0.14.11 → 0.14.12

data/VERSION

@@ -1 +1 @@
-0.14.11
+0.14.12

data/coderunner.gemspec

@@ -2,17 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: coderunner 0.14.11 ruby lib
-# stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.14.11"
+  s.version = "0.14.12"
 
   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-02-25"
+  s.date = "2014-03-11"
   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"]
@@ -92,13 +89,14 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://coderunner.sourceforge.net"
   s.licenses = ["GPLv3"]
+  s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
   s.rubyforge_project = "coderunner"
-  s.rubygems_version = "2.2.1"
+  s.rubygems_version = "1.8.11"
   s.summary = "A framework for the automated running and analysis of simulations."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 4
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<graphkit>, [">= 0.2.0"])

data/lib/coderunner/run.rb

@@ -529,7 +529,7 @@ EOF
 	parameters.each do |var, value|
 		raise CRFatal.new('Cannot specify id as a parameter') if var.to_sym == :id
 		set(var, value) unless value == :default
-		next if [:comment].include? var
+		next if [:comment, :extra_files].include? var
 		@naming_pars.push var
 	end
 	@naming_pars.uniq!
@@ -654,6 +654,7 @@ def prepare_submission(options={})
 	FileUtils.makedirs(@dir_name)
 	Dir.chdir(@dir_name) do 
 		generate_input_file
+    copy_extra_files
 		
 		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
@@ -662,6 +663,16 @@ def prepare_submission(options={})
 
 end
 
+#This function copies any files which are required at run time into the run folder.
+#It takes the form of an input parameter 'extra_files' which takes in an array
+#of file locations and copies them when the run folder is set up. It is called in prepare_submission. 
+def copy_extra_files
+  if @extra_files.kind_of?Array
+    @extra_files.each{|file| 
+    FileUtils.cp(file, File.basename(file))}
+  end
+end
+
 def generate_run_name
 		@run_name = %[v#@version] + @naming_pars.inject("") do |str, par|
 			str+="_#{par}_#{send(par).to_s[0...8]}"
@@ -809,7 +820,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] + 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, :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)}

data/test/test_coderunner.rb

@@ -37,10 +37,11 @@ class TestSubmission  < Test::Unit::TestCase
 		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')
+		CodeRunner.submit(Y: 'test/submission_results', C: 'cubecalc', m: 'empty', X: Dir.pwd + '/test/submission_results/cubecalc', p: %|{extra_files: ["#{Dir.pwd}/test/test_coderunner.rb"]}|)
 		CodeRunner.status(Y: 'test/submission_results')
 		assert(FileTest.exist?('test/submission_results/v'))
 		assert(FileTest.exist?('test/submission_results/v/id_1'))
+		assert(FileTest.exist?('test/submission_results/v/id_1/test_coderunner.rb'))
 		assert(FileTest.exist?('test/submission_results/cubecalc_defaults.rb'))
 	end
 	def test_status_loop

metadata

@@ -1,155 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.14.11
+  version: 0.14.12
+  prerelease: 
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &20607580 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+  version_requirements: *20607580
 - !ruby/object:Gem::Dependency
   name: parallelpipes
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &20606420 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+  version_requirements: *20606420
 - !ruby/object:Gem::Dependency
   name: rubyhacks
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &20604480 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.4
+  version_requirements: *20604480
 - !ruby/object:Gem::Dependency
   name: rb-gsl
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &20617520 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.12.0
+  version_requirements: *20617520
 - !ruby/object:Gem::Dependency
   name: gsl_extras
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &20614200 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
+  version_requirements: *20614200
 - !ruby/object:Gem::Dependency
   name: hostmanager
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &20626020 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+  version_requirements: *20626020
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &20623100 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *20623100
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &20636040 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.12'
+  version_requirements: *20636040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &20630340 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+  version_requirements: *20630340
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &20180920 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+  version_requirements: *20180920
 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
@@ -166,7 +137,7 @@ extra_rdoc_files:
 - README.md
 - README.rdoc
 files:
-- ".document"
+- .document
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -235,25 +206,26 @@ files:
 homepage: http://coderunner.sourceforge.net
 licenses:
 - GPLv3
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: coderunner
-rubygems_version: 2.2.1
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A framework for the automated running and analysis of simulations.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 886865324b5cca653fc6936737835a1e0157b6b6
-  data.tar.gz: 343b96a3efda0f36dfc71350fbe1ee60849439f2
-SHA512:
-  metadata.gz: 88ad20b5215150e18df660385bee5b2a67a13c8dc41a9346f9bca4cbd5b761111cafad8b265799fad5358b05d9157853468e894e75e35edddae526b2c689482d
-  data.tar.gz: eacc9765e09ac5170e77b78ff7f97cff93e63a2114353753479fe895355a6c6cc1f4f0dbccb147f66fddafbfa94ccc71743d0246c3f242389ca9f2a1e46707ee