rq-ruby1.8 3.4.5 → 3.4.6

data/INSTALL

@@ -4,9 +4,9 @@ The current version of rq runs on ruby1.8. A gem is available on rubygems:
 
   https://rubygems.org/gems/rq-ruby1.8
 
-simply with
+simply install 
 
-  install sqlite2 (Debian apt-get install libsqlite0-dev)
+  sqlite2 (Debian apt-get install libsqlite0-dev)
 
 and
 
@@ -18,21 +18,30 @@ The gem includes sqlite-1.3.1 for Ruby. And should include:
   - gem1.8 install arrayfields
   - gem1.8 install lockfile
 
-  gems also available from http://bio4.dnsalias.net/download/gem/ruby1.8/
+  these gems are also available from http://bio4.dnsalias.net/download/gem/ruby1.8/
 
 Find rq
 
   gem1.8 contents rq-ruby1.8|grep bin/rq$
+
+and add to the path, for example 
+
+  /var/lib/gems/1.8/bin 
   
 Maybe link it
 
   ln -sf `gem1.8 contents rq-ruby1.8|grep bin/rq$` /usr/local/bin/rq
+
   rq --help
 
+Run the integration tests, e.g.
+
+  test_rq.rb or /var/lib/gems/1.8/bin/test_rq.rb 
+
 === Debian
 
 On Debian systems, the recommended procedure is to use Debian apt on all 
-machines. For now, use the gem install, as documented in the README!
+machines. For now, use the gem install, as documented above, and in the README!
 
 This has been tested on Debian Squeeze (BioLinux Minimal):
 
@@ -45,23 +54,29 @@ This has been tested on Debian Squeeze (BioLinux Minimal):
           Successfully installed posixlock-0.0.1
           Successfully installed arrayfields-4.7.4
           Successfully installed lockfile-1.4.3
-          Successfully installed rq-ruby1.8-3.4.4
+          Successfully installed rq-ruby1.8-3.x.x
           4 gems installed
           Installing ri documentation for posixlock-0.0.1...
           Installing ri documentation for arrayfields-4.7.4...
           Installing ri documentation for lockfile-1.4.3...
-          Installing ri documentation for rq-ruby1.8-3.4.4...
+          Installing ri documentation for rq-ruby1.8-3.x.x...
           Installing RDoc documentation for posixlock-0.0.1...
           Installing RDoc documentation for arrayfields-4.7.4...
           Installing RDoc documentation for lockfile-1.4.3...
-          Installing RDoc documentation for rq-ruby1.8-3.4.4...
+          Installing RDoc documentation for rq-ruby1.8-3.x.x...
 
       ln -sf `gem1.8 contents rq-ruby1.8|grep bin/rq$` /usr/local/bin/rq
 
+    run
+
+      test_rq.rb or /var/lib/gems/1.8/bin/test_rq.rb 
+
+      rq --help
+
 root@vagrant-debian-squeeze:/home/vagrant# rq --help
   NAME
 
-    rq v3.4.4
+    rq v3.x.x
 
 (...)
 
@@ -144,7 +159,7 @@ The current version of rq runs on ruby1.8, using bundler and jeweler:
 === rubyio.h error
 
 Building native extensions.  This could take a while...
-ERROR:  Error installing rq-ruby1.8-3.4.5.gem:
+ERROR:  Error installing rq-ruby1.8-3.x.x.gem:
         ERROR: Failed to build gem native extension.
 
 /usr/local/include/ruby-1.9.1/ruby/backward/rubyio.h:2:2: warning: #warning use "ruby/io.h" instead of "rubyio.h"
@@ -154,8 +169,11 @@ have problems mixing gems, take a look at 'rvm'.
 
 === can not find rq, after successful install
 
-gem1.8 stores gems in dirs named /var/lib/gems/1.8/gems/rq-ruby1.8-3.4.5/. You 
-may have to create a symbolic link, e.g.
+gem1.8 stores gems in dirs named /var/lib/gems/1.8/gems/rq-ruby1.8-3.x.x/. With
+'binaries' in /var/lib/gems/1.8/bin. Either add that to the path, or 
+create a symbolic link, e.g.
 
   ln -sf `gem1.8 contents rq-ruby1.8|grep bin/rq$` /usr/local/bin/rq
 
+
+

data/README

@@ -1,6 +1,6 @@
 NAME
 
-  rq v3.4.5
+  rq v3.4.6
 
 SYNOPSIS
 
@@ -44,13 +44,24 @@ DESCRIPTION
 
 QUICK START
 
-  install rq using rubygems
+  install rq using rubygems, after installing sqlite 2.x
 
     gem1.8 install rq-ruby1.8
+
+  the binary is in /var/lib/gems/1.8/bin/, so add that to the path,
+  or create a symbolic link
+
     ln -sf `gem1.8 contents rq-ruby1.8|grep bin/rq$` /usr/local/bin/rq
+
+  now rq should work
+
     rq --help
 
-  set up a directory for the queue - this can be a local, or an NFS/sshfs
+  run the integration test
+
+    /var/lib/gems/1.8/bin/test_rq.rb
+
+  set up a directory for your queue - this can be a local, or an NFS/sshfs
   mounted drive:
 
     rq dir create
@@ -99,7 +110,7 @@ INSTALL
 
   See the ./INSTALL file, but quickly
 
-  gem >=3.4.5:
+  gem >=3.4.6:
 
     - install sqlite2 (Debian apt-get install libsqlite0-dev)
     - gem1.8 install rq-ruby1.8 

data/TUTORIAL

@@ -31,56 +31,7 @@ and one node are up - the cluster can continute processing jobs.
 === EXAMPLE INSTALL
 ---
 
-download rq from http://raa.ruby-lang.org/project/rq
-
-unpack rq-X.X.X.tgz
-
-cd ./depends/
-
-the ./depends/packages/ directory will contain ALL packages required to install
-rq including ruby[www.ruby-lang.org]
-
-the file ./depends/install.sh installs ALL required packages for ruby queue into
-an nfs mounted directory.  it is a simple script - feel free to read/edit.
-
-installed packages will include:
-
-* ruby
-* sqlite
-* sqlite-ruby
-* arrayfields
-* posixlock
-* lockfile
-* rq
-
-the install.sh procedure is reccomended since
-
-* a common nfs filesystem is required on which to store the queue anyhow
-
-* installing all packages into this common nfs filesystem means no
-  software will be installed locally on any node which simplifies maintainance
-  and the addition of new nodes to the cluster.
-
-* root privledges are not required for this technique
-
-* this technique implies only two requirements for any node to join the cluster
-  * the nfs filesystem is visible to it
-  * a single crontab entry has been added
-
-the user running ./depends/install.sh should have write permission (or sudo
-write permission) to the /nfs mounted directory.
-
-following are the steps for an install into the nfs mounted directory named
-'/nfs'.  absolutely NO packages or files will be installed outside this hierachy
-so simply use 'rm -rf' to un-install.  
-  
-  tar xvfz rq-X.X.X.tgz
-
-  cd rq-X.X.X/
-
-  cd depends/
-
-  ./install.sh /nfs  
+See README and INSTALL
 
 ---
 === EXAMPLE SETUP
@@ -226,5 +177,4 @@ for more info try
 === AUTHOR/ASSISTANCE/BUG REPORTS
 ---
 
-  ara.t.howard@noaa.gov
-
+See README

data/VERSION

@@ -1 +1 @@
-3.4.5
+3.4.6

data/bin/rq

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby1.8
 
-$: << '/var/lib/gems/1.8/gems/rq-ruby1.8-3.4.5/lib'  # locate gem1.8 install
-$: << '/usr/share/rq-ruby1.8/lib'
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+# $: << '/var/lib/gems/1.8/gems/rq-ruby1.8-3.4.5/lib'  # locate gem1.8 install
 
 # 
 # === the rq program

