eac_tools 0.41.0 → 0.42.0

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/instances/build_spec.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'avm/eac_asciidoctor_base0/sources/base'
+require 'avm/eac_asciidoctor_base0/instances/build'
+require 'eac_fs/comparator'
+
+::RSpec.describe ::Avm::EacAsciidoctorBase0::Instances::Build do # rubocop:disable Metrics/BlockLength
+  let(:application) { ::Avm::Applications::Base.new('myapp') }
+  let(:application_instance) do
+    ::Avm::EacAsciidoctorBase0::Instances::Base
+      .new(application, 'stub')
+  end
+  let(:fixtures_dir) { __dir__.to_pathname.join('build_spec_files') }
+  let(:fs_comparator) { ::EacFs::Comparator.new.truncate_file('*.html') }
+  let(:instance) { described_class.new(application_instance) }
+  let(:source) { avm_source('EacAsciidoctorBase0', target_basename: application.id) }
+  let(:target_dir) { fixtures_dir }
+  let(:main_document) do
+    source.path.join(::Avm::EacAsciidoctorBase0::Sources::Base::MAIN_FILE_SUBPATH)
+  end
+
+  before do
+    application.entry('stereotype').write('EacAsciidoctorBase0')
+    ::EacConfig::Node.context.current.entry("#{application.id}_dev.install.path")
+                     .value = source.path.to_path
+    application_instance.entry('install.name').write('The Author')
+    application_instance.entry('install.name_initials').write('T.A.')
+    application_instance.entry('install.email').write('theauthor@example.net')
+    application_instance.entry('web.url').write('https://www.example.net')
+    %w[doc1 doc2 doc2/doc2_1].each do |subpath|
+      target_dir = source.content_directory.join(subpath)
+      target_dir.mkpath
+      ::FileUtils.cp(
+        main_document,
+        target_dir.join(::Avm::EacAsciidoctorBase0::Sources::Base::CONTENT_DOCUMENT_BASENAME)
+      )
+    end
+    instance.perform
+  end
+
+  it do
+    expect(fs_comparator.build(instance.target_directory)).to eq(fs_comparator.build(target_dir))
+  end
+end

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/source_generators/base_spec_files/no_options/content/body.adoc

@@ -1,4 +1,5 @@
 = EacAsciidoctorBase0 Generated Source =
+//#header
 
 == First Section
 

data/sub/avm-eac_asciidoctor_base0/spec/lib/avm/eac_asciidoctor_base0/sources/base_spec.rb

@@ -1,7 +1,21 @@
 # frozen_string_literal: true
 
+require 'avm/eac_asciidoctor_base0/instances/base'
 require 'avm/eac_asciidoctor_base0/sources/base'
 
 ::RSpec.describe ::Avm::EacAsciidoctorBase0::Sources::Base do
   include_examples 'in_avm_registry', 'sources'
+
+  describe '#instance' do
+    let(:application) { ::Avm::Applications::Base.new('myapp') }
+    let(:source) { avm_source('EacAsciidoctorBase0', target_basename: application.id) }
+
+    before do
+      application.local_source_path_entry.value = source.path
+    end
+
+    it do
+      expect(source.instance).to be_a(::Avm::EacAsciidoctorBase0::Instances::Base)
+    end
+  end
 end

data/sub/avm-eac_asciidoctor_base0/spec/spec_helper.rb

@@ -2,7 +2,4 @@
 
 require 'eac_ruby_utils/rspec/default_setup'
 ::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
-
-require 'eac_ruby_utils/speaker'
-require 'eac_ruby_utils/rspec/stub_speaker'
-::EacRubyUtils::Speaker.context.push(::EacRubyUtils::Rspec::StubSpeaker.new)
+                     .stub_avm_contexts

data/sub/avm-eac_asciidoctor_base0/template/avm/eac_asciidoctor_base0/source_generators/base/content/body.adoc

@@ -1,4 +1,5 @@
 = EacAsciidoctorBase0 Generated Source =
