expansions 0.4.33 → 0.4.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cded197400bbf924399c1f9fa721ef57da0e88b
-  data.tar.gz: 91a2f79e7fd6369b696249d1e6968eb83b7f9d70
+  metadata.gz: 6046ae97940c3fab57fa282f1d0ff83d98a9fbb7
+  data.tar.gz: 61944c393d2e5b01345dd0034bababe455f23cc6
 SHA512:
-  metadata.gz: 6d0dcdda88d70c6f5915cc317126a4d77bc686c350f43929056b114e7a958bbf7d1269f8e642941c037f47152f844cf4aa4ad4153a06f2889d73bd2859e51f00
-  data.tar.gz: 243cb9f686dded797f0d90bad37a21fe149b2553ce21bdf83d51500507634c219d3295b6c32147a145f1898b697bda6adc38aa35b1d27ee1c2e92327740dd38b
+  metadata.gz: 6c9ba5a75fd6dc2e1929a3c98e7193d543d83af160d2b42581bca1b6003f2040ab5947c78ecf481a885ce208b26923f46af842bafad508da4a6a71f1b42bed6a
+  data.tar.gz: be8ddabe704ba220a48866dfe497c59c01485284f5982c4332c5f0995b0182d9595d17e3d942c1266d2f118972935721b0981933771b6ab58a151af27b056934

data/lib/expansions/template_visitor.rb

@@ -11,28 +11,34 @@ module Expansions
 
     def run_using(file_name)
       processor = processors.get_processor_for(file_name)
-
-      generated_name = File.basename(file_name,File.extname(file_name))
-
-      load_settings_file(File.dirname(file_name), generated_name)
-
-      generated_name = generated_name.gsub(DOT_FILE_PATTERN, "") 
-
-      generated_name = ".#{generated_name}" if (DOT_FILE_PATTERN =~ file_name) 
-
-      output = File.join(File.dirname(file_name),generated_name)
-
+      names = get_file_names(file_name)
+      load_settings_file(names[:settings_file])
+      output = names[:output_file_name]
       file.delete(output) if file.exists?(output)
 
-      processor.process(:input => file_name,:output => output)
+      begin
+        processor.process(:input => file_name,:output => output)
+      rescue Exception => e
+        raise "Error processing template file: #{file_name}"
+      end
     end
 
-    def load_settings_file(folder, file_name)
-      settings_file = File.join(folder, "#{file_name}.settings")
+    def get_file_names(file_name)
+        base_name = File.basename(file_name, File.extname(file_name))
+        dir_name = File.dirname(file_name)
+        generated_name = base_name.gsub(DOT_FILE_PATTERN, "") 
+        generated_name = ".#{generated_name}" if (DOT_FILE_PATTERN =~ file_name) 
+        output_file_name = File.join(dir_name, generated_name)
+        settings_file = File.join(dir_name, "#{base_name}.settings")
+
+        {
+          settings_file: settings_file,
+          output_file_name: output_file_name
+        }
+    end
 
-      if File.exist?(settings_file)
-        load settings_file
-      end
+    def load_settings_file(settings_file)
+      load settings_file if File.exist?(settings_file)
     end
   end
 end

data/lib/expansions/version.rb

@@ -1,3 +1,3 @@
 module Expansions
-  VERSION = "0.4.33"
+  VERSION = "0.4.34"
 end

data/spec/specs/template_visitor_spec.rb

@@ -20,7 +20,6 @@ module Expansions
       context "and the generated file already exists" do
         let(:file_name){"some.file"}
         before (:each) do
-          the_processor.stub(:remove_template_extension_from).and_return(file_name)
           file.stub(:exists?).with("./some.file").and_return(true)
         end
 
@@ -34,7 +33,6 @@ module Expansions
       context "and the generated file does not already exists" do
         let(:file_name){"some.file"}
         before (:each) do
-          the_processor.stub(:remove_template_extension_from).and_return(file_name)
           file.stub(:exists?).with("./some.file").and_return(false)
         end
 
@@ -53,7 +51,6 @@ module Expansions
 
         before (:each) do
           registry.stub(:get_processor_for).and_return(the_processor)
-          the_processor.stub(:remove_template_extension_from).ignore_arg.and_return("bashrc.dotfile")
         end
         before (:each) do
           sut.run_using(file_name)
@@ -69,7 +66,6 @@ module Expansions
 
         before (:each) do
           registry.stub(:get_processor_for).and_return(the_processor)
-          the_processor.stub(:remove_template_extension_from).ignore_arg.and_return("bashrc")
         end
         before (:each) do
           sut.run_using(file_name)
@@ -79,6 +75,29 @@ module Expansions
           the_processor.should have_received_message(:process,:input => file_name,:output => "blah/bashrc")
         end
       end
+
+      context "and the template processor throw an exception" do
+        let(:file_name){"blah/bashrc.erb"}
+        let(:options){{}}
+        let(:inner) { Exception.new("This is an error") }
+
+        before (:each) do
+          registry.stub(:get_processor_for).and_return(the_processor)
+          the_processor.stub(:process).throws(inner)
+        end
+
+        before (:each) do
+          begin
+            sut.run_using(file_name)
+          rescue Exception => e
+            @error = e
+          end
+        end
+
+        it "should rethrow the exception with details of the file that could not be transformed" do
+          expect(@error.message).to match(/Error processing/)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expansions
 version: !ruby/object:Gem::Version
-  version: 0.4.33
+  version: 0.4.34
 platform: ruby
 authors:
 - Develop With Passion®
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configatron