data/bin/rqmailer

@@ -1,4 +1,4 @@
-#!  /opt/local/bin/ruby
+#! /usr/bin/env ruby1.8
 
 ### built-in
 require 'openssl'

data/{test → bin}/test_rq.rb

@@ -9,9 +9,9 @@ require 'yaml'
 
 print "rq integration test suite by Pjotr Prins 2011\n"
 
-src = File.join('..',File.dirname(__FILE__))
-$rq = File.join(src,'bin','rq');
-raise "Run from test folder!" if !File.executable?($rq)
+src = File.join(File.dirname(__FILE__))
+$rq = File.join(src,'rq');
+# raise "Run from test folder!" if !File.executable?($rq)
 $queue = './test_queue'
 
 def rq_exec(args)

data/lib/rq/usage.rb

@@ -136,13 +136,24 @@ DESCRIPTION
 
 QUICK START
 
-  install rq using rubygems
+  install rq using rubygems, after installing sqlite 2.x
 
     gem1.8 install rq-ruby1.8
+
+  the binary is in /var/lib/gems/1.8/bin/, so add that to the path,
+  or create a symbolic link
+
     ln -sf `gem1.8 contents rq-ruby1.8|grep bin/rq$` /usr/local/bin/rq
+
+  now rq should work
+
     rq --help
 
-  set up a directory for the queue - this can be a local, or an NFS/sshfs
+  run the integration test
+
+    /var/lib/gems/1.8/bin/test_rq.rb
+
+  set up a directory for your queue - this can be a local, or an NFS/sshfs
   mounted drive:
 
     rq dir create

data/rq-ruby1.8.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rq-ruby1.8}
-  s.version = "3.4.5"
+  s.version = "3.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pjotr Prins"]
-  s.date = %q{2011-07-23}
+  s.date = %q{2011-07-24}
   s.description = %q{Zero configuration job scheduler for computer clusters}
   s.email = %q{pjotr.public01@thebird.nl}
-  s.executables = ["rqmailer", "rq"]
+  s.executables = ["rq", "rqmailer", "test_rq.rb"]
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE",
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/rq",
     "bin/rqmailer",
+    "bin/test_rq.rb",
     "example/a.rb",
     "ext/extconf.rb",
     "ext/sqlite.c",
@@ -83,7 +84,6 @@ Gem::Specification.new do |s|
     "rdoc.sh",
     "rq-ruby1.8.gemspec",
     "test/.gitignore",
-    "test/test_rq.rb",
     "white_box/crontab",
     "white_box/joblist",
     "white_box/killrq",

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rq-ruby1.8
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 3
   - 4
-  - 5
-  version: 3.4.5
+  - 6
+  version: 3.4.6
 platform: ruby
 authors: 
 - Pjotr Prins
@@ -15,88 +14,84 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-23 00:00:00 +02:00
+date: 2011-07-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: posixlock
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: arrayfields
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: lockfile
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 1
         - 0
         - 15
         version: 1.0.15
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 6
         - 4
         version: 1.6.4
-  requirement: *id005
+  type: :development
+  prerelease: false
+  version_requirements: *id005
 description: Zero configuration job scheduler for computer clusters
 email: pjotr.public01@thebird.nl
 executables: 
-- rqmailer
 - rq
+- rqmailer
+- test_rq.rb
 extensions: 
 - ext/extconf.rb
 extra_rdoc_files: 
@@ -116,6 +111,7 @@ files:
 - VERSION
 - bin/rq
 - bin/rqmailer
+- bin/test_rq.rb
 - example/a.rb
 - ext/extconf.rb
 - ext/sqlite.c
@@ -167,7 +163,6 @@ files:
 - rdoc.sh
 - rq-ruby1.8.gemspec
 - test/.gitignore
-- test/test_rq.rb
 - white_box/crontab
 - white_box/joblist
 - white_box/killrq
@@ -186,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -600309677
       segments: 
       - 0
       version: "0"
@@ -195,7 +190,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"