avm-tools 0.53.0 → 0.54.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f84588df0d4cd0ec0d2140c037681209a2d20ad2631dced23607886bef8d18f5
-  data.tar.gz: 9f2fbd2b970e79076c229d536e5b764d096688b51ef9d4d22646ad7a1b33ff6a
+  metadata.gz: ff1c138cd8d9fcf48f13c53e562c8ac55a92069f14ac8228c01ce20ffd24d911
+  data.tar.gz: dfd51e67a7da69a8ddfc71d2ea90cdc14e9c7bda3a7bae4b0a22c2eca5aaac4e
 SHA512:
-  metadata.gz: 3bfad35dd4309a96a5a8f61b97cb1ba84203fd3ae20aac14394d6366269af231f8a50cafe8b9d9bb38c10fddd28dace0309738ef14d59ef64c2381faa166b5ff
-  data.tar.gz: 2eebd6a5654e278c8131630f500568ae6d4cf5f92f9eae4108b9ea497b3c229c539acc6f6c1dc6904109bcd2bdf4505f86682e0af3098503649bb7c6be8c13aa
+  metadata.gz: 4ad3e4aca8dd78231d8ce0a1dae219887589e7d1a7fb6264cacfa027a68b5316525ac77c4fc8792e0f12cd3832213a6491487c1fc92f535ad053e826b5b1902c
+  data.tar.gz: 2e41e9fa4996597b6a735374e82af9864c6b7739a6a5d6c97d8c3c4f2db7c3245d0bdeaf1d0a4024808bb5acc6ea5dc0eda3a4a3f6a4dd27a749d8fd5d3020af

data/lib/avm/git/issue/complete/_git_subrepos.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'avm/git/subrepo_checks'
+require 'eac_git/local'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        def git_subrepos_result
+          return ::Avm::Result.error('Unclean workspace') unless clean_workspace?
+
+          r = ::Avm::Git::SubrepoChecks.new(::EacGit::Local.new(@git)).add_all_subrepos
+          r.check_remote = true
+          r.result
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/issue/complete/_validations.rb

@@ -16,6 +16,7 @@ module Avm
           commits: 'Commits?',
           bifurcations: 'Bifurcations?',
           dry_push: 'Dry push?',
+          git_subrepos: 'Git subrepos ok?',
           test: 'Test ok?'
         }.with_indifferent_access.freeze
 

data/lib/avm/git/issue/complete/_working_tree.rb

@@ -5,8 +5,11 @@ module Avm
     module Issue
       class Complete
         def clean_workspace_result
-          r = @git.dirty_files.none?
-          ::Avm::Result.success_or_error(r, 'yes', 'no')
+          ::Avm::Result.success_or_error(clean_workspace?, 'yes', 'no')
+        end
+
+        def clean_workspace?
+          @git.dirty_files.none?
         end
       end
     end

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

@@ -16,13 +16,17 @@ module Avm
               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
-              fatal_error 'Failed' if subrepo_checks.result.error?
+              return if options.fetch('--no-error')
+              return unless subrepo_checks.result.error?
+
+              fatal_error 'Failed'
             end
 
             private

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.53.0'
+    VERSION = '0.54.0'
   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/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/eac_git.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Put here the authors']
   s.summary     = 'Put here de description.'
 
-  s.files = Dir['{lib}/**/*']
+  s.files = Dir['{lib,vendor}/**/*']
 
   s.add_dependency 'eac_ruby_utils', '~> 0.37'
   s.add_dependency 'parseconfig', '~> 1.0', '>= 1.0.8'

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/envs'
-require 'eac_ruby_utils/simple_cache'
 
 module EacGit
   module Executables
@@ -14,9 +14,29 @@ module EacGit
 
       private
 
-      %w[git].each do |program|
-        define_method(program.underscore + '_uncached') do
-          env.executable(program, '--version')
+      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

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/rspec/conditional'
+require 'eac_git/executables'
+
+module EacGit
+  module Rspec
+    class << self
+      def configure
+        ::EacRubyUtils::Rspec::Conditional.default.add(:git) do
+          ::EacGit::Executables.git.validate
+        end
+        RSpec.configure { |config| ::EacRubyUtils::Rspec::Conditional.default.configure(config) }
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_git/executables'
+
+RSpec.describe(::EacGit::Executables, git: true) do
+  it 'output version' do
+    expect(described_class.git.command('--version').execute!).to be_present
+  end
+
+  it 'subrepo output version' do
+    expect(described_class.git.command('subrepo', '--version').execute!).to be_present
+  end
+end

data/vendor/gems/eac_git/spec/spec_helper.rb

@@ -98,3 +98,6 @@ RSpec.configure do |config|
   #   # as the one that triggered the failure.
   #   Kernel.srand config.seed
 end
+
+require 'eac_git/rspec'
+::EacGit::Rspec.configure

data/vendor/gems/eac_git/vendor/git-subrepo/Changes

@@ -0,0 +1,110 @@
+---
+version: 0.4.1
+date:    Thu Jan  9 17:11:21 CST 2020
+- Fix Bash version error messages and add to .rc
+- Nicer YAML formatting in .travis.yml
+- Wrap a long line
+- Update the docs
+- Force `make update` to always update docs
+- Don't use XXX in perl stuff
+- Add testing on MacOS
+- Remove conflicting -C from install -d commands.
+- Update version requirement documentation
+- Correct error message in branch
+- Use topo-order in subrepo branch
+- Make “git subrepo clean -f ...” delete refs correctly
+- Fix #410 Push empty repositories with recent git versions
+- Make subrepo work when run in a worktree
+- Simplify finding subrepos
+- Ask git to find the .gitrepo files
+- Doc: fix sentence repetition
+- Fix typos
+- Fixed typo
+- Travis CI not checking out a branch.
+---
+version: 0.4.0
+date:    Thu Nov  8 12:26:38 CET 2018
+changes:
+- Fix #325 Do not squash main repo commits
+- Improve error message for worktree handling
+- Make version checking portable. #307
+- #307, improve version check
+- #307, update version requirement
+- Fix part #308, Add stderr output if commands fail
+- Fix #306: Add check to prevent following commits with no .gitrepo
+- Remove dry-run flag as it's not implemented. Make sure branch --force delete worktree
+- Fix #296, Replace --first-parent with --ancestry-path
+- Fix #291, specify Trusty host to get new 2.x git
+- Fix #258, add --no-tags to git fetch
+- Test that no remotes are created during clone
+- #257 Remove remote creation to avoid problems with fetch --all
+- (origin/issue/150_to_0.4.0) Fix remove-worktree, remove unused parameters
+- Regenerate completion files
+- filter-branch operation should not be done on HEAD
+- Cleanup push and add hint to push directly after pull
+- Simplify cleanup and add worktree to status
+- Add --method option to init/clone, add a 'config' command
+- Updated unit tests to support the new logic
+- Use 'git worktree' for merge/rebase
+- Update docs to reflect how things should work
+- Make it possible to specify commit messages
+- Redesign, trash the tree hash approach and use merges instead
+- Add release branches to travis-ci
+- Add --method option to init/clone, add a 'config' command
+- Detect multiple pulls, use -u flag to decide
+- Don't reuse previous commit message when using --all
+- Update the docs for pull and push
+- Update error messages when failing merge/rebase
+- Fix env var bug in test/push.t
+- Do not overwrite author information
+---
+version: 0.3.1
+date:    Tue Jan  3 23:08:56 PST 2017
+changes:
+- Updated release for homebrew
+- Fix #192
+---
+version: 0.3.0
+date:    Wed Dec  2 19:19:43 PST 2015
+changes:
+- Fix issue #98 and host of others (89, 91, 95, 96)
+- Adds support for the merge-base command
+- Adds stability to many commands
+- Command completion updates
+- Rename `init` to `.rc`
+- @grimmySwe++ @dzzh++ @jrosdahl++ @perlpunk++
+---
+version: 0.2.3
+date:    Sun Aug  9 13:44:22 PDT 2015
+changes:
+- Fix issues #75 and #76
+---
+version: 0.2.2
+date:    Wed Jul 22 09:45:13 PDT 2015
+changes:
+- Added the `init` subcommand
+- Applied doc fixes
+---
+version: 0.2.1
+date:    Sat Mar 28 07:52:22 PDT 2015
+changes:
+- Allows subrepo clone to clone to an empty branch; fixes #26.
+- Refs in status
+- Empty parent set to 'none' in .gitrepo file.
+- Bug fixes
+---
+version: 0.2.0
+date:    Sat Jan 24 06:22:05 PST 2015
+changes:
+- Massive overhaul
+- .gitrepo files remain the same so backwards compatible
+- Introduce the branch and commit subcommands
+- The checkout subcommand goes away
+- Operations work much smoother like normal Git flow
+- Much more testing
+- Better doc
+---
+version: 0.1.0
+date:    Fri Feb 21 12:25:53 2014 -0800
+changes:
+- First version

data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/Intro.pod

@@ -1,7 +1,7 @@
 =pod
 
 =for comment
-DO NOT EDIT. This Pod was generated by Swim v0.1.41.
+DO NOT EDIT. This Pod was generated by Swim v0.1.48.
 See http://github.com/ingydotnet/swim-pm#readme
 
 =encoding utf8
@@ -311,7 +311,8 @@ Good:
 
 =back
 
-<badge travis ingydotnet/git-subrepo>
+=for html
+<a href="https://travis-ci.org/ingydotnet/git-subrepo"><img src="https://travis-ci.org/ingydotnet/git-subrepo.png" alt="git-subrepo"></a>
 
 Bad:
 
@@ -426,10 +427,10 @@ The resulting history is:
 
 Compare that to B<subtree>. This:
 
-    $ git subrepo add abc git@github.com:user/abc master
-    $ git subrepo add xyz git@github.com:user/def master
-    $ git subrepo pull abc git@github.com:user/abc master
-    $ git subrepo pull xyz git@github.com:user/def master
+    $ git subtree add abc git@github.com:user/abc master
+    $ git subtree add xyz git@github.com:user/def master
+    $ git subtree pull abc git@github.com:user/abc master
+    $ git subtree pull xyz git@github.com:user/def master
 
 Produces this:
 

data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/License

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2017 Ingy döt Net
+Copyright (c) 2013-2020 Ingy döt Net
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/Makefile

@@ -36,11 +36,11 @@ test:
 
 # Install support:
 install:
-	install -C -d -m 0755 $(INSTALL_LIB)/
+	install -d -m 0755 $(INSTALL_LIB)/
 	install -C -m 0755 $(LIB) $(INSTALL_LIB)/
-	install -C -d -m 0755 $(INSTALL_EXT)/
+	install -d -m 0755 $(INSTALL_EXT)/
 	install -C -m 0755 $(EXTS) $(INSTALL_EXT)/
-	install -C -d -m 0755 $(INSTALL_MAN1)/
+	install -d -m 0755 $(INSTALL_MAN1)/
 	install -C -m 0644 $(MAN1)/$(NAME).1 $(INSTALL_MAN1)/
 
 # Uninstall support:
@@ -57,20 +57,22 @@ env:
 .PHONY: doc
 update: doc compgen
 
+force:
+
 doc: ReadMe.pod Intro.pod $(MAN1)/$(NAME).1
 	perl pkg/bin/generate-help-functions.pl $(DOC) > \
 	    $(EXT)/help-functions.bash
 
-ReadMe.pod: $(DOC)
+ReadMe.pod: $(DOC) force
 	swim --to=pod --wrap --complete $< > $@
 
-Intro.pod: doc/intro-to-subrepo.swim
+Intro.pod: doc/intro-to-subrepo.swim force
 	swim --to=pod --wrap --complete $< > $@
 
-$(MAN1)/%.1: doc/%.swim Makefile
+$(MAN1)/%.1: doc/%.swim Makefile force
 	swim --to=man --wrap $< > $@
 
-compgen:
+compgen: force
 	perl pkg/bin/generate-completion.pl bash $(DOC) $(LIB) > \
 	    $(SHARE)/completion.bash
 	perl pkg/bin/generate-completion.pl zsh $(DOC) $(LIB) > \

data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/Meta

@@ -1,11 +1,11 @@
 =meta: 0.0.2
 
 name: git-subrepo
-version: 0.3.1
+version: 0.4.1
 abstract: Git Submodule Alternative
 homepage: https://github.com/ingydotnet/git-subrepo#readme
 license: MIT
-copyright: 2013-2017
+copyright: 2013-2020
 
 author:
   name: Ingy döt Net
@@ -16,8 +16,8 @@ author:
   homepage: http://ingy.net
 
 requires:
-  bash: 3.2.0
-  git: 1.7.0
+  bash: 4.0.0
+  git: 2.7.0
 test:
   cmd: make test
 install: make install