pipe_fitter 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ca34c72ead67585ab3933c20339c6024dba555d
-  data.tar.gz: 434c953698fb018b6babfbdcde83e1f4d770ab2c
+  metadata.gz: a1625059a89f5ae2b482da2c099fde222833c824
+  data.tar.gz: 338ea0ab87e4ac6e98156d7591f2185ea3c21014
 SHA512:
-  metadata.gz: a4ffd2b3e959cda33c02760755be11f05460c144a8700915f20a4f04fac44d74b825b29e25fbd03f4646fcb24333ca8afeb8b5e24640f09a3dac30af44b114c3
-  data.tar.gz: 0fe0ec48c13e2bcc260d9dbe7cae396a265e8f7f555fedb669c112874f48f6f2ec1d50939aca8a7496473374eac4f500e16cd36cb54f5f4654a4aad974f5026e
+  metadata.gz: 2fd6a9e9b5c3c2fa96b7f732369c3b7ae70f8088f88de8897b88b9527c12daf35ba65562920fd71462ab826f324b9be60f33709b8e42574d59d97bf83c32c3ec
+  data.tar.gz: 062c50ae98dd45eba4ce2363f43b2ea0302fa2e26441cf48f9864de3c9d9c83e56adab1cf201f51e4a7eb9ba900ee1cf48846bd149ce2631a9d486fa9d601cf3

data/exe/pipe_fitter

@@ -36,11 +36,11 @@ module PipeFitter
 
     desc "activate", "Activate pipeline"
     option :pipeline_id, type: :string, required: true, aliases: "i"
-    option :parameter_values, type: :hash, required: false, aliases: "p"
+    option :parameter_file, type: :string, required: false, aliases: "p"
     option :start_timestamp, type: :string, required: false, aliases: "t"
     def activate
       t = options[:start_timestamp] ? Time.parse(options[:start_timestamp]) : nil
-      puts client.activate(options[:pipeline_id], options[:parameter_values], t)
+      puts client.activate(options[:pipeline_id], options[:parameter_file], t)
     end
 
     private

data/lib/pipe_fitter/data_pipeline_client.rb

@@ -39,9 +39,9 @@ module PipeFitter
       [res.pipeline_id, put_definition(res.pipeline_id, pipeline)]
     end
 
-    def activate(pipeline_id, parameter_values, start_timestamp)
-      p = Pipeline.new({}, { pipeline_id: pipeline_id })
-      exec(:activate_pipeline, p.activate_opts(parameter_values, start_timestamp))
+    def activate(pipeline_id, parameter_file, start_timestamp)
+      p = parameter_file ? Pipeline.load_yaml(parameter_file) : Pipeline.new
+      exec(:activate_pipeline, p.activate_opts(pipeline_id, start_timestamp)).to_h
     end
 
     private

data/lib/pipe_fitter/pipeline.rb

@@ -21,7 +21,8 @@ module PipeFitter
           PipelineDescription.new(yml["pipeline_description"]))
     end
 
-    def initialize(pipeline_objects, parameter_objects, parameter_values, pipeline_description)
+    def initialize(pipeline_objects = nil, parameter_objects = nil,
+                   parameter_values = nil, pipeline_description = nil)
       @pipeline_objects = pipeline_objects
       @parameter_objects = parameter_objects
       @parameter_values = parameter_values
@@ -41,6 +42,10 @@ module PipeFitter
       }.to_yaml
     end
 
+    def create_opts
+      @pipeline_description.to_api_opts
+    end
+
     def put_definition_opts(pipeline_id)
       {
         pipeline_id: pipeline_id,
@@ -58,6 +63,15 @@ module PipeFitter
       { pipeline_id: pipeline_id, tag_keys: @pipeline_description.tag_keys }
     end
 
+    def activate_opts(pipeline_id, start_timestamp)
+      opts = {
+        pipeline_id: pipeline_id,
+        start_timestamp: start_timestamp,
+      }
+      opts.merge!(parameter_values: @parameter_values.to_api_opts) if @parameter_values
+      opts
+    end
+
     def diff(other, format = nil)
       Diffy::Diff.new(self.to_yaml, other.to_yaml).to_s(format)
     end
@@ -103,7 +117,6 @@ module PipeFitter
         if base.key?(key)
           base[key] = [base[key]] unless base[key].is_a?(Array)
           base[key] << value
-          base[key].sort!
         else
           base[key] = value
         end
@@ -193,9 +206,19 @@ module PipeFitter
         new(objs)
       end
 
+      DESCRIPTION_KEYS = %i(name description tags uniqueId).freeze
+
       def to_objs
-        keys = %i(name description tags uniqueId)
-        stringify_keys(@objs.select { |k, _| keys.include?(k) })
+        stringify_keys(@objs.select { |k, _| DESCRIPTION_KEYS.include?(k) })
+      end
+
+      def to_api_opts
+        @objs.select { |k, _| DESCRIPTION_KEYS.include?(k) }.tap do |obj|
+          obj[:unique_id] = obj.delete(:uniqueId)
+          obj[:tags] = obj[:tags].map do |tag|
+            tag.map { |k, v| { key: k, value: v } }
+          end.flatten
+        end
       end
 
       def tags

data/lib/pipe_fitter/version.rb

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

metadata

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