avm-tools 0.94.3 → 0.95.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 266e7f05ba459608c81b684bb675e5efab20d7be043e59424398a3c810cf1db9
-  data.tar.gz: f9b04149ba95fa4cd4b4aba277118918351727999ed1a363b4782f0cd5ffcd96
+  metadata.gz: 43ee05798fe159fe0fffa66e10aa7260aa8e29a7fe7f37786b29a89b051f600b
+  data.tar.gz: 86dbc1695a7dfe69cf4c33d2d5aae928a7cc05448305e41f4a23205636ea39ff
 SHA512:
-  metadata.gz: 1b2028e2aa894113dcbcee37742d302d1e12a363fddd5b569da22d84ea6c9e8f49ce87e9675af1bf8cef0b1a5d9e11dc94c969f61e71ff6ab1164371b145e987
-  data.tar.gz: 356839265fa90cc3d360af76194562840fa88aea67f0743814f22044263903fa5007b6617878610e19e43763bc5e238c6a37b697c379cccdf376ff61596ce1fa
+  metadata.gz: 52f50815a47e9373174a9f6b39e64d0f16cc5a6cf2a39f5bd540f1f90f3bbad6e3361607cdd7a37d225f746bb7f36717e99b344fbd35882f64013c33d56b5e51
+  data.tar.gz: dc15c004e0c6c67ebcaaa7b230c0210c5fbde1ca567a1b405fbea7148732b998f3919c74815be22ded25cd21cffbf4a3e0b6d82406a78e507dc89d6ff4fd41e8

data/lib/avm/ruby/bundler.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Ruby
+    module Bundler
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        require_sub __FILE__
+
+        enable_simple_cache
+        attr_reader :gems_in_conflict
+
+        def initialize(path)
+          @gems_in_conflict = ::Avm::Ruby::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/ruby/bundler/incompatible_parser/depends_on.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/line_parser_base'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class DependsOn < ::Avm::Ruby::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/ruby/bundler/incompatible_parser/gem_conflict.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/line_parser_base'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class GemConflict < ::Avm::Ruby::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_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
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/gem_conflict'
+require 'avm/ruby/bundler/incompatible_parser/line_factory'
+
+module Avm
+  module Ruby
+    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/ruby/bundler/incompatible_parser/line_factory.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/depends_on'
+require 'avm/ruby/bundler/incompatible_parser/gem_conflict'
+require 'avm/ruby/bundler/incompatible_parser/in_gemfile'
+
+module Avm
+  module Ruby
+    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/ruby/bundler/incompatible_parser/line_parser_base.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Ruby
+    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/ruby/bundler/incompatible_parser/version_requirement.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/ruby/bundler/incompatible_parser/line_parser_base'
+
+module Avm
+  module Ruby
+    module Bundler
+      class IncompatibleParser
+        class VersionRequirement < ::Avm::Ruby::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/ruby/gems/generator.rb

@@ -8,7 +8,7 @@ module Avm
     module Gems
       class Generator
         IDENT = '  '
-        JOBS = %w[root_directory gemspec root_lib version_lib static gemfile_lock rspec].freeze
+        JOBS = %w[root_directory gemspec root_lib version_lib static gemfile_lock].freeze
         TEMPLATE_VARIABLES = %w[lib_path name root_module].freeze
 
         enable_console_speaker
@@ -92,10 +92,6 @@ module Avm
           template_apply('root_lib', "lib/#{lib_path}.rb")
         end
 
-        def generate_rspec
-          self_gem.bundle('exec', 'rspec').chdir_root.execute!
-        end
-
         def generate_static
           template.child('static').apply(self, root_directory)
         end

data/lib/avm/tools/runner/local_project/ruby/bundler/incompatible.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'avm/fs_cache'
+require 'avm/ruby/bundler/incompatible_parser'
+require 'eac_ruby_base0/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class LocalProject
+        class Ruby
+          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.cached?
+                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"...'
+                instance.ruby_gem.bundle('update').execute[:stdout]
+              end
+
+              def content_path
+                fs_cache.write(bundle_update) unless fs_cache.cached? && parsed.last?
+                fs_cache.content_path
+              end
+
+              def fs_cache_uncached
+                ::Avm.fs_cache.child(self.class.name.variableize)
+                     .child(instance.path.to_s.variableize)
+              end
+
+              def gem_title(gem_in_conflict)
+                gem_in_conflict.gem_name
+              end
+
+              def instance
+                runner_context.call(:instance)
+              end
+
+              def parser_uncached
+                ::Avm::Ruby::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
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.94.3'
+    VERSION = '0.95.0'
   end
 end

data/template/avm/ruby/gems/generator/static/spec/rubocop_spec.rb

@@ -1,7 +1,3 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gem_support/spec/examples/rubocop_check'
-
-RSpec.describe ::RuboCop, slow: true do
-  include_examples 'rubocop_check', ::File.expand_path('..', __dir__)
-end
+::EacRubyGemSupport::Rspec.default.describe_rubocop

data/template/avm/ruby/gems/generator/static/spec/spec_helper.rb

@@ -97,4 +97,6 @@ RSpec.configure do |config|
   #   # test failures related to randomization by passing the same `--seed` value
   #   # as the one that triggered the failure.
   #   Kernel.srand config.seed
+  require 'eac_ruby_gem_support/rspec'
+  ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__))
 end

data/vendor/avm-apps/avm-apps.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'eac_ruby_utils', '~> 0.58', '>= 0.58.1'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/vendor/avm-apps/lib/avm/apps/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Apps
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/vendor/avm-apps/spec/rubocop_spec.rb

@@ -1,7 +1,3 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gem_support/spec/examples/rubocop_check'
-
-RSpec.describe ::RuboCop, slow: true do
-  include_examples 'rubocop_check', ::File.expand_path('..', __dir__)
-end
+::EacRubyGemSupport::Rspec.default.describe_rubocop

data/vendor/avm-apps/spec/spec_helper.rb

@@ -97,4 +97,7 @@ RSpec.configure do |config|
   #   # test failures related to randomization by passing the same `--seed` value
   #   # as the one that triggered the failure.
   #   Kernel.srand config.seed
+
+  require 'eac_ruby_gem_support/rspec'
+  ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__), config)
 end

data/vendor/eac_cli/eac_cli.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'eac_ruby_utils', '~> 0.55'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder.rb

@@ -36,7 +36,9 @@ module EacCli
       end
 
       def option_definition(option)
-        self.class.option_usage_full(option) + OPTION_DESC_SEP + option.description
+        self.class.option_usage_full(option) + option.description.if_present('') do |v|
+          OPTION_DESC_SEP + v
+        end
       end
 
       def section(header, include_header = true)

data/vendor/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.16.1'
+  VERSION = '0.16.3'
 end

data/vendor/eac_cli/spec/rubocop_spec.rb

@@ -1,7 +1,3 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gem_support/spec/examples/rubocop_check'
-
-RSpec.describe ::RuboCop, slow: true do
-  include_examples 'rubocop_check', ::File.expand_path('..', __dir__)
-end
+::EacRubyGemSupport::Rspec.default.describe_rubocop

data/vendor/eac_cli/spec/spec_helper.rb

@@ -97,4 +97,7 @@ RSpec.configure do |config|
   #   # test failures related to randomization by passing the same `--seed` value
   #   # as the one that triggered the failure.
   #   Kernel.srand config.seed
+
+  require 'eac_ruby_gem_support/rspec'
+  ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__), config)
 end

data/vendor/eac_docker/eac_docker.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'eac_ruby_utils', '~> 0.36'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.1'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/vendor/eac_docker/lib/eac_docker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacDocker
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/vendor/eac_docker/spec/rubocop_spec.rb

@@ -1,7 +1,3 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gem_support/spec/examples/rubocop_check'
-
-RSpec.describe ::RuboCop, slow: true do
-  include_examples 'rubocop_check', ::File.expand_path('..', __dir__)
-end
+::EacRubyGemSupport::Rspec.default.describe_rubocop

data/vendor/eac_docker/spec/spec_helper.rb

@@ -97,6 +97,9 @@ RSpec.configure do |config|
   #   # test failures related to randomization by passing the same `--seed` value
   #   # as the one that triggered the failure.
   #   Kernel.srand config.seed
+
+  require 'eac_ruby_gem_support/rspec'
+  ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__), config)
 end
 
 require 'eac_docker/rspec'

data/vendor/eac_git/eac_git.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'parseconfig', '~> 1.0', '>= 1.0.8'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.7'
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/vendor/eac_git/lib/eac_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacGit
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/vendor/eac_git/spec/rubocop_spec.rb

@@ -1,7 +1,3 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gem_support/spec/examples/rubocop_check'
-
-RSpec.describe ::RuboCop, slow: true do
-  include_examples 'rubocop_check', ::File.expand_path('..', __dir__)
-end
+::EacRubyGemSupport::Rspec.default.describe_rubocop

data/vendor/eac_git/spec/spec_helper.rb

@@ -97,6 +97,8 @@ RSpec.configure do |config|
   #   # test failures related to randomization by passing the same `--seed` value
   #   # as the one that triggered the failure.
   #   Kernel.srand config.seed
+  require 'eac_ruby_gem_support/rspec'
+  ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__), config)
 end
 
 require 'eac_git/rspec'

