rq 3.5.1 → 3.5.3

data/gemspec.rb

@@ -1,7 +1,9 @@
-#! /usr/bin/env gem build
-
 lib = 'rq'
-version = '3.5.1'
+
+dirname = File.dirname(__FILE__)
+lines = IO.readlines(File.join('lib/rq.rb'))
+line = lines.detect{|line| line =~ /VERSION =/}
+version = line.split(/=/).last.scan(/[\d.]+/).first
 
 require 'rubygems'
 
@@ -15,6 +17,8 @@ Gem::Specification::new do |spec|
     end
   end
 
+  spec.name = lib 
+  spec.description = 'ruby queue is a zero-admin zero-configuration tool used to create instant unix clusters'
   spec.name = lib 
   spec.version = version 
   spec.platform = Gem::Platform::RUBY

data/lib/rq.rb

@@ -7,7 +7,7 @@ unless defined? $__rq__
 
     AUTHOR = 'ara.t.howard@gmail.com'
     LIBNAME = 'rq'
-    VERSION = '3.5.0'
+    VERSION = '3.5.3'
     LIBVER = "#{ LIBNAME }-#{ VERSION }"
     DIRNAME = File::dirname(File::expand_path(__FILE__)) + File::SEPARATOR
     ROOTDIR = File::dirname(DIRNAME)

data/lib/rq/jobqueue.rb

@@ -215,13 +215,20 @@ unless defined? $__rq_jobqueue__
 
               execute(sql){}
 
-              FileUtils::rm_rf standard_in_4(jid)
-              FileUtils::rm_rf standard_out_4(jid)
-              FileUtils::rm_rf standard_err_4(jid)
               #FileUtils::rm_rf data_4(jid)
+=begin
+p :job => job
+p :ts => ts
+p :pwd => Dir.pwd
+p :data => data
+p :data_4 => data_4(jid)
+p :standard_in_4 => standard_in_4(jid)
+exit!(1)
+=end
               FileUtils::cp ts.path, standard_in_4(jid) if ts
+
               if data
-                FileUtils::mv data, data_4(jid)
+                FileUtils::cp data, data_4(jid)
               else
                 FileUtils::mkdir_p data_4(jid)
               end

data/lib/rq/jobrunner.rb

@@ -56,10 +56,15 @@ unless defined? $__rq_jobrunner__
         @stderr = @job['stderr']
         @data = @job['data']
 
-        @stdin &&= File::join @q.path, @stdin # assume path relative to queue 
-        @stdout &&= File::join @q.path, @stdout # assume path relative to queue 
-        @stderr &&= File::join @q.path, @stderr # assume path relative to queue
-        @data &&= File::join @q.path, @data # assume path relative to queue 
+        @stdin &&= File::join(@q.path, @stdin) # assume path relative to queue 
+        @stdout &&= File::join(@q.path, @stdout) # assume path relative to queue 
+        @stderr &&= File::join(@q.path, @stderr) # assume path relative to queue
+        @data &&= File::join(@q.path, @data) # assume path relative to queue 
+
+        [@stdin, @stdout, @stderr].each do |path|
+          FileUtils::mkdir_p(FileUtils::dirname(path)) rescue nil
+          FileUtils::touch(path) unless File.exist?(path)
+        end
 
         @cid = 
           Util::fork do
@@ -96,8 +101,6 @@ unless defined? $__rq_jobrunner__
             "( ( #{ command } ;) #{ sin } #{ sout } ) #{ serr }"
           end
 
-        FileUtils::touch(@stdin) unless File.exist?(@stdin)
-
         @w.puts command
         @w.close
 #--}}}

data/lib/rq/resubmitter.rb

@@ -77,8 +77,8 @@ unless defined? $__rq_resubmitter__
             job['tag'] = @tag if @options.has_key?('tag')
             job['runner'] = @runner if @options.has_key?('runner')
             job['restartable'] = @restartable if @options.has_key?('restartable')
-            job['stdin'] = @job_stdin if @job_stdin
-            job['data'] = @data if @data
+            job['stdin'] = @job_stdin
+            job['data'] = @data
             unless job['state'] =~ %r/running/io
               resubmitted = nil
               @q.resubmit(job){|resubmitted|}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rq
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arrayfields
@@ -59,7 +59,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: ruby queue is a zero-admin zero-configuration tool used to create instant
+  unix clusters
 email: ara.t.howard@gmail.com
 executables:
 - rq
@@ -132,7 +133,6 @@ files:
 - Makefile
 - rdoc.sh
 - README
-- rq
 - TODO
 - TUTORIAL
 - white_box/crontab

data/rq

@@ -1,4 +0,0 @@
-#!/bin/sh
-rq='./bin/rq'
-rqlib='./lib'
-RUBYLIB=${rqlib} $rq "$@"