eac_tools 0.87.1 → 0.89.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5c10bbe66cf1c052bbe052905fea472ec035ebd128fb31510f12d69473455e2
-  data.tar.gz: 58558921f126489a6a50e4fe5d79849c85c4232d7151323ed94da810296c54a3
+  metadata.gz: 8cb76604a2a0b5232d376cefac3d315c957d4e87b8b6b2580f2c7972f4a88aeb
+  data.tar.gz: 17ca5dc90d086d88446991053485c45c9e5a720ab74b1301ee2ff2019aa6cba5
 SHA512:
-  metadata.gz: 452a17b87781d7b4321de48220f788b6c884142c9ab10ea37c3f647cd13e5bc4170e8fdeb41a109d54903bea395e07f3d0ae74751525bcc42658161adda66ffe
-  data.tar.gz: 57a2516fe2033b50be88c0bd6a60197680c276eec534531676c9625e1c0ed6d992df7e19cba8573a930cbf2c677f1fc532d3d4d02222b6dfbdc197ae3c8f31e9
+  metadata.gz: 5c9ba6396b64568f48744e4cf59e7d6bcb16c8b1004ad8d079958d44b59828a9333a0add9f36d066ae9aef52f6133ce406bd2efc666105366d2cb102d0b78576
+  data.tar.gz: 60f4f4677b47dda6630a9006b1c5467a097cbc7afa7940cba95d5f81311fe60656f9475f6e9d8f9b290c37fdc9790ecbcfb1163c3fe8805d281a3c6501733337

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.87.1)
-      avm (~> 0.90, >= 0.90.1)
-      avm-eac_asciidoctor_base0 (~> 0.22, >= 0.22.1)
+    eac_tools (0.89.0)
+      avm (~> 0.91)
+      avm-eac_asciidoctor_base0 (~> 0.23)
       avm-eac_generic_base0 (~> 0.13)
       avm-eac_github_base0 (~> 0.3)
       avm-eac_gitlab_base0 (~> 0.4)
@@ -22,23 +22,10 @@ PATH
       avm-tools (~> 0.161)
       eac_ruby_utils (~> 0.121)
 
-PATH
-  remote: sub/avm-eac_redmine_base0
-  specs:
-    avm-eac_redmine_base0 (0.22.2)
-      avm (~> 0.90, >= 0.90.1)
-      avm-eac_generic_base0 (~> 0.13)
-      avm-eac_rails_base1 (~> 0.10)
-      avm-eac_ubuntu_base0 (~> 0.5, >= 0.5.1)
-      curb (~> 0.9, >= 0.9.11)
-      eac_fs (~> 0.17)
-      eac_rest (~> 0.12)
-      eac_ruby_utils (~> 0.121)
-
 PATH
   remote: sub/avm
   specs:
-    avm (0.90.1)
+    avm (0.91.0)
       eac_cli (~> 0.40, >= 0.40.1)
       eac_config (~> 0.14, >= 0.14.2)
       eac_docker (~> 0.7)
@@ -68,9 +55,9 @@ GEM
       ofx-parser (~> 1.1)
     asciidoctor (2.0.22)
     ast (2.4.2)
-    avm-eac_asciidoctor_base0 (0.22.1)
+    avm-eac_asciidoctor_base0 (0.23.0)
       asciidoctor (~> 2.0, >= 2.0.22)
-      avm-eac_webapp_base0 (~> 0.18, >= 0.18.4)
+      avm-eac_webapp_base0 (~> 0.19)
       eac_ruby_utils (~> 0.121)
       os (~> 1.1, >= 1.1.4)
       rouge (~> 3.30)
@@ -107,6 +94,15 @@ GEM
       avm-eac_ruby_base1 (~> 0.33)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.2)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
