bundler-audit-fix 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c681b15c5f4aab7669a41362ea73975636bbb6c1073184f30ea73863bd514ee
-  data.tar.gz: 7a79b41ebdbd0a88225d1030317442166d89802721fbaebc0e92cc30e0e1bbd1
+  metadata.gz: 787b5a1eab1ddee1883c1f26cfa5513d4d43cd05f1856d4476977587cc8f9fdd
+  data.tar.gz: f52d48982642024569736ccbe82cb46c0ca82a4f001aafaaea7d903d4c1aee23
 SHA512:
-  metadata.gz: 67a0d7c19635e68877b0dd79f11b384e646c8f8cf8c305f72def4858669342ca9c4c16b814b980633965d451a6592e821ce393770b1585ebfcf6f8bbe479784b
-  data.tar.gz: d0842d3f843d25a790e3090f0b284790e5c0df54abeb51cc0e2c00acde443f35064d7451498b17b0e034eeb350fd9dc5877a89c9b3ea478ded17bf22b7b7898b
+  metadata.gz: 73b8b401d1ee2ba082ee9d854493151efa240bd74e7b5cf200507e822e68fd610226013b75074db158ce37e3f5bb92b98689abbdbf3e8dc66d813a3df2b36077
+  data.tar.gz: 102469bd232effd565b99f9a3d1f1ebe8c22db79246016e1f37589d3742b8f2776addc032a1ac722357238b6734ba494f37e238097e060f5266434875678716f

data/.github/workflows/main.yml

@@ -1,16 +1,19 @@
 name: Ruby
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.6, 2.7, 3.0, 3.1]
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby
+    - name: Set up Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0.1
+        ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
     - name: Run the default task
       run: bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.0 - 2022-04-18
+
+- Include [default replacement config](https://github.com/nobuyo/bundler-audit-fix/blob/main/config/default.yml) for rails family.
+
 # 0.2.1 - 2022-01-30
 
 - Fix bug for 0.2.0 (revert)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bundler-audit-fix (0.2.1)
+    bundler-audit-fix (0.3.0)
       bundler (>= 1.2.0, < 3)
       bundler-audit (~> 0.9.0)
       thor (~> 1.0)
@@ -55,6 +55,7 @@ GEM
     unicode-display_width (2.1.0)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES

data/config/default.yml

@@ -0,0 +1,14 @@
+replacement:
+  rails:
+    - actionpack
+    - actionview
+    - activemodel
+    - activerecord
+    - actionmailer
+    - activejob
+    - actioncable
+    - activestorage
+    - activesupport
+    - actionmailbox
+    - actiontext
+    - railties

data/lib/bundler/audit/fix/configuration.rb

@@ -29,34 +29,60 @@ module Bundler
       class Configuration < Configuration
         attr_accessor :replacements
 
-        def self.load(file_path)
-          instance = super(file_path)
+        class << self
+          def load(file_path)
+            instance = super(file_path)
 
-          doc = YAML.parse(File.new(file_path))
-          doc.root.children.each_slice(2) do |key, value|
-            case key.value
-            when 'replacement'
-              unless value.children.is_a?(Array)
-                raise(InvalidConfigurationError, "'replacement' key found in config file, but is not an Array")
-              end
+            doc = YAML.parse(File.new(file_path))
+            doc.root.children.each_slice(2) do |key, value|
+              case key.value
+              when 'replacement'
+                unless value.children.is_a?(Array)
+                  raise(InvalidConfigurationError, "'replacement' key found in config file, but is not an Array")
+                end
 
-              instance.replacements = build_replacements(value)
+                instance.replacements ||= {}
+                instance.replacements = instance.replacements.merge(build_replacements(value))
+              end
             end
+
+            instance
+          end
+
+          def build_replacements(params)
+            params.children.each_slice(2).map do |key, value|
+              unless value.children
+                raise(InvalidConfigurationError,
+                      "'replacement.#{key.value}' in config file is empty")
+              end
+
+              unless value.children.all? { |node| node.is_a?(YAML::Nodes::Scalar) }
+                raise(InvalidConfigurationError,
+                      "'replacement.#{key.value}' array in config file contains a non-String")
+              end
+
+              { key.value => value.children.map(&:value) }
+            end.inject(&:merge)
           end
+        end
 
-          instance
+        def initialize(config = {})
+          super(config)
+          load_default
         end
 
-        def self.build_replacements(params)
-          params.children.each_slice(2).map do |key, value|
-            raise(InvalidConfigurationError, "'replacement.#{key.value}' in config file is empty") unless value.children
+        private
 
-            unless value.children.all? { |node| node.is_a?(YAML::Nodes::Scalar) }
-              raise(InvalidConfigurationError, "'replacement.#{key.value}' array in config file contains a non-String")
+        def load_default
+          base_dir = File.realpath(File.join(File.dirname(__FILE__), '..', '..', '..', '..'))
+          default_config_path = File.join(base_dir, 'config', 'default.yml')
+          doc = YAML.parse(File.new(default_config_path))
+          doc.root.children.each_slice(2) do |key, value|
+            case key.value
+            when 'replacement'
+              self.replacements = self.class.build_replacements(value)
             end
-
-            { key.value => value.children.map(&:value) }
-          end.inject(&:merge)
+          end
         end
       end
     end

data/lib/bundler/audit/fix/version.rb

@@ -20,7 +20,7 @@
 module Bundler
   module Audit
     module Fix
-      VERSION = '0.2.1'
+      VERSION = '0.3.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-audit-fix
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Nobuo Takizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - bin/bundler-audit-fix
 - bin/console
 - bundler-audit-fix.gemspec
+- config/default.yml
 - lib/bundler/audit/fix.rb
 - lib/bundler/audit/fix/cli.rb
 - lib/bundler/audit/fix/configuration.rb
@@ -106,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Automatic apply security update inspected by bundler-audit.