pipe_fitter 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16abe221f75664cadd6d2a891f6bdda26e70dac9be50e0011db75d621a432a23
-  data.tar.gz: cfd865d45095d2aec7aeb52a62527c57c5fc8db6b7805ab59e8c3198433dd69e
+  metadata.gz: 492dbabc48ad29fbd4fd1fa54b33a93ad360e91f7ab9cb6a16f63bd57205398e
+  data.tar.gz: 88dd6dc7e8473be5c7a76a154d09092a452e29079ad015a91886d5edbc394641
 SHA512:
-  metadata.gz: 3b685fd1dd462f29af07825649b7cecb88bca7daf129a204aea3328b9541ef8f0119847eaef195a8effc5285f0a727ff4887b1eed6ecd10be427f7de09a8443a
-  data.tar.gz: a54a4c6b637f63abd88551c83358a8ce48a9790278cc3704eff7fc84fe796da0034d839d526139c6c93e4792bab99774fd67b6c6a93dc2e6ca3207538ce5def1
+  metadata.gz: 1790c2db829697f8bfa4deb7485636c3951d34ebdc1a0c25514e294438fa4b406a1b61cc4f9276c559cd54f9b1c451de5a95a7483d5179422ff9ce1b8bbb7b80
+  data.tar.gz: 9455862795ee0e5d92c1195135347edfb13de13f2c60c73503d95863135849854bb4a19a7fad88bf23cad5c28e970476e671faafb28dab4ea921037497a4d9f3

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/version.rb

@@ -1,3 +1,3 @@
 module PipeFitter
-  VERSION = "0.2.4".freeze
+  VERSION = "0.2.6".freeze
 end

data/lib/pipe_fitter/yaml_loader.rb

@@ -12,6 +12,8 @@ module PipeFitter
     def load(filename)
       @search_path.unshift(Pathname.new(filename).dirname)
       text = eval_erb(grep_v(filename, /^\s*#/))
+      YAML.load(text, aliases: true) || {}
+    rescue ArgumentError
       YAML.load(text) || {}
     rescue Psych::SyntaxError => e
       text.split("\n").each_with_index do |l, i|

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

data/pipe_fitter.gemspec

@@ -32,5 +32,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "test-unit"
   spec.add_development_dependency "test-unit-rr"
-  spec.add_development_dependency "pry-byebug"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe_fitter
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 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
@@ -178,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: PipeFitter is a tool for AWS Data Pipeline.
 email:
 - masa21kik@gmail.com
@@ -211,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