eac_tools 0.33.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db0d464431cf41ef160af756aa3e544b3cc367794711149ad308f7931068c637
-  data.tar.gz: 292aedae8064eb68018c0036edbf1dfae6839e92f7b9d0776727d94dddfc1061
+  metadata.gz: 1a07350e5f6e203f916c6b9ef70f92f59eff8d4c3af4159a086385608d56119b
+  data.tar.gz: 03f349d5cee7e0865d05c26fb7e8a2e394f070cc22199bd4b306a81131f955af
 SHA512:
-  metadata.gz: b0fa09268506f2195aa716730b091dcca87a92c8d03cea20c964c81353a554e5858e51aaeefd6933f19dbeafab6ec6a978edb560c9fbbf5c55764e6dcc4d2ce9
-  data.tar.gz: 66cfd6c64ff37e3d4e9371d50483c8cff3fc4eeb18952701d9a0d4de8c49fdf9e02530c6e48be7b4a5fef93100e6bbf2c0c034a43196ff0aca064a30e3d6d487
+  metadata.gz: c44c9eedc11252a33e9f23cc07a13bd732b2808fd9d63900fa6a7d3583f15758dc0b561533ceb2f271e628d135e05786398744efce321ac8022219c55458da76
+  data.tar.gz: 83a02656f81b1248636ba07fbe6b96ebccbd74f3d4c2a09587e5b2f8561a03832a57ac75d79a6db6fed85edb67462c2b347fed11954258b43ad3b74d543c98ab

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.33.0)
+    eac_tools (0.34.0)
       avm (~> 0.45)
       avm-eac_asciidoctor_base0 (~> 0.7, >= 0.7.1)
       avm-eac_generic_base0 (~> 0.5)
@@ -10,10 +10,10 @@ PATH
       avm-eac_rails_base1 (~> 0.7)
       avm-eac_redmine_base0 (~> 0.16)
       avm-eac_redmine_plugin_base0 (~> 0.3)
-      avm-eac_ruby_base1 (~> 0.21)
+      avm-eac_ruby_base1 (~> 0.22)
       avm-eac_webapp_base0 (~> 0.9)
       avm-eac_wordpress_base0 (~> 0.2, >= 0.2.1)
-      avm-tools (~> 0.137)
+      avm-tools (~> 0.138)
       eac_ruby_utils (~> 0.104)
 
 PATH
@@ -80,10 +80,10 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.21.0)
-      avm (~> 0.41, >= 0.41.1)
+    avm-eac_ruby_base1 (0.22.0)
+      avm (~> 0.45)
       avm-eac_generic_base0 (~> 0.5)
-      eac_ruby_utils (~> 0.103)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_webapp_base0
@@ -116,10 +116,10 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.137.0)
+    avm-tools (0.138.0)
       aranha-parsers (~> 0.14, >= 0.14.3)
       avm (~> 0.45)
-      avm-eac_ruby_base1 (~> 0.21)
+      avm-eac_ruby_base1 (~> 0.22)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.4, >= 0.4.1)
       avm-git (~> 0.4)
@@ -342,7 +342,7 @@ GEM
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.6.1)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.1)
     zlib (2.1.1)
 
 PLATFORMS

data/lib/eac_tools/version.rb

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

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

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.41', '>= 0.41.1'
+  s.add_dependency 'avm', '~> 0.45'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
-  s.add_dependency 'eac_ruby_utils', '~> 0.103'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_local.rb

@@ -29,17 +29,34 @@ module Avm
               siblings.map { |s| sibling_gemfile_local_line(s) }.join
             end
 
+            def on_unexisting_gemfile_local
+              return yield unless gemfile_local_path.exist?
+
+              ::EacRubyUtils::Fs::Temp.on_file do |temp_file|
+                ::FileUtils.cp(gemfile_local_path, temp_file)
+                begin
+                  ::FileUtils.rm_f(gemfile_local_path)
+                  yield
+                ensure
+                  ::FileUtils.cp(temp_file, gemfile_local_path)
+                end
+              end
+            end
+
             def run_bundle
