pipe_fitter 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 075d1725f51b70e4036459d29a4b8b79a4ab8e4c
-  data.tar.gz: 508c41608ec7ecad91bd6a6b5c81406410d71148
+  metadata.gz: 69ad8e802eb67ae7a2f6e7bf0b7db4143ea681ee
+  data.tar.gz: 25cfcd60d89d01c51c0b474beea8902360cf93c4
 SHA512:
-  metadata.gz: ec5e28cf5c5f6be03ba5981eeacc7bb5f5eb55f004ce8917e8174ca22e1c589ec5c8adc268bf1be4a079642040c61f55d4789349c9bebdb888869056279b1be5
-  data.tar.gz: db05be7c15b9696556ec940755272ce43e70bbbab5f5365164c95c1692ac312fef5f53d6d554d0ae70d4a3d5df54af84c0954d4a88b3223895e8a27db8360808
+  metadata.gz: a5121edf6101aeceba5b7eb46dacbb65a59da7f57a22e44a827e8f38f5469ec63c34e83b73e8afbe56d1ac585fb992447327f514333cc35c97d0d1d2e7b0c2d4
+  data.tar.gz: ef18e2ee2d4973327c239c73b23d2241a99851954000ccd465ccf323f443df732d85e6ebc30789ff89334c560d327f717b6dc5d05c333805ff015e46b83623d4

data/lib/pipe_fitter/pipeline.rb

@@ -16,7 +16,7 @@ module PipeFitter
 
     def self.load_yaml(filename)
       filepath = Pathname.new(filename)
-      yml = YamlLoader.load(filepath)
+      yml = YamlLoader.new.load(filepath)
       new(PipelineObjects.new(yml["pipeline_objects"]),
           ParameterObjects.new(yml["parameter_objects"]),
           ParameterValues.new(yml["parameter_values"]),
@@ -233,7 +233,7 @@ module PipeFitter
       end
 
       def tag_keys
-        @objs[:tags].map(&keys).flatten
+        @objs[:tags].map(&:keys).flatten
       end
     end
   end

data/lib/pipe_fitter/version.rb

@@ -1,3 +1,3 @@
 module PipeFitter
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/pipe_fitter/yaml_loader.rb

@@ -1,24 +1,35 @@
 require "yaml"
 require "erb"
+require "pathname"
 
 module PipeFitter
   class YamlLoader
-    class << self
-      def load(filename, context_filename = nil)
-        context = context_filename.nil? ? nil : YAML.load_file(context_filename)
-        YAML.load(eval_erb(filename, context)) || {}
-      end
+    def initialize
+      @search_path = [Pathname.new(".")]
+    end
 
-      def include_template(filename, context = {})
-        eval_erb(filename, context)
+    def load(filename)
+      @search_path.unshift(Pathname.new(filename).dirname)
+      text = eval_erb(filename)
+      YAML.load(text) || {}
+    rescue Psych::SyntaxError => e
+      text.split("\n").each_with_index do |l, i|
+        mark = (e.line == i + 1) ? "*" : " "
+        $stderr.puts format("%s%4d| %s", mark, i + 1, l)
       end
+      raise e
+    end
 
-      private
+    def include_template(filename, context = {})
+      dir = @search_path.find { |p| p.join(filename).exist? }
+      path = dir.nil? ? filename : dir.join(filename)
+      eval_erb(path, context).gsub("\n", "\n" + " " * (context[:indent] || 0))
+    end
 
-      def eval_erb(filename, context = nil)
-        context ||= {}
-        ERB.new(File.read(filename), nil, "-").result(binding).strip
-      end
+    private
+
+    def eval_erb(filename, context = {})
+      ERB.new(File.read(filename), nil, "-").result(binding).strip
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe_fitter
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - masa21kik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk