rjobs 0.3.2.alpha → 0.3.3.alpha

data/bin/rjharvest

@@ -19,6 +19,8 @@ where [options] are:
 
 p = parser(banner)
 
+p.opt :separate, "colect output in separate file", :default=> false
+
 opts = Trollop::with_standard_exception_handling p do
   o = p.parse ARGV
   raise Trollop::HelpNeeded if ARGV.empty? # show help screen
@@ -33,16 +35,19 @@ 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, true)        
-end        
 
+if opts[:separate]
+  jobs.each do |job| 
+    Rjobs::JobHandler.get_job_results(job, true)        
+  end        
+end
 
-File.open("#{File.basename(jobs_file,File.extname(jobs_file))}.out", 'w') do |file|
+outputFile = "#{File.basename(jobs_file,File.extname(jobs_file))}.out"
+File.open(outputFile, '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
+puts "#{jobs.count} jobs was collected in \"#{outputFile}\"".green

data/bin/rjsubmit

@@ -19,6 +19,9 @@ where [options] are:
 "
 
 p = parser(banner)
+p.opt  :outputFile , "The file that store the mapping between JobName and JobId",
+        :type => String,
+        :default => ""
 
 opts = Trollop::with_standard_exception_handling p do
   o = p.parse ARGV
@@ -34,6 +37,21 @@ raise "The file \"#{jobs_input_file}\" must exist." unless File.exist?(jobs_inpu
 
 
 jif = Rjobs::JobInputFile.new(jobs_input_file)
+
+outputFile = opts[:outputFile].empty? ? "#{jif.jobName}.rjobs" : opts[:outputFile];
+if File.exist?(outputFile)
+  continue = true
+  while continue
+    print "File #{outputFile} exists. Would you like to overwrite it? [y/n]: "
+    case STDIN.gets
+      when /^[Yy](es)?$/
+        continue = false        
+      when /^[nN]o?$/ #n or no
+        Process.exit
+    end
+  end
+end
+
 jobs = []
 length = jif.jobIdTo.length
 (jif.jobIdFrom .. jif.jobIdTo).each do |id| 
@@ -48,6 +66,6 @@ jobs.each do |job|
 end
 
 jf = Rjobs::JobsFile.new()
-jf.write(jif.jobName+".rjobs",jobs)
+jf.write(outputFile, jobs)
+puts "#{jobs.count} job(s) submited.".green     
 
-puts "#{jobs.count} job(s) submited.".green

data/lib/rjobs/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjobs
 version: !ruby/object:Gem::Version
-  version: 0.3.2.alpha
+  version: 0.3.3.alpha
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70177246447460 !ruby/object:Gem::Requirement
+  requirement: &70168098688540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177246447460
+  version_requirements: *70168098688540
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70177246445320 !ruby/object:Gem::Requirement
+  requirement: &70168098688120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177246445320
+  version_requirements: *70168098688120
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70177246444900 !ruby/object:Gem::Requirement
+  requirement: &70168098685140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177246444900
+  version_requirements: *70168098685140
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70177246444480 !ruby/object:Gem::Requirement
+  requirement: &70168098684580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177246444480
+  version_requirements: *70168098684580
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &70177246443860 !ruby/object:Gem::Requirement
+  requirement: &70168098683960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177246443860
+  version_requirements: *70168098683960
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70177246443360 !ruby/object:Gem::Requirement
+  requirement: &70168098683340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70177246443360
+  version_requirements: *70168098683340
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &70177246442940 !ruby/object:Gem::Requirement
+  requirement: &70168098682700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70177246442940
+  version_requirements: *70168098682700
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70177246442520 !ruby/object:Gem::Requirement
+  requirement: &70168098682280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70177246442520
+  version_requirements: *70168098682280
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70177246442080 !ruby/object:Gem::Requirement
+  requirement: &70168098681860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70177246442080
+  version_requirements: *70168098681860
 description: Gem to handle Jobs for XGrid
 email:
 - merlinvn@gmail.com