-              the_source.bundle.execute!
-            rescue ::RuntimeError
-              the_source.bundle('update').execute!
+              on_unexisting_gemfile_local do
+                the_source.bundle.execute!
+              rescue ::RuntimeError
+                the_source.bundle('update').execute!
+              end
             end
 
             def sibling_gemfile_local_line(sibling)
               ["gem '#{sibling.gem_name}'",
                "path: ::File.expand_path('" +
                  sibling.path.relative_path_from(the_source.path).to_path +
-                 "', __dir__)"].join(', ') + "\n"
+                 "', __dir__)",
+               'require: false'].join(', ') + "\n"
             end
 
             def start_banner

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_lock/git.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      module Runners
+        class Bundler
+          class GemfileLock
+            module Git
+              private
+
+              def git_continue
+                infom "Adding \"#{gemfile_lock}\"..."
+                git_repo.command('add', gemfile_lock).execute!
+                if rebase_conflict?
+                  git_continue_run('rebase')
+                elsif cherry_conflict?
+                  git_continue_run('cherry-pick')
+                else
+                  raise 'Unknown how to continue'
+                end
+              end
+
+              def git_continue_run(command)
+                infom "\"#{command}\" --continue..."
+                cmd = git_repo.command(command, '--continue')
+                        .envvar('GIT_EDITOR', 'true')
+                return unless !cmd.system && !conflict?
+
+                fatal_error "\"#{cmd}\" failed and there is no conflict"
+              end
+
+              def git_repo
+                instance.scm.git_repo
+              end
+
+              def git_reset_checkout
+                git_reset_gemfile_lock
+                git_checkout_gemfile_lock
+              end
+
+              def git_checkout_gemfile_lock
+                infom 'Checkouting...'
+                git_repo.command('checkout', '--', gemfile_lock).system!
+              end
+
+              def git_reset_gemfile_lock
+                infom 'Reseting...'
+                git_repo.command('reset', gemfile_lock).system! if
+                ::File.exist?(gemfile_lock)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_lock.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      module Runners
+        class Bundler
+          class GemfileLock
+            require_sub __FILE__, include_modules: true
+            runner_with :help do
+              desc 'Manipulage a "Gemfile.lock" file.'
+              bool_opt '-c', '--continue', 'Continue Git rebase/cherry-pick.'
+              bool_opt '-i', '--install', 'Run "bundle install".'
+              bool_opt '-u', '--update', 'Run "bundle update".'
+              bool_opt '-r', '--recursive', 'Run until Git rebase/cherry-pick is finished.'
+              bool_opt '-a', '--all', 'Same as "-cirud".'
+              bool_opt '-d', '--delete', 'Delete Gemfile.lock'
+            end
+
+            def run
+              loop do
+                git_reset_checkout
+                delete_gemfile_lock
+                bundle_update
+                bundle_install
+                git_continue
+                break if complete?
+              end
+            end
+
+            private
+
+            def complete?
+              !option_or_all?(:recursive) || !conflict?
+            end
+
+            def delete_gemfile_lock
+              ::FileUtils.rm_f(gemfile_lock)
+            end
+
+            def rebasing?
+              git_repo.root_path.join('.git', 'rebase-merge').exist?
+            end
+
+            def bundle_install
+              infom '"bundle install"...'
+              bundle_run('install')
+            end
+
+            def bundle_update
+              infom '"bundle update"...'
+              bundle_run('update')
+            end
+
+            def gemfile_lock
+              'Gemfile.lock'
+            end
+
+            def bundle_run(*args)
+              instance.bundle(*args).system!
+            end
+
+            def conflict?
+              rebase_conflict? || cherry_conflict?
+            end
+
+            def rebase_conflict?
+              git_repo.root_path.join('.git', 'REBASE_HEAD').exist?
+            end
+
+            def cherry_conflict?
+              git_repo.root_path.join('.git', 'CHERRY_PICK_HEAD').exist?
+            end
+
+            def option_or_all?(option)
+              parsed[option] || parsed.all?
+            end
+
+            def instance
+              runner_context.call(:subject)
+            end
+          end
+        end
+      end
+    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.21.0'
+    VERSION = '0.22.0'
   end
 end

data/sub/avm-tools/avm-tools.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.3'
   s.add_dependency 'avm', '~> 0.45'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.21'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.22'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.4', '>= 0.4.1'
   s.add_dependency 'avm-git', '~> 0.4'

data/sub/avm-tools/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.137.0'
+    VERSION = '0.138.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -146,14 +146,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -194,14 +194,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.137'
+        version: '0.138'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.137'
+        version: '0.138'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -475,6 +475,8 @@ files:
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_local.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_lock.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_lock/git.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/bundler/incompatible.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/update_dependencies_requirements.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/tests.rb
@@ -711,10 +713,6 @@ files:
 - sub/avm-tools/lib/avm/tools/runner/source/issue.rb
 - sub/avm-tools/lib/avm/tools/runner/source/issue/complete.rb
 - sub/avm-tools/lib/avm/tools/runner/source/issue/deliver.rb
-- sub/avm-tools/lib/avm/tools/runner/source/ruby.rb
-- sub/avm-tools/lib/avm/tools/runner/source/ruby/bundler.rb
-- sub/avm-tools/lib/avm/tools/runner/source/ruby/bundler/gemfile_lock.rb
-- sub/avm-tools/lib/avm/tools/runner/source/ruby/bundler/gemfile_lock/git.rb
 - sub/avm-tools/lib/avm/tools/runner/source/subs.rb
 - sub/avm-tools/lib/avm/tools/runner/source/test.rb
 - sub/avm-tools/lib/avm/tools/runner/source/update.rb

