rjobs 0.2.0.alpha → 0.3.0.alpha

data/bin/rjharvest

@@ -9,23 +9,27 @@ require "rjobs/job_handler"
 require 'rjobs/cli_helper'
 include  Rjobs::CliHelper   
 
-p = Trollop::Parser.new do
-  banner <<-EOS
+banner = "================
 Harvest all finished jobs described in the jobs file.
-
+================
 Usage:
        rjharvest [options] <filename>
 where [options] are:
-EOS
-  
-end
+"
+
+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)
 jobs.each do |job| 

data/bin/rjstatus

@@ -9,16 +9,15 @@ require "rjobs/job_handler"
 require 'rjobs/cli_helper'
 include  Rjobs::CliHelper   
 
-p = Trollop::Parser.new do
-  banner <<-EOS
+banner = "================
 Get the status of jobs described in the jobs file.
-
+================
 Usage:
        rjstatus [options] <filename>
 where [options] are:
-EOS
-  
-end
+"
+
+p = parser(banner)
 
 opts = Trollop::with_standard_exception_handling p do
   o = p.parse ARGV
@@ -26,10 +25,34 @@ opts = Trollop::with_standard_exception_handling p do
 end
 
 jobs_file = ARGV[0]
+raise "The file \"#{jobs_file}\" must exist." unless File.exist?(jobs_file) 
 
 jobs = get_jobs_info(jobs_file)
 
+jFinished = 0
+jPending = 0
+jFailed = 0
+jNE =0
+
 jobs.each do |job|        
   puts "#{job.name} - #{job.status_with_color}"
+  case job.status
+  when /Finished/
+    jFinished +=1
+  when /Failed/
+    jFailed +=1
+  when /Not Exist/
+    jNE+=1
+  else
+    jPending +=1
+  end
+
 end
 
+#output number of success jobs - pending jobs - failed jobs
+sFinish = "#{jFinished} finished".green if jFinished > 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}."

data/bin/rjsubmit

@@ -10,16 +10,15 @@ require "rjobs/job_handler"
 require 'rjobs/cli_helper'
 include  Rjobs::CliHelper   
 
-p = Trollop::Parser.new do
-  banner <<-EOS
+banner = "================
 Submit jobs described in the YAML input file.
-
+================
 Usage:
-      rjsubmit [options] <filename>
+       rjsubmit [options] <filename>
 where [options] are:
-EOS
-  
-end
+"
+
+p = parser(banner)
 
 opts = Trollop::with_standard_exception_handling p do
   o = p.parse ARGV
@@ -28,6 +27,8 @@ end
 
 
 jobs_input_file = ARGV[0]
+raise "The file \"#{jobs_input_file}\" must exist." unless File.exist?(jobs_input_file) 
+
 
 jif = Rjobs::JobInputFile.new(jobs_input_file)
 jobs = []

data/features/step_definitions/listJobs_steps.rb

@@ -12,7 +12,7 @@ Then /^show me the output$/ do
 end
 
 Then /^each line of the output should match \/([^\/]*)\/$/ do |expected|
-    all_stdout.split("\n").each do |line|
+    all_stdout.split("\n")[0..-2].each do |line|
       # puts line
       line.should match expected
     end

data/lib/rjobs/cli_helper.rb

@@ -1,3 +1,5 @@
+require "trollop"
+
 module Rjobs
   module CliHelper
     def get_jobs_info(jobs_file)
@@ -10,5 +12,20 @@ module Rjobs
       end
       jobs
     end
+
+    def parser(banner_string)
+      default_hostname = ENV['XGRID_CONTROLLER_HOSTNAME'].nil? ? "127.0.0.1" : ENV['XGRID_CONTROLLER_HOSTNAME']
+      default_password = ENV['XGRID_CONTROLLER_PASSWORD'].nil? ? "xgrid" : ENV['XGRID_CONTROLLER_PASSWORD'] 
+      Trollop::Parser.new do
+        banner banner_string
+        opt :host, "Hostname or IP address of the xgrid controller", 
+            :type=> String, 
+            :default=> default_hostname
+        opt :password, "Password to access the xgrid controller", 
+            :type=> String, 
+            :default=> default_password 
+      end
+    end
+
   end
 end

data/lib/rjobs/job.rb

@@ -43,7 +43,6 @@ module Rjobs
       result = Plist::parse_xml(xml)
       @name = result['jobAttributes'].nil? ? "" : result['jobAttributes']['name']      
       @status = result['jobAttributes'].nil? ? "Not Exist" : result['jobAttributes']['jobStatus']      
-      
     end
 
 

data/lib/rjobs/job_handler.rb

@@ -9,8 +9,8 @@ module Rjobs
 
     def self.get_job_attributes(id)
       cb = Rjobs::CommandBuilder.new("xgrid", {
-        :h => @@host,
-        :p => @@password,
+        :h => host,
+        :p => password,
         :f => "xml",
         :job => :attributes,
         :id => id
@@ -54,5 +54,23 @@ module Rjobs
       Rjobs::Process.run(cb.build)
     end
 
+    def self.host
+      @@host
+    end
+
+    def self.host=(value)
+      @@host = value
+    end
+
+    def self.password      
+      @@password
+    end
+
+    def self.password=(value)
+      @@password = value
+    end
+
+
+
   end
 end

data/lib/rjobs/version.rb

@@ -1,3 +1,3 @@
 module Rjobs
-  VERSION = "0.2.0.alpha"
+  VERSION = "0.3.0.alpha"
 end

data/spec/lib/job_handler_spec.rb

@@ -25,5 +25,7 @@ describe Rjobs::JobHandler do
     job.id.should == 11
   end
 
+
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjobs
 version: !ruby/object:Gem::Version
-  version: 0.2.0.alpha
+  version: 0.3.0.alpha
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000Z
+date: 2011-11-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70169642269800 !ruby/object:Gem::Requirement
+  requirement: &70100005401960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169642269800
+  version_requirements: *70100005401960
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70169642268840 !ruby/object:Gem::Requirement
+  requirement: &70100005401340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169642268840
+  version_requirements: *70100005401340
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70169642268400 !ruby/object:Gem::Requirement
+  requirement: &70100005400720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169642268400
+  version_requirements: *70100005400720
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70169642267980 !ruby/object:Gem::Requirement
+  requirement: &70100005400120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169642267980
+  version_requirements: *70100005400120
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &70169642267440 !ruby/object:Gem::Requirement
+  requirement: &70100005399420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169642267440
+  version_requirements: *70100005399420
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70169642267020 !ruby/object:Gem::Requirement
+  requirement: &70100005398920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169642267020
+  version_requirements: *70100005398920
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70169642266600 !ruby/object:Gem::Requirement
+  requirement: &70100005398500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169642266600
+  version_requirements: *70100005398500
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70169642266140 !ruby/object:Gem::Requirement
+  requirement: &70100005398080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169642266140
+  version_requirements: *70100005398080
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70169642265700 !ruby/object:Gem::Requirement
+  requirement: &70100005397640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169642265700
+  version_requirements: *70100005397640
 description: Gem to handle Jobs for XGrid
 email:
 - merlinvn@gmail.com