+    avm-eac_redmine_base0 (0.22.2)
+      avm (~> 0.90, >= 0.90.1)
+      avm-eac_generic_base0 (~> 0.13)
+      avm-eac_rails_base1 (~> 0.10)
+      avm-eac_ubuntu_base0 (~> 0.5, >= 0.5.1)
+      curb (~> 0.9, >= 0.9.11)
+      eac_fs (~> 0.17)
+      eac_rest (~> 0.12)
+      eac_ruby_utils (~> 0.121)
     avm-eac_redmine_plugin_base0 (0.4.1)
       avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
       eac_ruby_utils (~> 0.121)
@@ -218,7 +214,7 @@ GEM
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
     faraday-net_http (3.0.2)
-    faraday-retry (2.2.0)
+    faraday-retry (2.2.1)
       faraday (~> 2.0)
     filesize (0.2.0)
     git (1.19.1)
@@ -226,13 +222,13 @@ GEM
       rchardet (~> 1.8)
     hpricot (0.8.6)
     htmlbeautifier (1.4.3)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
     minitar (0.9)
     minitest (5.22.3)
-    multipart-post (2.4.0)
+    multipart-post (2.4.1)
     net-ssh (4.2.0)
     nokogiri (1.15.6-x86_64-linux)
       racc (~> 1.4)
@@ -241,7 +237,7 @@ GEM
     os (1.1.4)
     parallel (1.24.0)
     parseconfig (1.1.2)
-    parser (3.3.0.5)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -249,10 +245,10 @@ GEM
       tty-color (~> 0.5)
     public_suffix (5.0.5)
     racc (1.7.3)
-    rack (3.0.10)
+    rack (3.0.11)
     rainbow (3.1.1)
     rchardet (1.8.0)
-    regexp_parser (2.9.0)
+    regexp_parser (2.9.1)
     rexml (3.2.6)
     rouge (3.30.0)
     rspec (3.13.0)
@@ -264,11 +260,11 @@ GEM
     rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.63.0)
+    rubocop (1.63.5)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -279,8 +275,8 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
@@ -290,12 +286,12 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.29.1)
+    rubocop-rspec (2.29.2)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
       rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.2)
+    rubocop-rspec_rails (2.28.3)
       rubocop (~> 1.40)
     ruby-filemagic (0.7.3)
     ruby-progressbar (1.13.0)
@@ -323,7 +319,6 @@ PLATFORMS
 
 DEPENDENCIES
   avm!
-  avm-eac_redmine_base0!
   eac_ruby_gem_support (~> 0.10)
   eac_tools!
 

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.87.1'
+  VERSION = '0.89.0'
 end

data/sub/avm/lib/avm/applications/base/local_source.rb

@@ -10,7 +10,7 @@ module Avm
       module LocalSource
         # @return [Pathname]
         def local_source_path
-          (local_source_path_entry.value || auto_local_source_path).to_pathname
+          user_local_source_path || auto_local_source_path
         end
 
         # @return [EacConfig::Entry]
@@ -18,6 +18,11 @@ module Avm
           ::EacConfig::Node.context.current.entry([local_instance_id, 'install', 'path'])
         end
 
+        # @return [Path, nil]
+        def user_local_source_path
+          local_source_path_entry.value.if_present(&:to_pathname)
+        end
+
         private
 
         # @return [Avm::Sources::Base]

data/sub/avm/lib/avm/launcher/context/instance_discovery/root_instance_paths.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'ruby-progressbar'
+require 'avm/launcher/instances/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    class Context
+      class InstanceDiscovery
+        class RootInstancePaths
+          acts_as_instance_method
+          enable_speaker
+
+          common_constructor :owner
+
+          # @return [Array<Avm::Launcher::Paths::Logical>]
+          def result
+            application_user_local_source_paths.map do |path|
+              ::Avm::Launcher::Paths::Logical.new(owner.context, nil, path.to_path,
+                                                  "/#{path.basename}")
+            end
+          end
+
+          private
+
+          # @param application [Avm::Applications::Base]
+          # @return [Pathname, nil]
+          def application_user_local_source_path(application) # rubocop:disable Metrics/MethodLength
+            if application.user_local_source_path.blank?
+              warn "Application \"#{application}\" does not have a user local source set"
+              nil
+            elsif application.user_local_source_path.directory?
+              infov application,
+                    "user local source found in \"#{application.user_local_source_path}"
+              application.user_local_source_path
+            else
+              warn "Application \"#{application}\"'s local source path is not a directory"
+              nil
+            end
+          end
+
+          # @return [Array<Pathname>]
+          def application_user_local_source_paths
+            ::Avm::Registry.applications.available.sort_by { |a| [a.id] }.map do |application|
+              application_user_local_source_path(application)
+            end.compact_blank.uniq.sort
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/launcher/context/instance_discovery.rb

@@ -2,23 +2,34 @@
 
 require 'ruby-progressbar'
 require 'avm/launcher/instances/base'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Launcher
     class Context
       class InstanceDiscovery
-        attr_reader :instances
+        enable_simple_cache
 
-        def initialize(context)
-          @context = context
+        # @!method instances
+        #   @return [Array<Avm::Launcher::Instances::Base>]
+
+        # @!method initialize(context)
+        #   @param context [Avm::Launcher::Context]
+        common_constructor :context
+
+        private
+
+        # @return [Array<Avm::Launcher::Instances::Base>]
+        def instances_uncached
           @progress = ::ProgressBar.create(title: 'Instance discovery', total: 1)
-          @instances = path_instances(@context.root, nil)
+          root_instance_paths.flat_map { |path| path_instances(path, nil) }
         ensure
           @progress&.finish
         end
 
-        private
-
+        # @param path [Avm::Launcher::Paths::Logical]
+        # @param parent_instance [Avm::Launcher::Instances::Base]
+        # @return [Array<Avm::Launcher::Instances::Base>]
         def path_instances(path, parent_instance)
           update_progress_format(path)
           on_rescued_path_instances(path) do |r|
@@ -32,6 +43,8 @@ module Avm
           end
         end
 
+        # @param path [Avm::Launcher::Paths::Logical]
+        # @return [Array<Avm::Launcher::Instances::Base>]
         def on_rescued_path_instances(path)
           r = []
           begin
@@ -42,14 +55,20 @@ module Avm
           r
         end
 
+        # @param path [Avm::Launcher::Paths::Logical]
+        # @return [void]
         def update_progress_format(path)
           @progress.format = "%t (Paths: %c/%C, Current: #{path.logical}) |%B| %a"
         end
 
+        # @param path [Array<Avm::Launcher::Paths::Logical>]
+        # @return [void]
         def update_progress_count(children)
           @progress.total += children.count
           @progress.increment
         end
+
+        require_sub __FILE__, require_mode: :kernel
       end
     end
   end

data/sub/avm/lib/avm/launcher/context.rb

@@ -29,14 +29,14 @@ module Avm
         end
       end
 
-      attr_reader :root, :settings, :cache_root
+      attr_reader :settings, :cache_root
       attr_accessor :publish_options, :recache, :instance_manager
 
       CONFIG_PATH_PREFIX = 'launcher'
+      FS_OBJECT_ID = 'unique'
 
       def initialize(options = {})
         @options = options.with_indifferent_access
-        @root = ::Avm::Launcher::Paths::Logical.new(self, nil, build_option(:projects_root), '/')
         @settings = ::Avm::Launcher::Context::Settings.new(build_option(:settings_file))
         @cache_root = build_option(:cache_root)
         @publish_options = { new: false, confirm: false, stereotype: nil }
@@ -45,7 +45,7 @@ module Avm
       end
 
       def fs_object_id
-        root.real.variableize
+        FS_OBJECT_ID
       end
 
       def instance(name)

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

@@ -8,7 +8,8 @@ module Avm
     module Setup
       require_sub __FILE__
       EXAMPLES = %w[avm_file_formats_with_fixtures avm_file_format_file_resource_name
-                    avm_source_generated entries_values in_avm_registry not_in_avm_registry].freeze
+                    avm_source_generated entries_values in_avm_registry not_in_avm_registry
+                    with_config].freeze
 
       def self.extended(obj)
         obj.setup_examples

data/sub/avm/lib/avm/rspec/shared_examples/entries_values.rb

@@ -4,9 +4,7 @@ require 'eac_ruby_utils/core_ext'
 
 RSpec.shared_examples 'entries_values' do |spec_file, expected_values|
   describe '#read_entry' do
-    config_path = spec_file.to_pathname
-    config_path = config_path.dirname.join("#{config_path.basename_noext}_files", 'config.yml')
-    EacRubyUtils::Rspec.default_setup.stub_eac_config_node(self, config_path)
+    include_examples 'with_config', spec_file
 
     expected_values.each do |instance_id, values|
       values.each do |input, expected|

data/sub/avm/lib/avm/rspec/shared_examples/with_config.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+RSpec.shared_examples 'with_config' do |spec_file|
+  config_path = spec_file.to_pathname
+  config_path = config_path.dirname.join("#{config_path.basename_noext}_files", 'config.yml')
+  temp_config_path = EacRubyUtils::Fs::Temp.file
+  FileUtils.cp(config_path, temp_config_path)
+  EacRubyUtils::Rspec.default_setup.stub_eac_config_node(self, temp_config_path)
+end

data/sub/avm/lib/avm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.90.1'
+  VERSION = '0.91.0'
 end

data/sub/avm/spec/lib/avm/launcher/context_spec.rb

@@ -4,7 +4,16 @@ require 'avm/launcher/context'
 require 'avm/launcher/stereotype'
 
 RSpec.describe Avm::Launcher::Context do
+  include_context 'with launcher'
+  include_examples 'with_config', __FILE__
+
   describe '#instances' do
+    before do
+      %w[avm-tools_stub ruby_gem_stub].each do |id|
+        application_source_path(id, DUMMY_DIR.to_pathname.join(id))
+      end
+    end
+
     it 'returns all stub instances' do
       is = described_class.current.instances.map(&:name)
       expect(is).to contain_exactly('/avm-tools_stub', '/ruby_gem_stub')
@@ -30,6 +39,7 @@ RSpec.describe Avm::Launcher::Context do
       before do
         temp_context(File.join(__dir__, 'context_spec.yml'))
         mylib_repos
+        application_source_path('app', File.join(projects_root, 'app'))
       end
 
       context 'when sub is a GitSubrepo' do
@@ -81,6 +91,7 @@ RSpec.describe Avm::Launcher::Context do
           touch_commit(app, 'file1')
           app.execute!('subtree', 'add', '-P', 'mylib', mylib_repos, 'master')
           app.execute!('remote', 'add', 'mylib', mylib_repos)
+          application_source_path('subtree_main_app', app.root_path)
         end
 
         it 'recognizes subtree instance' do # rubocop:disable RSpec/MultipleExpectations

data/sub/avm/spec/lib/avm/launcher/context_spec_files/config.yml

@@ -0,0 +1,9 @@
+---
+app:
+  avm_type: Application
+avm-tools_stub:
+  avm_type: Application
+ruby_gem_stub:
+  avm_type: Application
+subtree_main_app:
+  avm_type: Application

data/sub/avm/spec/lib/avm/launcher/instances/base_spec.rb

@@ -4,20 +4,19 @@ require 'avm/launcher/context'
 require 'avm/launcher/instances/base'
 
 RSpec.describe Avm::Launcher::Instances::Base do
+  include_context 'with launcher'
   let(:fixtures_dir) { __dir__.to_pathname.join('base_spec_files') }
-  let(:launcher_context) do
-    Avm::Launcher::Context.current = Avm::Launcher::Context.new(
-      projects_root: fixtures_dir.join('projects').to_path,
-      settings_file: fixtures_dir.join('settings.yaml').to_path,
-      cache_root: Dir.mktmpdir
-    )
-  end
 
   before do
     allow(ProgressBar).to receive(:create).and_return(double.as_null_object)
