coderunner 0.15.11 → 0.15.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eae74e13da43cbdc34d182a9d3b780005b90984
-  data.tar.gz: 4934af8baada72248a7d240247bb679dd6699841
+  metadata.gz: d2978c40385db27d78718304136bce84f6fd4816
+  data.tar.gz: 2bb7c2c495b6c73800944cbe4db67676af95241c
 SHA512:
-  metadata.gz: 3c300c860f72dad4b5e76de69819a8198813699a2bc9ad7aec3cf4b75c017de94f5d15c4ad172b37957c1b84455d8cbbca3ca538ac53c17bb075d4416e270ded
-  data.tar.gz: 00c8481231ca54e4958421fc7c058bcaa06cde068c2c37006fc7a5de873f6fcf9d09627b19f8331e2f2e2670b487f0e4b28aaf7a97517df239bf9ae6b0da3db7
+  metadata.gz: a643a60a5a228eb4365d20120e29901ec746345f7afe2317f1b0cbfe16aa97a7903ad87c1793509f6ac25394b924bb732ce87e1b2701b7ceced3cf94013d8d9b
+  data.tar.gz: 01f80f29a2c1a1f48178c9911fbdb696b082e2095fab1e8b151e503bb4a6959627ba921f52a5dec9761868f2a2cb5efc22040dc01b95b894a24631ab6b2e0c26

data/VERSION

@@ -1 +1 @@
-0.15.11
+0.15.12

data/coderunner.gemspec

@@ -2,12 +2,12 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: coderunner 0.15.11 ruby lib
+# stub: coderunner 0.15.12 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.15.11"
+  s.version = "0.15.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/coderunner/class_methods.rb

@@ -422,7 +422,7 @@ EOF
               sleep refresh.to_i while %x[ps -e -o pid,ppid].split("\n").grep(Regexp.new("^\\s*#{wpid}\\s+#{ppid}")).size > 0
             end
             #p ["command", command]
-            exec(command + "; wait")
+            exec(command + "\n wait")
           end
           `cp #{tl}/queue_status.txt #{tl}/queue_status2.txt; ps > #{tl}/queue_status.txt`
           mutex.synchronize{processes.push pid}

data/lib/coderunner/system_modules/stampede.rb

@@ -11,8 +11,8 @@ class CodeRunner
 		end
 		def run_command
 	# 		"qsub #{batch_script_file}"
-			if (ENV['CODE_RUNNER_LAUNCHER'].size > 0 rescue false)
-				return %[ibrun -n #{@nprocs} -o 0 #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
+			if use_launcher
+				return %[#{code_run_environment}\n ibrun -n #{@nprocs} -o 0 #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
 			else
 				"ibrun #{executable_location}/#{executable_name} #{parameter_string}"
 			end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.15.11
+  version: 0.15.12
 platform: ruby
 authors:
 - Edmund Highcock