rake-funnel 0.0.1.pre → 0.0.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d13cf1a193e9b4f8f63bf3845a7b9e3411dc6b77
-  data.tar.gz: 83dcbb1be8a17e1b7b8b6065a69868d550ca2c71
+  metadata.gz: 534bce3208ca29cf25f9e04b4938c6167db9410c
+  data.tar.gz: 823fb7a0a61e1bf89860fbe20ad2aacd86839779
 SHA512:
-  metadata.gz: a082174a5f60488ae61a0319fbc0e793073b92f7a5363161d9f57e28ef86325ed51d6d953824d132b9f31d11596700d7978e6931abcfdf8a3c9c572d5a197738
-  data.tar.gz: 1bb7a3277da0c4c7a0b49f411abea297bc3fae354fbce34bbddc056dcdc71109ec695439a2a7d2a48018d3ae70bab20207b7e678720e8f30525a6d30a876818a
+  metadata.gz: 6dd1a16051c0acd07de377b14b8417ebf53517f379cd4c2d9e176ebf53e780f0823feaddaa31641b544db1cf69d23c92ac120b109c1608c871e68ceb021b47be
+  data.tar.gz: fac23dfb383cada38f8eb1c76d39e63680848bb402506fbb1eba621ca75a10cd60f3772b30cccf062120941989a8236f2cb332e0e54786ca4ac71ff12fa77fb9

data/lib/rake/funnel/tasks/environments_support/loader.rb

@@ -17,7 +17,7 @@ module Rake::Funnel::Tasks::EnvironmentsSupport
           operation = 'Merging'
 
           yaml = File.read(file)
-          yaml = ERB.new(yaml).result
+          yaml = evaluate_erb(yaml, file)
           yaml = YAML.load(yaml) || {}
           store.configure_from_hash(yaml)
         end
@@ -28,6 +28,12 @@ module Rake::Funnel::Tasks::EnvironmentsSupport
         log(store.inspect)
       end
 
+      def evaluate_erb(yaml, filename)
+        render = ERB.new(yaml)
+        render.filename = filename
+        render.result
+      end
+
       private
       def log(message)
         Rake.rake_output_message(message)

data/lib/rake/funnel/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Funnel
-    VERSION = '0.0.1.pre'
+    VERSION = '0.0.2.pre'
   end
 end

data/spec/rake/funnel/tasks/environments_support/loader_spec.rb

@@ -1,12 +1,24 @@
 describe Rake::Funnel::Tasks::EnvironmentsSupport::Loader do
-  describe 'loading configuration' do
-    let(:config) {
-      {
-        name: 'environment name',
-        config_files: config_files.keys.map(&:to_s)
-      }
+  let(:store) {
+    double(Configatron::Store).as_null_object
+  }
+
+  let(:config) {
+    {
+      name: 'environment name',
+      config_files: config_files.keys.map(&:to_s)
     }
+  }
 
+  before {
+    config_files.each do |file, content|
+      allow(File).to receive(:read).with(file.to_s).and_return(content)
+    end
+
+    allow(Rake).to receive(:rake_output_message)
+  }
+
+  describe 'loading configuration' do
     let(:config_files) {
       {
         one: 'one: 23',
@@ -14,18 +26,6 @@ describe Rake::Funnel::Tasks::EnvironmentsSupport::Loader do
       }
     }
 
-    let(:store) {
-      double(Configatron::Store).as_null_object
-    }
-
-    before {
-      config_files.each do |file, content|
-        allow(File).to receive(:read).with(file.to_s).and_return(content)
-      end
-
-      allow(Rake).to receive(:rake_output_message)
-    }
-
     before {
       described_class.load_configuration(config, store)
     }
@@ -98,17 +98,36 @@ describe Rake::Funnel::Tasks::EnvironmentsSupport::Loader do
         expect(store).to have_received(:configure_from_hash).with({})
       end
     end
+  end
 
-    context 'config file with ERb' do
+  describe 'config file with ERb' do
+    context 'ERb success' do
       let(:config_files) {
         {
           with_erb: 'foo: <%= 40 + 2 %>'
         }
       }
 
+      before {
+        described_class.load_configuration(config, store)
+      }
+
       it 'should evaluate ERb' do
         expect(store).to have_received(:configure_from_hash).with({ 'foo' => 42 })
       end
     end
+
+    context 'ERb failure' do
+      let(:config_files) {
+        {
+          with_erb: 'bogus: <%= 42 + "a" %>'
+        }
+      }
+
+      it 'should report file name' do
+        expect(lambda { described_class.load_configuration(config, store) })
+          .to raise_error { |ex| expect(ex.backtrace.join("\n")).to match(/with_erb/) }
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.0.2.pre
 platform: ruby
 authors:
 - Alexander Groß