eac_tools 0.101.2 → 0.101.3

data/sub/eac_git/lib/eac_git/local/subrepo.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+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
+        local.raise_error "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

data/sub/eac_git/lib/eac_git/local.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+module EacGit
+  # A Git repository in local filesystem.
+  class Local
+    require_sub __FILE__, include_modules: true
+    include ::Comparable
+
+    HEAD_REFERENCE = 'HEAD'
+
+    class << self
+      def find(path)
+        path = path.to_pathname.expand_path
+        if path.join('.git').exist?
+          new(path)
+        elsif path.to_path != '/'
+          find(path.parent)
+        end
+      end
+    end
+
+    common_constructor :root_path do
+      self.root_path = root_path.to_pathname
+    end
+
+    def <=>(other)
+      root_path <=> other.root_path
+    end
+
+    # Retrieves a local branch.
+    #
+    # @param name [String] Ex.: for "refs/heads/master", name should be "master".
+    # @return [EacGit::Local::Branch]
+    def branch(name)
+      ::EacGit::Local::Branch.new(self, name)
+    end
+
+    def commit(ref, required = false) # rubocop:disable Style/OptionalBooleanParameter
+      rev_parse(ref, required).if_present { |v| ::EacGit::Local::Commit.new(self, v) }
+    end
+
+    def commitize(source)
+      if source.is_a?(::EacGit::Local::Commit)
+        return source if source.repo == self
+
+        source = source.id
+      end
+
+      source.to_s.strip.if_present(nil) { |v| ::EacGit::Local::Commit.new(self, v) }
+    end
+
+    # Retrieves the current local branch.
+    #
+    # @return [EacGit::Local::Branch, nil]
+    def current_branch
+      command('symbolic-ref', '--quiet', HEAD_REFERENCE)
+        .execute!(exit_outputs: { 256 => '' })
+        .gsub(%r{\Arefs/heads/}, '').strip
+        .if_present { |v| branch(v) }
+    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
+
+    # @return [EacGit::Local::Commit
+    def head(required = true) # rubocop:disable Style/OptionalBooleanParameter
+      commit(HEAD_REFERENCE, required)
+    end
+
+    def merge_base(*commits)
+      refs = commits.dup
+      while refs.count > 1 # rubocop:disable Style/CollectionQuerying
+        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 raise_error(message)
+      raise "#{root_path}: #{message}"
+    end
+
+    def rev_parse(ref, required = false) # rubocop:disable Style/OptionalBooleanParameter
+      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_error "Reference \"#{ref}\" not found"
+    end
+
+    def subrepo(subpath)
+      ::EacGit::Local::Subrepo.new(self, subpath)
+    end
+
+    # @return [Array<EacGit::Local::Subrepo>]
+    def subrepos
+      command('subrepo', '-q', 'status').execute!.split("\n").map(&:strip).select(&:present?)
+        .map { |subpath| subrepo(subpath) }
+    end
+
+    def to_s
+      "#{self.class}[#{root_path}]"
+    end
+
+    private
+
+    def merge_base_pair(commit1, commit2)
+      command('merge-base', commit1, commit2).execute!(exit_outputs: { 256 => nil })
+        .if_present(nil, &:strip)
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/remote.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module EacGit
+  # A Git remote repository referenced by URI.
+  class Remote
+    include ::EacGit::RemoteLike
+
+    common_constructor :uri
+
+    # @return [EacRubyUtils::Envs::Command
+    def git_command(...)
+      ::EacGit::Executables.git.command(...)
+    end
+
+    # @return [String]
+    def remote_reference
+      uri
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/remote_like/ls_result.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module EacGit
+  module RemoteLike
+    class LsResult
+      class << self
+        def by_ls_remote_command_output(output)
+          new(
+            output.each_line.map { |line| line.strip.split(/\s+/) }.to_h { |x| [x[1], x[0]] } # rubocop:disable Style/MapToHash
+          )
+        end
+      end
+
+      common_constructor :hashes
+      delegate :fetch, :[], :count, :any?, :empty?, to: :hashes
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/remote_like.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module EacGit
+  module RemoteLike
+    require_sub __FILE__
+    enable_abstract_methods
+
+    # @return [String] The output of command "git fetch".
+    def fetch
+      local.command('fetch', name).execute!
+    end
+
+    # @return [EacRubyUtils::Envs::Command
+    def git_command(*_args)
+      raise_abstract_method __method__
+    end
+
+    # @return [EacGit::RemoteLike::LsResult]
+    def ls
+      ::EacGit::RemoteLike::LsResult.by_ls_remote_command_output(
+        git_command('ls-remote', remote_reference).execute!
+      )
+    end
+
+    # @return [String]
+    def remote_reference
+      raise_abstract_method __method__
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/rspec/setup.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module EacGit
+  module Rspec
+    module Setup
+      def self.extended(setup_obj)
+        setup_obj.setup_conditional_git
+        setup_obj.setup_stubbed_git_local_repo
+      end
+
+      def setup_conditional_git
+        conditional(:git) { ::EacGit::Executables.git.validate }
+      end
+
+      def setup_stubbed_git_local_repo
+        rspec_config.include ::EacGit::Rspec::StubbedGitLocalRepo
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo/directory.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      class Directory < ::EacGit::Rspec::StubbedGitLocalRepo::FsObject
+        # @return [self]
+        def create
+          ::FileUtils.mkdir_p(path)
+          self
+        end
+
+        # @return [self]
+        def delete
+          ::FileUtils.rm_rf(path)
+          self
+        end
+
+        # @param subpath [Array<String>]
+        # @return [EacGit::Rspec::StubbedGitLocalRepo::Directory]
+        def directory(*subpath)
+          git.directory(*self.subpath, *subpath)
+        end
+
+        # @param subpath [Array<String>]
+        # @return [EacGit::Rspec::StubbedGitLocalRepo::File]
+        def file(*subpath)
+          git.file(*self.subpath, *subpath)
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo/file.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      class File < ::EacGit::Rspec::StubbedGitLocalRepo::FsObject
+        def touch
+          ::FileUtils.touch(path.to_path)
+        end
+
+        def delete
+          path.unlink
+        end
+
+        delegate :write, to: :path
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo/fs_object.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      class FsObject
+        # @!attribute [r] git
+        #   @param git [EacGit::Rspec::StubbedGitLocalRepo::Repository]
+
+        # @!attribute [r] subpath
+        #   @param git [Array<String>]
+
+        # @!method initialize(git, subpath)
+        #   @param git [EacGit::Rspec::StubbedGitLocalRepo::Repository]
+        #   @param subpath [Array<String>
+        common_constructor :git, :subpath
+
+        # @return [Pathname]
+        def path
+          git.root_path.join(*subpath)
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo/repository.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'securerandom'
+
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      class Repository < ::EacGit::Local
+        # @return [EacGit::Rspec::StubbedGitLocalRepo::Directory]
+        def directory(*subpath)
+          ::EacGit::Rspec::StubbedGitLocalRepo::Directory.new(self, subpath)
+        end
+
+        def file(*subpath)
+          ::EacGit::Rspec::StubbedGitLocalRepo::File.new(self, subpath)
+        end
+
+        # @return [EacGit::Local::Commit
+        def random_commit
+          content = ::SecureRandom.hex
+          file = "#{content}.txt"
+          file(file).write(content)
+          command('add', file).execute!
+          command('commit', '-m', "Random commit: #{file}.").execute!
+          head
+        end
+      end
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/rspec/stubbed_git_local_repo.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'tmpdir'
+
+module EacGit
+  module Rspec
+    module StubbedGitLocalRepo
+      def stubbed_git_local_repo(bare = false) # rubocop:disable Style/OptionalBooleanParameter
+        path = ::Dir.mktmpdir
+        ::EacRubyUtils::Envs.local.command(stubbed_git_local_repo_args(path, bare)).execute!
+        repo = ::EacGit::Rspec::StubbedGitLocalRepo::Repository.new(path)
+        repo.command('config', 'user.email', 'theuser@example.net').execute!
+        repo.command('config', 'user.name', 'The User').execute!
+        repo
+      end
+
+      private
+
+      def stubbed_git_local_repo_args(path, bare)
+        r = %w[git init]
+        r << '--bare' if bare
+        r + [path]
+      end
+
+      require_sub __FILE__
+    end
+  end
+end

data/sub/eac_git/lib/eac_git/rspec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module EacGit
+  module Rspec
+    require_sub __FILE__
+  end
+end

data/sub/eac_git/lib/eac_git/version.rb

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

data/sub/eac_git/lib/eac_git.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils'
+EacRubyUtils::RootModuleSetup.perform __FILE__
+
+require 'parseconfig'
+
+module EacGit
+end

data/sub/eac_git/spec/lib/eac_git/executables_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+RSpec.describe(EacGit::Executables, :git) 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/sub/{avm-git/spec/lib/avm/git → eac_git/spec/lib/eac_git/local}/commit/diff_tree_line_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/git/commit/diff_tree_line'
-
-RSpec.describe Avm::Git::Commit::DiffTreeLine, :git do
+RSpec.describe EacGit::Local::Commit::DiffTreeLine, :git do
   include_examples 'source_target_fixtures', __FILE__ do
     def source_data(source_file)
       File.read(source_file).each_line.map do |line|

data/sub/{avm-git/spec/lib/avm/git → eac_git/spec/lib/eac_git/local}/commit_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'avm/git/commit'
+require 'tmpdir'
 
-RSpec.describe Avm::Git::Commit, :git do
+RSpec.describe EacGit::Local::Commit, :git do
   let(:git) { stubbed_git_local_repo }
 
   let(:first_commit_sha1) do
