Merge pull request #82 from esaulkov/dotenv

feature: allow erb syntax in conf file
abak-press · May 23, 2016 · 69866a2 · 69866a2
2 parents 410dee3 + faa3bed
commit 69866a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/resque/integration/configuration.rb b/lib/resque/integration/configuration.rb
@@ -204,7 +204,9 @@ def to_god
       private
       def load(path)
         if File.exists?(path)
-          config = YAML.load(File.read(path))
+          input = File.read(path)
+          input = ERB.new(input).result if defined?(ERB)
+          config = YAML.load(input)
 
           @configuration.merge!(config)
         end

diff --git a/spec/resque/integration/configuration_spec.rb b/spec/resque/integration/configuration_spec.rb
@@ -6,6 +6,7 @@
   let(:config) do
     File.stub(:exists? => true)
     File.stub(:read)
+    ERB.stub_chain(:new, :result)
     YAML.stub(:load => config_yaml)
     described_class.new('path/to/config.yml')
   end