+//#header
 
 == First Section
 

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.54'
+  s.add_dependency 'avm', '~> 0.55'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106', '>= 0.106.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators/base/dependencies.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ruby_base1/source_generators/base/version_builder'
+require 'avm/source_generators/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module SourceGenerators
+      class Base < ::Avm::SourceGenerators::Base
+        module Dependencies
+          def eac_ruby_gem_support_version
+            dependency_version('eac_ruby_gem_support')
+          end
+
+          def eac_ruby_utils_version
+            dependency_version('eac_ruby_utils')
+          end
+
+          def dependency_version(gem_name)
+            ::Avm::EacRubyBase1::SourceGenerators::Base::VersionBuilder.new(gem_name, options).to_s
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators/base/gemfile_lock.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ruby_base1/source_generators/base/options'
+require 'avm/source_generators/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module SourceGenerators
+      class Base < ::Avm::SourceGenerators::Base
+        module GemfileLock
+          def generate_gemfile_lock
+            return unless generate_gemfile_lock?
+
+            self_gem.bundle('install').chdir_root.execute!
+          end
+
+          # @return [Boolean]
+          def generate_gemfile_lock?
+            options[::Avm::EacRubyBase1::SourceGenerators::Base::Options::GEMFILE_LOCK_OPTION]
+              .to_bool
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators/base/options.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/source_generators/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module SourceGenerators
+      class Base < ::Avm::SourceGenerators::Base
+        module Options
+          common_concern
+
+          GEMFILE_LOCK_OPTION = 'gemfile-lock'.to_sym
+
+          OPTIONS = {
+            'eac-ruby-utils-version'.to_sym => 'Version for "eac_ruby_utils" gem.',
+            'eac-ruby-gem-support-version'.to_sym => 'Version for "eac_ruby_gem_support" gem.',
+            GEMFILE_LOCK_OPTION => 'Run "bundle install" at the end'
+          }.freeze
+
+          module ClassMethods
+            def option_list
+              OPTIONS.inject(super) { |a, e| a.option(*e) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators/base/version_builder.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/source_generators/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module SourceGenerators
+      class Base < ::Avm::SourceGenerators::Base
+        class VersionBuilder
+          enable_simple_cache
+          common_constructor :gem_name, :options
+
+          def to_s
+            r = "'~> #{two_segments}'"
+            r += ", '>= #{three_segments}'" if segments.count >= 3 && segments[2].positive?
+            r
+          end
+
+          # @return [Gem::Version]
+          def version
+            (options_version || default_version)
+          end
+
+          def two_segments
+            segments.first(2).join('.')
+          end
+
+          def three_segments
+            segments.first(3).join('.')
+          end
+
+          private
+
+          def segments_uncached
+            version.release.to_s.split('.').map(&:to_i)
+          end
+
+          def default_version
+            ::Gem.loaded_specs[gem_name].version
+          end
+
+          def options_version
+            options["#{gem_name}_version".dasherize.to_sym].if_present do |v|
+              ::Gem::Version.new(v)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators/base.rb

@@ -12,32 +12,15 @@ module Avm
         IDENT = '  '
         JOBS = %w[root_directory gemspec root_lib version_lib static gemfile_lock].freeze
         TEMPLATE_VARIABLES = %w[lib_path name root_module].freeze
-        OPTIONS = {
-          'eac-ruby-utils-version'.to_sym => 'Version for "eac_ruby_utils" gem.',
-          'eac-ruby-gem-support-version'.to_sym => 'Version for "eac_ruby_gem_support" gem.'
-        }.freeze
 
         enable_speaker
         enable_simple_cache
-
-        class << self
-          def option_list
-            OPTIONS.inject(super) { |a, e| a.option(*e) }
-          end
-        end
+        require_sub __FILE__, include_modules: true
 
         def root_directory
           target_path
         end
 
-        def eac_ruby_gem_support_version
-          dependency_version('eac_ruby_gem_support')
-        end
-
-        def eac_ruby_utils_version
-          dependency_version('eac_ruby_utils')
-        end
-
         def name
           root_directory.basename.to_s
         end
@@ -93,18 +76,10 @@ module Avm
           end
         end
 
-        def dependency_version(gem_name)
-          VersionBuilder.new(gem_name, options).to_s
-        end
-
         def generate_gemspec
           template_apply('gemspec', "#{name}.gemspec")
         end
 
-        def generate_gemfile_lock
-          self_gem.bundle('install').chdir_root.execute!
-        end
-
         def generate_root_directory
           root_directory.mkpath
         end
@@ -130,46 +105,6 @@ module Avm
           target.dirname.mkpath
           template.child("#{from}.template").apply_to_file(self, target.to_path)
         end
-
-        class VersionBuilder
-          enable_simple_cache
-          common_constructor :gem_name, :options
-
-          def to_s
-            r = "'~> #{two_segments}'"
-            r += ", '>= #{three_segments}'" if segments.count >= 3 && segments[2].positive?
-            r
-          end
-
-          # @return [Gem::Version]
-          def version
-            (options_version || default_version)
-          end
-
-          def two_segments
-            segments.first(2).join('.')
-          end
-
-          def three_segments
-            segments.first(3).join('.')
-          end
-
-          private
-
-          def segments_uncached
-            version.release.to_s.split('.').map(&:to_i)
-          end
-
-          def default_version
-            ::Gem.loaded_specs[gem_name].version
-          end
-
-          def options_version
-            options["#{gem_name}_version".dasherize.to_sym].if_present do |v|
-              ::Gem::Version.new(v)
-            end
-          end
-        end
       end
     end
   end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.26.2'
+    VERSION = '0.27.0'
   end
 end

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec.rb

@@ -7,7 +7,8 @@ RSpec.describe ::Avm::EacRubyBase1::SourceGenerators::Base do
   include_examples 'avm_source_generated', __FILE__, 'EacRubyBase1',
                    {
                      'eac-ruby-utils-version' => '0.35.0',
-                     'eac-ruby-gem-support-version' => '0.2.0'
+                     'eac-ruby-gem-support-version' => '0.2.0',
+                     'gemfile-lock' => true
                    }
 
   alias_method :fs_comparator_super, :fs_comparator

data/sub/eac_cli/eac_cli.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*', 'Gemfile']
 
   s.add_dependency 'colorize', '~> 0.8', '>= 0.8.1'
-  s.add_dependency 'eac_config', '~> 0.11', '>= 0.11.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.103'
+  s.add_dependency 'eac_config', '~> 0.12'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_cli/lib/eac_cli/config/entry.rb

@@ -18,6 +18,10 @@ module EacCli
       end
 
       def value
+        value!
+      end
+
+      def value!
         return sub_value_to_return if sub_entry.found?
         return nil unless options.required?
 

data/sub/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.28.0'
+  VERSION = '0.29.0'
 end

data/sub/eac_config/eac_config.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'addressable', '~> 2.8'
-  s.add_dependency 'eac_ruby_utils', '~> 0.102'
+  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_config/lib/eac_config/entry/not_found_error.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacConfig
+  class Entry
+    class NotFoundError < ::RuntimeError
+      def initialize(entry)
+        super("Entry #{entry} not found")
+      end
+    end
+  end
+end

data/sub/eac_config/lib/eac_config/entry.rb

@@ -5,6 +5,7 @@ require 'eac_ruby_utils/core_ext'
 
 module EacConfig
   class Entry
+    require_sub __FILE__
     enable_simple_cache
     common_constructor :root_node, :path do
       self.path = ::EacConfig::EntryPath.assert(path)
@@ -30,6 +31,12 @@ module EacConfig
       node_entry.if_present(&:value)
     end
 
+    def value!
+      return value if found?
+
+      raise ::EacConfig::Entry::NotFoundError, self
+    end
+
     def value=(a_value)
       write_node.self_entry(path).value = a_value
     end

data/sub/eac_config/lib/eac_config/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacConfig
-  VERSION = '0.11.1'
+  VERSION = '0.12.0'
 end

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/rspec/stub_speaker'
+require 'eac_ruby_utils/speaker'
 
 module EacRubyUtils
   module Rspec
@@ -13,6 +15,13 @@ module EacRubyUtils
         obj.rspec_config.setup_manager = obj
         obj.rspec_config.include(::EacRubyUtils::Rspec::Setup::SetupManager)
       end
+
+      # @return [self]
+      def stub_eac_speaker
+        ::EacRubyUtils::Speaker.context.push(::EacRubyUtils::Rspec::StubSpeaker.new)
+
+        self
+      end
     end
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/settings_provider/setting_value.rb

@@ -28,8 +28,7 @@ module EacRubyUtils
 
       def value
         parsed_options.order.each do |method|
-          value = send("value_by_#{method}")
-          return value if value
+          return send("value_by_#{method}") if send("value_by_#{method}?")
         end
         return parsed_options.default if parsed_options.respond_to?(OPTION_DEFAULT)
         return nil unless parsed_options.required
@@ -39,16 +38,26 @@ module EacRubyUtils
 
       def value_by_constant
         source.class.const_get(constant_name)
-      rescue NameError
-        nil
+      end
+
+      def value_by_constant?
+        source.class.const_defined?(constant_name)
       end
 
       def value_by_method
-        source.respond_to?(key, true) ? source.send(key) : nil
+        source.send(key)
+      end
+
+      def value_by_method?
+        source.respond_to?(key, true)
       end
 
       def value_by_settings_object
-        source.settings_object[key.to_s] || source.settings_object[key.to_sym]
+        source.settings_object.fetch(key)
+      end
+
+      def value_by_settings_object?
+        source.settings_object.key?(key)
       end
 
       private

data/sub/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'active_support/hash_with_indifferent_access'
 require 'eac_ruby_utils/require_sub'
 
 module EacRubyUtils
@@ -15,8 +16,11 @@ module EacRubyUtils
       %w[settings_object method constant]
     end
 
+    # return [ActiveSupport::HashWithIndifferentAccess]
     def settings_object
-      respond_to?(settings_object_name) ? send(settings_object_name) : {}
+      ActiveSupport::HashWithIndifferentAccess.new(
+        respond_to?(settings_object_name) ? send(settings_object_name) : {}
+      )
     end
 
     def settings_object_name

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.106.1'
+  VERSION = '0.107.0'
 end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/settings_provider_spec.rb

@@ -16,6 +16,10 @@ RSpec.describe ::EacRubyUtils::SettingsProvider do
         'method_b'
       end
 
+      def key_f
+        nil
+      end
+
       def settings
         { 'key_b' => 'setting_b', key_c: 'setting_c' }
       end
@@ -33,9 +37,12 @@ RSpec.describe ::EacRubyUtils::SettingsProvider do
       [:key_b] => 'setting_b',
       ['key_b', { order: %w[constant method settings_object] }] => 'method_b',
       ['key_c'] => 'setting_c',
-      ['key_d'] => 'constant_d'
+      ['key_d'] => 'constant_d',
+      ['key_f'] => nil
     }.each do |args, expected_value|
-      it { expect(stub.setting_value(*args)).to eq(expected_value) }
+      context "when args are \"#{args}\"" do
+        it { expect(stub.setting_value(*args)).to eq(expected_value) }
+      end
     end
 
     it do