avm-eac_ruby_base1 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e656d0b5fb33024c64dd35c473501431f7028a33807ad1d5e6f4552a05f667
-  data.tar.gz: 70bb5bb4b97831868bf3fd517ffcc136fe1e986a1af5b30d95d96b8e150c5085
+  metadata.gz: c305f619c0ed8bc7660261832144b80ff2d2c4f4f2c36e2bf11c3c457565a4d3
+  data.tar.gz: 2d045f5de093cc946db258c9d7ddb8bf23f783a05ebb884ec0b3c35485712756
 SHA512:
-  metadata.gz: 177ee8f268f7a561978082f381685da016a58cbe76cd13fa6e0593a9e052e19aca60def68475d30cb23675f73d215ed8e64bd2ec207551509ecd3fcc46eb138f
-  data.tar.gz: e5cedc261ea19d80fd7cbba6d6a54f4cc92ce17be70f7a487f0ccc76379504404911378a750ff6b152c3d06725bcfd0fc2fa40eac95ac956ea94ca5123aa7f8e
+  metadata.gz: 76b37e673a2c8f2efc9af27c54bdc5873b6cca86e9eba7b09c986efdb4d7aa8ed92135f37f805abd476feb2a7aa59cd35f022df11a7abe983f9c82db4032d4e4
+  data.tar.gz: c24bb9ca1bf92936fce1b415a2beabd53f29b3c93353ea862d5021c817a9fcf2b80a0dea4f32b921093873b79700ec0142a6660a84a16e901b405837d9d31200

