pipe_fitter 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cb9f2f924f88ec2ab37a6ec3c61c2ea23700d88e3fba2f923801f46cdd79a47
-  data.tar.gz: 04ff627ba4eb1beef15b71051e278f1b1ca856fe109ebc4220b36ba5f628a7c3
+  metadata.gz: 57e2a796254d92b989009e5136a89dc470926ad62bf2430fdb17832bb3dfa678
+  data.tar.gz: 3f41226aae8456caab45a13b34e0f8678d24b2456150f4ae6980b17730693ff2
 SHA512:
-  metadata.gz: 4aff19dc044c5584b7f342d7a0d9e4c6899e09c45563c3a10ad4ce873488651a696a0cf69132f1307c1f10fb7d90344ef565213c4bed1162b556ebd34272ba86
-  data.tar.gz: 26b7035abcbc846efa2cdd700ca7954e4ce57403a7d83e8edad97820f3fcc014ea5b37221b718631cecb71b7b3aa03082693d131340a76e10ffd145d516942f1
+  metadata.gz: 8c88c58acd22b40bf4428e3ba07b4faaf7e5cee4483e6de13ada3ae547f9050955fbf21bc0567a19e4cb2725f3ec770322604f65555b6b6b8b074f56b1274747
+  data.tar.gz: d472387e2b9a66c3fc20fbb1c6f031efa97e73bbda671dc868e9fd8ee5d7931189e07ad2dfebbb974e3f6ae004a871cac55a25a112aa1f132ca057975f9fa925

data/.github/workflows/test.yml

@@ -29,6 +29,7 @@ jobs:
           - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
 
     steps:
       - uses: actions/checkout@v3

data/exe/pipe_fitter

@@ -1,102 +1,5 @@
 #!/usr/bin/env ruby
 
 require "pipe_fitter"
-require "thor"
-
-module PipeFitter
-  class Cli < Thor
-    class_option :region, type: :string
-    class_option :profile, type: :string
-
-    desc "export", "Export pipeline definition"
-    option :pipeline_id, type: :string, required: true, aliases: "i"
-    def export
-      puts client.definition(options[:pipeline_id]).to_yaml
-    end
-
-    desc "register DEFINITION_FILE", "Register pipeline"
-    def register(definition_file)
-      id, res = client.register(definition_file)
-      puts id, JSON.pretty_generate(res)
-    end
-
-    desc "diff DEFINITION_FILE", "Show pipeline difference"
-    option :pipeline_id, type: :string, required: true, aliases: "i"
-    option :format, type: :string, default: "color", aliases: "f"
-    def diff(definition_file)
-      puts client.diff(options[:pipeline_id], definition_file, options[:format])
-    end
-
-    desc "update DEFINITION_FILE", "Update pipeline definition"
-    option :pipeline_id, type: :string, required: true, aliases: "i"
-    def update(definition_file)
-      res = client.update(options[:pipeline_id], definition_file)
-      puts JSON.pretty_generate(res)
-    end
-
-    desc "activate", "Activate pipeline"
-    option :pipeline_id, type: :string, required: true, aliases: "i"
-    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_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
-
-    desc "find", "Find pipeline besed on name and uniqueId"
-    def find(definition_file)
-      puts client.find_registered(definition_file).to_h.to_json
-    end
-
-    desc "find_diff", "Find pipeline besed on name and uniqueId, show diff"
-    option :format, type: :string, default: "color", aliases: "f"
-    def find_diff(definition_file)
-      p = client.find_registered(definition_file)
-      abort("Pipeline is not registered") if p.nil?
-      puts client.diff(p.id, definition_file, options[:format])
-      puts p.to_h.to_json
-    end
-
-    desc "find_update", "Find pipeline besed on name and uniqueId, update pipeline definition"
-    option :force_update, type: :boolean, aliases: "f"
-    def find_update(definition_file)
-      p = client.find_registered(definition_file)
-      abort("Pipeline is not registered") if p.nil?
-      unless options[:force_update]
-        puts client.diff(p.id, definition_file)
-        print "\nReally update pipeline definition? [y/N] : "
-        abort("Update was canceled") if $stdin.gets.chomp !~ /^y$/i
-      end
-      res = client.update(p.id, definition_file)
-      puts JSON.pretty_generate(res)
-      puts p.to_h.to_json
-    end
-
-    desc "diff_deploy_files DEFINITION_FILE", "Show deploy files differences"
-    option :format, type: :string, default: "color", aliases: "f"
-    def diff_deploy_files(definition_file)
-      client.diff_deploy_files(definition_file, options[:format]).each do |d|
-        puts d
-      end
-    end
-
-    desc "upload_deploy_files DEFINITION_FILE", "Upload deploy files"
-    def upload_deploy_files(definition_file)
-      client.upload_deploy_files(definition_file)
-    end
-
-    private
-
-    def client
-      @client ||= DataPipelineClient.new(options)
-    end
-  end
-end
 
 PipeFitter::Cli.start