data/vendor/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.8'
   s.add_dependency 'eac_ruby_utils', '~> 0.60'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/input.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/abstract_methods'
+
+module EacRubyBase0
+  module RunnerWith
+    module Input
+      STDIN_OPTION = '-'
+      BLANK_OPTION = '+'
+      DEFAULT_DEFAULT_INPUT_OPTION = BLANK_OPTION
+
+      common_concern do
+        enable_settings_provider
+        include ::EacCli::Runner
+
+        runner_definition do
+          arg_opt '-i', '--input', 'Input from file.'
+        end
+      end
+
+      def input_content
+        case input_option
+        when STDIN_OPTION then $stdin.read
+        when BLANK_OPTION then ''
+        else input_option.to_pathname.read
+        end
+      end
+
+      def input_option
+        parsed.input || setting_value(:default_input_option, default: DEFAULT_DEFAULT_INPUT_OPTION)
+      end
+    end
+  end
+end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyBase0
-  VERSION = '0.6.0'
+  VERSION = '0.7.1'
 end

data/vendor/eac_ruby_base0/spec/rubocop_spec.rb

@@ -1,7 +1,3 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gem_support/spec/examples/rubocop_check'
-
-RSpec.describe ::RuboCop, slow: true do
-  include_examples 'rubocop_check', ::File.expand_path('..', __dir__)
-end
+::EacRubyGemSupport::Rspec.default.describe_rubocop

data/vendor/eac_ruby_base0/spec/spec_helper.rb

@@ -97,4 +97,7 @@ RSpec.configure do |config|
   #   # test failures related to randomization by passing the same `--seed` value
   #   # as the one that triggered the failure.
   #   Kernel.srand config.seed
+
+  require 'eac_ruby_gem_support/rspec'
+  ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__), config)
 end

data/vendor/eac_ruby_gems_utils/eac_ruby_gems_utils.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_ruby_utils', '~> 0.29'
 
   # Tests
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyGemsUtils
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/vendor/eac_ruby_gems_utils/spec/code/rubocop_check_spec.rb

@@ -1,7 +1,3 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gem_support/spec/examples/rubocop_check'
-
-RSpec.describe ::RuboCop do
-  include_examples 'rubocop_check', ::File.expand_path('../..', __dir__)
-end
+::EacRubyGemSupport::Rspec.default.describe_rubocop

data/vendor/eac_ruby_gems_utils/spec/spec_helper.rb

@@ -97,4 +97,7 @@ RSpec.configure do |config|
   #   # test failures related to randomization by passing the same `--seed` value
   #   # as the one that triggered the failure.
   #   Kernel.srand config.seed
+
+  require 'eac_ruby_gem_support/rspec'
+  ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__), config)
 end

data/vendor/eac_ruby_utils/eac_ruby_utils.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'docopt', '~> 0.6.1'
   s.add_dependency 'filesize'
   s.add_dependency 'net-ssh', '~> 4.2'
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.1'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/filesystem_cache.rb

@@ -24,6 +24,12 @@ module EacRubyUtils
       ::File.read(content_path)
     end
 
+    def read_or_cache
+      write(yield) unless cached?
+
+      read
+    end
+
     def write(value)
       assert_directory_on_path
       ::File.write(content_path, value)

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp/to_parser.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/regexp_parser'
+
+class Regexp
+  # @return [::EacRubyUtils::RegexpParser]
+  def to_parser(&block)
+    ::EacRubyUtils::RegexpParser.new(self, &block)
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/regexp_parser.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class RegexpParser
+    attr_reader :pattern, :builder_proc
+
+    def initialize(pattern, &builder_proc)
+      @pattern = pattern
+      @builder_proc = builder_proc
+    end
+
+    def parse(string)
+      internal_parse(string)[1]
+    end
+
+    def parse!(string)
+      match, result = internal_parse(string)
+      return result if match
+
+      raise ::ArgumentError, "String \"#{string}\" does not match pattern \"#{pattern}\""
+    end
+
+    private
+
+    def internal_parse(string)
+      m = pattern.match(string)
+      if m
+        [true, builder_proc ? builder_proc.call(m) : m]
+      else
+        [false, nil]
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb

@@ -2,12 +2,18 @@
 
 module EacRubyUtils
   module SimpleCache
-    UNCACHED_METHOD_PATTERN = /\A(\s+)_uncached\z/.freeze
+    UNCACHED_METHOD_NAME_SUFFIX = '_uncached'
+    UNCACHED_METHOD_PATTERN = /\A(\s+)_#{::Regexp.quote(UNCACHED_METHOD_NAME_SUFFIX)}\z/.freeze
+
+    class << self
+      def uncached_method_name(method_name)
+        "#{method_name}#{UNCACHED_METHOD_NAME_SUFFIX}"
+      end
+    end
 
     def method_missing(method, *args, &block)