data/lib/avm/eac_ruby_base1/bundler/incompatible_parser/depends_on.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class DependsOn < ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /(.+) was resolved to (.+), which depends on/
+                          .to_parser { |m| new(m[1], m[2]) }
+
+          common_constructor :gem_name, :version do
+            self.version = ::Gem::Version.new(version)
+          end
+
+          def data
+            { gem_name: gem_name, version: version }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/bundler/incompatible_parser/gem_conflict.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class GemConflict < ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /Bundler could not find compatible versions for gem "(.+)":/
+                          .to_parser { |m| new(m[1]) }
+
+          enable_simple_cache
+          common_constructor :gem_name
+
+          def add_depends_on(depends_on)
+            depends_on_stack << depends_on
+          end
+
+          def add_version_requirement(version_requirement)
+            version_requirement.stack = depends_on_stack
+            versions_requirements << version_requirement
+            @depends_on_stack = nil
+          end
+
+          def data
+            { gem_name: gem_name, versions_requirements: versions_requirements.map(&:data) }
+          end
+
+          def versions_requirements
+            @versions_requirements ||= []
+          end
+
+          private
+
+          def depends_on_stack
+            @depends_on_stack ||= []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/bundler/incompatible_parser/in_gemfile.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class InGemfile < ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /In Gemfile:/
+                          .to_parser { |_m| new }
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_buffer.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/gem_conflict'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_factory'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class LineBuffer
+          class << self
+            def from_file(path)
+              new(::File.read(path.to_s))
+            end
+          end
+
+          attr_reader :gems_in_conflict
+
+          def initialize(content)
+            self.gems_in_conflict = []
+            self.parsing_required = false
+            content.each_line { |string_line| add_line(LineFactory.new(string_line)) }
+          end
+
+          private
+
+          attr_accessor :parsing_required
+          attr_writer :gems_in_conflict
+
+          def add_line(line)
+            return if line.blank?
+
+            return if LineFactory::TYPES.any? do |type|
+              next false unless line.result.is_a?(type)
+
+              send("on_#{type.name.demodulize.underscore.variableize}_line", line.result)
+              true
+            end
+
+            return unless parsing_required
+
+            raise(::ArgumentError, "Unparsed line: \"#{line.content}\"")
+          end
+
+          def on_gem_conflict_line(result)
+            self.parsing_required = true
+            gems_in_conflict << result
+          end
+
+          def on_in_gemfile_line(result)
+            # Do nothing
+          end
+
+          def on_depends_on_line(result)
+            current_gem_conflict.add_depends_on(result)
+          end
+
+          def on_version_requirement_line(result)
+            current_gem_conflict.add_version_requirement(result)
+          end
+
+          def current_gem_conflict
+            raise 'No gems in conflict' if gems_in_conflict.none?
+            raise 'Last gem is blank' if gems_in_conflict.last.blank?
+
+            gems_in_conflict.last
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_factory.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/depends_on'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/gem_conflict'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/in_gemfile'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class LineFactory
+          TYPES = [GemConflict, InGemfile, DependsOn, VersionRequirement].freeze
+
+          enable_simple_cache
+          common_constructor :content do
+            self.content = content.strip
+          end
+
+          delegate :blank?, to: :content
+
+          private
+
+          def result_uncached
+            TYPES.lazy.map { |type| type.parse(content) }.find(&:present?)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class LineParserBase
+          class << self
+            def parse(line_content)
+              const_get('LINE_PARSER').parse(line_content)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/bundler/incompatible_parser/version_requirement.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class VersionRequirement < ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /\A([a-z][a-z\-_0-9]*)(?: \((.+)\))?\z/
+                          .to_parser { |m| new(m[1], m[2]) }
+
+          enable_simple_cache
+          attr_accessor :stack
+
+          common_constructor :gem_name, :requirements_source
+
+          def data
+            { requirements_source: requirements_source, stack: stack.map(&:data) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/bundler/incompatible_parser.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        require_sub __FILE__
+
+        enable_simple_cache
+        attr_reader :gems_in_conflict
+
+        def initialize(path)
+          @gems_in_conflict = ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineBuffer
+                                .from_file(path).gems_in_conflict.freeze
+        end
+
+        def data
+          gems_in_conflict.map(&:data)
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/sources/base/bundle_command.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/sources/base'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/ruby/command'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class Base < ::Avm::EacGenericBase0::Sources::Base
+        class BundleCommand < ::EacRubyUtils::Ruby::Command
+          GEMFILE_PATH_ENVVAR = 'BUNDLE_GEMFILE'
+
+          attr_reader :source
+
+          def initialize(source, command_args, extra_options = {})
+            @source = source
+            super(command_args, extra_options.merge(host_env: source.env))
+          end
+
+          # Changes current directory to the source's directory.
+          def chdir_root
+            chdir(source.path)
+          end
+
+          def envvar_gemfile
+            envvar(GEMFILE_PATH_ENVVAR, source.gemfile_path.to_path)
+          end
+
+          protected
+
+          def duplicate(command, extra_options)
+            self.class.new(source, command, extra_options)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/sources/base/bundler.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/sources/base'
+require 'avm/eac_ruby_base1/sources/base/bundle_command'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class Base < ::Avm::EacGenericBase0::Sources::Base
+        module Bundler
+          CONFIGURED_GEMFILE_PATH_ENTRY_KEY = 'ruby.gemfile_path'
+          DEFAULT_GEMFILE_PATH = 'Gemfile'
+
+          # @return [Avm::EacRubyBase1::Sources::Base::BundleCommand]
+          def bundle(*args)
+            ::Avm::EacRubyBase1::Sources::Base::BundleCommand.new(self, %w[bundle] + args)
+              .envvar_gemfile
+          end
+
+          # @return [String]
+          def configured_gemfile_path
+            configuration.entry(CONFIGURED_GEMFILE_PATH_ENTRY_KEY).value
+          end
+
+          # @return [String]
+          def default_gemfile_path
+            DEFAULT_GEMFILE_PATH
+          end
+
+          # @return [Pathname]
+          def gemfile_path
+            path.join(configured_gemfile_path || default_gemfile_path)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@
 require 'avm/eac_generic_base0/sources/base'
 require 'avm/eac_ruby_base1/sources/update'
 require 'avm/eac_ruby_base1/sources/tester'
+require 'avm/eac_ruby_base1/sources/runners/bundler'
 require 'avm/version_number'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
@@ -14,8 +15,12 @@ module Avm
         require_sub __FILE__, include_modules: :prepend, require_dependency: true
         delegate :gemspec_path, to: :the_gem
 
-        def gemfile_path
-          path.join('Gemfile')
+        EXTRA_AVAILABLE_SUBCOMMANDS = {
+          'bundler' => ::Avm::EacRubyBase1::Sources::Runners::Bundler
+        }.freeze
+
+        def extra_available_subcommands
+          EXTRA_AVAILABLE_SUBCOMMANDS
         end
 
         def valid?

data/lib/avm/eac_ruby_base1/sources/runners/bundler/incompatible.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ruby_base1/bundler/incompatible_parser'
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      module Runners
+        class Bundler
+          class Incompatible
+            runner_with :help do
+              desc 'Identify incompatible gems in a "Gemfile.lock" file.'
+              bool_opt '-l', '--last', 'Process the last \"bundle update\" result.'
+            end
+
+            def run
+              infov 'Cache path', fs_cache.content_path
+              infov 'Cached?', fs_cache.stored?
+              parser.gems_in_conflict.each do |gem_in_conflict|
+                print_gem_in_conflict(gem_in_conflict)
+              end
+            end
+
+            private
+
+            def bundle_update
+              infom 'Running "bundle update"...'
+              runner_context.call(:subject).bundle('update').execute[:stdout]
+            end
+
+            def content_path
+              fs_cache.write(bundle_update) unless fs_cache.stored? && parsed.last?
+              fs_cache.content_path
+            end
+
+            def fs_object_id
+              runner_context.call(:subject).path.to_s.variableize
+            end
+
+            def gem_title(gem_in_conflict)
+              gem_in_conflict.gem_name
+            end
+
+            def parser_uncached
+              ::Avm::EacRubyBase1::Bundler::IncompatibleParser.new(content_path)
+            end
+
+            def print_gem_in_conflict(gem_in_conflict)
+              infov 'Gem', gem_title(gem_in_conflict)
+              gem_in_conflict.versions_requirements.each do |requirement|
+                print_requirement(requirement)
+              end
+            end
+
+            def print_requirement(req)
+              infov '  ' + requirement_title(req), requirement_value(req)
+            end
+
+            def requirement_stack(req)
+              req.stack.map { |d| "#{d.gem_name} (#{d.version})" }.join(' > '.green)
+            end
+
+            def requirement_title(req)
+              req.requirements_source.if_present('*')
+            end
+
+            def requirement_value(req)
+              requirement_stack(req)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/sources/runners/bundler.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      module Runners
+        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

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

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

data/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.6.1'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_ruby_base1
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.80'
+- !ruby/object:Gem::Dependency
+  name: aranha-parsers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -97,13 +117,26 @@ files:
 - lib/avm/eac_ruby_base1/bundler/gemfile.rb
 - lib/avm/eac_ruby_base1/bundler/gemfile/add_or_replace_gem_line.rb
 - lib/avm/eac_ruby_base1/bundler/gemfile/dependency.rb
+- lib/avm/eac_ruby_base1/bundler/incompatible_parser.rb
+- lib/avm/eac_ruby_base1/bundler/incompatible_parser/depends_on.rb
+- lib/avm/eac_ruby_base1/bundler/incompatible_parser/gem_conflict.rb
+- lib/avm/eac_ruby_base1/bundler/incompatible_parser/in_gemfile.rb
+- lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_buffer.rb
+- 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/rubocop.rb
 - lib/avm/eac_ruby_base1/rubocop/configured.rb
 - lib/avm/eac_ruby_base1/rubocop/envvar.rb
 - lib/avm/eac_ruby_base1/rubocop/gemfile.rb
 - lib/avm/eac_ruby_base1/sources.rb
 - lib/avm/eac_ruby_base1/sources/base.rb
+- lib/avm/eac_ruby_base1/sources/base/bundle_command.rb
+- lib/avm/eac_ruby_base1/sources/base/bundler.rb
 - lib/avm/eac_ruby_base1/sources/base/version_bump.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/incompatible.rb
 - lib/avm/eac_ruby_base1/sources/tester.rb
 - lib/avm/eac_ruby_base1/sources/update.rb
 - lib/avm/eac_ruby_base1/sources/update/sub_update.rb