pipe_fitter 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35272d9ed3c3d4edc4bf88d64b11442e35e3c9a4cace6a98444d83d4c48289dc
-  data.tar.gz: bed943fbffa0862193d6206f94ba719ab21c99a80b9ba70dea74f333794c1549
+  metadata.gz: 16abe221f75664cadd6d2a891f6bdda26e70dac9be50e0011db75d621a432a23
+  data.tar.gz: cfd865d45095d2aec7aeb52a62527c57c5fc8db6b7805ab59e8c3198433dd69e
 SHA512:
-  metadata.gz: bc2ef02c8e8a3739cbe518045f2560e3a993ab3c29b14980c25a3213e305a71396f47d311a1b3cbf50e0deb3d3fb4bf47cfbd9b699d8e5d9415a4f5eb6a3ad57
-  data.tar.gz: fdc45689a2e8c8711419c36a7284d0fb8a1321ce27651f1ee3641b8a301e95da745bf394831fe60f4e04bea8d803a5ab7491ece069b375cefb2aafea26321b28
+  metadata.gz: 3b685fd1dd462f29af07825649b7cecb88bca7daf129a204aea3328b9541ef8f0119847eaef195a8effc5285f0a727ff4887b1eed6ecd10be427f7de09a8443a
+  data.tar.gz: a54a4c6b637f63abd88551c83358a8ce48a9790278cc3704eff7fc84fe796da0034d839d526139c6c93e4792bab99774fd67b6c6a93dc2e6ca3207538ce5def1

data/.github/workflows/test.yml

@@ -0,0 +1,65 @@
+name: test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  schedule:
+    - cron: "0 10 * * 5" # JST 19:00 (Fri)
+
+env:
+  RUBYOPT: -EUTF-8
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby:
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: bundle update --jobs $(nproc) --retry 3
+
+      - name: bundle update
+        run: |
+          set -xe
+          bundle config path vendor/bundle
+          bundle update --jobs $(nproc) --retry 3
+
+      - name: Setup Code Climate Test Reporter
+        uses: aktions/codeclimate-test-reporter@v1
+        with:
+          codeclimate-test-reporter-id: ${{ secrets.CC_TEST_REPORTER_ID }}
+          command: before-build
+        continue-on-error: true
+
+      - run: bundle exec rake test
+        timeout-minutes: 1
+
+      - name: Teardown Code Climate Test Reporter
+        uses: aktions/codeclimate-test-reporter@v1
+        with:
+          codeclimate-test-reporter-id: ${{ secrets.CC_TEST_REPORTER_ID }}
+          command: after-build
+        if: always()
+        continue-on-error: true

data/exe/pipe_fitter

@@ -60,6 +60,7 @@ module PipeFitter
       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"
@@ -74,6 +75,7 @@ module PipeFitter
       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"

data/lib/pipe_fitter/pipeline.rb

@@ -83,6 +83,15 @@ module PipeFitter
     end
 
     class PipelineBaseObjects
+      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_objs
         case @objs
         when Array then @objs.map { |obj| stringify_keys(obj) }
@@ -126,7 +135,7 @@ module PipeFitter
         res = []
         obj.each do |k, v|
           next if skip_keys.include?(k)
-          (v.is_a?(Array) ? v : [v]).each do |vv|
+          Array(v).each do |vv|
             if vv.is_a?(Hash) && vv.key?(:ref)
               res << { key: k, ref_value: vv[:ref] }
             else
@@ -150,15 +159,8 @@ module PipeFitter
         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
+      def key_order
+        %i(id name).freeze
       end
 
       def to_api_opts
@@ -179,15 +181,8 @@ module PipeFitter
         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
+      def key_order
+        %i(id).freeze
       end
 
       def to_api_opts

data/lib/pipe_fitter/version.rb

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

data/lib/pipe_fitter/yaml_loader.rb

@@ -39,7 +39,7 @@ module PipeFitter
     private
 
     def eval_erb(data, context = {})
-      ERB.new(data, nil, "-").result(binding).strip
+      ERB.new(data, trim_mode: "-").result(binding).strip
     end
 
     def grep_v(filename, pattern)

data/pipe_fitter.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "s3diff", ">= 0.1.2"
+  spec.add_runtime_dependency "rexml"
 
   spec.add_development_dependency "bundler", ">= 1.3.5"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe_fitter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - masa21kik
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +200,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -205,7 +220,7 @@ homepage: https://github.com/masa21kik/pipe_fitter
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -220,8 +235,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: PipeFitter is a tool for AWS Data Pipeline.
 test_files: []