avm-tools 0.62.4 → 0.63.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38f999acefb3965e6b892798012b79d38fe80aed211c008efbb4f0e7d0d1de11
-  data.tar.gz: 6bb113d722f19ce336368e675d3785aee55ee1f63e2e67cc3ff3b681c9de5811
+  metadata.gz: 855b0d8610e334378c5f061444ae6c414739fa383b9d09d64229ef8014feba53
+  data.tar.gz: '09008022bebd8de5a6c3104406c7b5f415f94b1c0f2d84700e92a2b29d4fa530'
 SHA512:
-  metadata.gz: 979ca70b0e402b50b7b5a92340d1da20312937e4d9fa7df4bb1dd358e08f68f63a9e973109abb3d5568e5d7e0e4ebef672ed03dbd74d8dc1e992069e1e90bcc1
-  data.tar.gz: 990a1f70e3317c05ac0764b4dfe0d28183eae7723f1b599cfaf2bf7ac192226f45a370f9b6ef29e9bfe367427f67fb3a57cec5764d48d4773601856a2cc9bbfa
+  metadata.gz: c4f2e3cb91702b6b93963c1478c38498c0774617538b75a8401ce96b00b505156aeb5d6554c595d5837c678a6f245b86352a57f86056c6599a40f5fbefae3cd7
+  data.tar.gz: a577468f0221af04fb6fc08a5f6ada465dc9e64228b4be577ac0b6cbdaed4cd995108ca0f88f713226cadacf4152b1243b18986f3d9212d20742b75a84e651ff

data/lib/avm/git/organize.rb

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

data/lib/avm/git/organize/reference_update.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Organize
+      class ReferenceUpdate
+        enable_listable
+        lists.add_symbol :operation, :remove
+
+        common_constructor :repository, :reference, :operation
+
+        def run_operation
+          send("run_operation_#{operation}")
+        end
+
+        def to_s
+          "#{reference} [#{operation}]"
+        end
+
+        private
+
+        def reference_pathname
+          repository.refs_root.join(reference)
+        end
+
+        def run_operation_remove
+          reference_pathname.unlink
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/organize/repository.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Organize
+      class Repository
+        enable_simple_cache
+        common_constructor :eac_git_local
+
+        def collected_references
+          @collected_references || []
+        end
+
+        def collect_subrepos
+          collect_references_with_pattern(
+            %r{\Asubrepo/},
+            ::Avm::Git::Organize::ReferenceUpdate::OPERATION_REMOVE
+          )
+          collect_references_with_pattern(
+            %r{\Aheads/subrepo/},
+            ::Avm::Git::Organize::ReferenceUpdate::OPERATION_REMOVE
+          )
+        end
+
+        def collect_originals
+          collect_references_with_pattern(
+            %r{\Aoriginal/},
+            ::Avm::Git::Organize::ReferenceUpdate::OPERATION_REMOVE
+          )
+        end
+
+        def all_branches
+          eac_git_local.execute!
+        end
+
+        delegate :to_s, to: :eac_git_local
+
+        private
+
+        def all_references
+          ::Pathname.glob("#{refs_root}/**/*").select(&:file?)
+                    .map { |p| p.relative_path_from(refs_root).to_path }
+        end
+
+        def reference_update_by_ref(reference)
+          collected_references.find { |ru| ru.reference == reference }
+        end
+
+        def collect_reference(reference, operation)
+          new_ru = ::Avm::Git::Organize::ReferenceUpdate.new(self, reference, operation)
+          reference_update_by_ref(new_ru.reference).if_present do |ru_found|
+            raise "Reference #{new_ru} already added (#{ru_found})"
+          end
+          @collected_references ||= []
+          @collected_references << new_ru
+        end
+
+        def collect_references_with_pattern(pattern, operation)
+          references_with_pattern(pattern).each do |reference|
+            collect_reference(reference, operation)
+          end
+        end
+
+        def references_with_pattern(pattern)
+          all_references.select { |reference| pattern.if_match(reference, false) }
+        end
+
+        def refs_root_uncached
+          eac_git_local.root_path / '.git' / 'refs'
+        end
+      end
+    end
+  end
+end

data/lib/avm/patches/eac_ruby_gems_utils/gem.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/instances/configuration'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 

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

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'avm/git/organize/repository'
+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 Organize < ::EacRubyUtils::Console::DocoptRunner
+          include ::EacCli::DefaultRunner
+
+          runner_definition do
+            desc 'Organize branches.'
+            bool_opt '-a', '--all', 'Run all organizations.'
+            bool_opt '-n', '--no', 'Do not run operations.'
+            bool_opt '-o', '--originals', 'Remove refs/original branches.'
+            bool_opt '-s', '--subrepos', 'Remove git-subrepo branches.'
+            bool_opt '-y', '--yes', 'Run operations without confirmation.'
+          end
+
+          def run
+            start_banner
+            collect_references
+            after_collect_banner
+            run_operations
+          end
+
+          private
+
+          def after_collect_banner
+            infov 'Collected references', repository.collected_references.count
+            repository.collected_references.each do |ru|
+              infov "  * #{ru.reference}", ru.operation
+            end
+          end
+
+          def collect?(type)
+            options.fetch("--#{type}") || options.fetch('--all')
+          end
+
+          def collect_references
+            %w[subrepos originals].each do |type|
+              repository.send("collect_#{type}") if collect?(type)
+            end
+          end
+
+          def run_operations
+            return warn('No operations to run (Run with --help to see options)') if
+            repository.collected_references.empty?
+            return unless run_operations?
+
+            repository.collected_references.each do |ru|
+              info "Doing operation #{ru}..."
+              ru.run_operation
+            end
+          end
+
+          def run_operations?
+            return true if options.fetch('--yes')
+            return false if options.fetch('--no')
+
+            request_input('Confirm operations?', bool: true)
+          end
+
+          def repository_uncached
+            ::Avm::Git::Organize::Repository.new(context(:git).eac_git)
+          end
+
+          def start_banner
+            infov 'Repository', repository
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.62.4'
+    VERSION = '0.63.0'
   end
 end

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

@@ -48,6 +48,10 @@ module EacGit
       ::EacGit::Local::Subrepo.new(self, subpath)
     end
 
+    def to_s
+      "#{self.class}[#{root_path}]"
+    end
+
     private
 
     def merge_base_pair(commit1, commit2)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.62.4
+  version: 0.63.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -336,6 +336,9 @@ files:
 - lib/avm/git/issue/complete/_validations.rb
 - lib/avm/git/issue/complete/_working_tree.rb
 - lib/avm/git/issue/complete/validation.rb
+- lib/avm/git/organize.rb
+- lib/avm/git/organize/reference_update.rb
+- lib/avm/git/organize/repository.rb
 - lib/avm/git/revision_test.rb
 - lib/avm/git/spec_helper.rb
 - lib/avm/git/subrepo_check.rb
@@ -475,6 +478,7 @@ files:
 - lib/avm/tools/runner/git/deploy.rb
 - lib/avm/tools/runner/git/dirty_files.rb
 - lib/avm/tools/runner/git/issue.rb
+- lib/avm/tools/runner/git/organize.rb
 - lib/avm/tools/runner/git/revisions_test.rb
 - lib/avm/tools/runner/git/subrepo.rb
 - lib/avm/tools/runner/git/subrepo/check.rb