resqued 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8e7be4711322272287bceeae0c9192c20231b21
-  data.tar.gz: 259b3e8da585db42bc351d81ace7eaab284f8df0
+  metadata.gz: ce7631acfa66d7a6304040677347a590e4c8b228
+  data.tar.gz: 75ef7fb35ce15af4c6a822923ec87dafb045e459
 SHA512:
-  metadata.gz: ab5c1d07edf8e9e1f500236de138da349d8f25b7608d03476208d307c282bce47540c2c354487229991f17ca1348b1911d0a7e82856b9dbf85a7cdb02e8c9dc5
-  data.tar.gz: 99ceb6e83b86c23f0f605ebf41e30bc096b720c51647a5d8f8e23b00373b2b757cfae08303a4249f9c550611ff9b9be588ae42cf330d7ecee9c6b60377f1737b
+  metadata.gz: bb0b962f81017fd01923398777f08eea1d6de730dbe497aa5771e196eb4debb3cea73a2b24954e0f17ac49950a5bc600be3994d343303f54df9792dfa813afc5
+  data.tar.gz: 8c3a8685eb36b6f34ea2fcaf5d1376c16e08425e23216a6c630aad8dc1d229cc6d55555d3dd643db1f92e780fe1ddfa2e1fa67ca71868c4cb81968ddb86ad234

data/CHANGES.md

@@ -1,5 +1,10 @@
 Starting with version 0.6.1, resqued uses semantic versioning to indicate incompatibilities between the master process, listener process, and configuration.
 
+v0.7.10
+-------
+
+* Support require_relative in config files. (#31)
+
 0.7.9
 -----
 

data/lib/resqued/config/base.rb

@@ -18,7 +18,9 @@ module Resqued
       # Public: Apply the configuration from several files.
       def apply_all(configs)
         configs.each do |config|
-          instance_eval(config[:content], config[:path])
+          with_current_path(config[:path]) do
+            instance_eval(config[:content], config[:path])
+          end
         end
         results
       end
@@ -28,6 +30,23 @@ module Resqued
       # Private: The results of applying the config.
       def results
       end
+
+      # Private: Set a base path for require_relative.
+      def with_current_path(path)
+        @current_path, old_current_path = path, @current_path
+        yield
+      ensure
+        @current_path = old_current_path
+      end
+
+      # Private: Override require_relative to work around https://bugs.ruby-lang.org/issues/4487
+      def require_relative(path)
+        if @current_path
+          require File.expand_path(path, File.dirname(@current_path))
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/resqued/version.rb

@@ -1,3 +1,3 @@
 module Resqued
-  VERSION = '0.7.9'
+  VERSION = '0.7.10'
 end

data/spec/resqued/config_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+require 'fileutils'
+require 'tmpdir'
+
+require 'resqued/config'
+
+describe Resqued::Config do
+  context do
+    around do |example|
+      $test_val = :not_set
+      $other_test_val = :not_set
+      Dir.mktmpdir do |dir|
+        @config_file = make_file(dir, "config/resqued.rb", "require_relative '../lib/file'\nworker 'example'\n")
+        make_file(dir, "lib/file.rb", "require_relative 'file2'\n$test_val = :ok\n")
+        make_file(dir, "lib/file2.rb", "$other_test_val = :ok\n")
+        example.call
+      end
+    end
+    let(:config) { Resqued::Config.new([@config_file]) }
+
+    it("can require_relative") { config.build_workers ; expect($test_val).to eq(:ok) }
+    it("does not override require_relative in required files") { config.build_workers ; expect($other_test_val).to eq(:ok) }
+
+    def make_file(dir, relative_path, content)
+      File.join(dir, relative_path).tap do |path|
+        FileUtils.mkpath File.dirname(path)
+        File.write(path, content)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resqued
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - Matt Burke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -121,6 +121,7 @@ files:
 - spec/resqued/backoff_spec.rb
 - spec/resqued/config/fork_event_spec.rb
 - spec/resqued/config/worker_spec.rb
+- spec/resqued/config_spec.rb
 - spec/resqued/sleepy_spec.rb
 - spec/resqued/test_case_spec.rb
 - spec/resqued/test_case_spec.rb.orig
@@ -161,6 +162,7 @@ test_files:
 - spec/resqued/backoff_spec.rb
 - spec/resqued/config/fork_event_spec.rb
 - spec/resqued/config/worker_spec.rb
+- spec/resqued/config_spec.rb
 - spec/resqued/sleepy_spec.rb
 - spec/resqued/test_case_spec.rb
 - spec/resqued/test_case_spec.rb.orig