erb-hiera 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cad7d10ee664cf6998134bc530864207bf5af649
-  data.tar.gz: cb9f9fd07e9622641ebf124d555da74cba8c53d3
+  metadata.gz: fc6d4ae917342fbb62b9debfdcc027099284d98a
+  data.tar.gz: b00a638a52371b3cb53622aed168a2964a025214
 SHA512:
-  metadata.gz: 99fc9a1ee9264237f40c57ae7bbdba4ee52f188a12eb17226d2e75df211f6e7af2bb38771edf2dfd619525d98da7a5acd89d191a095703e68411b5de4c3e3351
-  data.tar.gz: d1ba6e4b7626fee5f9812b2d8aa6723ec51fb6aa0cb49d34f3b48105d36d39af0bb357004a15ce994543fc632c7696d32fc9f41fcb884d0081f97b12caf6a0df
+  metadata.gz: f5acefa45f15ca30d341c8718d84b904d5bd0292d7f33d5875db10e2ace2e28425c23141bcea0492109a3d90b338c713308232128af22aa1b878e8b020c1e5a6
+  data.tar.gz: 33abb2397e7cdac18f735d04660be51c2d0a71609fac1920e65cad7af176c9bf26f97e29ac4ec4f2a737fbefc73950da1d3908d1dfe4f2cff08864210964c731

data/lib/erb-hiera.rb

@@ -20,26 +20,23 @@ module ErbHiera
 
     mappings.each do |mapping|
       ErbHiera.scope  = mapping["scope"]
-      in_dir          = mapping["dir"]["input"]
-      out_dir         = mapping["dir"]["output"]
+      input           = mapping["dir"]["input"]
+      output          = mapping["dir"]["output"]
 
-      [:in_dir, :out_dir].each do |dir|
-        raise StandardError, "error: undefined #{dir.to_s.split('_')[0]}put directory" unless binding.local_variable_get(dir)
+      [:input, :output].each do |location|
+        raise StandardError, "error: undefined #{dir.to_s.split('_')[0]}put" unless binding.local_variable_get(location)
       end
 
-      manifests(in_dir).each do |manifest|
-        out_file = File.join(out_dir, manifest.gsub(in_dir, ""))
-
-        Manifest.info(manifest, out_file) if options[:verbose]
-
-        erb = ERB.new(File.read(manifest), nil, "-").result(Hiera.get_binding)
-
-        puts erb if options[:verbose]
+      # if input is a file then out_file is a file too
+      if input =~ /.erb$/
+        generate(output, input)
+        next
+      end
 
-        unless options[:dry_run]
-          FileUtils.mkdir_p File.dirname(out_file) unless Dir.exists?(File.dirname(out_file))
-          File.write(out_file, erb)
-        end
+      # otherwise the input/output are directories and all files should be processed..
+      manifests(input).each do |manifest|
+        out_file = File.join(output, manifest.gsub(input, ""))
+        generate(out_file, manifest)
       end
     end
   rescue => error
@@ -49,6 +46,19 @@ module ErbHiera
 
   private
 
+  def self.generate(out_file, manifest)
+    Manifest.info(manifest, out_file) if options[:verbose]
+
+    erb = ERB.new(File.read(manifest), nil, "-").result(Hiera.get_binding)
+
+    puts erb if options[:verbose]
+
+    unless options[:dry_run]
+      FileUtils.mkdir_p File.dirname(out_file) unless Dir.exists?(File.dirname(out_file))
+      File.write(out_file, erb)
+    end
+  end
+
   def self.handle_error(error)
     if options[:debug]
       puts

data/lib/erb-hiera/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module ErbHiera
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erb-hiera
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Rob Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiera