coderunner 0.17.2 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b0abf9dd6e6a60db107f9cb90b1ec2a01da16f3
-  data.tar.gz: 3b748ca1afafeed0d546b6b95701190959291599
+  metadata.gz: 554e5c730407b32651cda8ce43cd5453fad35132
+  data.tar.gz: f34ed6190f5f242e748ecfbf24270ae60b92b9a0
 SHA512:
-  metadata.gz: 49075a788f4bffdf23202df136f2319f298674991d8b8b899b9de6ebaeb6ebb3bcc15fe9833ec0f59bf3089532bd60b0458c37bd5b7475b8f49eee1bbb8dd197
-  data.tar.gz: ebe2c25bd99beda5fa353abcbb3e1ede19ff7a27cf2e6aa89dc4487f0eab095a19760ad8e66d75bb04a3de0f84c79837730f2571035924e7bf7bb1e5dc5fe651
+  metadata.gz: a1692edb1e21f67c49f4a720e52e2d7b1bf4738f41a9263d61714eec25c35b804ec8a9552d38f312e6400394dc804cfe5832d4ae5edad69501e740a1ca2c1a1d
+  data.tar.gz: 67e773d77563e726b2d0f0f13573532c6a707d37ad76cce08c6ed9bec1ee7850e9783bc6943a9a49be35da6f4144c04eec2ee4828604b2fa99d0994ed492ba71

data/VERSION

@@ -1 +1 @@
-0.17.2
+0.17.3

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.17.2 ruby lib
+# stub: coderunner 0.17.3 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.17.2"
+  s.version = "0.17.3"
 
   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 = "2015-09-04"
+  s.date = "2015-09-09"
   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", "coderunnerrepo"]
@@ -99,7 +99,7 @@ Gem::Specification.new do |s|
   s.licenses = ["GPLv3"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
   s.rubyforge_project = "coderunner"
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.8"
   s.summary = "A framework for the automated running and analysis of simulations."
 
   if s.respond_to? :specification_version then

data/lib/coderunner/system_modules/archer.rb

@@ -34,14 +34,8 @@ EOF
     "aprun -n #{ppn*nodes}"
     end
 def get_run_status(job_no, current_status)
-	if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
-		if current_status =~ Regexp.new(job_no.to_s)
-			@running = true
-			return :Running
-		else
-			@running = false
-			return :Unknown
-		end
+	if use_launcher
+		return :Unknown
 	end
 	line = current_status.split(/\n/).grep(Regexp.new(job_no.to_s))[0]
 	unless line

data/lib/coderunner/system_modules/moab.rb

@@ -1,5 +1,7 @@
 class CodeRunner
+require SCRIPT_FOLDER + '/system_modules/launcher.rb'
 module Moab
+  include Launcher
 
 	#def self.configure_environment
 		#eputs "Configuring Hector"
@@ -13,9 +15,8 @@ module Moab
 	#end
 				
 	def queue_status
-		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
-			%x[cat #{CodeRunner.launcher_directory}/queue_status.txt | grep sh]  +
-			%x[cat #{CodeRunner.launcher_directory}/queue_status2.txt | grep sh] 
+		if use_launcher
+      queue_status_launcher
 		else
 			%x[qstat | grep $USER]
 		end
@@ -25,22 +26,22 @@ module Moab
 		"aprun -n #{nprocstot} -N #{ppn}"
 	end
 
-	def nodes
-			nodes, ppn = @nprocs.split(/:/)[0].split(/x/)
-			nodes.to_i
-	end
+  def nodes
+    nodes, _ppn = @nprocs.split(/:/)[0].split(/x/)
+    nodes.to_i
+  end
 	def ppn
-			nodes, ppn = @nprocs.split(/:/)[0].split(/x/)
+			_nodes, ppn = @nprocs.split(/:/)[0].split(/x/)
 			ppn.to_i
 	end
 	def nprocstot
 		
 			#nodes, ppn = @nprocs.split(/x/)
-			nprocstot = nodes.to_i * ppn.to_i
+			_nprocstot = nodes.to_i * ppn.to_i
 	end
 	def run_command
 # 		"qsub #{batch_script_file}"
-		if (ENV['CODE_RUNNER_LAUNCHER'].size > 0 rescue false)
+		if use_launcher
 			return %[#{code_run_environment}
 				#{mpi_prog} #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
 		else
@@ -49,17 +50,11 @@ module Moab
 	end
 
 	def execute
-		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
-			launch_id = "#{Time.now.to_i}#{$$}"
-			fname = "#{CodeRunner.launcher_directory}/#{launch_id}"
-			File.open(fname + '.start', 'w'){|file| file.print "cd #{Dir.pwd};", run_command, "\n"}
-			sleep 2 until FileTest.exist? fname + '.pid'
-			pid = File.read(fname + '.pid').to_i
-			FileUtils.rm fname + '.pid'
-			return pid
+		if use_launcher
+      return execute_launcher
 		else
 			File.open(batch_script_file, 'w'){|file| file.puts batch_script + run_command + "\n"}
-			pid = %x[qsub #{batch_script_file}].to_i
+			_pid = %x[qsub #{batch_script_file}].to_i
 		end
 	end
 
@@ -109,59 +104,42 @@ EOF
 	end
 
 	def cancel_job
-		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
-			 fname = CodeRunner.launcher_directory + "/#{$$}.stop"
-			 File.open(fname, 'w'){|file| file.puts "\n"}
-		else
-			`qdel #{@job_no}`
-		end
+		use_launcher ? cancel_job_launcher : `qdel #{@job_no}`
 	end
 
 	def error_file
-		if (ENV['CODE_RUNNER_LAUNCHER'].size > 0 rescue false)
-			return "#{executable_name}.#{job_identifier}.e"
-		else
-			return "#{executable_name}.#{job_identifier}.e#@job_no"
-		end
+		use_launcher ? error_file_launcher :
+			"#{executable_name}.#{job_identifier}.e#@job_no"
 	end
 
 	def output_file
-		if (ENV['CODE_RUNNER_LAUNCHER'].size > 0 rescue false)
-			return "#{executable_name}.#{job_identifier}.o"
-		else
-			return "#{executable_name}.#{job_identifier}.o#@job_no"
-		end
+		use_launcher ? output_file_launcher :
+			"#{executable_name}.#{job_identifier}.o#@job_no"
 	end
 
-def get_run_status(job_no, current_status)
-	if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
-		if current_status =~ Regexp.new(job_no.to_s)
-			@running = true
-			return :Running
-		else
-			@running = false
-			return :Unknown
-		end
-	end
-	line = current_status.split(/\n/).grep(Regexp.new(job_no.to_s))[0]
-	unless line
-		return :Unknown
-	else 
-		if line =~ /\sQ\s/
-			return :Queueing
-		elsif line =~ /\sR\s/
-			return :Running
-		elsif line =~ /\sH\s/
-			return :Queueing
-		elsif line =~ /\sC\s/
-			@running=false
-			return :Unknown
-		else
-			ep 'line', line
-			raise 'Could not get run status'
-		end
-	end
-end
+  def get_run_status(job_no, current_status)
+    if use_launcher
+      return :Unknown
+    end
+    line = current_status.split(/\n/).grep(Regexp.new(job_no.to_s))[0]
+    unless line
+      return :Unknown
+    else 
+      if line =~ /\sQ\s/
+        return :Queueing
+      elsif line =~ /\sR\s/
+        return :Running
+      elsif line =~ /\sH\s/
+        return :Queueing
+      elsif line =~ /\sC\s/
+        @running=false
+        return :Unknown
+      else
+        ep 'line', line
+        raise 'Could not get run status'
+      end
+    end
+  end
 
-	end
+end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.3
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: coderunner
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A framework for the automated running and analysis of simulations.