vizir 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/bin/vizir

@@ -4,6 +4,7 @@ $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
 require 'eventmachine'
 require 'growl'
+require 'logger'
 require 'net/ssh/gateway'
 require 'optparse'
 require 'rest_client'
@@ -11,6 +12,9 @@ require 'vizir'
 
 $alert_period = 60
 $refresh_period = 3600
+$log = Logger.new(STDOUT)
+$log.datetime_format = "%H:%M:%S"
+$log.level = Logger::WARN
 
 def setup_ssh_tunnel
   gateway = Net::SSH::Gateway.new('access.grenoble.grid5000.fr', $login)
@@ -27,8 +31,8 @@ def setup_growl
   $growl.register('Vizir', ['Job ending soon'])
 end
 
-def notify_via_growl(jobid, site_name, time, time_unit)
-  $growl.notify('Job ending soon', 'OAR job terminating soon', "Job #{jobid} in #{site_name} ending in #{time} #{time_unit}.", :sticky => true)
+def notify_via_growl(jobid, site_name, time)
+  $growl.notify('Job ending soon', 'OAR job terminating soon', "Job #{jobid} in #{site_name} ending #{time}.", :sticky => true)
 end
 
 $login = nil
@@ -45,13 +49,21 @@ opts = OptionParser.new do |opts|
   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 }
+  opts.on('-v', '--verbose', "Print debugging messages") { $log.level = Logger::INFO }
 end
 
-opts.parse!(ARGV)
+begin
+  opts.parse!(ARGV)
+rescue
+  puts "Error: " + $!
+  puts "\n" + opts.to_s
+  exit 1
+end
 
 if $login == nil
-  puts opts
-  exit
+  puts "Error: login is required"
+  puts "\n" + opts.to_s
+  exit 1
 end
 
 gateway, port = setup_ssh_tunnel

data/lib/vizir.rb

@@ -7,21 +7,24 @@ module Vizir
   FIRST_ALERT_TIME = 600
 
   def Vizir.humanize_time(time)
-    fail "Can't humanize negative period" if time < 0
-
-    if time >= 60
-      remaining_time = time / 60
-      remaining_time_unit = "minute"
-    else
-      remaining_time = time
-      remaining_time_unit = "second"
+    return "now" if time <= 0
+
+    time_units = []
+    minutes = time / 60
+    if minutes != 0
+      s = "#{minutes} minute"
+      s += "s" if minutes > 1
+      time_units.push(s)
     end
 
-    if remaining_time > 1
-      remaining_time_unit += "s"
+    seconds = time % 60
+    if seconds != 0
+      s = "#{seconds} second"
+      s += "s" if seconds > 1
+      time_units.push(s)
     end
 
-    return remaining_time, remaining_time_unit
+    return "in " + time_units.join(" and ")
   end
 
   def Vizir.get_remaining_time(end_time, now)
@@ -71,7 +74,9 @@ module Vizir
           jobid = job_details['Job_Id']
           # If we don't yet know the job, record it in $jobs
           if $jobs[jobid].nil?
-            $jobs[jobid] = Vizir::Job.new(jobid, Time.at(Integer(job_details['startTime']) + Integer(job_details['walltime'])), site_name.capitalize)
+            ending_time = Time.at(Integer(job_details['startTime']) + Integer(job_details['walltime']))
+            $jobs[jobid] = Vizir::Job.new(jobid, ending_time, site_name.capitalize)
+            $log.info("learned job #{jobid} in #{site_name.capitalize} ending on #{ending_time.strftime('%b %d')} at #{ending_time.strftime('%H:%M:%S')}")
           end
         end
       end
@@ -98,12 +103,8 @@ module Vizir
           next
         end
         remaining_sec = Vizir.get_remaining_time(job.end_time, Time.now)
-        if remaining_sec < 0
-          $stderr.puts "Error: negative time"
-          next
-        end
-        remaining_time, remaining_time_unit = Vizir.humanize_time(remaining_sec)
-        notify_via_growl(jobid, job.site_name, remaining_time, remaining_time_unit)
+        remaining_time = Vizir.humanize_time(remaining_sec)
+        notify_via_growl(jobid, job.site_name, remaining_time)
       end
     end
   end

data/test/test_vizir.rb

@@ -2,20 +2,21 @@ require 'test_helper'
 
 class VizirTest < Test::Unit::TestCase
   TIMES = [
-    [0,   [0,   "second"]],
-    [1,   [1,   "second"]],
-    [30,  [30,  "seconds"]],
-    [59,  [59,  "seconds"]],
-    [60,  [1,   "minute"]],
-    [119, [1,   "minute"]],
-    [120, [2,   "minutes"]]
+    [-119,  "now"],
+    [-1,    "now"],
+    [0,     "now"],
+    [1,     "in 1 second"],
+    [30,    "in 30 seconds"],
+    [59,    "in 59 seconds"],
+    [60,    "in 1 minute"],
+    [61,    "in 1 minute and 1 second"],
+    [119,   "in 1 minute and 59 seconds"],
+    [120,   "in 2 minutes"]
   ]
   def test_humanize_time
     TIMES.each do |seconds, result|
       assert_equal(result, Vizir.humanize_time(seconds))
     end
-    e = assert_raise(RuntimeError) { Vizir.humanize_time(-1) }
-    assert_equal("Can't humanize negative period", e.message)
   end
 
   def test_learn_sites
@@ -34,7 +35,7 @@ class VizirTest < Test::Unit::TestCase
         "uri" => "/sites/luxembourg"
       }]
     json = JSON.generate(o)
-    FakeWeb.register_uri(:get, "#{Vizir::APIURL}/sites?structure=simple", :string => json)
+    FakeWeb.register_uri(:get, "#{Vizir::APIURL}/sites?structure=simple", :body => json)
     api = Vizir.get_api(Vizir::APIURL)
     sites = o.delete_if { |hash| hash["site"] == "luxembourg" }
     ignored_sites = ["luxembourg", "portoalegre"]

data/vizir.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vizir}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pierre Riteau"]
-  s.date = %q{2009-06-19}
+  s.date = %q{2009-07-13}
   s.default_executable = %q{vizir}
   s.email = %q{pierre.riteau@gmail.com}
   s.executables = ["vizir"]
@@ -27,12 +27,11 @@ Gem::Specification.new do |s|
      "test/test_vizir.rb",
      "vizir.gemspec"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/priteau/vizir}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{vizir}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{Growl notifications for Grid'5000 jobs}
   s.test_files = [
     "test/test_helper.rb",
@@ -41,7 +40,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vizir
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Pierre Riteau
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-19 00:00:00 +02:00
+date: 2009-07-13 00:00:00 +02:00
 default_executable: vizir
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,8 @@ files:
 - vizir.gemspec
 has_rdoc: true
 homepage: http://github.com/priteau/vizir
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -105,9 +107,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: vizir
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Growl notifications for Grid'5000 jobs
 test_files: 
 - test/test_helper.rb