avm-tools 0.62.1 → 0.64.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 447658cf671d6c1aac6466424cf7b18d4872629bdfb1bdf9c742cff32204b727
-  data.tar.gz: f7bf0f7474bd5b90b726b5cc19802d4cdaef60ae8eaa06a138c3a4ecd542e483
+  metadata.gz: 1565797abcceccaa3a466abb16694b514ae9773b151142ad27628a0d344a6c2b
+  data.tar.gz: a2756806ed389c2d141a9d038cdb6a55aaa28c9747768cac97bb32ca27b49962
 SHA512:
-  metadata.gz: a14e64ac9c8e6220ab30e4d24a86fee412dd7ba7b15d4825adfc3c064fe9b7ea1a0a96469e608ee85a5cc0041580f625bd1a367ba560db3a205428c28ae322eb
-  data.tar.gz: 227b8a6efafda6f7660549498858a09cc1e4900cf154464ef77095c430e7f915f0604c0662faec8d5b4515043a02bc79e66237beeaea075ecf1128fb6a526368
+  metadata.gz: 5d895b6ceef334e3b439291f2c2eed9477cc738864fede0f4426d0f7040768febf4759b3cc2267fa0ee34eb18301e8c0066e29b5c1a02b952fcacd7f711c91bd
+  data.tar.gz: 812e64910a913c855562bcea3f61aabf441cfafbd7a0af8e356dc217f66451f12361d30507343dbab2b56898313d319880d51bf59893ca11cab6c1d29ed90682

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/context/instance_manager.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_launcher/publish/check_result'
+require('yaml')
+
+module Avm
+  module Launcher
+    class Context
+      class InstanceManager
+        require_sub __FILE__
+        enable_simple_cache
+        common_constructor :context
+
+        def publish_state_set(instance, stereotype_name, check_status)
+          data = cached_instances_file_content_uncached
+          data[instance.logical] ||= {}
+          data[instance.logical][:publish_state] ||= {}
+          data[instance.logical][:publish_state][stereotype_name] = check_status
+          write_cache_file(data)
+        end
+
+        def pending_instances
+          instances.select { |instance| pending_instance?(instance) }
+        end
+
+        private
+
+        def instances_uncached
+          (cached_instances || search_instances).select(&:included?)
+        end
+
+        def search_instances
+          cache_instances(::EacLauncher::Context::InstanceDiscovery.new(context).instances)
+        end
+
+        def cached_instances
+          return nil if context.recache
+          return nil unless cached_instances_file_content
+
+          CachedInstances.new(self, cached_instances_file_content).instances
+        end
+
+        def cached_instances_file_content_uncached
+          r = YAML.load_file(cache_file_path)
+          r.is_a?(::Hash) ? r : nil
+        rescue Errno::ENOENT
+          nil
+        end
+
+        def cache_instances(instances)
+          write_cache_file(Hash[instances.map { |i| [i.logical, i.to_h] }])
+          instances
+        end
+
+        def write_cache_file(data)
+          ::File.write(cache_file_path, data.to_yaml)
+        end
+
+        def cache_file_path
+          ::File.join(context.cache_root, 'instances.yml')
+        end
+
+        def pending_instance?(instance)
+          data = cached_instances_file_content
+          return false unless data[instance.logical]
+          return false unless data[instance.logical][:publish_state].is_a?(Hash)
+
+          data[instance.logical][:publish_state].any? do |_k, v|
+            ::EacLauncher::Publish::CheckResult.pending_status?(v)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/launcher/context/instance_manager/cached_instance.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'avm/launcher/instances/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    class Context
+      class InstanceManager
+        class CachedInstance
+          enable_console_speaker
+          enable_simple_cache
+          common_constructor :cached_instances, :data
+
+          private
+
+          def instance_uncached
+            ::Avm::Launcher::Instances::Base.instanciate(path, parent_instance)
+          rescue ::Avm::Launcher::Errors::NonProject
+            warn "Cached instance \"#{data[:logical]}\" not found"
+            nil
+          end
+
+          def parent_instance_uncached
+            data[:parent]
+              .if_present { |v| cached_instances.by_logical_path(v) }
+              .if_present(&:instance)
+          end
+
+          def path_uncached
+            ::EacLauncher::Paths::Logical.from_h(cached_instances.context, data)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/launcher/context/instance_manager/cached_instances.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'avm/launcher/context/instance_manager/cached_instance'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    class Context
+      class InstanceManager
+        class CachedInstances
+          enable_simple_cache
+          common_constructor :context, :content
+
+          def instances
+            content.keys.map { |k| by_logical_path(k).instance }.reject(&:blank?)
+          end
+
+          def by_logical_path(key)
+            cached_instances[key].if_blank do
+              cached_instances[key] = ::Avm::Launcher::Context::InstanceManager::CachedInstance.new(
+                self, content.fetch(key)
+              )
+            end
+          end
+
+          private
+
+          def cached_instances_uncached
+            {}
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Avm
+  module Launcher
+    module Errors
+      class Base < ::StandardError
+      end
+    end
+  end
+end

