expansions 0.4.33 → 0.4.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4cded197400bbf924399c1f9fa721ef57da0e88b
-  data.tar.gz: 91a2f79e7fd6369b696249d1e6968eb83b7f9d70
+SHA256:
+  metadata.gz: b1eb812bc08443b3690124ff06b7c3160bf53f1b5119a4729133fe0b0c7fadc3
+  data.tar.gz: 4dd15f72d8ea0889e1d3e3527cba52f951b7a56a27bd787de5772a660e9743a7
 SHA512:
-  metadata.gz: 6d0dcdda88d70c6f5915cc317126a4d77bc686c350f43929056b114e7a958bbf7d1269f8e642941c037f47152f844cf4aa4ad4153a06f2889d73bd2859e51f00
-  data.tar.gz: 243cb9f686dded797f0d90bad37a21fe149b2553ce21bdf83d51500507634c219d3295b6c32147a145f1898b697bda6adc38aa35b1d27ee1c2e92327740dd38b
+  metadata.gz: 9faf85ebb12b2f665cda089e6de19ba745bd82a392d260e68753db1c6726edc829c6f10e590b406c04be787bad00ec46373f3d9aa23844db916a51cb88490eb1
+  data.tar.gz: 921a5edaeb87e6e6406ca9c1c3c2c55eabc08c0886144097e4959b8cca35cab52a62db9652da70b21c9f766a1b1571955d26815d0230a5e655f929eefdc580b6

data/lib/expansions/file_merge.rb

@@ -59,7 +59,7 @@ module Expansions
 
     def add_merge_file(items,file)
       return if items.include?(file)
-      items << file if File.exists?(file)
+      items << file if File.exist?(file)
     end
   end
 end

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.35"
 end

data/spec/specs/file_merge_spec.rb

@@ -7,7 +7,7 @@ module Expansions
       let(:output_file){"out_file.rb"}
       let(:sut){FileMerge.new(output_file)}
       before (:each) do
-        File.stub(:exists?).with(file).and_return(true)
+        File.stub(:exist?).with(file).and_return(true)
       end
       context "and it is not already in the list" do
         before (:each) do
@@ -36,7 +36,7 @@ module Expansions
       let(:output_file){"out_file.rb"}
       let(:sut){FileMerge.new(output_file)}
       before (:each) do
-        File.stub(:exists?).with(file).and_return(true)
+        File.stub(:exist?).with(file).and_return(true)
       end
 
       before (:each) do

data/spec/specs/kernel_spec.rb

@@ -27,7 +27,7 @@ describe Expansions do
 
     context "and no block is given" do
       before (:each) do
-        @result = glob(File.join(RelativeFileSystem.base_path,"**/*.*"))
+        @result = glob(File.join(RelativeFileSystem.base_path,"**/**"))
       end
 
       it "should return all files in path" do
@@ -41,7 +41,7 @@ describe Expansions do
       end
 
       before (:each) do
-        @result = glob(File.join(RelativeFileSystem.base_path,"**/*.*")) do |file|
+        @result = glob(File.join(RelativeFileSystem.base_path,"**/*")) do |file|
           @items_visited += 1
         end
       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.35
 platform: ruby
 authors:
 - Develop With Passion®
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2023-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configatron
@@ -112,7 +112,7 @@ homepage: http://www.developwithpassion.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,26 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: expansions
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Simple Expansion Automation Utility
-test_files:
-- spec/spec_helper.rb
-- spec/specs/array_spec.rb
-- spec/specs/configuration_spec.rb
-- spec/specs/copy_spec.rb
-- spec/specs/copy_to_target_spec.rb
-- spec/specs/enumerable_extensions_spec.rb
-- spec/specs/erb_template_file_spec.rb
-- spec/specs/expansion_spec.rb
-- spec/specs/file_merge_spec.rb
-- spec/specs/file_spec.rb
-- spec/specs/kernel_spec.rb
-- spec/specs/mustache_template_file_spec.rb
-- spec/specs/shell_action_against_file_spec.rb
-- spec/specs/string_spec.rb
-- spec/specs/template_processors_spec.rb
-- spec/specs/template_visitor_spec.rb
-has_rdoc: 
+test_files: []