data/sub/avm-tools/lib/avm/tools/runner/source/ruby/bundler/gemfile_lock/git.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_base0/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class Source < ::Avm::Sources::Runner
-        class Ruby
-          class Bundler
-            class GemfileLock
-              module Git
-                private
-
-                def git_continue
-                  return unless check_capability(__method__, :git_repo, :continue)
-
-                  infom "Adding \"#{gemfile_lock}\"..."
-                  instance.git_repo.command('add', gemfile_lock).execute!
-                  if rebase_conflict?
-                    git_continue_run('rebase')
-                  elsif cherry_conflict?
-                    git_continue_run('cherry-pick')
-                  else
-                    raise 'Unknown how to continue'
-                  end
-                end
-
-                def git_continue_run(command)
-                  infom "\"#{command}\" --continue..."
-                  cmd = instance.git_repo.command(command, '--continue')
-                          .envvar('GIT_EDITOR', 'true')
-                  return unless !cmd.system && !conflict?
-
-                  fatal_error "\"#{cmd}\" failed and there is no conflict"
-                end
-
-                def git_reset_checkout
-                  return unless check_capability(__method__, :git_repo, nil)
-
-                  git_reset_gemfile_lock
-                  git_checkout_gemfile_lock
-                end
-
-                def git_checkout_gemfile_lock
-                  infom 'Checkouting...'
-                  instance.git_repo.command('checkout', '--', gemfile_lock).system!
-                end
-
-                def git_reset_gemfile_lock
-                  infom 'Reseting...'
-                  instance.git_repo.command('reset', gemfile_lock).system! if
-                  ::File.exist?(gemfile_lock)
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/sub/avm-tools/lib/avm/tools/runner/source/ruby/bundler/gemfile_lock.rb

@@ -1,105 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_base0/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class Source < ::Avm::Sources::Runner
-        class Ruby
-          class Bundler
-            class GemfileLock
-              require_sub __FILE__, include_modules: true
-              runner_with :help do
-                desc 'Manipulage a "Gemfile.lock" file.'
-                bool_opt '-c', '--continue', 'Continue Git rebase/cherry-pick.'
-                bool_opt '-i', '--install', 'Run "bundle install".'
-                bool_opt '-u', '--update', 'Run "bundle update".'
-                bool_opt '-r', '--recursive', 'Run until Git rebase/cherry-pick is finished.'
-                bool_opt '-a', '--all', 'Same as "-cirud".'
-                bool_opt '-d', '--delete', 'Delete Gemfile.lock'
-              end
-
-              def run
-                loop do
-                  git_reset_checkout
-                  delete_gemfile_lock
-                  bundle_update
-                  bundle_install
-                  git_continue
-                  break if complete?
-                end
-              end
-
-              private
-
-              def complete?
-                !option_or_all?(:recursive) || !conflict?
-              end
-
-              def delete_gemfile_lock
-                return unless check_capability(__method__, nil, :delete)
-
-                ::FileUtils.rm_f(gemfile_lock)
-              end
-
-              def rebasing?
-                instance.git_repo.root_path.join('.git', 'rebase-merge').exist?
-              end
-
-              def bundle_install
-                return unless check_capability(__method__, :ruby_gem, :install)
-
-                infom '"bundle install"...'
-                bundle_run('install')
-              end
-
-              def bundle_update
-                return unless check_capability(__method__, :ruby_gem, :update)
-
-                infom '"bundle update"...'
-                bundle_run('update')
-              end
-
-              def gemfile_lock
-                'Gemfile.lock'
-              end
-
-              def bundle_run(*args)
-                instance.ruby_gem.bundle(*args).system!
-              end
-
-              def conflict?
-                rebase_conflict? || cherry_conflict?
-              end
-
-              def rebase_conflict?
-                instance.git_repo.root_path.join('.git', 'REBASE_HEAD').exist?
-              end
-
-              def cherry_conflict?
-                instance.git_repo.root_path.join('.git', 'CHERRY_PICK_HEAD').exist?
-              end
-
-              def option_or_all?(option)
-                parsed[option] || parsed.all?
-              end
-
-              def instance
-                runner_context.call(:instance)
-              end
-
-              def check_capability(caller, capability, option)
-                return false unless option.blank? || option_or_all?(option)
-                return true if capability.if_present(true) { |v| instance.respond_to?(v) }
-
-                warn "Cannot run #{caller}: instance has no capability \"#{capability}\""
-                false
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/sub/avm-tools/lib/avm/tools/runner/source/ruby/bundler.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_base0/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class Source < ::Avm::Sources::Runner
-        class Ruby
-          class Bundler
-            require_sub __FILE__
-            runner_with :help, :subcommands do
-              desc 'Ruby\'s bundler utitilies for local projects.'
-              subcommands
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/sub/avm-tools/lib/avm/tools/runner/source/ruby.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class Source < ::Avm::Sources::Runner
-        class Ruby
-          require_sub __FILE__
-          runner_with :help, :subcommands do
-            desc 'Ruby utitilies for local projects.'
-            subcommands
-          end
-        end
-      end
-    end
-  end
-end