coderunner 0.16.9 → 0.16.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 965c131b40f6fa56035dcbb096f2ab2f1854b0f3
-  data.tar.gz: 3b5cab30f2b1834f3d64a8ff3b1d2fec25c6ea38
+  metadata.gz: 21411f5ad7f57734efea8495ee11742ecf3aa024
+  data.tar.gz: a0ce50ddfeed76e91d1ab19c07af98ec62b5dce4
 SHA512:
-  metadata.gz: 9ce7eaf12bbf889e0dfef57b82a7bb3b7bc5a5d2107c9e3aeaeaf2928e66ce08956d6db97722be21954a3a178760e6b1132ed95f6113754a8b1ce02ee8d59b8c
-  data.tar.gz: 8e004d802095c14e67d3dd6217dd93cb89a7e4042e2bbac4b48872bd24aac95d44b06c53f24c56b3ffadf3d9765187e12403ac65bb27086cd7b9db57733f345b
+  metadata.gz: 36de124b45dfadd6d179fb0dca8b0b3450e5c566da91880b7080908cd2f0aaf8d8783489aeef37cb2a693eb1c97a6ce1184595b4db1cd063f4827f42937cc120
+  data.tar.gz: 16c6d3bc8bc85ba3100adcefad814002d57f5cf44ea1c5fd641ecda2a2194f0555f384bcb2b1d8cb4c9239e37ecb9251b6f57f19808afd38bc2930420439a4a3

data/VERSION

@@ -1 +1 @@
-0.16.9
+0.16.10

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.16.9 ruby lib
+# stub: coderunner 0.16.10 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.16.9"
+  s.version = "0.16.10"
 
   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

@@ -392,16 +392,17 @@ EOF
     unless ENV['CODE_RUNNER_LAUNCHER'] =~ /serial/
       mutex = Mutex.new
       processes= []
+      command_list = {}
 
       Thread.new do
         loop do
           `cp #{tl}/queue_status.txt #{tl}/queue_status2.txt`
-          `ps > #{tl}/queue_status.txt`
+          #`ps > #{tl}/queue_status.txt`
           mutex.synchronize do 
             File.open("#{tl}/queue_status.txt", 'a') do |f| 
               # This ensures that the right pids will be listed,
               # regardless of the way that ps behaves
-              f.puts processes 
+              f.puts processes.map{|pid| "#{pid} #{command_list[pid]}"}
             end
           end
           sleep 1
@@ -439,12 +440,15 @@ EOF
             exec(command + "\n wait")
           end
           `cp #{tl}/queue_status.txt #{tl}/queue_status2.txt; ps > #{tl}/queue_status.txt`
-          mutex.synchronize{processes.push pid}
+          mutex.synchronize do
+            processes.push pid
+            command_list[pid] = command
+          end
 
           File.open(tl + '/' + id + '.pid', 'w'){|fle| fle.puts pid}
           FileUtils.rm(tl + '/' + file)
 
-          Thread.new{Process.wait pid; mutex.synchronize{processes.delete pid}}
+          Thread.new{Process.wait pid; mutex.synchronize{processes.delete pid; command_list.delete(pid)}}
         end
 #         processes.each{|pid| Process.wait pid}
         sleep refresh.to_i

data/lib/coderunner/system_modules/launcher.rb

@@ -11,8 +11,10 @@ class CodeRunner
       launcher_prefix and launcher_prefix.size > 0
     end
     def queue_status_launcher
-			%x[cat #{CodeRunner.launcher_directory}/queue_status.txt | grep sh]  +
-			%x[cat #{CodeRunner.launcher_directory}/queue_status2.txt | grep sh] 
+			#%x[cat #{CodeRunner.launcher_directory}/queue_status.txt | grep sh]  +
+			#%x[cat #{CodeRunner.launcher_directory}/queue_status2.txt | grep sh] 
+			%x[cat #{CodeRunner.launcher_directory}/queue_status.txt ]  +
+			%x[cat #{CodeRunner.launcher_directory}/queue_status2.txt ] 
     end 
     def execute_launcher
 			launch_id = "#{Time.now.to_i}#{$$}"

metadata

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