avm-eac_ruby_base1 0.31.2 → 0.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c120ab255f7d64dff133fd5e4047dcd927bb3b2a9af1eebc93c8e8c52559083
-  data.tar.gz: c2bdf9ff353dca9697ad09ba5100bcd7fcef42c8c42d21e0a0103e165f0ae90e
+  metadata.gz: 789c1286e939fea7eaec5d9840fdcdd08e7fb95b1878a07a4778e34cad1658b0
+  data.tar.gz: 15331da0f7215694e7641414f0f2ce371f1b6c7abc029fa8782f4c4b3e9373fa
 SHA512:
-  metadata.gz: 5361c12917431ecb63afcb004d4d98a375f27d9b687b86363a50fa54ff606e8aeb546e57323c2c8445409ba44dc50869ef1858be56b9de3c9d2ecf88ba091c83
-  data.tar.gz: aaa73983e8e33fcf78bbd694a5fb8726149bc2b007bfd3bacc99bace00667754574fdf21522e3cdd73ba455743d2cd409607b4550be3d752375d0238ea95a8cf
+  metadata.gz: 22103d338d843d4fc4de1281d74b09b591e00d218c19d076a01bd1ca9116aec6a226f86aab95302d85fa5d841e6d8729236599a039a36aa2e1efac0675ea61bd
+  data.tar.gz: 247d13c01bb3bb1afe1502465b57aa34897d28ff78391fa4d34991299b689e4aeac51f3493e9b64e5d40329d6585a267e1c71d0ed746c8a43dbc026bd298b471

data/lib/avm/eac_ruby_base1/sources/base/rubocop.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/sources/base'
+require 'avm/eac_ruby_base1/sources/base/bundle_command'
+require 'avm/eac_ruby_base1/sources/bundle_update'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class Base < ::Avm::EacGenericBase0::Sources::Base
+        module Rubocop
+          RUBOCOP_CONFIG_SUBPATH = '.rubocop.yml'
+
+          # @return [Avm::EacRubyBase1::Sources::Base::RubocopCommand]
+          def rubocop_command
+            ::Avm::EacRubyBase1::Sources::Base::RubocopCommand.new(self)
+          end
+
+          # @return [Pathname]
+          def rubocop_config_path
+            path.join(RUBOCOP_CONFIG_SUBPATH)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/sources/base/rubocop_command.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class Base < ::Avm::EacGenericBase0::Sources::Base
+        class RubocopCommand
+          acts_as_immutable
+          immutable_accessor :ignore_parent_exclusion, :autocorrect, :autocorrect_all,
+                             type: :boolean
+          immutable_accessor :file, type: :array
+          common_constructor :source
+          delegate :execute, :execute!, :system, :system!, to: :bundle_command
+
+          # @return [Enumerable]
+          def immutable_constructor_args
+            [source]
+          end
+
+          # @return [Gemspec::Version]
+          def version
+            @version ||= ::Gemspec::Version.new(
+              source.bundle('exec', 'rubocop', '--version').execute!
+            )
+          end
+
+          private
+
+          # @return [String]
+          def autocorrect_option
+            '--auto-correct'
+          end
+
+          # @return [String]
+          def autocorrect_all_option
+            '--auto-correct-all'
+          end
+
+          # @return [String]
+          def ignore_parent_exclusion_option
+            '--ignore-parent-exclusion'
+          end
+
+          # @return [Avm::EacRubyBase1::Sources::Base::BundleCommand]
+          def bundle_command
+            source.bundle(*bundle_command_args)
+          end
+
+          # @return [Array<String>]
+          def bundle_command_args
+            %w[exec rubocop] + rubocop_command_args
+          end
+
+          # @return [Array<String>]
+          def rubocop_command_args
+            r = ['--config', source.rubocop_config_path]
+            r << ignore_parent_exclusion_option if ignore_parent_exclusion?
+            if autocorrect_all?
+              r << autocorrect_all_option
+            elsif autocorrect?
+              r << autocorrect_option
+            end
+            r + files
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/sources/update_dependency_requirements.rb

@@ -10,6 +10,8 @@ module Avm
         enable_simple_cache
         common_constructor :source, :gem_name
 
+        RUBOCOP_OK_CODES = [256].freeze
+
         def perform
           source.scm.commit_if_change(commit_message) { update_code }
         end
@@ -24,6 +26,12 @@ module Avm
                          __locale: source.locale)
         end
 
+        def format_gemspec
+          source.rubocop_command.ignore_parent_exclusion(true).autocorrect(true)
+            .file(source.gemspec_path)
+            .execute!(exit_outputs: RUBOCOP_OK_CODES.map { |k| [k, nil] }.to_h)
+        end
+
         # @return [Array<String>]
         def requirements_list_uncached
           ::Avm::EacRubyBase1::PreferredVersionRequirements.new(
@@ -48,9 +56,7 @@ module Avm
         def update_gemspec
           gemspec.dependency(gem_name).version_specs = requirements_list
           gemspec.write(source.gemspec_path)
-          ::Avm::EacRubyBase1::Rubocop.new(
-            source.path, ['-a', '--ignore-parent-exclusion', source.gemspec_path]
-          ).run
+          format_gemspec
         end
       end
     end

data/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.31.2'
+    VERSION = '0.32.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_ruby_base1
 version: !ruby/object:Gem::Version
-  version: 0.31.2
+  version: 0.32.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.79'
+        version: '0.80'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.79'
+        version: '0.80'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: eac_envs-http
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +87,7 @@ dependencies:
         version: '0.119'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.119.1
+        version: 0.119.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +97,7 @@ dependencies:
         version: '0.119'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.119.1
+        version: 0.119.2
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +193,8 @@ files:
 - lib/avm/eac_ruby_base1/sources/base/bundle_command.rb
 - lib/avm/eac_ruby_base1/sources/base/bundler.rb
 - lib/avm/eac_ruby_base1/sources/base/rake.rb
+- lib/avm/eac_ruby_base1/sources/base/rubocop.rb
+- lib/avm/eac_ruby_base1/sources/base/rubocop_command.rb
 - lib/avm/eac_ruby_base1/sources/base/rubygems.rb
 - lib/avm/eac_ruby_base1/sources/base/update.rb
 - lib/avm/eac_ruby_base1/sources/base/version.rb