avm-eac_ruby_base1 0.20.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e384235b4b3e787d8ecc17f339a6ccf7e08f3e2f3825a52f674af016b50df8af
-  data.tar.gz: 70ffc25d7e2f5c558fe6fae304441d4e193bdd2177b6d264a6ce45324a1e6782
+  metadata.gz: 3dbe022e931d72a6273d17350c232661bb943b57a7b69f432e43fba5083088cf
+  data.tar.gz: 6315d5afaff312e6a410e1f06cfa13f064e1f2a571c4e4d8362d1622154aa378
 SHA512:
-  metadata.gz: 8b97d6e0a2198b474d074e407ef00d3c5c215a007e502facab3f4a99b03d97aa2a6460778be8f831dccfe61524feac9177d643df2881e7c402279517eee890e3
-  data.tar.gz: 763a8b8feb93e394d6a419753697a7f2edf33800745e7bd40e9acca2ae8d31db5e714d63cdae5109517e88d30b9a925b81e779f70c6610b54855aca39c438753
+  metadata.gz: d005ee107b7eadcfd496e76ec2a88afeefdba7443f819d9a8b3d2f96c3d27d37bacde960ce9e44055dc847cfc1a68df457b161a6a407d14db0d4109cf5d3bc58
+  data.tar.gz: 228237474272dbc10f48062e96fa9adafce13709607d32e36d4fe195ce04456bce87fcf476d8693b74b5df73817dd5e35da0f644b9d96cf73ef7eb5b81f74ce6

data/lib/avm/eac_ruby_base1/runners/base/lib_rename.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'avm/eac_ruby_base1/sources/namespace_replacer'
+
+module Avm
+  module EacRubyBase1
+    module Runners
+      class Base
+        class LibRename
+          runner_with :help, :file_replacer do
+            desc 'Rename Ruby modules classes Ruby.'
+            arg_opt '-f', '--from', 'Rename "from".'
+            arg_opt '-t', '--to', 'Rename "to".'
+          end
+
+          def run
+            start_banner
+            validate
+            replacements_banner
+            run_filesystem_traverser
+            success 'Done!'
+          end
+
+          def validate
+            %w[from to].each do |opt|
+              fatal_error "No \"#{opt}\" option" if send(opt).blank?
+            end
+          end
+
+          def start_banner
+            infov 'From', from
+            infov 'To', to
+          end
+
+          private
+
+          def namespace_replacer_uncached
+            ::Avm::EacRubyBase1::Sources::NamespaceReplacer.new(from, to)
+          end
+
+          def text_replacer
+            @text_replacer ||= super.gsub(from, to).gsub(from_path, to_path)
+                                 .gsub(namespace_replacer.from_result, namespace_replacer.to_result)
+          end
+
+          def replace_file?(file)
+            file.extname == '.rb'
+          end
+
+          def replacements_banner
+            infov 'Replacements', text_replacer.replacements.count
+            text_replacer.replacements.each do |rep|
+              infov '  * ', rep
+            end
+          end
+
+          def from
+            parsed.from.to_s
+          end
+
+          def to
+            parsed.to.to_s
+          end
+
+          def from_path
+            from.underscore
+          end
+
+          def to_path
+            to.underscore
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class NamespaceReplacer
+        common_constructor :from, :to
+
+        def concat_regex(regexes)
+          r = regexes.first
+          regexes[1..-1].each do |x|
+            r = ::Regexp.new(r.source + x.source)
+          end
+          r
+        end
+
+        def from_result
+          /\n#{from_open.source}(.+)#{from_close.source}/m
+        end
+
+        def from_open
+          concat_regex(from.split('::')
+            .map { |v| / *(?:class|module) +#{::Regexp.quote(v)} *\n/m })
+        end
+
+        def from_close
+          concat_regex(from.split('::').count.times.map { / *end *\n/m })
+        end
+
+        def to_result
+          "\n\n#{to_open}\\1#{to_close}"
+        end
+
+        def to_open
+          s = ''
+          to.split('::').each_with_index do |part, index|
+            s += ('  ' * index) + "module #{part}\n"
+          end
+          s
+        end
+
+        def to_close
+          parts = to.split('::')
+          s = ''
+          parts.each_with_index do |_part, index|
+            tabc = (parts.count - 1 - index)
+            tabc -= 1 if index.zero?
+            s += ('  ' * tabc) + "end\n"
+          end
+          s
+        end
+      end
+    end
+  end
+end

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/sources/runners/update_dependencies_requirements.rb

@@ -16,13 +16,9 @@ module Avm
           end
 
           def run
-            runner_context.call(:source_banner)
-            infov 'Gems to update', gem_names.count
-            gem_names.each do |gem_name|
-              infov 'Gem to update', gem_name
-              ::Avm::EacRubyBase1::Sources::UpdateDependencyRequirements
-                .new(runner_context.call(:source), gem_name).perform
-            end
+            start_banner
+            update_gemfile_lock
+            process_all_gems
           end
 
           def gemspec
@@ -47,6 +43,24 @@ module Avm
 
             gemspec.dependencies.map(&:gem_name)
           end
+
+          def process_all_gems
+            gem_names.each do |gem_name|
+              infov 'Gem to update', gem_name
+              ::Avm::EacRubyBase1::Sources::UpdateDependencyRequirements
+                .new(runner_context.call(:source), gem_name).perform
+            end
+          end
+
+          def start_banner
+            runner_context.call(:source_banner)
+            infov 'Gems to update', gem_names.count
+          end
+
+          def update_gemfile_lock
+            infom 'Updating Gemfile\'s lock...'
+            runner_context.call(:source).bundle('update').execute!
+          end
         end
       end
     end

data/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.20.1'
+    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.20.1
+  version: 0.22.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-06 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.102'
+        version: '0.104'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
+        version: '0.104'
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +117,7 @@ files:
 - lib/avm/eac_ruby_base1/rubygems/version_file.rb
 - lib/avm/eac_ruby_base1/runners.rb
 - lib/avm/eac_ruby_base1/runners/base.rb
+- lib/avm/eac_ruby_base1/runners/base/lib_rename.rb
 - lib/avm/eac_ruby_base1/runners/base/rubocop.rb
 - lib/avm/eac_ruby_base1/source_generators.rb
 - lib/avm/eac_ruby_base1/source_generators/base.rb
@@ -134,9 +129,12 @@ files:
 - lib/avm/eac_ruby_base1/sources/base/rubygems.rb
 - lib/avm/eac_ruby_base1/sources/base/version_bump.rb
 - lib/avm/eac_ruby_base1/sources/bundle_update.rb
+- lib/avm/eac_ruby_base1/sources/namespace_replacer.rb
 - 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