rjobs 0.3.1.alpha → 0.3.2.alpha

data/bin/rjharvest

@@ -31,8 +31,18 @@ Rjobs::JobHandler.password = opts[:password]
 jobs_file = ARGV[0]
 raise "The file \"#{jobs_file}\" must exist." unless File.exist?(jobs_file) 
 
+
 jobs = get_jobs_info(jobs_file)
 jobs.each do |job| 
-  Rjobs::JobHandler.get_job_results(job)        
+  Rjobs::JobHandler.get_job_results(job, true)        
 end        
 
+
+File.open("#{File.basename(jobs_file,File.extname(jobs_file))}.out", 'w') do |file|
+  jobs.each do |job| 
+    file.puts Rjobs::JobHandler.get_job_results(job, false)        
+  end    
+end
+
+
+puts "#{jobs.count} jobs was collected.".green

data/bin/rjstatus

@@ -22,14 +22,21 @@ p = parser(banner)
 opts = Trollop::with_standard_exception_handling p do
   o = p.parse ARGV
   raise Trollop::HelpNeeded if ARGV.empty? # show help screen
+  o
 end
 
+Rjobs::JobHandler.host = opts[:host]
+Rjobs::JobHandler.password = opts[:password]
+
 jobs_file = ARGV[0]
 raise "The file \"#{jobs_file}\" must exist." unless File.exist?(jobs_file) 
 
+
+
 jobs = get_jobs_info(jobs_file)
 
 jFinished = 0
+jRunning = 0
 jPending = 0
 jFailed = 0
 jNE =0
@@ -39,6 +46,8 @@ jobs.each do |job|
   case job.status
   when /Finished/
     jFinished +=1
+  when /Running/
+    jRunning +=1
   when /Failed/
     jFailed +=1
   when /Not Exist/
@@ -50,9 +59,10 @@ jobs.each do |job|
 end
 
 #output number of success jobs - pending jobs - failed jobs
-sFinish = "#{jFinished} finished".green if jFinished > 0
+sFinish = "#{jFinished} finished".green
+sRunning = "- #{jRunning} running".blue if jRunning > 0
 sPending = "- #{jPending} pending" if jPending > 0
 sFailed = "- #{jFailed} failed".red if jFailed > 0
 sNE = "- #{jNE} not exist".red if jNE > 0
 
-puts "#{jobs.count} jobs: #{sFinish} #{sPending} #{sFailed} #{sNE}."
+puts "#{jobs.count} jobs: #{sFinish} #{sRunning} #{sPending} #{sFailed} #{sNE}"

data/bin/rjsubmit

@@ -23,8 +23,11 @@ p = parser(banner)
 opts = Trollop::with_standard_exception_handling p do
   o = p.parse ARGV
   raise Trollop::HelpNeeded if ARGV.empty? # show help screen
+  o
 end
 
+Rjobs::JobHandler.host = opts[:host]
+Rjobs::JobHandler.password = opts[:password]
 
 jobs_input_file = ARGV[0]
 raise "The file \"#{jobs_input_file}\" must exist." unless File.exist?(jobs_input_file) 

data/lib/rjobs/job.rb

@@ -27,6 +27,8 @@ module Rjobs
       case @status
       when /Finished/
         @status.green
+      when /Running/
+        @status.blue
       when /Failed/
         @status.light_red
       when /Not Exist/
@@ -44,9 +46,6 @@ module Rjobs
       @name = result['jobAttributes'].nil? ? "" : result['jobAttributes']['name']      
       @status = result['jobAttributes'].nil? ? "Not Exist" : result['jobAttributes']['jobStatus']      
     end
-
-
-
   end
 end
 

data/lib/rjobs/job_handler.rb

@@ -21,12 +21,14 @@ module Rjobs
 
     def self.submit_job(job)
       cb = Rjobs::CommandBuilder.new("xgrid", {
-        :h => @@host,
-        :p => @@password,
+        :h => host,
+        :p => password,
         :f => "xml",
         :job => :submit        
       })      
       cmd = cb.build << " " << job.command
+      puts cmd
+
       result = Rjobs::Process.run(cmd)
       
       result = Plist::parse_xml(result)
@@ -34,23 +36,24 @@ module Rjobs
       job.id = result['jobIdentifier'].nil? ? -1 : Integer(result['jobIdentifier'])
     end
 
-    def self.get_job_results(job)
+    def self.get_job_results(job, separate_output)
       params = {
-        :h => @@host,
-        :p => @@password,
+        :h => host,
+        :p => password,
         :f => "xml",
         :job => :results,
         :id => job.id        
       }
-      if job.status == "Finished"
-        params[:so] = job.name+".out"
-      else
-        params[:se] = job.name+".err"
+      if separate_output
+        if job.status == "Finished"
+          params[:so] = job.name+".out"
+          puts "#{job.name} --> #{params[:so]}"
+        else
+          params[:se] = job.name+".err"
+          puts "#{job.name} --> #{params[:se]}".red
+        end        
       end
-        
-
       cb = Rjobs::CommandBuilder.new("xgrid", params)      
-      # puts cb.build
       Rjobs::Process.run(cb.build)
     end
 

data/lib/rjobs/version.rb

@@ -1,3 +1,3 @@
 module Rjobs
-  VERSION = "0.3.1.alpha"
+  VERSION = "0.3.2.alpha"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjobs
 version: !ruby/object:Gem::Version
-  version: 0.3.1.alpha
+  version: 0.3.2.alpha
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000Z
+date: 2011-12-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70307088348000 !ruby/object:Gem::Requirement
+  requirement: &70177246447460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307088348000
+  version_requirements: *70177246447460
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70307088346580 !ruby/object:Gem::Requirement
+  requirement: &70177246445320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307088346580
+  version_requirements: *70177246445320
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70307088345500 !ruby/object:Gem::Requirement
+  requirement: &70177246444900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307088345500
+  version_requirements: *70177246444900
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70307088344580 !ruby/object:Gem::Requirement
+  requirement: &70177246444480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307088344580
+  version_requirements: *70177246444480
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &70307088343700 !ruby/object:Gem::Requirement
+  requirement: &70177246443860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307088343700
+  version_requirements: *70177246443860
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70307088342780 !ruby/object:Gem::Requirement
+  requirement: &70177246443360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307088342780
+  version_requirements: *70177246443360
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70307088341800 !ruby/object:Gem::Requirement
+  requirement: &70177246442940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307088341800
+  version_requirements: *70177246442940
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70307088340520 !ruby/object:Gem::Requirement
+  requirement: &70177246442520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307088340520
+  version_requirements: *70177246442520
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70307088339720 !ruby/object:Gem::Requirement
+  requirement: &70177246442080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307088339720
+  version_requirements: *70177246442080
 description: Gem to handle Jobs for XGrid
 email:
 - merlinvn@gmail.com