coderunner 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fc5e5974dff0a71a29915aaf0c735afd0cad363
-  data.tar.gz: 2fbdcc05d0a38b8294edb033637a152787c73cdc
+  metadata.gz: 6cd7f8afa58069ccdb34e72bff14f922bfa53fb5
+  data.tar.gz: 69f7b07f3dc1008a50a9a630ff006f9f07523276
 SHA512:
-  metadata.gz: 8eb527b55e5a2ee9f4cddaf4170aefc75a9a5583d2af93191002117578145c51470d0a7f813b67821480b9c784feec9c4bd6e315c765294541f676880ebe2336
-  data.tar.gz: 365aac180ed54957ca351fa57a7b6780a6d2f10eb057aa58fd8238581615f75c568e7704027e4eb4c6a56c18c66a1cd4ea77841e215d152e79b42b85012ac789
+  metadata.gz: 48f307830a8d73ef708cb809ae98191dbe73fb754e3aa520b198c3455ded9d03a8cc2b322d79feecaeb61c09e6c9d52da21b7caf268896d5e043f6ef4cd815b0
+  data.tar.gz: d01ff9e906cf760fa0596621fa947fc5aa9979ffa150872d4482738df20ca6f8076a6092870f9670824a8abfcfae8e455e3598797150bde4ae0cec568b44b6c6

data/VERSION

@@ -1 +1 @@
-0.17.0
+0.17.1

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.0 ruby lib
+# stub: coderunner 0.17.1 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.17.0"
+  s.version = "0.17.1"
 
   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-08-11"
+  s.date = "2015-08-16"
   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"]

data/lib/coderunner/class_methods.rb

@@ -221,7 +221,7 @@ class CodeRunner
       eputs queue_status
     rescue => _err
       eputs "General queue status doesn't work on this system; showing queue status for this folder"
-#       p err
+      #ep err
       runner = fetch_runner(copts)
       eputs runner.queue_status
     end

data/lib/coderunner/system_modules/generic_linux.rb

@@ -1,16 +1,22 @@
 class CodeRunner
+require SCRIPT_FOLDER + '/system_modules/launcher.rb'
 module GenericLinux
+  include Launcher
 
 
 # @@ruby_command = "ruby1.9"
 
 def queue_status
-	if rcp.uses_mpi
-		return %x[ps -e -U #{Process.uid} | grep mpi] + %x[ps -e -U #{Process.uid} | grep -G '\\bsh\\b'] + %x[ps -e -U #{Process.uid} -o pid,user,cmd | grep coderunner].grep(/launch/)
-	else
-# 		ep executable_name
-		return %x[ps -e -U #{Process.uid} | grep '#{executable_name}'] + %x[ps -e -U #{Process.uid} | grep -G '\\bsh\\b']
-	end
+		if use_launcher
+      queue_status_launcher
+    else
+      if methods.include?(:rcp) and rcp.uses_mpi? and rcp.uses_mpi
+        return %x[ps -e -U #{Process.uid} | grep mpi] + %x[ps -e -U #{Process.uid} | grep -G '\\bsh\\b'] + %x[ps -e -U #{Process.uid} -o pid,user,cmd | grep coderunner].grep(/launch/)
+      else
+    # 		ep executable_name
+        return %x[ps -e -U #{Process.uid} | grep '#{executable_name}'] + %x[ps -e -U #{Process.uid} | grep -G '\\bsh\\b']
+      end
+    end
 end
 
 def run_command
@@ -44,7 +50,7 @@ def execute
   if prefix = ENV['CODE_RUNNER_LAUNCHER']
     launch_id = "#{Time.now.to_i}#{$$}"
     fname = CodeRunner.launcher_directory + "/#{launch_id}"
-    File.open(fname + '.start', 'w'){|file| file.puts "cd #{Dir.pwd};#{run_command}"}
+    File.open(fname + '.start', 'w'){|file| file.puts "cd '#{Dir.pwd}';#{run_command}"}
     sleep 1 until FileTest.exist? fname + '.pid'
     pid = File.read(fname + '.pid').to_i
     FileUtils.rm fname + '.pid'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit