coderunner 0.16.12 → 0.16.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a5fabaed2679fb026e5d753d3dfa7a4b5923c8f
-  data.tar.gz: c8c733a67cf95a7aa962a70904b5263c91b3ba04
+  metadata.gz: 43bead6fec269358f63b4383ff7314b563907215
+  data.tar.gz: d9b9600896bd8f90496d3c9d9b815cb93d30dc98
 SHA512:
-  metadata.gz: b03ae4cabb3003e47f3b29eb113a9a513fd5fa2c20b479ff5cb4187f0d262752f95de198fbb69ec57e417a9d0bf3c623a3b0fb06330f2e7ab4865170694ea9b7
-  data.tar.gz: 1ec4d8aad74c2f772fb0a8c641f9134e2e3f1dc23b39b7ed2c1ba9c4e5b2d5ebbfd878b8a7ce96a2b26e8888d90a333d48a52aafaf1e6b2d34b867165cacb52d
+  metadata.gz: 395adc891d85088a696262d0fe7c8a5fd82e71c302b1238d6a1a38ef0a00c999ea7b45160db1ca167ea47e36bb60c203a11e48c5da01203ec2c531b00a0b40a6
+  data.tar.gz: dd3f28c468d935df74de4f9b1f1ab300cb0e9874659857c9e65a71c53939a6e2de7512455f9e1e5db992f4bfde2b5f53e7b641552f0773eec02a59a2cb6f9370

data/VERSION

@@ -1 +1 @@
-0.16.12
+0.16.13

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.16.12 ruby lib
+# stub: coderunner 0.16.13 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.16.12"
+  s.version = "0.16.13"
 
   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-05-27"
+  s.date = "2015-05-28"
   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.rb

@@ -232,6 +232,7 @@ EOF
 		["status", "st", 0, 'Print out a summary of the status of the filtered runs.', [], [:U, :N, :j, :f, :O]],
 		["status_with_comments", "sc", 0, 'Print a list of ids with their status and any comments.', [], [:U, :N, :j, :f, :O]],
 		["status_loop", "sl", 0, 'Loop, updating the filtered runs, then printing out a summary of the status of the filtered runs.  ', [], [:U, :N, :j, :f, :O]],
+		["status_loop_running", "slr", 0, 'Loop, updating and then printing out a summary of runs which are currently running.', [], [:U, :N, :O]],
 		["submit", "sub", 0, 'Submit a run to be simulated.', [], [:p, :n, :W, :k, :v, :T, :d, :J]],
 		["submit_command", "subcom", 2, 'Submit an arbitrary shell command to the batch queue.', ['job name', 'command'], [:n, :W, :v, :T, :d]],
 		["write_graph", "wg", 1, 'Write a graph to disk.', ['filename'], [:G, :g, :w, :O, :U, :N, :j, :f]],

data/lib/coderunner/class_methods.rb

@@ -737,6 +737,36 @@ EOF
     runner.print_out(0, with_comments: copts[:with_comments]) unless copts[:interactive_start] or copts[:Z] or copts[:no_print_out]
   end
   def self.status_loop(copts={})
+#     process_copts(copts)
+    runner = fetch_runner(copts)
+    runner.print_out(0, with_comments: copts[:with_comments]) unless copts[:interactive_start] or copts[:Z] or copts[:no_print_out]
+    break_out = false
+    loop do
+      old_trap = trap(2){eputs " Terminating loop, please wait..."; break_out = true}
+      runner.use_large_cache = true
+      runner.update(false)
+      (trap(2, old_trap); break) if break_out
+      runner.recheck_filtered_runs(false)
+      runner.print_out(nil, with_comments: copts[:with_comments])
+      trap(2, old_trap)
+      break if break_out
+      break if not runner.run_list.values.find do |r|
+        not [:Complete, :Failed].include? r.status
+      end
+      #ep "sleep"
+      sleep 3
+      #ep "end sleep"
+    end
+  end
+  def self.status_loop_running(copts={})
+    copts[:f] = "@running"
+    runner = fetch_runner(copts)
+    ids = runner.filtered_ids
+    copts[:f] = "#{ids.inspect}.include? id"
+    copts[:j] = nil
+    status_loop(copts)
+  end
+  def self.status_loop(copts={})
 #     process_copts(copts)
     runner = fetch_runner(copts)
     runner.print_out(0, with_comments: copts[:with_comments]) unless copts[:interactive_start] or copts[:Z] or copts[:no_print_out]
@@ -902,7 +932,8 @@ EOF
         else
           runner = @runners[copts[:Y]]
         end
-        #p 'reading defaults', runner.recalc_all, DEFAULT_RUNNER_OPTIONS
+        # This call ensures that even if we are using an existing
+        # runner, it still uses the new copts  
         runner.read_defaults
         #p 'read defaults', runner.recalc_all
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.16.12
+  version: 0.16.13
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit