avm-tools 0.51.0 → 0.54.2

data/lib/avm/result.rb

@@ -2,12 +2,13 @@
 
 require 'colorized_string'
 require 'eac_ruby_utils/listable'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   class Result < ::SimpleDelegator
     include ::EacRubyUtils::Listable
 
-    lists.add_string :type, :success, :error, :neutral
+    lists.add_string :type, :success, :error, :neutral, :pending, :outdated
 
     lists.type.values.each do |type| # rubocop:disable Style/HashEachMethods
       class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
@@ -20,10 +21,19 @@ module Avm
     TYPE_SUCCESS_COLOR = 'green'
     TYPE_ERROR_COLOR = 'red'
     TYPE_NEUTRAL_COLOR = 'light_black'
+    TYPE_PENDING_COLOR = 'yellow'
+    TYPE_OUTDATED_COLOR = 'blue'
 
     class << self
-      def success_or_error(value, success)
-        new(value, success ? ::Avm::Result::TYPE_SUCCESS : ::Avm::Result::TYPE_ERROR)
+      # Return Avm::Result.success(success_value) if +success+ is truthy.
+      # Return Avm::Result.error(error_value || success_value) if +success+ is falsely.
+      # @return [Avm::Result]
+      def success_or_error(success, success_value, error_value = nil)
+        if success
+          self.success(success_value)
+        else
+          error(error_value.presence || success_value)
+        end
       end
     end
 

data/lib/avm/tools/runner/git/auto_commit.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit_path'
+require 'eac_cli/default_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Git < ::EacRubyUtils::Console::DocoptRunner
+        class AutoCommit < ::EacRubyUtils::Console::DocoptRunner
+          include ::EacCli::DefaultRunner
+
+          runner_definition do
+            desc 'Commit with message based in content commited.'
+            bool_opt '-d', '--dirty', 'Select dirty files.'
+            pos_arg 'paths', repeat: true, optional: true
+          end
+
+          def run
+            clear_stage
+            banner
+            run_paths
+          end
+
+          private
+
+          def banner
+            infov 'Paths', paths.count
+          end
+
+          def clear_stage
+            infom 'Clearing stage...'
+            context(:git).system!('reset', 'HEAD')
+          end
+
+          def dirty_paths
+            return [] unless options.fetch('--dirty')
+
+            context(:git).dirty_files.map { |d| context(:git).root_path.join / d.path }
+          end
+
+          def paths_uncached
+            (options.fetch('<paths>')
+              .map { |p| p.to_pathname.expand_path } + dirty_paths)
+              .reject(&:directory?)
+              .sort.uniq.map { |path| ::Avm::Git::AutoCommitPath.new(context(:git), path) }
+          end
+
+          def run_paths
+            paths.each(&:run)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/git/subrepo.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'eac_cli/default_runner'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Git < ::EacRubyUtils::Console::DocoptRunner
+        class Subrepo < ::EacRubyUtils::Console::DocoptRunner
+          require_sub __FILE__
+          include ::EacCli::DefaultRunner
+
+          runner_definition do
+            desc 'Git-subrepo (https://github.com/ingydotnet/git-subrepo) utilities.'
+            subcommands
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/git/subrepo/check.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'eac_cli/default_runner'
+require 'eac_git/local'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Git < ::EacRubyUtils::Console::DocoptRunner
+        class Subrepo < ::EacRubyUtils::Console::DocoptRunner
+          class Check < ::EacRubyUtils::Console::DocoptRunner
+            include ::EacCli::DefaultRunner
+
+            runner_definition do
+              desc 'Check status of subrepos.'
+              bool_opt '-a', '--all', 'Select all subrepos.'
+              bool_opt '-f', '--fix-parent', 'Fix parent SHA1.'
+              bool_opt '-n', '--no-error', 'Do not exit with error if check fails.'
+              bool_opt '-r', '--remote', 'Check subrepos remote.'
+              pos_arg :subrepos, repeat: true, optional: true
+            end
+
+            def run
+              subrepo_checks.show_result
+              return if options.fetch('--no-error')
+              return unless subrepo_checks.result.error?
+
+              fatal_error 'Failed'
+            end
+
+            private
+
+            def subrepo_checks_uncached
+              r = ::Avm::Git::SubrepoChecks.new(local_repos)
+              r.check_remote = options.fetch('--remote')
+              r.fix_parent = options.fetch('--fix-parent')
+              r.add_all_subrepos if options.fetch('--all')
+              r.add_subrepos(*options.fetch('<subrepos>'))
+              r
+            end
+
+            def local_repos_uncached
+              ::EacGit::Local.new(context(:git))
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.51.0'
+    VERSION = '0.54.2'
   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/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