eac_tools 0.77.0 → 0.77.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d70e40ff292d0e0d728294d8c9b7bb1906c46e00bb4935d5cded1dfb02ee87e
-  data.tar.gz: 83c1d1f602c4e2a76ffca74596cf0b53cec97303cb99f3fd2287380048318997
+  metadata.gz: 3f517b6d6540d86de71eb838d6bb96479c1991ec194ca1d60b420e3d7318f7f4
+  data.tar.gz: be11c1bbf741c6c9a39e6108c312f9cc2d11a75e924da7b59be2a5ffb4c569e6
 SHA512:
-  metadata.gz: 22b840c8531a025c38e2bd00109cd16b9921ee4fd192d5e5f9de62bd0dce445d193ce50293b802c32bbfec0c8f13ef6c20051f4746915b4e3d4b3189e4d82dc2
-  data.tar.gz: 434796f650c912a6aa982c9e61657e372d2b248c32044bb9833d6f61a07911072722dd5d212368e9d4650bccb10c1b719986c8299fd2e6baa18a75d11738bfd0
+  metadata.gz: bf8108ddd620e8ca590551490a742d1f3bbf35090f3df2e5b11bcbff00c6c8625720468f13dd710a097e38cb815e5f012c2d93759d8facc8e62a82defdfba5ba
+  data.tar.gz: f8ef025927b82d16f5ab1f9ae34f2e60d648923a9a748fb93c466d8846523204a53a0f8344c47303c9c1bd5caaaa98b4c5c8bb129f1fe5962088cef5a839eba9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.77.0)
+    eac_tools (0.77.1)
       avm (~> 0.79)
       avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
@@ -13,7 +13,7 @@ PATH
       avm-eac_rails_base1 (~> 0.9, >= 0.9.3)
       avm-eac_redmine_base0 (~> 0.21)
       avm-eac_redmine_plugin_base0 (~> 0.4)
-      avm-eac_ruby_base1 (~> 0.31, >= 0.31.2)
+      avm-eac_ruby_base1 (~> 0.32)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
       avm-git (~> 0.13, >= 0.13.4)
@@ -106,12 +106,12 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.31.2)
+    avm-eac_ruby_base1 (0.32.0)
       aranha-parsers (~> 0.21)
       avm (~> 0.79)
-      avm-eac_generic_base0 (~> 0.12)
+      avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
       eac_envs-http (~> 0.4, >= 0.4.1)
-      eac_ruby_utils (~> 0.119, >= 0.119.1)
+      eac_ruby_utils (~> 0.119, >= 0.119.2)
 
 PATH
   remote: sub/avm-eac_ubuntu_base0

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.77.0'
+  VERSION = '0.77.1'
 end

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'aranha-parsers', '~> 0.21'
   s.add_dependency 'avm', '~> 0.79'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.12'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.12', '>= 0.12.1'
   s.add_dependency 'eac_envs-http', '~> 0.4', '>= 0.4.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.119', '>= 0.119.2'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.6.0'

data/sub/avm-eac_ruby_base1/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/sub/avm-eac_ruby_base1/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/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update_dependency_requirements.rb

@@ -24,6 +24,11 @@ module Avm
                          __locale: source.locale)
         end
 
+        def format_gemspec
+          source.rubocop_command.ignore_parent_exclusion(true).autocorrect(true)
+            .file(source.gemspec_path).system!
+        end
+
         # @return [Array<String>]
         def requirements_list_uncached
           ::Avm::EacRubyBase1::PreferredVersionRequirements.new(
@@ -48,9 +53,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/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.77.0
+  version: 0.77.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-15 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -212,20 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.31.2
+        version: '0.32'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.31.2
+        version: '0.32'
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -714,6 +708,8 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/bundle_command.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/bundler.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/rake.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/rubocop.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/rubocop_command.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/rubygems.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/update.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/version.rb