delayed_job 2.1.3 → 2.1.4

data/lib/delayed/command.rb

@@ -47,6 +47,9 @@ module Delayed
         opts.on('--sleep-delay N', "Amount of time to sleep when no jobs are found") do |n|
           @options[:sleep_delay] = n
         end
+        opts.on('-p', '--prefix NAME', "String to be prefixed to worker process names") do |prefix|
+          @options[:prefix] = prefix
+        end
       end
       @args = opts.parse!(args)
     end
@@ -76,6 +79,7 @@ module Delayed
     
     def run_process(process_name, dir)
       Daemons.run_proc(process_name, :dir => dir, :dir_mode => :normal, :monitor => @monitor, :ARGV => @args) do |*args|
+        $0 = File.join(@options[:prefix], process_name) if @options[:prefix]
         run process_name
       end
     end

data/lib/delayed/yaml_ext.rb

@@ -2,6 +2,7 @@
 # Classes, Modules and Structs
 
 require 'yaml'
+YAML::ENGINE.yamler = "syck" if defined?(YAML::ENGINE)
 
 class Module
   yaml_as "tag:ruby.yaml.org,2002:module"
@@ -27,7 +28,7 @@ end
 
 class Class
   yaml_as "tag:ruby.yaml.org,2002:class"
-  remove_method :to_yaml # use Module's to_yaml
+  remove_method :to_yaml if respond_to?(:to_yaml) && method(:to_yaml).owner == Class # use Module's to_yaml
 end
 
 class Struct

data/spec/yaml_ext_spec.rb

@@ -3,14 +3,29 @@ require 'spec_helper'
 describe YAML do
   it "should autoload classes that are unknown at runtime" do
     lambda {
-      YAML.load("--- !ruby/object:Autoloaded::Clazz {}")
+      obj = YAML.load("--- !ruby/object:Autoloaded::Clazz {}")
+      obj.class.to_s.should == 'Autoloaded::Clazz'
     }.should_not raise_error
   end
 
   it "should autoload structs that are unknown at runtime" do
     lambda {
-      YAML.load("--- !ruby/struct:Autoloaded::Struct {}")
+      obj = YAML.load("--- !ruby/struct:Autoloaded::Struct {}")
+      obj.class.to_s.should == 'Autoloaded::Struct'
     }.should_not raise_error
   end
+
+  # As we're overriding some of Yaml's internals it is best that our changes
+  # don't impact other places where Yaml is used. Or at least don't make it
+  # look like the exception is caused by DJ
+  it "should not raise exception on poorly formatted yaml" do
+    lambda do
+      YAML.load(<<-EOYAML
+default:
+  <<: *login
+EOYAML
+      )
+    end.should_not raise_error
+  end
   
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_job
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 2
   - 1
-  - 3
-  version: 2.1.3
+  - 4
+  version: 2.1.4
 platform: ruby
 authors: 
 - Chris Gaffney
@@ -16,103 +17,110 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 -07:00
+date: 2011-02-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   name: daemons
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   name: activesupport
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
         version: "3.0"
-  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *id002
+  type: :development
+  name: rails
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 0
         version: "2.0"
-  type: :development
-  prerelease: false
-  version_requirements: *id003
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: rake
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rails
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  type: :development
   name: sqlite3
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: mysql
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id007
+  requirement: *id007
 description: |-
   Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.
   
@@ -178,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1896469102761102405
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -187,14 +195,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1896469102761102405
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify