avm-eac_ruby_base1 0.21.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa6fb2c75a6703bcdd4ceed8ead247dadbf815b655dad7b109f8ecbb91e5d0f
-  data.tar.gz: 8c0f0df2c68515851f468c2cfa289850b61d1ad3bdec8803245d4367c696e838
+  metadata.gz: 593b0984d6d71dda38fdf738b47b62a34203ffafaea53ef49677e3784f88b79c
+  data.tar.gz: 0ea5f59a0beaa510c80876bd7fbaca0882177a398ceaf413646fe7b0f125ea53
 SHA512:
-  metadata.gz: 0b1ecc88e497cb8a525c9cf4b628ea656bc3220ba84b5a8440d9f0083af30737d8d9f5195cdf5e1a315138a8bbc3309df2dd8aa963c0e10aacf949eac319d892
-  data.tar.gz: a506c42ac49b68c2845b490567eacd8de4b2d38e991016ce21d3f8727df372510ddb1c2cb46475ac5dc1151d3a34f57371090e7bbaebe3c218eaca1f9a9cae39
+  metadata.gz: 0da3cca9255f6720eca645cff4b1e1bb315e3f3cb152011feb3e9cbe28d045b0d57b248ac1139a1747b55102e663982c86dbde9c6db081880444e4f17cd0e825
+  data.tar.gz: aa6e632bdf53ff895ef761f2e8a9001ec1e764584b53eab34da6b68f8a1efb4fa0a194239c8210a3f0349bda2c33552df04d18644feb8198d8d6ab157cb26f4e

data/lib/avm/eac_ruby_base1/launcher/gem/build.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require 'tmpdir'
+require 'eac_cli/speaker'
+require 'eac_ruby_utils/envs'
+require 'avm/eac_ruby_base1/launcher/gem/specification'
+
+module Avm
+  module EacRubyBase1
+    module Launcher
+      module Gem
+        class Build
+          enable_speaker
+
+          def initialize(original_gem_root)
+            @original_gem_root = original_gem_root
+          end
+
+          def output_file
+            return nil unless @gem_root
+
+            @gem_root.find_files_with_extension('.gem').first
+          end
+
+          def builded?
+            output_file.present? && ::File.exist?(output_file)
+          end
+
+          def build
+            return if builded?
+
+            copy_gem_files
+            build_gem
+            check_gem_empty_size
+            check_gem_version
+          end
+
+          def close
+            ::FileUtils.remove_entry(@gem_root) if @gem_root && ::File.directory?(@gem_root)
+            @gem_root = nil
+          end
+
+          private
+
+          def copy_gem_files
+            @gem_root = ::Avm::Launcher::Paths::Real.new(::Dir.mktmpdir)
+            FileUtils.cp_r "#{@original_gem_root}/.", @gem_root
+          end
+
+          def build_gem
+            info("Building gemspec #{gemspec_file}...")
+            clear_gems
+            Dir.chdir @gem_root do
+              isolated_build_gem
+            end
+          end
+
+          def isolated_build_gem
+            on_clean_ruby do
+              EacRubyUtils::Envs.local.command('gem', 'build', gemspec_file).execute!
+            end
+          end
+
+          def check_gem_empty_size
+            Dir.mktmpdir do |dir|
+              Dir.chdir dir do
+                EacRubyUtils::Envs.local.command('gem', 'unpack', gem).system
+                gs = File.join(dir, File.basename(gem, '.gem'))
+                if (Dir.entries(gs) - %w[. ..]).empty?
+                  raise "\"#{dir}\" (Unpacked from #{gem}) has no source code"
+                end
+              end
+            end
+          end
+
+          def clear_gems
+            @gem_root.find_files_with_extension('.gem').each do |f|
+              FileUtils.rm_rf(f)
+            end
+          end
+
+          def gemspec_file
+            @gem_root.find_file_with_extension('.gemspec')
+          end
+
+          def gem
+            @gem_root.find_file_with_extension('.gem')
+          end
+
+          def check_gem_version
+            spec = ::Avm::EacRubyBase1::Launcher::Gem::Specification.new(gemspec_file)
+            return if ::File.basename(output_file, '.gem') == spec.full_name
+
+            raise("Builded gem is not the same version of gemspec (#{spec}, #{output_file})")
+          end
+
+          def bundle_dependencies
+            gemfile = @gem_root.subpath('Gemfile')
+            return unless ::File.exist?(gemfile)
+
+            Dir.chdir(@gem_root) do
+              EacRubyUtils::Envs.local.command('bundle', 'install').execute!
+            end
+          end
+
+          def on_clean_ruby
+            on_clear_envvars('BUNDLE', 'RUBY') { yield }
+          end
+
+          def on_clear_envvars(*start_with_vars)
+            old_values = envvars_starting_with(start_with_vars)
+            old_values.each_key { |k| ENV.delete(k) }
+            yield
+          ensure
+            old_values&.each { |k, v| ENV[k] = v }
+          end
+
+          def envvars_starting_with(start_with_vars)
+            ENV.select { |k, _v| start_with_vars.any? { |var| k.start_with?(var) } }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/launcher/gem/specification.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/object'
+
+module Avm
+  module EacRubyBase1
+    module Launcher
+      module Gem
+        class Specification
+          class << self
+            def parse_version_file(file)
+              s = ::File.read(file)
+              m = /VERSION\s*=\s*[\'\"]([^\'\"]+)[\'\"]/.match(s)
+              m ? m[1] : nil
+            end
+          end
+
+          attr_reader :gemspec_file
+
+          def initialize(gemspec_file)
+            @gemspec_file = gemspec_file
+          end
+
+          def version
+            v = self.class.parse_version_file(version_file)
+            return v if v.present?
+
+            raise "Version not found on file \"#{version_file}\""
+          end
+
+          def name
+            ::File.basename(gemspec_file).gsub(/\.gemspec\z/, '')
+          end
+
+          def full_name
+            "#{name}-#{version}"
+          end
+
+          def to_s
+            full_name
+          end
+
+          private
+
+          def gem_root
+            ::File.dirname(gemspec_file)
+          end
+
+          def version_file
+            f = ::File.join(gem_root, 'lib', *namespace_parts, 'version.rb')
+            return f if ::File.exist?(f)
+
+            raise "Version file \"#{f}\" does not exist"
+          end
+
+          def namespace_parts
+            name.split('-')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/launcher/gem.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Launcher
+      module Gem
+        require_sub __FILE__
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/launcher.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Launcher
+      require_sub __FILE__
+    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/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.21.0'
+    VERSION = '0.23.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.23.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-11 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.48'
   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.48'
 - !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
@@ -111,6 +105,10 @@ files:
 - lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_factory.rb
 - lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base.rb
 - lib/avm/eac_ruby_base1/bundler/incompatible_parser/version_requirement.rb
+- lib/avm/eac_ruby_base1/launcher.rb
+- lib/avm/eac_ruby_base1/launcher/gem.rb
+- lib/avm/eac_ruby_base1/launcher/gem/build.rb
+- lib/avm/eac_ruby_base1/launcher/gem/specification.rb
 - lib/avm/eac_ruby_base1/preferred_version_requirements.rb
 - lib/avm/eac_ruby_base1/rubocop.rb
 - lib/avm/eac_ruby_base1/rubocop/configured.rb
@@ -139,6 +137,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