nera 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.1
+* 1 major enhancement:
+  * "show log" menu is implemented into the CUI program.
+  * functions of local execution are implemented.
+* 2 bug fixes
+  * fixes a bug which happens when a job script is created without any parameter.
+
 == 0.2.0
 * 1 major enhancement:
   * logger is implemented. Log informatios are stored in "db_name"/Tables/logfile.txt.

data/lib/nera/nera_cui.rb

@@ -74,7 +74,7 @@ HEADER
         r[:name]
       end
       names.unshift("go to Jobs layer")
-      names += ["exit"]
+      names += ["show logs", "exit"]
       selected = 0
       Dir.chdir( slc.path_to_sim_layer) {
         selected = Dialog::select_one_or_return_string( names, "Select a simulator.")
@@ -85,6 +85,9 @@ HEADER
       }
       if names[selected] == "go to Jobs layer"
         return :job_layer
+      elsif names[selected] == "show logs"
+        system "less #{slc.path_to_log_file}"
+        return :simulator_layer
       elsif names[selected] == "exit"
         return :exit
       else
@@ -351,6 +354,7 @@ HEADER
       action_list = ["Back to simulator layer",
                      "Show job infos",
                      "Cancel jobs",
+                     "Execute jobs now",
                      "Show host infos",
                      "Upload jobs",
                      "Download data",
@@ -391,6 +395,23 @@ HEADER
             Dialog::message("Cancellation failed.")
           end
         end
+        return :job_layer
+      when "Execute jobs now"
+        header,list = jlc.not_finished_list_in_csv
+        list.unshift("Cancel")
+        selected_jobs = Dialog::select_many( list, header).map do |num|
+          list[num].split(',')[0].to_i
+        end
+        return :job_layer if selected_jobs.include?(0)
+
+        system "top"
+        if Dialog::ask("Will you execute now?", true)
+          flag = jlc.execute_jobs_now( selected_jobs)
+          Dialog::message("The following jobs are successfully submitted.\n#{flag.join(', ')}") if flag
+          non_submitted = selected_jobs - flag.to_a
+          Dialog::message("Warning! The following jobs are not submitted.\n#{non_submitted.join(', ')}") if non_submitted.size > 0
+        end
+        
         return :job_layer
       when "Show host infos"
         h_list = ["Cancel", "All"] + rc.hostnames

data/lib/nera/nera_db_folders.rb

@@ -37,7 +37,7 @@ module NERA
       end
 
       # logger instance
-      @logger = Logger.new( "#{@db_folder}/Tables/logfile.txt", 8)
+      @logger = Logger.new( path_to_log_file, 8)
       @logger.level = Logger::INFO
     end
 
@@ -238,6 +238,10 @@ module NERA
       return @db_folder + "Tables/hosts.yml"
     end
 
+    def path_to_log_file
+      return @db_folder + "Tables/logfile.txt"
+    end
+
   end
 end
     

data/lib/nera/nera_job_layer_controller.rb

@@ -91,6 +91,41 @@ module NERA
       return destroyed_jobids
     end
 
+    def execute_jobs_now( job_ids)
+      unless job_ids.is_a?(Array)
+        raise ArgumentError, "job_ids must be an Array."
+      end
+      job_ids.each do |x|
+        raise ArgumentError, "each element of job_ids must be an Integer" unless x.is_a?(Integer)
+      end
+
+      submitted_jobs = []
+      @job_records.transaction {
+        jids = []
+        job_ids.uniq.each do |jid|
+          jids << jid if @job_records.find_by_id(jid)
+        end
+        return nil if jids.size == 0
+
+        jids.each do |jid|
+          js_path = File.expand_path( @db_folders.path_to_job_script(jid) )
+          FileUtils.chmod(0744, js_path)
+          next if File.directory?( @db_folders.path_to_include_layer+File.basename( js_path).sub(/\.sh$/,'') ) or File.exist?( @db_folders.path_to_include_layer + File.basename( js_path).sub(/\.sh$/,'.tar.bz2'))
+          Dir.chdir( @db_folders.path_to_include_layer) {
+            system "nohup #{js_path} &"
+            submitted_jobs << jid
+          }
+          @job_records.update_to_state_submitted( jid, "localhost")
+          @db_folders.logger.info( self.class.to_s) {
+            "submitted a job (jobid:#{jid}) to localhost"
+          }
+        end
+      }
+      submitted_jobs = nil if submitted_jobs.size == 0
+      return submitted_jobs
+    end
+
+
     def include_list
       list = @db_folders.search_include_files
       list.map! do |path|

data/lib/nera/nera_job_script.rb

@@ -112,9 +112,9 @@ BODY
       unless sim_inst.kind_of?(NERA::Simulator)
         raise ArgumentError, "Simulation_Instance must be a subclass of NERA::Simulator."
       else
-        if sim_inst.param == {}
-          raise ArgumentError, "@param in Simulation_Instance must be set a parameter."
-        end
+        # if sim_inst.param == {}
+        #   raise ArgumentError, "@param in Simulation_Instance must be set a parameter."
+        # end
       end
       unless run_stat.is_a?(Array)
         raise ArgumentError, "Run_Status must be an Array."

data/lib/nera/nera_simulator_layer_controller.rb

@@ -63,6 +63,11 @@ module NERA
       return a
     end
 
+    public
+    def path_to_log_file
+      @db_folders.path_to_log_file
+    end
+
   end
 
 end

data/lib/nera.rb

@@ -22,5 +22,5 @@ require 'nera_simulator_records'
 require 'nera_remote_connector'
 
 module NERA
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/test/test_nera_db_folders.rb

@@ -210,6 +210,11 @@ class TC_NERA_DB_FOLDERS < Test::Unit::TestCase
     assert_equal( @db_folder+"/Tables/hosts.yml",p)
   end
 
+  def test_path_to_log_file
+    path = @dbf.path_to_log_file
+    assert_equal( @db_folder + "/Tables/logfile.txt", path)
+  end
+
   def test_logger
     @dbf.logger.info("controller") do "test_message" end
     assert( File.exist?( @db_folder+"/Tables/logfile.txt") )

data/test/test_nera_job_layer_controller.rb

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/test_helper'
 class TC_NERA_JOB_LAYER_CONTROLLER < Test::Unit::TestCase
 
   def setup
-    @testdir = 'test_sim_controller'
+    @testdir = 'test_job_controller'
     FileUtils.mkdir(@testdir)
     FileUtils.chdir(@testdir)
     @db_folder = "nera_db"
@@ -87,6 +87,43 @@ class TC_NERA_JOB_LAYER_CONTROLLER < Test::Unit::TestCase
 
   end
 
+  def test_execute_jobs_now
+    assert_raise( ArgumentError) {
+      @jlc.execute_jobs_now(1)
+    }
+
+    logp = @db_folder+'/Tables/logfile.txt'
+    s1 = File.open(logp,'r').readlines.size
+    f = @jlc.execute_jobs_now( [1,2] )
+    assert_equal([1,2], f)
+    h, l = @jlc.not_finished_list_in_csv
+    assert_equal( 3, l.size)
+    assert_equal( "submitted", l[0].split(',')[1].strip)
+    assert_equal( "localhost", l[0].split(',')[-1].strip)
+    assert_equal( "submitted", l[1].split(',')[1].strip)
+    assert_equal( "localhost", l[1].split(',')[-1].strip)
+    s2 = File.open(logp,'r').readlines.size
+    assert_equal( s1+2, s2)
+
+    sleep 2
+    l = @jlc.include_list
+    assert_equal( 2, l.size)
+
+    f = @jlc.execute_jobs_now( [1,2] )
+    assert_nil( f)
+    s2 = File.open(logp,'r').readlines.size
+    assert_equal( s1+2, s2)
+
+    f = @jlc.execute_jobs_now( [2,3] )
+    assert_equal([3], f)
+    s3 = File.open(logp,'r').readlines.size
+    assert_equal( s2+1, s3)
+    sleep 2
+    
+  end
+
+
+
   def test_include_list
     l = @jlc.include_list
     assert_equal( 0, l.size)

data/test/test_nera_simulator_layer_controller.rb

@@ -60,4 +60,9 @@ class TC_NERA_SIM_LAYER_CONTROLLER < Test::Unit::TestCase
     assert_nil(found)
   end
 
+  def test_path_to_log_file
+    path = @slc.path_to_log_file
+    assert_equal( @db_folder + "/Tables/logfile.txt", path)
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nera
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Yohsuke Murase
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-24 00:00:00 +09:00
+date: 2009-05-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency