pipe_fitter 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69ad8e802eb67ae7a2f6e7bf0b7db4143ea681ee
-  data.tar.gz: 25cfcd60d89d01c51c0b474beea8902360cf93c4
+  metadata.gz: 892c113ee708c1620229690aa80940b4cd2ec4df
+  data.tar.gz: ec8b73ebbd4f064f944ee640158782d76291b16d
 SHA512:
-  metadata.gz: a5121edf6101aeceba5b7eb46dacbb65a59da7f57a22e44a827e8f38f5469ec63c34e83b73e8afbe56d1ac585fb992447327f514333cc35c97d0d1d2e7b0c2d4
-  data.tar.gz: ef18e2ee2d4973327c239c73b23d2241a99851954000ccd465ccf323f443df732d85e6ebc30789ff89334c560d327f717b6dc5d05c333805ff015e46b83623d4
+  metadata.gz: 5a3801e39e26c40dd1dda5411d23fce072f3d95f56496b600dfc02a98f4ed29b0dc8f6732c8469bd6f089ec69c75fafc07eafb7e6c89af764cf08c8325ad4679
+  data.tar.gz: 8053e25626a894251dd2bb93b7c261728c64bac31fc6984d3847713114a02a11da0cc79732d02dc7d038718854c835349b1cf6af9bb1608644181aff33283bf9

data/lib/pipe_fitter/pipeline.rb

@@ -79,13 +79,6 @@ module PipeFitter
     end
 
     class PipelineBaseObjects
-      def initialize(objs)
-        @objs = case objs
-                when Array then objs.map { |obj| symbolize_keys(obj) }
-                else symbolize_keys(objs) || {}
-                end
-      end
-
       def to_objs
         case @objs
         when Array then @objs.map { |obj| stringify_keys(obj) }
@@ -143,16 +136,27 @@ module PipeFitter
 
     class PipelineObjects < PipelineBaseObjects
       def self.create(api_res)
-        objs = (api_res || []).map(&:to_h).sort_by { |obj| obj[:id] }.map do |obj|
+        objs = (api_res || []).map(&:to_h).map do |obj|
           base = { id: obj[:id], name: obj[:name] }
           fields = obj[:fields].inject({}) do |a, e|
             update_hash(a, e[:key].to_sym, e[:string_value] || { ref: e[:ref_value] })
           end
-          base.merge(fields.sort_by { |k, _| k }.to_h)
+          base.merge(fields)
         end
         new(objs)
       end
 
+      KEY_ORDER = %i(id name).freeze
+
+      def initialize(objs)
+        @objs = (objs || []).map { |obj| symbolize_keys(obj) }
+                .sort_by { |obj| obj[:id] }.map do |obj|
+          obj.sort_by do |k, v|
+            [KEY_ORDER.index(k) || KEY_ORDER.size + 1, k.to_s, v.to_s]
+          end.to_h
+        end
+      end
+
       def to_api_opts
         @objs.map do |obj|
           { id: obj[:id], name: obj[:name], fields: split_object(obj, %i(id name)) }
@@ -162,15 +166,26 @@ module PipeFitter
 
     class ParameterObjects < PipelineBaseObjects
       def self.create(api_res)
-        objs = (api_res || []).map(&:to_h).sort_by { |obj| obj[:id] }.map do |obj|
+        objs = (api_res || []).map(&:to_h).map do |obj|
           base = { id: obj[:id] }
-          obj[:attributes].sort_by { |a| a[:key] }.inject(base) do |a, e|
+          obj[:attributes].inject(base) do |a, e|
             update_hash(a, e[:key].to_sym, e[:string_value])
           end
         end
         new(objs)
       end
 
+      KEY_ORDER = %i(id).freeze
+
+      def initialize(objs)
+        @objs = (objs || []).map { |obj| symbolize_keys(obj) }
+                .sort_by { |obj| obj[:id] }.map do |obj|
+          obj.sort_by do |k, v|
+            [KEY_ORDER.index(k) || KEY_ORDER.size + 1, k.to_s, v.to_s]
+          end.to_h
+        end
+      end
+
       def to_api_opts
         @objs.map do |obj|
           { id: obj[:id], attributes: split_object(obj, %i(id)) }
@@ -180,12 +195,16 @@ module PipeFitter
 
     class ParameterValues < PipelineBaseObjects
       def self.create(api_res)
-        objs = (api_res || []).sort_by { |obj| [obj[:id], obj[:string_value]] }.map do |obj|
+        objs = (api_res || []).map do |obj|
           { obj[:id].to_sym => obj[:string_value] }
         end
         new(objs)
       end
 
+      def initialize(objs)
+        @objs = (objs || []).sort_by { |obj| obj.first[0] }
+      end
+
       def to_api_opts
         @objs.map do |e|
           e.map do |k, v|
@@ -209,6 +228,12 @@ module PipeFitter
         new(objs)
       end
 
+      def initialize(objs)
+        @objs = symbolize_keys(objs || {}).sort_by do |k, v|
+          [DESCRIPTION_KEYS.index(k) || DESCRIPTION_KEYS.size + 1, k.to_s, v.to_s]
+        end.to_h
+      end
+
       DESCRIPTION_KEYS = %i(name description tags uniqueId).freeze
 
       def to_objs

data/lib/pipe_fitter/version.rb

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

data/lib/pipe_fitter/yaml_loader.rb

@@ -1,6 +1,7 @@
 require "yaml"
 require "erb"
 require "pathname"
+require "tempfile"
 
 module PipeFitter
   class YamlLoader
@@ -10,7 +11,7 @@ module PipeFitter
 
     def load(filename)
       @search_path.unshift(Pathname.new(filename).dirname)
-      text = eval_erb(filename)
+      text = eval_erb(grep_v(filename, /^\s*#/))
       YAML.load(text) || {}
     rescue Psych::SyntaxError => e
       text.split("\n").each_with_index do |l, i|
@@ -23,13 +24,18 @@ module PipeFitter
     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))
+      eval_erb(File.read(path), context)
+        .gsub("\n", "\n" + " " * (context[:indent] || 0))
     end
 
     private
 
-    def eval_erb(filename, context = {})
-      ERB.new(File.read(filename), nil, "-").result(binding).strip
+    def eval_erb(data, context = {})
+      ERB.new(data, nil, "-").result(binding).strip
+    end
+
+    def grep_v(filename, pattern)
+      File.open(filename).select { |l| l !~ pattern }.join
     end
   end
 end

metadata

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