avm-tools 0.62.2 → 0.64.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 023b291269b46cb2a272642eac7febb8cbecd15429aeae61435260d0977c0958
-  data.tar.gz: 4ff8f6c8c50ad54a5f7b84be35780e7a221608c7e955a0cb2e241b6f31aa88e1
+  metadata.gz: 4e6a74ca2abee19a57dbb17f1857ede525b0386297e58a036ab98d15e601a9d5
+  data.tar.gz: e94fe357e1fd4ba8a0acd651fdef3e1f60f67465a6758a1ddc899b6aebb87197
 SHA512:
-  metadata.gz: df68926e69e0e8912f73e452fd50b218909620040eb2a69a0695ddce9542f8616e881cd455248df8a9cb89028f6ad9ff9d66aa204c7c79ba0559d317779c2e56
-  data.tar.gz: 155dbcdd721e28b5d4cd021ddb25f35daf4b4f26c2b530cb5ba21377c72ee7a0329a5149831a6031d0c7cfd12e777254b251954774ea7eb9e317b7d57f034f10
+  metadata.gz: 2b59f21007fd2c766ee0b5f8b0cf24da986a036bcafc4fddfd0b5ef26910e1605c541e37a580f7e933d1d7174a25f5465a59c572c6a1d89f085498caf0793f7c
+  data.tar.gz: a6db12617e9f12a9aaf3d031b1c586ec36e7ac45fc7fa18310f4ddabc1ebc51654e44ed108d23532807e6b6cea3f94c93ee9cdee83d923740d4566e24535e8a1

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/instances/configuration.rb

@@ -17,15 +17,23 @@ module Avm
           internal_find_path(path.expand_path)
         end
 
-        private
-
-        def internal_find_path(absolute_pathname)
+        def find_in_path(path)
+          absolute_pathname = path.to_pathname.expand_path
           if absolute_pathname.directory?
             FILENAMES.each do |filename|
               file = absolute_pathname.join(filename)
               return new(file) if file.exist?
             end
           end
+          nil
+        end
+
+        private
+
+        def internal_find_path(absolute_pathname)
+          r = find_in_path(absolute_pathname)
+          return r if r.present?
+
           internal_find_path(absolute_pathname.dirname) unless absolute_pathname.root?
         end
       end

data/lib/avm/instances/configuration/_tests.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gems_utils/gem'
+require 'avm/patches/eac_ruby_gems_utils/gem'
 
 module Avm
   module Instances

data/lib/avm/launcher/instances/base.rb

@@ -80,6 +80,7 @@ module Avm
 
         def publish?(stereotype)
           return false unless stereotype.publish_class
+          return false unless options.stereotype_publishable?(stereotype)
 
           filter = ::EacLauncher::Context.current.publish_options[:stereotype]
           filter.blank? ? true : filter == stereotype.name.demodulize

data/lib/avm/launcher/instances/settings.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    module Instances
+      class Settings
+        DEFAULT_CURRENT_REVISION = 'origin/master'
+        DEFAULT_PUBLISH_REMOTE = 'publish'
+        PUBLISHABLE_KEY = :publishable
+
+        common_constructor :data do
+          self.data = (data.is_a?(Hash) ? data : {}).with_indifferent_access
+        end
+
+        def git_current_revision
+          data[__method__] || DEFAULT_CURRENT_REVISION
+        end
+
+        def git_publish_remote
+          data[__method__] || DEFAULT_PUBLISH_REMOTE
+        end
+
+        def publishable?
+          !!publishable_value
+        end
+
+        def stereotype_publishable?(stereotype)
+          return publishable? unless publishable_value.is_a?(::Hash)
+
+          parse_publishable_value(publishable_value[stereotype.stereotype_name], true)
+        end
+
+        private
+
+        def publishable_value
+          parse_publishable_value(data[PUBLISHABLE_KEY], false)
+        end
+
+        def parse_publishable_value(value, hash_to_true)
+          return value.with_indifferent_access if !hash_to_true && value.is_a?(::Hash)
+          return true if value.nil? || value == true
+          return false if value == false
+
+          !!value
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/instances/configuration'
+require 'eac_ruby_gems_utils/gem'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Patches
+    module EacRubyGemsUtils
+      module Gem
+        enable_simple_cache
+
+        private
+
+        def configuration_uncached
+          ::Avm::Instances::Configuration.find_in_path(root)
+        end
+
+        def gemfile_path_uncached
+          return super unless configuration.present? && configuration.rubocop_gemfile.present?
+
+          configuration.rubocop_gemfile
+        end
+      end
+    end
+  end
+end
+
+::EacRubyGemsUtils::Gem.prepend(::Avm::Patches::EacRubyGemsUtils::Gem)

data/lib/avm/projects/stereotypes/ruby_gem/local_project_mixin.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gems_utils/gem'
+require 'avm/patches/eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

data/lib/avm/ruby/rubocop/_gemfile.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gems_utils/gem'
+require 'avm/patches/eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/on_clean_ruby_environment'
 
@@ -14,7 +14,7 @@ module Avm
       end
 
       def rubocop_command_by_gemfile_path(path)
-        ::EacRubyGemsUtils::Gem.new(path).bundle('exec', 'rubocop')
+        ::EacRubyGemsUtils::Gem.new(path).bundle('exec', 'rubocop').chdir_root
       end
 
       def rubocop_gemfile?

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.2'
+    VERSION = '0.64.1'
   end
 end

data/lib/eac_launcher/context/settings.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
+require 'avm/launcher/instances/settings'
 require 'eac_ruby_utils/simple_cache'
 require 'yaml'
-require 'eac_launcher/instances/settings'
 
 module EacLauncher
   class Context
@@ -18,7 +18,7 @@ module EacLauncher
       end
 
       def instance_settings(instance)
-        ::EacLauncher::Instances::Settings.new(value(['Instances', instance.name]))
+        ::Avm::Launcher::Instances::Settings.new(value(['Instances', instance.name]))
       end
 
       private

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

@@ -6,7 +6,7 @@ module EacLauncher
   module Git
     class Base < ::EacLauncher::Paths::Real
       module DirtyFiles
-        delegate :dirty, to: :eac_git
+        delegate :dirty?, to: :eac_git
 
         def dirty_files
           eac_git.dirty_files.map do |df|

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

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem.rb

@@ -64,7 +64,7 @@ module EacRubyGemsUtils
     end
 
     def gemfile_lock_path_uncached
-      root.join('Gemfile.lock')
+      gemfile_path.basename_sub { |b| "#{b}.lock" }
     end
 
     def gemspec_path_uncached

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyGemsUtils
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.62.2
+  version: 0.64.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-02 00:00:00.000000000 Z
+date: 2020-08-25 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
@@ -370,10 +373,12 @@ files:
 - lib/avm/launcher/errors/non_project.rb
 - lib/avm/launcher/instances/base.rb
 - lib/avm/launcher/instances/base/cache.rb
+- lib/avm/launcher/instances/settings.rb
 - lib/avm/local_projects.rb
 - lib/avm/local_projects/instance.rb
 - lib/avm/local_projects/jobs/update.rb
 - lib/avm/patches.rb
+- lib/avm/patches/eac_ruby_gems_utils/gem.rb
 - lib/avm/patches/object/template.rb
 - lib/avm/path_string.rb
 - lib/avm/projects.rb
@@ -474,6 +479,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
@@ -511,7 +517,6 @@ files:
 - lib/eac_launcher/instances.rb
 - lib/eac_launcher/instances/error.rb
 - lib/eac_launcher/instances/runner_helper.rb
-- lib/eac_launcher/instances/settings.rb
 - lib/eac_launcher/paths.rb
 - lib/eac_launcher/paths/logical.rb
 - lib/eac_launcher/paths/real.rb

data/lib/eac_launcher/instances/settings.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module EacLauncher
-  module Instances
-    class Settings
-      def initialize(data)
-        @data = ActiveSupport::HashWithIndifferentAccess.new(data.is_a?(Hash) ? data : {})
-      end
-
-      def git_current_revision
-        @data[__method__] || 'origin/master'
-      end
-
-      def git_publish_remote
-        @data[__method__] || 'publish'
-      end
-
-      def publishable?
-        @data.key?(:publishable) ? @data[:publishable] : true
-      end
-    end
-  end
-end