rq 0.1.7 → 3.0.0

data/lib/{rq-0.1.7 → rq-3.0.0}/util.rb

@@ -1,6 +1,6 @@
 unless defined? $__rq_util__
   module RQ 
-#{{{
+#--{{{
     LIBDIR = File::dirname(File::expand_path(__FILE__)) + File::SEPARATOR unless
       defined? LIBDIR
 
@@ -8,54 +8,57 @@ unless defined? $__rq_util__
     require 'socket'
     require 'tmpdir'
 
+    #
+    # of course - all the rest goes here
+    #
     module  Util
-#{{{
+#--{{{
       class << self
         def export sym
-#{{{
+#--{{{
           sym = "#{ sym }".intern
           module_function sym 
           public sym 
-#}}}
+#--}}}
         end
         def append_features c
-#{{{
+#--{{{
           super
           c.extend Util 
-#}}}  
+#--}}}
         end
       end
       def mcp obj
-#{{{
+#--{{{
         Marshal.load(Marshal.dump(obj))
-#}}}
+#--}}}
       end
       export 'mcp'
       def klass
-#{{{
+#--{{{
         self.class
-#}}}
+#--}}}
       end
       export 'klass'
       def realpath path
-#{{{
+#--{{{
         path = File::expand_path "#{ path }"
         begin
           Pathname::new(path).realpath.to_s
         rescue Errno::ENOENT, Errno::ENOTDIR
           path
         end
-#}}}
+#--}}}
       end
       export 'realpath'
       def hashify(*hashes)
-#{{{
+#--{{{
         hashes.inject(accum={}){|accum,hash| accum.update hash}
-#}}}
+#--}}}
       end
       export 'hashify'
       def getopt opt, hash, default = nil
-#{{{
+#--{{{
         key = opt
         return hash[key] if hash.has_key? key
 
@@ -66,11 +69,11 @@ unless defined? $__rq_util__
         return hash[key] if hash.has_key? key
 
         return default
-#}}}
+#--}}}
       end
       export 'getopt'
       def alive? pid
-#{{{
+#--{{{
         pid = Integer("#{ pid }")
         begin
           Process.kill 0, pid
@@ -78,11 +81,11 @@ unless defined? $__rq_util__
         rescue Errno::ESRCH
           false
         end
-#}}}
+#--}}}
       end
       export 'alive?'
       def maim(pid, opts = {})
-#{{{
+#--{{{
         sigs = getopt('signals', opts) || %w(SIGTERM SIGQUIT SIGKILL) 
         suspend = getopt('suspend', opts) || 4
         pid = Integer("#{ pid }")
@@ -100,19 +103,19 @@ unless defined? $__rq_util__
           end
         end
         not alive?(pid)
-#}}}
+#--}}}
       end
       export 'maim'
       def timestamp time = Time.now
-#{{{
+#--{{{
         usec = "#{ time.usec }"
         usec << ('0' * (6 - usec.size)) if usec.size < 6 
         time.strftime('%Y-%m-%d %H:%M:%S.') << usec
-#}}}
+#--}}}
       end
       export 'timestamp'
       def stamptime string, local = true 
-#{{{
+#--{{{
         string = "#{ string }"
         pat = %r/^\s*(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d).(\d\d\d\d\d\d)\s*$/o
         match = pat.match string
@@ -123,28 +126,28 @@ unless defined? $__rq_util__
         else
           Time.gm yyyy,mm,dd,h,m,s,u
         end
-#}}}
+#--}}}
       end
       export 'stamptime'
       def escape! s, char, esc
-#{{{
+#--{{{
         re = %r/([#{0x5c.chr << esc}]*)#{char}/
         s.gsub!(re) do
           (($1.size % 2 == 0) ? ($1 << esc) : $1) + char 
         end
-#}}}
+#--}}}
       end
       export 'escape!'
       def escape s, char, esc
-#{{{
+#--{{{
         ss = "#{ s }"
         escape! ss, char, esc
         ss
-#}}}
+#--}}}
       end
       export 'escape'
       def fork(*args, &block)
-#{{{
+#--{{{
         begin
           verbose = $VERBOSE
           $VERBOSE = nil
@@ -152,11 +155,11 @@ unless defined? $__rq_util__
         ensure
           $VERBOSE = verbose
         end
-#}}}
+#--}}}
       end
       export 'fork'
       def exec(*args, &block)
-#{{{
+#--{{{
         begin
           verbose = $VERBOSE
           $VERBOSE = nil
@@ -164,11 +167,11 @@ unless defined? $__rq_util__
         ensure
           $VERBOSE = verbose
         end
-#}}}
+#--}}}
       end
       export 'exec'
       def system(*args, &block)
-#{{{
+#--{{{
         begin
           verbose = $VERBOSE
           $VERBOSE = nil
@@ -176,58 +179,58 @@ unless defined? $__rq_util__
         ensure
           $VERBOSE = verbose
         end
-#}}}
+#--}}}
       end
       export 'system'
       def hostname
-#{{{
+#--{{{
         @__hostname__ ||= Socket::gethostname
-#}}}
+#--}}}
       end
       export 'hostname'
       def host
-#{{{
+#--{{{
         @__host__ ||= Socket::gethostname.gsub(%r/\..*$/o,'')
-#}}}
+#--}}}
       end
       export 'host'
       def emsg e
-#{{{
+#--{{{
         "#{ e.message } - (#{ e.class })"
-#}}}
+#--}}}
       end
       export 'emsg'
       def btrace e
-#{{{
+#--{{{
         (e.backtrace or []).join("\n")
-#}}}
+#--}}}
       end
       export 'btrace'
       def errmsg e
-#{{{
+#--{{{
         emsg(e) << "\n" << btrace(e)
-#}}}
+#--}}}
       end
       export 'errmsg'
       def erreq a, b
-#{{{
+#--{{{
         a.class == b.class and
         a.message == b.message and
         a.backtrace == b.backtrace
-#}}}
+#--}}}
       end
       export 'erreq'
       def tmpnam dir = Dir.tmpdir, seed = File::basename($0)
-#{{{
+#--{{{
         pid = Process.pid
         path = "%s_%s_%s_%s_%d" % 
           [Util::hostname, seed, pid, Util::timestamp.gsub(/\s+/o,'_'), rand(101010)]
         File::join(dir, path)
-#}}}
+#--}}}
       end
       export 'tmpnam'
       def uncache file 
-#{{{
+#--{{{
         refresh = nil
         begin
           is_a_file = File === file
@@ -243,11 +246,11 @@ unless defined? $__rq_util__
           rescue Errno::ENOENT
           end
         end
-#}}}
+#--}}}
       end
       export 'uncache'
       def columnize buf, width = 80, indent = 0
-#{{{
+#--{{{
         column = []
         words = buf.split %r/\s+/o
         row = ' ' * indent
@@ -263,11 +266,11 @@ unless defined? $__rq_util__
         end
         column << row unless row.strip.empty?
         column.join "\n"
-#}}}
+#--}}}
       end
       export 'columnize'
       def defval var, default = nil
-#{{{
+#--{{{
         v = "#{ var }"
         c = "DEFAULT_#{ v }".upcase
         begin
@@ -275,12 +278,27 @@ unless defined? $__rq_util__
         rescue NameError
           default
         end
-#}}}
+#--}}}
       end
       export 'defval'
-#}}}
+      def hms s
+#--{{{
+        h, s = s.divmod 3600
+        m, s = s.divmod 60
+        [h.to_i, m.to_i, s]
+#--}}}
+      end
+      export 'hms'
+      def which_ruby
+#--{{{
+        c = ::Config::CONFIG
+        realpath( File::join(c['bindir'], c['ruby_install_name']) << c['EXEEXT'] )
+#--}}}
+      end
+      export 'which_ruby'
+#--}}}
     end # module Util
-#}}}
+#--}}}
   end # module RQ
 $__rq_util__ = __FILE__ 
 end

data/lib/rq.rb

@@ -1,13 +1,22 @@
 unless defined? $__rq__
   module RQ 
-#{{{
-    AUTHOR = 'ara.t.howard@noaa.gov'
+#--{{{
+    require 'rbconfig'
+
+    C = Config::CONFIG
+
+    AUTHOR = 'ara.t.howard@gmail.com'
     LIBNAME = 'rq'
-    VERSION = '0.1.7'
+    VERSION = '3.0.0'
     LIBVER = "#{ LIBNAME }-#{ VERSION }"
     DIRNAME = File::dirname(File::expand_path(__FILE__)) + File::SEPARATOR
     ROOTDIR = File::dirname(DIRNAME)
     LIBDIR = File::join(DIRNAME, LIBVER) + File::SEPARATOR
+    LOCALDIR = File::join(LIBDIR, 'local') + File::SEPARATOR
+    LOCALBINDIR = File::join(LOCALDIR, 'bin') + File::SEPARATOR
+    LOCALLIBDIR = File::join(LOCALDIR, 'lib') + File::SEPARATOR
+    ARCH = C['sitearch'] || C['arch']
+    ARCHLIBDIR = File::join(LIBDIR, ARCH) + File::SEPARATOR
     EXIT_SUCCESS = 0
     EXIT_FAILURE = 1
   #
@@ -16,10 +25,10 @@ unless defined? $__rq__
     require 'optparse'
     require 'logger'
     require 'socket'
-    require 'rbconfig'
     require 'optparse'
     require 'logger'
     require 'yaml'
+    require 'yaml/store'
     require 'pp'
     require 'socket'
     require 'pathname'
@@ -27,18 +36,22 @@ unless defined? $__rq__
     require 'fileutils'
     require 'tmpdir'
     require 'drb/drb'
+    require 'digest/md5'
   #
-  # depends - http://raa.ruby-lang.org
+  # try to load rubygems
   #
     begin
-      require 'arrayfields'
+      require 'rubygems'
     rescue LoadError
-      abort "require arrayfields - http://raa.ruby-lang.org/project/arrayfields/"
+      nil
     end
+  #
+  # depends - http://raa.ruby-lang.org
+  #
     begin
-      require 'sqlite'
+      require 'arrayfields'
     rescue LoadError
-      abort "require sqlite - http://raa.ruby-lang.org/project/sqlite-ruby/"
+      abort "require arrayfields - http://raa.ruby-lang.org/project/arrayfields/"
     end
     begin
       require 'posixlock'
@@ -51,13 +64,31 @@ unless defined? $__rq__
       abort "require lockfile - http://raa.ruby-lang.org/project/lockfile/"
     end
   #
+  # setup local require/lib/path/environment
+  #
+    $VERBOSE = nil
+    ENV['PATH'] = [LOCALBINDIR, ENV['PATH']].join(':')
+    ENV['LD_LIBRARY_PATH'] = [LOCALLIBDIR, ENV['LD_LIBRARY_PATH']].join(':')
+    begin
+      $:.unshift ARCHLIBDIR 
+      $:.unshift LIBDIR  
+      require 'sqlite'
+    rescue LoadError
+      abort "require sqlite - http://raa.ruby-lang.org/project/sqlite-ruby/"
+    ensure
+      $:.shift
+      $:.shift
+    end
+    #system "ldd #{ ARCHLIBDIR }/_sqlite.so"
+    #system "which sqlite"
+  #
   # rq support libs
   #
     require LIBDIR + 'util'
     require LIBDIR + 'logging'
-    require LIBDIR + 'configfile'
+    require LIBDIR + 'orderedhash'
+    require LIBDIR + 'orderedautohash'
     require LIBDIR + 'sleepcycle'
-    require LIBDIR + 'refresher'
     require LIBDIR + 'qdb'
     require LIBDIR + 'jobqueue'
     require LIBDIR + 'job'
@@ -67,6 +98,7 @@ unless defined? $__rq__
     require LIBDIR + 'mainhelper'
     require LIBDIR + 'creator'
     require LIBDIR + 'submitter'
+    require LIBDIR + 'resubmitter'
     require LIBDIR + 'lister'
     require LIBDIR + 'statuslister'
     require LIBDIR + 'deleter'
@@ -77,8 +109,16 @@ unless defined? $__rq__
     require LIBDIR + 'snapshotter'
     require LIBDIR + 'locker'
     require LIBDIR + 'backer'
+    require LIBDIR + 'rotater'
     require LIBDIR + 'feeder'
-#}}}
+    require LIBDIR + 'recoverer'
+    require LIBDIR + 'ioviewer'
+    require LIBDIR + 'toucher'
+    #require LIBDIR + 'resourcemanager'
+    #require LIBDIR + 'resource'
+    require LIBDIR + 'cron'
+
+#--}}}
   end # module rq
   $__rq__ = __FILE__ 
 end

data/rdoc.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+#
+# workaround so bin/* gets doc'd as ruby files
+#
+
+pushd .
+cd bin
+for f in *; do ln -s $f "$f.rb"; done
+popd
+
+rdoc -a -d -F -S -m README -I jpg -N [A-Z]* bin/rq.rb lib/rq.rb lib/*/*
+
+pushd .
+cd bin
+for f in *rb; do rm -f $f; done
+popd