data/lib/avm/launcher/errors/non_project.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/launcher/errors/base'
+
+module Avm
+  module Launcher
+    module Errors
+      class NonProject < ::Avm::Launcher::Errors::Base
+        def initialize(path)
+          super("#{path} is not a project")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+require_relative 'base/cache'
+require 'avm/launcher/errors/non_project'
+
+module Avm
+  module Launcher
+    module Instances
+      module Base
+        class << self
+          def extend_object(object)
+            object.extend ::EacRubyUtils::SimpleCache
+            object.extend ::EacRubyUtils::Console::Speaker
+            object.extend ::Avm::Launcher::Instances::Base::Cache
+            super
+          end
+
+          def instanciate(path, parent)
+            unless path.is_a?(::Avm::Launcher::Instances::Base)
+              raise ::Avm::Launcher::Errors::NonProject, path unless path.project?
+
+              path.extend(::Avm::Launcher::Instances::Base)
+              path.parent = parent
+            end
+            path
+          end
+        end
+
+        attr_accessor :parent
+
+        def name
+          logical
+        end
+
+        def stereotype?(stereotype)
+          stereotypes.include?(stereotype)
+        end
+
+        def to_parent_path
+          return self unless @parent
+
+          logical.gsub(/\A#{Regexp.quote(@parent.logical)}/, '')
+        end
+
+        def project?
+          stereotypes.any?
+        end
+
+        def publish_run
+          stereotypes.each do |s|
+            next unless publish?(s)
+
+            infov(name, "publishing #{s.label}")
+            s.publish_class.new(self).run
+          end
+        end
+
+        def publish_check
+          stereotypes.each do |s|
+            next unless publish?(s)
+
+            puts "#{name.to_s.cyan}|#{s.label}|" \
+              "#{s.publish_class.new(self).check}"
+          end
+        end
+
+        def project_name
+          ::File.basename(logical)
+        end
+
+        def included?
+          !::EacLauncher::Context.current.settings.excluded_projects.include?(project_name)
+        end
+
+        def to_h
+          super.to_h.merge(parent: parent ? parent.logical : nil)
+        end
+
+        private
+
+        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
+        end
+
+        def options_uncached
+          ::EacLauncher::Context.current.settings.instance_settings(self)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Avm
+  module Launcher
+    module Instances
+      module Base
+        module Cache
+          def cache_path(subpath)
+            File.join(cache_root, subpath)
+          end
+
+          def cache_key(key, &block)
+            v = cache_key_get(key)
+            return v if v.present? || block.nil?
+
+            v = yield
+            cache_key_write(key, v)
+            v
+          end
+
+          private
+
+          def cache_key_get(key)
+            File.file?(cache_key_path(key)) ? File.read(cache_key_path(key)) : nil
+          end
+
+          def cache_key_write(key, value)
+            FileUtils.mkdir_p(File.dirname(cache_key_path(key)))
+            File.write(cache_key_path(key), value)
+          end
+
+          def cache_key_path(key)
+            File.join(cache_root, 'keys', key.parameterize)
+          end
+
+          def cache_root
+            File.join(::EacLauncher::Context.current.cache_root, name.parameterize)
+          end
+        end
+      end
+    end
+  end
+end

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/git_subrepo/warp.rb

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/simple_cache'
 require 'eac_launcher/git/sub_warp_base'
-require 'eac_launcher/instances/error'
+require 'avm/launcher/errors/base'
 require 'eac_launcher/paths/real'
 require 'eac_launcher/vendor/github'
 
@@ -32,8 +32,9 @@ module Avm
             return if parent_git_warped.rev_parse(subrepo_parent_hash) &&
                       parent_git_warped.descendant?('HEAD', subrepo_parent_hash)
 
-            raise EacLauncher::Instances::Error, "Subrepo parent hash \"#{subrepo_parent_hash}\""\
-              " not found in \"#{parent_git_warped}\""
+            raise EacLauncher::Instances::Errors::Base,
+                  "Subrepo parent hash \"#{subrepo_parent_hash}\"" \
+                  " not found in \"#{parent_git_warped}\""
           end
 
           def subrepo_parent_hash
@@ -41,7 +42,7 @@ module Avm
             h = data['Pull Parent']
             return h if h.present?
 
-            raise EacLauncher::Instances::Error, "Subrepo parent hash is blank: #{data}"
+            raise EacLauncher::Instances::Errors::Base, "Subrepo parent hash is blank: #{data}"
           end
 
           def init_aux

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.1'
+    VERSION = '0.64.0'
   end
 end

data/lib/eac_launcher/context.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/hash/indifferent_access'
+require 'avm/launcher/context/instance_manager'
 require 'eac_ruby_utils/simple_cache'
 require 'eac_ruby_utils/console/speaker'
 require 'eac_launcher/context/instance_discovery'
-require 'eac_launcher/context/instance_manager'
 require 'eac_launcher/context/settings'
 require 'eac_launcher/paths/logical'
 require 'eac_launcher/project'
@@ -39,7 +39,7 @@ module EacLauncher
       @settings = ::EacLauncher::Context::Settings.new(build_option(:settings_file))
       @cache_root = build_option(:cache_root)
       @publish_options = { new: false, confirm: false, stereotype: nil }
-      @instance_manager = ::EacLauncher::Context::InstanceManager.new(self)
+      @instance_manager = ::Avm::Launcher::Context::InstanceManager.new(self)
       @recache = false
     end
 

data/lib/eac_launcher/context/instance_discovery.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'ruby-progressbar'
-require 'eac_launcher/instances/base'
+require 'avm/launcher/instances/base'
 
 module EacLauncher
   class Context
@@ -22,7 +22,7 @@ module EacLauncher
         update_progress_format(path)
         on_rescued_path_instances(path) do |r|
           if path.project?
-            parent_instance = ::EacLauncher::Instances::Base.instanciate(path, parent_instance)
+            parent_instance = ::Avm::Launcher::Instances::Base.instanciate(path, parent_instance)
             r << path
           end
           children = path.children

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/lib/eac_launcher/git/sub_warp_base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/error'
+require 'avm/projects/stereotype'
+require 'avm/launcher/errors/base'
 
 module EacLauncher
   module Git
@@ -11,7 +12,7 @@ module EacLauncher
         r = find_parent_instance(instance.parent)
         return r if r
 
-        ::EacLauncher::Instances::Error.new('Git parent not found')
+        ::EacLauncher::Instances::Errors::Base.new('Git parent not found')
       end
 
       def find_parent_instance(current)

data/lib/eac_launcher/instances.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/base'
-require 'eac_launcher/instances/error'
+require 'avm/launcher/errors/base'
+require 'avm/launcher/instances/base'
 require 'eac_launcher/instances/runner_helper'
 require 'eac_launcher/instances/settings'

data/lib/eac_launcher/instances/error.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
-module EacLauncher
-  module Instances
-    class Error < StandardError
+module Avm
+  module Launcher
+    module Instances
+      module Errors
+        class Error < StandardError
+        end
+      end
     end
   end
 end

data/lib/eac_launcher/paths/logical.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes'
+require 'avm/projects/stereotypes'
 require 'eac_launcher/paths/real'
 
 module EacLauncher
@@ -68,7 +68,7 @@ module EacLauncher
       end
 
       def warped_uncached
-        if is_a?(::EacLauncher::Instances::Base)
+        if is_a?(::Avm::Launcher::Instances::Base)
           stereotypes.each do |s|
             return s.warp_class.new(self) if s.warp_class
           end

data/lib/eac_launcher/publish/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_launcher/instances/error'
+require 'avm/launcher/errors/base'
 
 module EacLauncher
   module Publish
@@ -35,7 +35,7 @@ module EacLauncher
 
       def check_with_rescue
         internal_check
-      rescue ::EacLauncher::Instances::Error => e
+      rescue ::EacLauncher::Instances::Errors::Base => e
         ::EacLauncher::Publish::CheckResult.blocked("Error: #{e}")
       rescue ::EacLauncher::Git::Error => e
         ::EacLauncher::Publish::CheckResult.blocked("Git error: #{e}")

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.1
+  version: 0.64.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-02 00:00:00.000000000 Z
+date: 2020-08-19 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
@@ -363,10 +366,19 @@ files:
 - lib/avm/instances/entries.rb
 - lib/avm/instances/entries/entry_reader.rb
 - lib/avm/instances/entry_keys.rb
+- lib/avm/launcher/context/instance_manager.rb
+- lib/avm/launcher/context/instance_manager/cached_instance.rb
+- lib/avm/launcher/context/instance_manager/cached_instances.rb
+- lib/avm/launcher/errors/base.rb
+- 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
@@ -467,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
@@ -487,7 +500,6 @@ files:
 - lib/eac_launcher.rb
 - lib/eac_launcher/context.rb
 - lib/eac_launcher/context/instance_discovery.rb
-- lib/eac_launcher/context/instance_manager.rb
 - lib/eac_launcher/context/settings.rb
 - lib/eac_launcher/git.rb
 - lib/eac_launcher/git/base.rb
@@ -503,11 +515,8 @@ files:
 - lib/eac_launcher/git/sub_warp_base.rb
 - lib/eac_launcher/git/warp_base.rb
 - lib/eac_launcher/instances.rb
-- lib/eac_launcher/instances/base.rb
-- lib/eac_launcher/instances/base/cache.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/context/instance_manager.rb

@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_launcher/publish/check_result'
-require('yaml')
-
-module EacLauncher
-  class Context
-    class InstanceManager
-      include ::EacRubyUtils::SimpleCache
-
-      def initialize(context)
-        @context = context
-      end
-
-      def publish_state_set(instance, stereotype_name, check_status)
-        data = cached_instances_file_content_uncached
-        data[instance.logical] ||= {}
-        data[instance.logical][:publish_state] ||= {}
-        data[instance.logical][:publish_state][stereotype_name] = check_status
-        write_cache_file(data)
-      end
-
-      def pending_instances
-        instances.select { |instance| pending_instance?(instance) }
-      end
-
-      private
-
-      def instances_uncached
-        (cached_instances || search_instances).select(&:included?)
-      end
-
-      def search_instances
-        cache_instances(::EacLauncher::Context::InstanceDiscovery.new(@context).instances)
-      end
-
-      def cached_instances
-        return nil if @context.recache
-        return nil unless cached_instances_file_content
-
-        CachedInstances.new(cached_instances_file_content).instances
-      end
-
-      def cached_instances_file_content_uncached
-        r = YAML.load_file(cache_file_path)
-        r.is_a?(::Hash) ? r : nil
-      rescue Errno::ENOENT
-        nil
-      end
-
-      def cache_instances(instances)
-        write_cache_file(Hash[instances.map { |i| [i.logical, i.to_h] }])
-        instances
-      end
-
-      def write_cache_file(data)
-        ::File.write(cache_file_path, data.to_yaml)
-      end
-
-      def cache_file_path
-        ::File.join(@context.cache_root, 'instances.yml')
-      end
-
-      def pending_instance?(instance)
-        data = cached_instances_file_content
-        return false unless data[instance.logical]
-        return false unless data[instance.logical][:publish_state].is_a?(Hash)
-
-        data[instance.logical][:publish_state].any? do |_k, v|
-          ::EacLauncher::Publish::CheckResult.pending_status?(v)
-        end
-      end
-
-      class CachedInstances
-        def initialize(content)
-          @content = content
-          @instances = {}
-        end
-
-        def instances
-          @content.keys.map { |k| by_logical_path(k) }
-        end
-
-        def by_logical_path(key)
-          return @instances[key] if @instances.key?(key)
-
-          h = @content[key]
-          parent_instance = h[:parent] ? by_logical_path(h[:parent]) : nil
-          path = ::EacLauncher::Paths::Logical.from_h(@context, h)
-          @instances[key] = ::EacLauncher::Instances::Base.instanciate(path, parent_instance)
-        end
-      end
-    end
-  end
-end

data/lib/eac_launcher/instances/base.rb

@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'base/cache'
-
-module EacLauncher
-  module Instances
-    module Base
-      class << self
-        def extend_object(object)
-          object.extend ::EacRubyUtils::SimpleCache
-          object.extend ::EacRubyUtils::Console::Speaker
-          object.extend ::EacLauncher::Instances::Base::Cache
-          super
-        end
-
-        def instanciate(path, parent)
-          unless path.is_a?(::EacLauncher::Instances::Base)
-            raise "#{path} is not a project" unless path.project?
-
-            path.extend(::EacLauncher::Instances::Base)
-            path.parent = parent
-          end
-          path
-        end
-      end
-
-      attr_accessor :parent
-
-      def name
-        logical
-      end
-
-      def stereotype?(stereotype)
-        stereotypes.include?(stereotype)
-      end
-
-      def to_parent_path
-        return self unless @parent
-
-        logical.gsub(/\A#{Regexp.quote(@parent.logical)}/, '')
-      end
-
-      def project?
-        stereotypes.any?
-      end
-
-      def publish_run
-        stereotypes.each do |s|
-          next unless publish?(s)
-
-          infov(name, "publishing #{s.label}")
-          s.publish_class.new(self).run
-        end
-      end
-
-      def publish_check
-        stereotypes.each do |s|
-          next unless publish?(s)
-
-          puts "#{name.to_s.cyan}|#{s.label}|" \
-            "#{s.publish_class.new(self).check}"
-        end
-      end
-
-      def project_name
-        ::File.basename(logical)
-      end
-
-      def included?
-        !::EacLauncher::Context.current.settings.excluded_projects.include?(project_name)
-      end
-
-      def to_h
-        super.to_h.merge(parent: parent ? parent.logical : nil)
-      end
-
-      private
-
-      def publish?(stereotype)
-        return false unless stereotype.publish_class
-
-        filter = ::EacLauncher::Context.current.publish_options[:stereotype]
-        filter.blank? ? true : filter == stereotype.name.demodulize
-      end
-
-      def options_uncached
-        ::EacLauncher::Context.current.settings.instance_settings(self)
-      end
-    end
-  end
-end

data/lib/eac_launcher/instances/base/cache.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module EacLauncher
-  module Instances
-    module Base
-      module Cache
-        def cache_path(subpath)
-          File.join(cache_root, subpath)
-        end
-
-        def cache_key(key, &block)
-          v = cache_key_get(key)
-          return v if v.present? || block.nil?
-
-          v = yield
-          cache_key_write(key, v)
-          v
-        end
-
-        private
-
-        def cache_key_get(key)
-          File.file?(cache_key_path(key)) ? File.read(cache_key_path(key)) : nil
-        end
-
-        def cache_key_write(key, value)
-          FileUtils.mkdir_p(File.dirname(cache_key_path(key)))
-          File.write(cache_key_path(key), value)
-        end
-
-        def cache_key_path(key)
-          File.join(cache_root, 'keys', key.parameterize)
-        end
-
-        def cache_root
-          File.join(::EacLauncher::Context.current.cache_root, name.parameterize)
-        end
-      end
-    end
-  end
-end

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