avm-eac_ruby_base1 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa6fb2c75a6703bcdd4ceed8ead247dadbf815b655dad7b109f8ecbb91e5d0f
-  data.tar.gz: 8c0f0df2c68515851f468c2cfa289850b61d1ad3bdec8803245d4367c696e838
+  metadata.gz: 3dbe022e931d72a6273d17350c232661bb943b57a7b69f432e43fba5083088cf
+  data.tar.gz: 6315d5afaff312e6a410e1f06cfa13f064e1f2a571c4e4d8362d1622154aa378
 SHA512:
-  metadata.gz: 0b1ecc88e497cb8a525c9cf4b628ea656bc3220ba84b5a8440d9f0083af30737d8d9f5195cdf5e1a315138a8bbc3309df2dd8aa963c0e10aacf949eac319d892
-  data.tar.gz: a506c42ac49b68c2845b490567eacd8de4b2d38e991016ce21d3f8727df372510ddb1c2cb46475ac5dc1151d3a34f57371090e7bbaebe3c218eaca1f9a9cae39
+  metadata.gz: d005ee107b7eadcfd496e76ec2a88afeefdba7443f819d9a8b3d2f96c3d27d37bacde960ce9e44055dc847cfc1a68df457b161a6a407d14db0d4109cf5d3bc58
+  data.tar.gz: 228237474272dbc10f48062e96fa9adafce13709607d32e36d4fe195ce04456bce87fcf476d8693b74b5df73817dd5e35da0f644b9d96cf73ef7eb5b81f74ce6

data/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/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/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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_ruby_base1
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: '0.45'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: '0.45'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.103'
+        version: '0.104'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.103'
+        version: '0.104'
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +133,8 @@ files:
 - lib/avm/eac_ruby_base1/sources/runners.rb
 - lib/avm/eac_ruby_base1/sources/runners/bundler.rb
 - lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_local.rb
+- lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_lock.rb
+- lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_lock/git.rb
 - lib/avm/eac_ruby_base1/sources/runners/bundler/incompatible.rb
 - lib/avm/eac_ruby_base1/sources/runners/update_dependencies_requirements.rb
 - lib/avm/eac_ruby_base1/sources/tests.rb