data/lib/pipe_fitter/cli.rb

@@ -0,0 +1,97 @@
+require "thor"
+
+module PipeFitter
+  class Cli < Thor
+    class_option :region, type: :string
+    class_option :profile, type: :string
+
+    desc "export", "Export pipeline definition"
+    option :pipeline_id, type: :string, required: true, aliases: "i"
+    def export
+      puts client.definition(options[:pipeline_id]).to_yaml
+    end
+
+    desc "register DEFINITION_FILE", "Register pipeline"
+    def register(definition_file)
+      id, res = client.register(definition_file)
+      puts id, JSON.pretty_generate(res)
+    end
+
+    desc "diff DEFINITION_FILE", "Show pipeline difference"
+    option :pipeline_id, type: :string, required: true, aliases: "i"
+    option :format, type: :string, default: "color", aliases: "f"
+    def diff(definition_file)
+      puts client.diff(options[:pipeline_id], definition_file, options[:format])
+    end
+
+    desc "update DEFINITION_FILE", "Update pipeline definition"
+    option :pipeline_id, type: :string, required: true, aliases: "i"
+    def update(definition_file)
+      res = client.update(options[:pipeline_id], definition_file)
+      puts JSON.pretty_generate(res)
+    end
+
+    desc "activate", "Activate pipeline"
+    option :pipeline_id, type: :string, required: true, aliases: "i"
+    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_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
+
+    desc "find", "Find pipeline besed on name and uniqueId"
+    def find(definition_file)
+      puts client.find_registered(definition_file).to_h.to_json
+    end
+
+    desc "find_diff", "Find pipeline besed on name and uniqueId, show diff"
+    option :format, type: :string, default: "color", aliases: "f"
+    def find_diff(definition_file)
+      p = client.find_registered(definition_file)
+      abort("Pipeline is not registered") if p.nil?
+      puts client.diff(p.id, definition_file, options[:format])
+      puts p.to_h.to_json
+    end
+
+    desc "find_update", "Find pipeline besed on name and uniqueId, update pipeline definition"
+    option :force_update, type: :boolean, aliases: "f"
+    def find_update(definition_file)
+      p = client.find_registered(definition_file)
+      abort("Pipeline is not registered") if p.nil?
+      unless options[:force_update]
+        puts client.diff(p.id, definition_file)
+        print "\nReally update pipeline definition? [y/N] : "
+        abort("Update was canceled") if $stdin.gets.chomp !~ /^y$/i
+      end
+      res = client.update(p.id, definition_file)
+      puts JSON.pretty_generate(res)
+      puts p.to_h.to_json
+    end
+
+    desc "diff_deploy_files DEFINITION_FILE", "Show deploy files differences"
+    option :format, type: :string, default: "color", aliases: "f"
+    def diff_deploy_files(definition_file)
+      client.diff_deploy_files(definition_file, options[:format]).each do |d|
+        puts d
+      end
+    end
+
+    desc "upload_deploy_files DEFINITION_FILE", "Upload deploy files"
+    def upload_deploy_files(definition_file)
+      client.upload_deploy_files(definition_file)
+    end
+
+    private
+
+    def client
+      @client ||= DataPipelineClient.new(options)
+    end
+  end
+end

data/lib/pipe_fitter/pipeline.rb

@@ -135,7 +135,7 @@ module PipeFitter
         res = []
         obj.each do |k, v|
           next if skip_keys.include?(k)
-          Array(v).each do |vv|
+          (v.is_a?(Array) ? v : [v]).each do |vv|
             if vv.is_a?(Hash) && vv.key?(:ref)
               res << { key: k, ref_value: vv[:ref] }
             else

data/lib/pipe_fitter/version.rb

@@ -1,3 +1,3 @@
 module PipeFitter
-  VERSION = "0.2.5".freeze
+  VERSION = "0.2.7".freeze
 end

data/lib/pipe_fitter.rb

@@ -2,6 +2,7 @@ require "pipe_fitter/version"
 require "pipe_fitter/pipeline"
 require "pipe_fitter/yaml_loader"
 require "pipe_fitter/data_pipeline_client"
+require "pipe_fitter/cli"
 
 module PipeFitter
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe_fitter
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - masa21kik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -197,6 +197,7 @@ files:
 - bin/setup
 - exe/pipe_fitter
 - lib/pipe_fitter.rb
+- lib/pipe_fitter/cli.rb
 - lib/pipe_fitter/data_pipeline_client.rb
 - lib/pipe_fitter/pipeline.rb
 - lib/pipe_fitter/version.rb