vizir 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/bin/vizir

@@ -9,13 +9,8 @@ require 'optparse'
 require 'rest_client'
 require 'vizir'
 
-ALERT_PERIOD = 60
-REFRESH_TIME = 3600
-
-def usage
-  puts 'usage: vizir [ -h | --help ] [ -l | --login login_name ]'
-  exit 1
-end
+$alert_period = 60
+$refresh_period = 3600
 
 def setup_ssh_tunnel
   gateway = Net::SSH::Gateway.new('access.grenoble.grid5000.fr', $login)
@@ -37,13 +32,26 @@ def notify_via_growl(jobid, site_name, time, time_unit)
 end
 
 $login = nil
-opts = OptionParser.new
-opts.on('-h', '--help') { usage }
-opts.on('-l', '--login STRING', String) { |str| $login = str }
-opts.parse(ARGV)
+
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: vizir [options]"
+  opts.separator("")
+
+  opts.separator("Options:")
+  opts.on('-a', '--alert-period TIME', Integer, "Job alert period (seconds), default: #{$alert_period}") { |t| $alert_period = t }
+  opts.on('-h', '--help', 'Print help') do
+    puts opts
+    exit
+  end
+  opts.on('-l', '--login LOGIN', String, "User login on Grid\'5000") { |str| $login = str }
+  opts.on('-m', '--min-job-time TIME', Integer, "Minimum job time (seconds), default: #{$refresh_period}") { |t| $refresh_period = t }
+end
+
+opts.parse!(ARGV)
 
 if $login == nil
-  usage
+  puts opts
+  exit
 end
 
 gateway, port = setup_ssh_tunnel
@@ -59,8 +67,8 @@ Vizir.learn_new_jobs(api)
 Vizir.alert_jobs(api)
 
 EventMachine::run {
-  EventMachine::PeriodicTimer.new(REFRESH_TIME) { Vizir.learn_new_jobs(api) }
-  EventMachine::PeriodicTimer.new(ALERT_PERIOD) { Vizir.alert_jobs(api) }
+  EventMachine::PeriodicTimer.new($refresh_period) { Vizir.learn_new_jobs(api) }
+  EventMachine::PeriodicTimer.new($alert_period) { Vizir.alert_jobs(api) }
 }
 
 gateway.shutdown!

data/vizir.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vizir}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pierre Riteau"]
-  s.date = %q{2009-06-10}
+  s.date = %q{2009-06-19}
   s.default_executable = %q{vizir}
   s.email = %q{pierre.riteau@gmail.com}
   s.executables = ["vizir"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vizir
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Pierre Riteau
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-10 00:00:00 +02:00
+date: 2009-06-19 00:00:00 +02:00
 default_executable: vizir
 dependencies: 
 - !ruby/object:Gem::Dependency