nera 0.6.0 → 0.7.0

data/History.txt

@@ -1,3 +1,8 @@
+== 0.7.0
+* 1 major enhancement:
+  * a function to show recently included job records is implemented.
+* 2 bug fixes:
+
 == 0.6.0
 * 1 major enhancement:
   * Implemented a new API functions.

data/lib/nera.rb

@@ -22,5 +22,5 @@ require 'nera_simulator_records'
 require 'nera_remote_connector'
 
 module NERA
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/nera/nera_cui.rb

@@ -394,6 +394,7 @@ HEADER
                      "Upload jobs",
                      "Download data",
                      "Include data",
+                     "Show recently included jobs",
                      "Exit"]
       jlc = NERA::JobLayerController.new( @path_db_folder)
       rc = NERA::RemoteConnector.new( @path_db_folder)
@@ -542,6 +543,13 @@ HEADER
           Dialog::message("Inclusion failed.")
         end
         return :job_layer
+      when "Show recently included jobs"
+        list = jlc.recently_included_list
+        Dialog::message("  * id, simulator, parameter_id, run_id, included_at")
+        list.each do |rec|
+          Dialog::message("  - #{rec[:id]}, #{rec[:simulator]}, #{rec[:parameter_id]}, #{rec[:run_id]}, #{rec[:included_at].to_s}")
+        end
+        return :job_layer
       when "Exit"
         return :exit
       end

data/lib/nera/nera_db_folders.rb

@@ -234,6 +234,10 @@ module NERA
       return @db_folder + "Tables/finished_jobs.yml"
     end
 
+    def path_to_recently_finished_jobs_file
+      return @db_folder + "Tables/recently_finished_jobs.yml"
+    end
+
     def path_to_hosts_yaml
       return @db_folder + "Tables/hosts.yml"
     end

data/lib/nera/nera_job_layer_controller.rb

@@ -164,6 +164,20 @@ module NERA
       return true
     end
 
+    # Return the array of the finished records.
+    # Each record is a Hash.
+    # Return the records which are included on the same day as the most recently included record.
+    def recently_included_list
+      recs = []
+      fname = @db_folders.path_to_recently_finished_jobs_file
+      if File.exist?( fname)
+        YAML.load_documents( File.open(fname,'r') ) do |obj|
+          recs << obj if obj
+        end
+      end
+      return recs
+    end
+
     private
     def expand_and_parse( fpath)
       bz2_path = fpath.sub( /^#{@db_folders.path_to_include_layer}/, '')
@@ -254,10 +268,27 @@ module NERA
       destroyed[:start_at] = jinfo[:start_at]
       destroyed[:host_name] = jinfo[:host_name]
       destroyed[:finish_at] = jinfo[:finish_at]
+      destroyed[:included_at] = DateTime.now
+      # append to finished_jobs.yml
       File.open( @db_folders.path_to_finished_jobs_file, "a") do |io|
         YAML.dump( destroyed, io)
         io.flush
       end
+
+      # append to recently_finished_jobs.yml
+      fname = @db_folders.path_to_recently_finished_jobs_file
+      obj = YAML.load( File.open( fname, 'r') ) if File.exist?(fname)
+      if obj and Date.parse(obj[:included_at].to_s) === destroyed[:included_at]
+        File.open( fname, 'a') do |io|
+          YAML.dump( destroyed, io)
+          io.flush
+        end
+      else
+        File.open( fname, 'w') do |io|
+          YAML.dump( destroyed, io)
+          io.flush
+        end
+      end
     end
 
     def remove_files( fpath)

data/test/test_nera_db_folders.rb

@@ -205,6 +205,11 @@ class TC_NERA_DB_FOLDERS < Test::Unit::TestCase
     assert_equal( @db_folder+"/Tables/finished_jobs.yml", p)
   end
 
+  def test_path_to_recently_finished_jobs_file
+    p = @dbf.path_to_recently_finished_jobs_file
+    assert_equal( @db_folder+"/Tables/recently_finished_jobs.yml", p)
+  end
+
   def test_path_to_hosts_yaml
     p = @dbf.path_to_hosts_yaml
     assert_equal( @db_folder+"/Tables/hosts.yml",p)

data/test/test_nera_job_layer_controller.rb

@@ -171,8 +171,6 @@ class TC_NERA_JOB_LAYER_CONTROLLER < Test::Unit::TestCase
     
   end
 
-
-
   def test_include_list
     l = @jlc.include_list
     assert_equal( 0, l.size)
@@ -243,4 +241,31 @@ class TC_NERA_JOB_LAYER_CONTROLLER < Test::Unit::TestCase
     }
   end
   
+  def test_recently_included_list
+    a = @jlc.recently_included_list
+    assert_equal( [] , a)
+    
+    prepare_zipped_file
+    @jlc.include_all
+
+    a = @jlc.recently_included_list
+    assert_equal( 3, a.size)
+    assert_equal( "Ising", a[0][:simulator])
+    assert_equal( 1, a[0][:parameter_id])
+    assert_equal( 1, a[0][:run_id])
+    assert_equal( 1, a[0][:number_of_runs])
+    assert( DateTime.now === DateTime.parse(a[0][:included_at].to_s))
+    
+    assert_equal( "Ising", a[1][:simulator])
+    assert_equal( 1, a[1][:parameter_id])
+    assert_equal( 2, a[1][:run_id])
+    assert_equal( 1, a[1][:number_of_runs])
+    assert( DateTime.now === DateTime.parse(a[1][:included_at].to_s))
+
+    assert_equal( "Ising", a[2][:simulator])
+    assert_equal( 1, a[2][:parameter_id])
+    assert_equal( 3, a[2][:run_id])
+    assert_equal( 1, a[2][:number_of_runs])
+    assert( DateTime.now === DateTime.parse(a[2][:included_at].to_s))
+  end
 end

data/website/index.html

@@ -34,7 +34,7 @@
     <div class="sidebar">
       <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/nera"; return false'>
         <p>Get Version</p>
-        <a href="http://rubyforge.org/projects/nera" class="numbers">0.6.0</a>
+        <a href="http://rubyforge.org/projects/nera" class="numbers">0.7.0</a>
       </div>
     </div>
     <h2>What</h2>

data/website/temporary/temp.html

@@ -34,7 +34,7 @@
     <div class="sidebar">
       <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/nera"; return false'>
         <p>Get Version</p>
-        <a href="http://rubyforge.org/projects/nera" class="numbers">0.6.0</a>
+        <a href="http://rubyforge.org/projects/nera" class="numbers">0.7.0</a>
       </div>
     </div>
     <p>The database created by nera is a hierarchical database which consists of three layers.<br />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nera
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Yohsuke Murase
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 +09:00
+date: 2010-01-07 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency