pipe_fitter 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1625059a89f5ae2b482da2c099fde222833c824
-  data.tar.gz: 338ea0ab87e4ac6e98156d7591f2185ea3c21014
+  metadata.gz: 075d1725f51b70e4036459d29a4b8b79a4ab8e4c
+  data.tar.gz: 508c41608ec7ecad91bd6a6b5c81406410d71148
 SHA512:
-  metadata.gz: 2fd6a9e9b5c3c2fa96b7f732369c3b7ae70f8088f88de8897b88b9527c12daf35ba65562920fd71462ab826f324b9be60f33709b8e42574d59d97bf83c32c3ec
-  data.tar.gz: 062c50ae98dd45eba4ce2363f43b2ea0302fa2e26441cf48f9864de3c9d9c83e56adab1cf201f51e4a7eb9ba900ee1cf48846bd149ce2631a9d486fa9d601cf3
+  metadata.gz: ec5e28cf5c5f6be03ba5981eeacc7bb5f5eb55f004ce8917e8174ca22e1c589ec5c8adc268bf1be4a079642040c61f55d4789349c9bebdb888869056279b1be5
+  data.tar.gz: db05be7c15b9696556ec940755272ce43e70bbbab5f5365164c95c1692ac312fef5f53d6d554d0ae70d4a3d5df54af84c0954d4a88b3223895e8a27db8360808

data/Rakefile

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
+task default: :test
+
 desc "Run test_unit based test"
 Rake::TestTask.new do |t|
   # To run test for only one file (or file path pattern)

data/exe/pipe_fitter

@@ -43,6 +43,12 @@ module PipeFitter
       puts client.activate(options[:pipeline_id], options[:parameter_file], t)
     end
 
+    desc "show", "Show pipeline setting in YAML format"
+    option :parameter_file, type: :string, required: false, aliases: "p"
+    def show(definition_file)
+      puts Pipeline.load_yaml(definition_file).to_yaml
+    end
+
     private
 
     def client

data/lib/pipe_fitter/pipeline.rb

@@ -5,6 +5,8 @@ require "pathname"
 
 module PipeFitter
   class Pipeline
+    Diffy::Diff.default_options.merge!(diff: "-u", include_diff_info: true)
+
     def self.create(definition_from_api, description_from_api)
       new(PipelineObjects.create(definition_from_api[:pipeline_objects]),
           ParameterObjects.create(definition_from_api[:parameter_objects]),
@@ -68,7 +70,7 @@ module PipeFitter
         pipeline_id: pipeline_id,
         start_timestamp: start_timestamp,
       }
-      opts.merge!(parameter_values: @parameter_values.to_api_opts) if @parameter_values
+      opts[:parameter_values] =  @parameter_values.to_api_opts if @parameter_values
       opts
     end
 
@@ -143,9 +145,10 @@ module PipeFitter
       def self.create(api_res)
         objs = (api_res || []).map(&:to_h).sort_by { |obj| obj[:id] }.map do |obj|
           base = { id: obj[:id], name: obj[:name] }
-          obj[:fields].sort_by { |f| f[:key] }.inject(base) do |a, e|
+          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)
         end
         new(objs)
       end
@@ -198,8 +201,8 @@ module PipeFitter
           pipeline_id: api_res[:pipeline_id],
           name: api_res[:name],
           description: api_res[:description],
+          tags: (api_res[:tags] || []).map { |e| { e[:key].to_sym => e[:value] } },
         }
-        objs[:tags] = (api_res[:tags] || []).map { |e| { e[:key].to_sym => e[:value] } }
         (api_res[:fields] || []).inject(objs) do |a, e|
           a.update(e[:key].to_sym => (e[:string_value] || { ref: e[:ref_value] } ))
         end

data/lib/pipe_fitter/version.rb

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

data/lib/pipe_fitter/yaml_loader.rb

@@ -9,15 +9,15 @@ module PipeFitter
         YAML.load(eval_erb(filename, context)) || {}
       end
 
-      def include_yaml(filepath, indent = 1)
-        load(filepath).to_yaml.chomp.gsub("---", "").gsub("\n", "\n" + "  " * indent)
+      def include_template(filename, context = {})
+        eval_erb(filename, context)
       end
 
       private
 
       def eval_erb(filename, context = nil)
         context ||= {}
-        ERB.new(File.read(filename)).result(binding)
+        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.5
+  version: 0.1.6
 platform: ruby
 authors:
 - masa21kik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk