guard-bosh 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab9503fc851cdf19034ac1606debeacb0f2f085c
-  data.tar.gz: 533de1a40a7b769549221eac66627419d1782f41
+  metadata.gz: 51ca6f0f55880bc7db9d36d693036a5626b228a0
+  data.tar.gz: 269d78e98809510e93ae63d48da0809f8e567270
 SHA512:
-  metadata.gz: c4e0d898885f104008bf467c695667211e986e8d787a167bba61f1c0d555ae23e700da025c920c5962620aa219ad5127b94beacc0541054d482c15edc0d38c1b
-  data.tar.gz: edabe6e92e3c1cebec6cb08739eca1bb149c512fed9d4b288bc19a34139bb6549cdd6654cd2f006f1691b0fe89b0c6ed9a3221ed59cda6e176cc3c9c2e92fb2e
+  metadata.gz: 3a0ba80730401e7a0f7ec1d13c0fba3464fdea1c5c96f6f839bcbfa4f179103271a658bbb8d8f96c9f25b9fa2ced000d4ab50534ca0e72e54d555776f8c0cd5d
+  data.tar.gz: 96ab6eec2791ca84dc582eae3dece52d7a749f835f4646a3f7c3904cee6f2fed76f6a2c6bc0cec06eeade259af44814cd873a8030efcb7f8a887e26d5bb6412f

data/lib/guard/bosh/template_renderer.rb

@@ -8,17 +8,33 @@ module Guard
       def render(context:, template:)
         renderer = ::Bosh::Template::Renderer.new(
           context: JSON.generate(context))
+
+        # The re-writing of messages we do here is intended to make the output
+        # more readable, but may not be wise.
         begin
           renderer.render(template)
           { template: template, status: :success, detail: '' }
         rescue ::Bosh::Template::UnknownProperty => e
-          {
-            template: template,
-            status: :failure,
-            detail: "Missing property: #{e.name}"
-          }
+          error(template, "missing property: #{e.name}")
+        rescue NoMethodError => e
+          error(template, e.message.sub(/ for #<[^>]+>$/, ''))
+        rescue NameError => e
+          error(template, e.message.sub(/ for #<[^>]+>$/, ''))
+        rescue SyntaxError => e
+          error(template, e.message.split("\n").first.sub(
+            /^\(erb\):[0-9]+: /, ''))
         end
       end
+
+      private
+
+      def error(template, message)
+        {
+          template: template,
+          status: :failure,
+          detail: message
+        }
+      end
     end
   end
 end

data/spec/guard/bosh/template_renderer_spec.rb

@@ -7,10 +7,14 @@ describe Guard::Bosh::TemplateRenderer do
     Guard::Bosh::TemplateRenderer.new
   end
 
+  let(:bosh_renderer) { instance_double(::Bosh::Template::Renderer) }
+  before do
+    expect(::Bosh::Template::Renderer).to receive(:new).with(
+      context: '{}').and_return(bosh_renderer)
+  end
+
   context 'when the template contains no errors' do
     it 'reports that no error occurred' do
-      bosh_renderer = instance_double(::Bosh::Template::Renderer)
-      expect(::Bosh::Template::Renderer).to receive(:new).with(context: '{}').and_return(bosh_renderer)
       expect(bosh_renderer).to receive(:render).with('config.erb')
       result = subject.render(context: {}, template: 'config.erb')
       expect(result).to eq(template: 'config.erb', status: :success, detail: '')
@@ -19,11 +23,53 @@ describe Guard::Bosh::TemplateRenderer do
 
   context 'when the template refers to an unknown property' do
     it 'reports the missing property' do
-      bosh_renderer = instance_double(::Bosh::Template::Renderer)
-      expect(::Bosh::Template::Renderer).to receive(:new).with(context: '{}').and_return(bosh_renderer)
-      expect(bosh_renderer).to receive(:render).with('config.erb').and_raise(::Bosh::Template::UnknownProperty.new('redis.port'))
+      expect(bosh_renderer).to receive(:render).with('config.erb').and_raise(
+        ::Bosh::Template::UnknownProperty.new('redis.port'))
+      result = subject.render(context: {}, template: 'config.erb')
+      expect(result).to eq(
+        template: 'config.erb',
+        status: :failure,
+        detail: 'missing property: redis.port'
+      )
+    end
+  end
+
+  context 'when the template calls a misnamed helper method' do
+    it 'reports the missing helper method' do
+      expect(bosh_renderer).to receive(:render).with('config.erb').and_raise(
+        NoMethodError.new("undefined method `o' for #<Bosh::Template::EvaluationContext:0x00000000000000>"))
+      result = subject.render(context: {}, template: 'config.erb')
+      expect(result).to eq(
+        template: 'config.erb',
+        status: :failure,
+        detail: "undefined method `o'"
+      )
+    end
+  end
+
+  context 'when the template references a missing name' do
+    it 'reports the missing name' do
+      expect(bosh_renderer).to receive(:render).with('config.erb').and_raise(
+        NameError.new("undefined local variable or method `missing' for #<Bosh::Template::EvaluationContext:0x00000000000000>"))
+      result = subject.render(context: {}, template: 'config.erb')
+      expect(result).to eq(
+        template: 'config.erb',
+        status: :failure,
+        detail: "undefined local variable or method `missing'"
+      )
+    end
+  end
+
+  context 'when the template is not well-formed' do
+    it 'reports the template error' do
+      expect(bosh_renderer).to receive(:render).with('config.erb').and_raise(
+        SyntaxError.new("(erb):7: syntax error, unexpected end-of-input, expecting keyword_end\n; _erbout.force_encoding(__ENCODING__)"))
       result = subject.render(context: {}, template: 'config.erb')
-      expect(result).to eq(template: 'config.erb', status: :failure, detail: 'Missing property: redis.port')
+      expect(result).to eq(
+        template: 'config.erb',
+        status: :failure,
+        detail: 'syntax error, unexpected end-of-input, expecting keyword_end'
+      )
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-bosh
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Crump
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh-template