-      uncached_method = "#{method}_uncached"
-      if respond_to?(uncached_method, true)
-        call_method_with_cache(uncached_method, args, &block)
+      if respond_to?(::EacRubyUtils::SimpleCache.uncached_method_name(method), true)
+        call_method_with_cache(method, args, &block)
       else
         super
       end
@@ -35,10 +41,17 @@ module EacRubyUtils
       raise 'Não é possível realizar o cache de métodos com bloco' if block
 
       key = ([method] + args).join('@@@')
-      cache_keys[key] = send(method, *args) unless cache_keys.key?(key)
+      unless cache_keys.key?(key)
+        uncached_value = call_uncached_method(method, args)
+        cache_keys[key] = uncached_value
+      end
       cache_keys[key]
     end
 
+    def call_uncached_method(method, args)
+      send(::EacRubyUtils::SimpleCache.uncached_method_name(method), *args)
+    end
+
     def cache_keys
       @cache_keys ||= {}
     end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.62.0'
+  VERSION = '0.63.0'
 end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb

@@ -16,6 +16,11 @@ class CacheableObject
     "#{arg1}/#{@counter2}"
   end
 
+  def method_with_reset_uncached
+    reset_cache
+    'result'
+  end
+
   private
 
   def private_method_uncached
@@ -39,6 +44,10 @@ RSpec.describe ::EacRubyUtils::SimpleCache do
     it 'is able to call private uncached as cached' do
       expect(instance.private_method).to eq(instance.private_method)
     end
+
+    it 'return value even if reset cache' do
+      expect(instance.method_with_reset).to eq('result')
+    end
   end
 
   describe 'cache value with args' do

data/vendor/eac_ruby_utils/spec/rubocop_check_spec.rb

@@ -1,7 +1,3 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gem_support/spec/examples/rubocop_check'
-
-RSpec.describe ::RuboCop do
-  include_examples 'rubocop_check', ::File.expand_path('..', __dir__)
-end
+::EacRubyGemSupport::Rspec.default.describe_rubocop

data/vendor/eac_ruby_utils/spec/spec_helper.rb

@@ -5,6 +5,9 @@ require 'tmpdir'
 
 RSpec.configure do |config|
   config.example_status_persistence_file_path = ::File.join(::Dir.tmpdir, 'eac_ruby_utils_rspec')
+
+  require 'eac_ruby_gem_support/rspec'
+  ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__), config)
 end
 
 require 'i18n'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.94.3
+  version: 0.95.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -98,20 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: eac_cli
   requirement: !ruby/object:Gem::Requirement
@@ -514,6 +508,15 @@ files:
 - lib/avm/rails.rb
 - lib/avm/result.rb
 - lib/avm/ruby.rb
+- lib/avm/ruby/bundler.rb
+- lib/avm/ruby/bundler/incompatible_parser.rb
+- lib/avm/ruby/bundler/incompatible_parser/depends_on.rb
+- lib/avm/ruby/bundler/incompatible_parser/gem_conflict.rb
+- lib/avm/ruby/bundler/incompatible_parser/in_gemfile.rb
+- lib/avm/ruby/bundler/incompatible_parser/line_buffer.rb
+- lib/avm/ruby/bundler/incompatible_parser/line_factory.rb
+- lib/avm/ruby/bundler/incompatible_parser/line_parser_base.rb
+- lib/avm/ruby/bundler/incompatible_parser/version_requirement.rb
 - lib/avm/ruby/gems.rb
 - lib/avm/ruby/gems/generator.rb
 - lib/avm/ruby/rubocop.rb
@@ -570,6 +573,7 @@ files:
 - lib/avm/tools/runner/local_project/ruby.rb
 - lib/avm/tools/runner/local_project/ruby/bundler.rb
 - lib/avm/tools/runner/local_project/ruby/bundler/gemfile_lock.rb
+- lib/avm/tools/runner/local_project/ruby/bundler/incompatible.rb
 - lib/avm/tools/runner/local_project/test.rb
 - lib/avm/tools/runner/local_project/update.rb
 - lib/avm/tools/runner/local_project/version_bump.rb
@@ -951,6 +955,7 @@ files:
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmation.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/filesystem_traverser.rb
+- vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/input.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/output.rb
 - vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb
 - vendor/eac_ruby_base0/spec/lib/eac_ruby_base0/runner_with/confirmation_spec.rb
@@ -1109,6 +1114,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/basename_sub.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp/if_match.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp/to_parser.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string/inflector.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/time.rb
@@ -1117,6 +1123,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/entry_key_error.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/node.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/path_search.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/regexp_parser.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/require_sub.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/rspec.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/rspec/conditional.rb