-    Avm::Launcher::Context.current = launcher_context
+    context_set(fixtures_dir.join('settings.yaml').to_path, DUMMY_DIR)
+    %w[avm-tools_stub ruby_gem_stub].each do |id|
+      application_source_path(id, File.join(projects_root, id))
+    end
   end
 
+  include_examples 'with_config', __FILE__
+
   describe '#options' do
     context 'when instance is "avm-tools_stub"' do
       let(:instance) { Avm::Launcher::Context.current.instance('/avm-tools_stub') }

data/sub/avm/spec/lib/avm/launcher/instances/base_spec_files/config.yml

@@ -0,0 +1,5 @@
+---
+avm-tools_stub:
+  avm_type: Application
+ruby_gem_stub:
+  avm_type: Application

data/sub/avm/spec/spec_helper/{eac_launcher.rb → launcher_context.rb}

@@ -1,47 +1,70 @@
 # frozen_string_literal: true
 
 DUMMY_DIR = File.expand_path('../dummy', __dir__)
-ROOT_DIR = File.expand_path('../..', __dir__)
 
-require 'avm/launcher/context'
-
-RSpec.configure do |config|
-  config.before do
+RSpec.shared_context 'with launcher' do
+  before do
     require 'avm/launcher/context'
     Avm::Launcher::Context.current = Avm::Launcher::Context.new(
       projects_root: DUMMY_DIR,
-      settings_file: File.join(__dir__, 'eac_launcher', 'settings.yml'),
+      settings_file: File.join(__dir__, 'launcher_context', 'settings.yml'),
       cache_root: Dir.mktmpdir
     )
     @remotes_dir = Dir.mktmpdir
     allow(ProgressBar).to receive(:create).and_return(double.as_null_object)
   end
 
-  def temp_context(settings_path)
+  # @param application_id [String]
+  # @param path [Pathname]
+  # @return void
+  def application_source_path(application_id, path)
+    EacConfig::Node.context.current.entry("#{application_id}_dev.install.path").value =
+      path.to_pathname.to_path
+  end
+
+  # @param settings_path [Pathname]
+  # @param projects_root [Pathname]
+  def context_set(settings_path, projects_root)
     require 'avm/launcher/context'
     require 'tmpdir'
     Avm::Launcher::Context.current = Avm::Launcher::Context.new(
-      projects_root: Dir.mktmpdir, settings_file: settings_path, cache_root: Dir.mktmpdir
+      settings_file: settings_path.to_pathname.to_path,
+      cache_root: Dir.mktmpdir
     )
+    self.projects_root = projects_root
+  end
+
+  # @param settings_path [Pathname]
+  def temp_context(settings_path)
+    context_set(settings_path, Dir.mktmpdir)
   end
 
   def init_remote(name)
     require 'avm/git/launcher/base'
-    r = Avm::Git::Launcher::Base.new(File.join(@remotes_dir, name))
+    r = Avm::Git::Launcher::Base.new(File.join(@remotes_dir, name)) # rubocop:disable RSpec/InstanceVariable
     r.init_bare
     r
   end
 
   def init_git(subdir)
     require 'avm/git/launcher/base'
-    r = Avm::Git::Launcher::Base.new(File.join(Avm::Launcher::Context.current.root.real,
-                                               subdir))
+    r = Avm::Git::Launcher::Base.new(File.join(projects_root, subdir))
     r.git
     r.execute!('config', 'user.email', 'theuser@example.net')
     r.execute!('config', 'user.name', 'The User')
     r
   end
 
+  # @param path [String]
+  def projects_root
+    @projects_root ||= Dir.mktmpdir
+  end
+
+  # @param path [Pathname]
+  def projects_root=(path)
+    @projects_root = path.to_pathname.to_path
+  end
+
   def touch_commit(repos, subpath)
     require 'fileutils'
     FileUtils.mkdir_p(File.dirname(repos.subpath(subpath)))