canvas-jobs 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06b0d47df9e4e61f3ecb4036f429c02acc0d6cd0
-  data.tar.gz: 81246d65f48fbeac3bd230f0917cf02d0ca702b4
+  metadata.gz: fc057ee6906ea7379cfb792230dafc66f213acad
+  data.tar.gz: 77fe7aa819367091e923f105c9c06f914df3468e
 SHA512:
-  metadata.gz: 995da9b8ba15ab581a67f26b25931ed1faeda4f6a839aaa07a010ab6e7fddd07a1c6fc0f920d39899d3c70990a7208c17e7fb05fdcada38389aa814086d024e1
-  data.tar.gz: 2f809d07cbaf801726610fdb2712807fc8eb762966ec1de580354005ab46d26a0f721821ff25aa6f866bb95fb126be296849b0f856984c2c2b062ecea94ee4c0
+  metadata.gz: e9db129cd415d8e054d17aee72e40a7a15cff7b79b81919ee72af8a1c681b09273f23076aa451891283533fa3fa1f6be0cb947a28dd57d000374386aef55a292
+  data.tar.gz: 3959cbd432ec566d779f88a00dd7c2e777f8a3235b2ae0e7ee3f28a99fe2337590d0be8d2978b6cecd8a7e2abd645bd3a6f56d0fa94de872664bc0d16c78cd7a

data/lib/delayed/pool.rb

@@ -15,8 +15,8 @@ class Pool
     @workers = {}
     @config = { :workers => [] }
     @options = {
-      :config_file => expand_rails_path("config/delayed_jobs.yml"),
-      :pid_folder => expand_rails_path("tmp/pids"),
+      :config_file => Settings.default_worker_config_name,
+      :pid_folder => Settings.expand_rails_path("tmp/pids"),
       :tail_logs => true, # only in FG mode
     }
   end
@@ -120,7 +120,7 @@ class Pool
   end
 
   def load_rails
-    require(expand_rails_path("config/environment.rb"))
+    require(Settings.expand_rails_path("config/environment.rb"))
     Dir.chdir(Rails.root)
   end
 
@@ -248,7 +248,7 @@ class Pool
     # it somewhere useful
     last_ditch_logfile = self.last_ditch_logfile || "log/delayed_job.log"
     if last_ditch_logfile[0] != '|'
-      last_ditch_logfile = expand_rails_path(last_ditch_logfile)
+      last_ditch_logfile = Settings.expand_rails_path(last_ditch_logfile)
     end
     STDIN.reopen("/dev/null")
     STDOUT.reopen(open(last_ditch_logfile, 'a'))
@@ -312,26 +312,11 @@ class Pool
   end
 
   def read_config(config_filename)
-    config = YAML.load(ERB.new(File.read(config_filename)).result)
-    env = defined?(RAILS_ENV) ? RAILS_ENV : ENV['RAILS_ENV'] || 'development'
-    @config = config[env] || config['default']
-    # Backwards compatibility from when the config was just an array of queues
-    @config = { :workers => @config } if @config.is_a?(Array)
-    unless @config && @config.is_a?(Hash)
-      raise ArgumentError,
-        "Invalid config file #{config_filename}"
-    end
+    @config = Settings.worker_config(config_filename)
   end
 
   def apply_config
-    @config = @config.with_indifferent_access
-    Settings::SETTINGS.each do |setting|
-      Settings.send("#{setting}=", @config[setting.to_s]) if @config.key?(setting.to_s)
-    end
-  end
-
-  def expand_rails_path(path)
-    File.expand_path("../#{path}", ENV['BUNDLE_GEMFILE'])
+    Settings.apply_worker_config!(@config)
   end
 
 end

data/lib/delayed/settings.rb

@@ -28,5 +28,39 @@ module Delayed
 
     self.num_strands = ->(strand_name){ nil }
     self.default_job_options = ->{ Hash.new }
+
+    def self.worker_config(config_filename = nil)
+      config_filename ||= default_worker_config_name
+      config = YAML.load(ERB.new(File.read(config_filename)).result)
+      env = defined?(RAILS_ENV) ? RAILS_ENV : ENV['RAILS_ENV'] || 'development'
+      config = config[env] || config['default']
+      # Backwards compatibility from when the config was just an array of queues
+      config = { :workers => config } if config.is_a?(Array)
+      unless config && config.is_a?(Hash)
+        raise ArgumentError,
+          "Invalid config file #{config_filename}"
+      end
+      config.with_indifferent_access
+    end
+
+    def self.apply_worker_config!(config)
+      SETTINGS.each do |setting|
+        self.send("#{setting}=", config[setting.to_s]) if config.key?(setting.to_s)
+      end
+    end
+
+    def self.default_worker_config_name
+      expand_rails_path("config/delayed_jobs.yml")
+    end
+
+    # Expands rails-relative paths, without depending on rails being loaded.
+    def self.expand_rails_path(path)
+      root = if defined?(Rails) && Rails.root
+        (Rails.root+"Gemfile").to_s
+      else
+        ENV.fetch('BUNDLE_GEMFILE')
+      end
+      File.expand_path("../#{path}", root)
+    end
   end
 end

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas-jobs
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit