avm-tools 0.50.0 → 0.54.1

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.50.0'
+    VERSION = '0.54.1'
   end
 end

data/lib/eac_launcher.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-GIT_SUBREPO_LIB = ::File.join(::File.dirname(__dir__), 'vendor', 'git-subrepo', 'lib')
-ENV['PATH'] = "#{GIT_SUBREPO_LIB}#{::File::PATH_SEPARATOR}#{ENV['PATH']}"
-
 module EacLauncher
   require 'eac_launcher/context'
   require 'eac_launcher/paths'

data/lib/eac_launcher/git/base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_git/local'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/envs'
 require 'eac_launcher/paths/real'
@@ -16,21 +17,21 @@ module EacLauncher
       include ::EacLauncher::Git::Base::Subrepo
       include ::EacLauncher::Git::Base::Underlying
 
+      attr_reader :eac_git
+      delegate :descendant?, :merge_base, :rev_parse, to: :eac_git
+
+      def initialize(path)
+        super(path)
+
+        @eac_git = ::EacGit::Local.new(path)
+      end
+
       def init_bare
         FileUtils.mkdir_p(self)
         ::EacRubyUtils::Envs.local.command('git', 'init', '--bare', self).execute! unless
         File.exist?(subpath('.git'))
       end
 
-      def rev_parse(ref, required = false)
-        r = execute!('rev-parse', ref, exit_outputs: { 128 => nil, 32_768 => nil })
-        r.strip! if r.is_a?(String)
-        return r if r.present?
-        return nil unless required
-
-        raise "Reference \"#{ref}\" not found"
-      end
-
       # @return [Pathname]
       def root_path
         @root_path ||= self.class.find_root(to_s)
@@ -44,17 +45,6 @@ module EacLauncher
         base == revparse
       end
 
-      def merge_base(*commits)
-        refs = commits.dup
-        while refs.count > 1
-          refs[1] = merge_base_pair(refs[0], refs[1])
-          return nil if refs[1].blank?
-
-          refs.shift
-        end
-        refs.first
-      end
-
       def subtree_split(prefix)
         execute!('subtree', '-q', 'split', '-P', prefix).strip
       end
@@ -89,12 +79,6 @@ module EacLauncher
       def raise(message)
         ::Kernel.raise EacLauncher::Git::Error.new(self, message)
       end
-
-      private
-
-      def merge_base_pair(commit1, commit2)
-        execute!('merge-base', commit1, commit2, exit_outputs: { 256 => '' }).strip
-      end
     end
   end
 end

data/lib/eac_launcher/git/base/underlying.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_git/executables'
 require 'eac_ruby_utils/envs'
 require 'git'
 require 'eac_launcher/paths/real'
@@ -9,23 +10,24 @@ module EacLauncher
     class Base < ::EacLauncher::Paths::Real
       module Underlying
         def command(*args)
-          args, _options = build_args(args)
-          ::EacRubyUtils::Envs.local.command(*args)
+          args, options = build_args(args)
+          r = ::EacGit::Executables.git.command(*args)
+          (options[:exit_outputs] || {}).each do |status_code, result|
+            r = r.status_result(status_code, result)
+          end
+          r
         end
 
         def execute(*args)
-          args, options = build_args(args)
-          ::EacRubyUtils::Envs.local.command(*args).execute(options)
+          command(*args).execute
         end
 
         def execute!(*args)
-          args, options = build_args(args)
-          ::EacRubyUtils::Envs.local.command(*args).execute!(options)
+          command(*args).execute!
         end
 
         def system!(*args)
-          args, options = build_args(args)
-          ::EacRubyUtils::Envs.local.command(*args).system!(options)
+          command(*args).system!
         end
 
         def init
@@ -42,7 +44,7 @@ module EacLauncher
             args.pop
           end
           args = args.first if args.first.is_a?(Array)
-          [['git', '-C', self, '--no-pager'] + args, options]
+          [['-C', self, '--no-pager'] + args, options]
         end
 
         def git_uncached

data/template/avm/ruby/gems/generator/gemspec.template

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require '%%LIB_PATH%%/version'
+
+Gem::Specification.new do |s|
+  s.name        = '%%NAME%%'
+  s.version     = %%ROOT_MODULE%%::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'eac_ruby_utils', %%EAC_RUBY_UTILS_VERSION%%
+
+  s.add_development_dependency 'eac_ruby_gem_support', %%EAC_RUBY_GEM_SUPPORT_VERSION%%
+end

data/template/avm/ruby/gems/generator/root_lib.template

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+%%ROOT_MODULE_OPEN%%
+%%ROOT_MODULE_INNER_IDENTATION%%require_sub __FILE__
+%%ROOT_MODULE_CLOSE%%

data/template/avm/ruby/gems/generator/static/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec

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

@@ -0,0 +1,7 @@
+# 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

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

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+  #   # This allows you to limit a spec run to individual examples or groups
+  #   # you care about by tagging them with `:focus` metadata. When nothing
+  #   # is tagged with `:focus`, all examples get run. RSpec also provides
+  #   # aliases for `it`, `describe`, and `context` that include `:focus`
+  #   # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  #   config.filter_run_when_matching :focus
+  #
+  #   # Allows RSpec to persist some state between runs in order to support
+  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
+  #   # you configure your source control system to ignore this file.
+  #   config.example_status_persistence_file_path = "spec/examples.txt"
+  #
+  #   # Limits the available syntax to the non-monkey patched syntax that is
+  #   # recommended. For more details, see:
+  #   #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  #   config.disable_monkey_patching!
+  #
+  #   # This setting enables warnings. It's recommended, but in some cases may
+  #   # be too noisy due to issues in dependencies.
+  #   config.warnings = true
+  #
+  #   # Many RSpec users commonly either run the entire suite or an individual
+  #   # file, and it's useful to allow more verbose output when running an
+  #   # individual spec file.
+  #   if config.files_to_run.one?
+  #     # Use the documentation formatter for detailed output,
+  #     # unless a formatter has already been configured
+  #     # (e.g. via a command-line flag).
+  #     config.default_formatter = "doc"
+  #   end
+  #
+  #   # Print the 10 slowest examples and example groups at the
+  #   # end of the spec run, to help surface which specs are running
+  #   # particularly slow.
+  #   config.profile_examples = 10
+  #
+  #   # Run specs in random order to surface order dependencies. If you find an
+  #   # order dependency and want to debug it, you can fix the order by providing
+  #   # the seed, which is printed after each run.
+  #   #     --seed 1234
+  #   config.order = :random
+  #
+  #   # Seed global randomization in this process using the `--seed` CLI option.
+  #   # Setting this allows you to use `--seed` to deterministically reproduce
+  #   # test failures related to randomization by passing the same `--seed` value
+  #   # as the one that triggered the failure.
+  #   Kernel.srand config.seed
+end

data/template/avm/ruby/gems/generator/version.template

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+%%ROOT_MODULE_OPEN%%
+%%ROOT_MODULE_INNER_IDENTATION%%VERSION = '0.0.0'
+%%ROOT_MODULE_CLOSE%%

data/vendor/gems/eac_git/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec

data/vendor/gems/eac_git/eac_git.gemspec

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'eac_git/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'eac_git'
+  s.version     = EacGit::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib,vendor}/**/*']
+
+  s.add_dependency 'eac_ruby_utils', '~> 0.37'
+  s.add_dependency 'parseconfig', '~> 1.0', '>= 1.0.8'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
+end

data/vendor/gems/eac_git/lib/eac_git.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  require_sub __FILE__
+end

data/vendor/gems/eac_git/lib/eac_git/executables.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/envs'
+
+module EacGit
+  module Executables
+    class << self
+      include ::EacRubyUtils::SimpleCache
+
+      def env
+        ::EacRubyUtils::Envs.local
+      end
+
+      private
+
+      def git_uncached
+        r = env.executable('git', '--version')
+        r.extend(GitCommandExtensions)
+        r
+      end
+
+      module GitCommandExtensions
+        def command(*args)
+          super(*args).envvar('PATH', path_with_git_subrepo)
+        end
+
+        def gem_root
+          '../..'.to_pathname.expand_path(__dir__)
+        end
+
+        def git_subrepo_root
+          gem_root.join('vendor', 'git-subrepo')
+        end
+
+        def path_with_git_subrepo
+          ([git_subrepo_root.join('lib').to_path] +
+              ENV['PATH'].if_present('').split(::File::PATH_SEPARATOR))
+            .join(::File::PATH_SEPARATOR)
+        end
+      end
+    end
+  end
+end

data/vendor/gems/eac_git/lib/eac_git/local.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'eac_git/executables'
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  # A Git repository in local filesystem.
+  class Local
+    require_sub __FILE__
+
+    common_constructor :root_path do
+      self.root_path = root_path.to_pathname
+    end
+
+    def descendant?(descendant, ancestor)
+      base = merge_base(descendant, ancestor)
+      return false if base.blank?
+
+      revparse = command('rev-parse', '--verify', ancestor).execute!.strip
+      base == revparse
+    end
+
+    def merge_base(*commits)
+      refs = commits.dup
+      while refs.count > 1
+        refs[1] = merge_base_pair(refs[0], refs[1])
+        return nil if refs[1].blank?
+
+        refs.shift
+      end
+      refs.first
+    end
+
+    def command(*args)
+      ::EacGit::Executables.git.command('-C', root_path.to_path, *args)
+    end
+
+    def rev_parse(ref, required = false)
+      r = command('rev-parse', ref).execute!(exit_outputs: { 128 => nil, 32_768 => nil })
+      r.strip! if r.is_a?(String)
+      return r if r.present?
+      return nil unless required
+
+      raise "Reference \"#{ref}\" not found"
+    end
+
+    def subrepo(subpath)
+      ::EacGit::Local::Subrepo.new(self, subpath)
+    end
+
+    private
+
+    def merge_base_pair(commit1, commit2)
+      command('merge-base', commit1, commit2).execute!(exit_outputs: { 256 => nil }).strip
+    end
+  end
+end

data/vendor/gems/eac_git/lib/eac_git/local/subrepo.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'eac_git/remote'
+require 'eac_ruby_utils/core_ext'
+
+module EacGit
+  class Local
+    # A git-subrepo (https://github.com/ingydotnet/git-subrepo) in a [EacGit::Local].
+    class Subrepo
+      require_sub __FILE__
+      enable_simple_cache
+
+      common_constructor :local, :subpath do
+        self.subpath = subpath.to_pathname
+        raise "Config file \"#{config_absolute_path}\" not found" unless config_absolute_path.file?
+      end
+
+      def command(subrepo_subcommand, *subrepo_subcommand_args)
+        local.command('subrepo', subrepo_subcommand, subpath.to_path,
+                      *subrepo_subcommand_args)
+      end
+
+      delegate(*::EacGit::Local::Subrepo::Config::MAPPING.keys, to: :config)
+
+      def write_config
+        config_absolute_path.write(config.to_content)
+      end
+
+      private
+
+      def config_uncached
+        ::EacGit::Local::Subrepo::Config.from_file(config_absolute_path)
+      end
+
+      def config_absolute_path_uncached
+        config_relative_path.expand_path(local.root_path)
+      end
+
+      def config_relative_path_uncached
+        subpath.join('.gitrepo')
+      end
+
+      def remote_uncached
+        ::EacGit::Remote.new(remote_uri)
+      end
+    end
+  end
+end