@@ -26,9 +26,9 @@ RSpec.describe Avm::Git::Commit, :git do
   let(:first_commit) { described_class.new(git, first_commit_sha1) }
   let(:second_commit) { described_class.new(git, second_commit_sha1) }
 
-  describe '#files' do
-    it { expect(first_commit.files.count).to eq(2) }
-    it { expect(second_commit.files.count).to eq(3) }
+  describe '#changed_files' do
+    it { expect(first_commit.changed_files.count).to eq(2) }
+    it { expect(second_commit.changed_files.count).to eq(3) }
 
     {
       'first_commit' => %w[a.txt b.txt],
@@ -37,16 +37,16 @@ RSpec.describe Avm::Git::Commit, :git do
       filenames.each do |filename|
         it "find file \"#{filename}\" in commit \"#{commit_name}\"" do
           commit = send(commit_name)
-          file = commit.files.find { |f| f.path == filename }
-          expect(file).to be_a(Avm::Git::Commit::File)
+          file = commit.changed_files.find { |f| f.path == filename }
+          expect(file).to be_a(EacGit::Local::Commit::ChangedFile)
         end
       end
     end
   end
 
-  describe '#files_size' do
-    it { expect(first_commit.files_size).to eq(6) }
-    it { expect(second_commit.files_size).to eq(8) }
+  describe '#changed_files_size' do
+    it { expect(first_commit.changed_files_size).to eq(6) }
+    it { expect(second_commit.changed_files_size).to eq(8) }
   end
 
   describe '#root_child?' do

data/sub/eac_git/spec/lib/eac_git/local/dirty_files_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'tmpdir'
+
+RSpec.describe EacGit::Local, '#dirty_files', :git do
+  let(:repo) { stubbed_git_local_repo }
+  let(:dirty_files_paths) { Set.new(repo.dirty_files.lazy.map(&:path).map(&:to_path)) }
+
+  before do
+    repo.file('a_file').touch
+    repo.directory('b_directory').create.file('c_file').touch
+    repo.file('d file').touch
+  end
+
+  it do
+    expect(dirty_files_paths).to eq(Set.new(['a_file', 'b_directory/c_file', 'd file']))
+  end
+end

data/sub/{avm-git → eac_git}/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/git'
+require 'eac_git'
 require 'eac_ruby_gem_support'
-EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__)).stub_avm_contexts
+EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__))

data/sub/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