eac_tools 0.65.1 → 0.67.0

data/sub/avm-tools/lib/avm/tools/runner/instance/data.rb

@@ -13,6 +13,13 @@ module Avm
             desc 'Data utilities for EacRailsBase0 instances.'
             subcommands
           end
+
+          for_context :data_owner
+
+          # @return [Avm::Instances::Data::Package]
+          def data_owner
+            instance.data_package
+          end
         end
       end
     end

data/sub/avm-tools/lib/avm/tools/runner/launcher.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'avm/tools/core_ext'
-require 'avm/projects/stereotypes'
 
 module Avm
   module Tools

data/sub/avm-tools/lib/avm/tools/runner/launcher_stereotypes/list.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'avm/launcher/stereotype'
-require 'avm/projects/stereotypes'
 require 'avm/tools/core_ext'
 
 module Avm

data/sub/avm-tools/lib/avm/tools/runner_with/include_exclude.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'eac_cli/runner'
+
+module Avm
+  module Tools
+    module RunnerWith
+      module IncludeExclude
+        common_concern do
+          include ::EacCli::Runner
+
+          runner_definition do
+            arg_opt '-I', '--include', repeat: true
+            arg_opt '-E', '--exclude', repeat: true
+          end
+        end
+
+        delegate :include, :exclude, to: :parsed
+      end
+    end
+  end
+end

data/sub/avm-tools/lib/avm/tools/runner_with/instance_data_clear.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/data/clearer'
+require 'eac_cli/core_ext'
+require 'eac_cli/runner'
+
+module Avm
+  module Tools
+    module RunnerWith
+      module InstanceDataClear
+        common_concern do
+          enable_simple_cache
+          include ::EacCli::Runner
+        end
+
+        def run
+          performer.perform
+        end
+
+        private
+
+        def performer_uncached
+          %i[include exclude].inject(::Avm::Data::Clearer.new(data_owner)) do |a1, e1|
+            if_respond(e1, []).inject(a1) { |a2, e2| a2.send(e1, e2) }
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-tools/lib/avm/tools/runner_with.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Tools
+    module RunnerWith
+      require_sub __FILE__, require_mode: :kernel
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.147.0'
+    VERSION = '0.149.0'
   end
 end

data/sub/eac_cli/eac_cli.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'colorize', '~> 0.8', '>= 0.8.1'
   s.add_dependency 'eac_config', '~> 0.12'
-  s.add_dependency 'eac_ruby_utils', '~> 0.114'
+  s.add_dependency 'eac_ruby_utils', '~> 0.117'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_cli/lib/eac_cli/definition/alternative.rb

@@ -42,14 +42,15 @@ module EacCli
         pos_set.to_a
       end
 
-      def positional_arguments_blocked?(new_pos_arg)
+      def positional_arguments_blocked_reason(new_pos_arg)
         last = pos_set.last
-        return false unless last
-        return true if subcommands?
-        return true if last.repeat?
-        return true if last.optional? && new_pos_arg.if_present(&:required?)
+        return nil unless last
+        return 'there are subcommands' if subcommands?
+        return 'last argument repeats' if last.repeat?
+        return 'new argument is required and last is optional' if
+          last.optional? && new_pos_arg.if_present(&:required?)
 
-        false
+        nil
       end
 
       def subcommands
@@ -65,7 +66,10 @@ module EacCli
       private
 
       def check_positional_blocked(new_pos_arg)
-        raise 'Positional arguments are blocked' if positional_arguments_blocked?(new_pos_arg)
+        positional_arguments_blocked_reason(new_pos_arg).if_present do |v|
+          raise ::EacCli::Definition::Error, "Positional arguments are blocked: #{v}" \
+            " (New argument: #{new_pos_arg})"
+        end
       end
 
       def pos_set

data/sub/eac_cli/lib/eac_cli/definition/base_option/initialize_args_parser.rb

@@ -26,7 +26,8 @@ module EacCli
           common_constructor :value
 
           def type
-            TYPES.find { |type| send("#{type}?") } || raise("Unknown type for \"#{value}\"")
+            TYPES.find { |type| send("#{type}?") } ||
+              raise(::EacCli::Definition::Error, "Unknown type for \"#{value}\"")
           end
 
           def short?

data/sub/eac_cli/lib/eac_cli/definition/base_option.rb

@@ -42,7 +42,7 @@ module EacCli
           v.to_s.if_present { |vv| return vv.variableize.to_sym }
         end
 
-        raise 'No short or long option to build identifier'
+        raise(::EacCli::Definition::Error, 'No short or long option to build identifier')
       end
 
       def repeat?

data/sub/eac_cli/lib/eac_cli/definition/boolean_option.rb

@@ -16,7 +16,8 @@ module EacCli
       def default_value
         return super unless default_value?
 
-        raise "Unallowed default value for boolean options (Option: #{self})"
+        raise(::EacCli::Definition::Error,
+              "Unallowed default value for boolean options (Option: #{self})")
       end
 
       def default_default_value

data/sub/eac_cli/lib/eac_cli/definition/error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Definition
+    class Error < ::StandardError
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/runner/after_class_methods.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_cli/definition'
+require 'eac_cli/definition/error'
 require 'eac_cli/runner/class_runner'
 
 module EacCli
@@ -21,7 +22,11 @@ module EacCli
 
       def runner_definition(&block)
         @runner_definition ||= super_runner_definition
-        @runner_definition.instance_eval(&block) if block
+        begin
+          @runner_definition.instance_eval(&block) if block
+        rescue ::EacCli::Definition::Error => _e
+          raise ::EacCli::Definition::Error, "Definition error for #{self}"
+        end
         @runner_definition
       end
 

data/sub/eac_cli/lib/eac_cli/runner/context.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_cli/runner/context_responders/parent'
+require 'eac_cli/runner/context_responders/runner'
+require 'eac_cli/runner/context_responders/runner_missing_method'
+require 'eac_cli/runner/context_responders/set'
 
 module EacCli
   module Runner
@@ -17,24 +21,42 @@ module EacCli
 
       # Call a method in the runner or in one of it ancestors.
       def call(method_name, *args)
-        return runner.send(method_name, *args) if runner.respond_to?(method_name)
-        return parent_call(method_name, *args) if parent.present?
+        context_call_responder(method_name).call(*args)
+      end
 
-        raise ::NameError, "No method \"#{method_name}\" found in #{runner} or in its ancestors"
+      # @return [EacCli::Runner::ContextResponders]
+      def context_call_responder(method_name)
+        ::EacCli::Runner::ContextResponders::Set.new(self, method_name, %i[runner parent])
       end
 
-      def respond_to_call?((method_name))
-        parent.respond_to?(:runner_context) && parent.runner_context.respond_to_call?(method_name)
+      # @param method_name [Symbol]
+      # @return [EacCli::Runner::ContextResponders::Parent]
+      def runner_missing_method_responder(method_name)
+        ::EacCli::Runner::ContextResponders::RunnerMissingMethod
+          .new(self, method_name)
       end
 
-      protected
+      # @param method_name [Symbol]
+      # @return [Boolean]
+      def parent_respond_to?(method_name)
+        parent.if_present(false) do |v|
+          next true if v.respond_to?(method_name)
+
+          v.if_respond(:runner_context, false) { |w| w.parent_respond_to?(method_name) }
+        end
+      end
 
       def parent_call(method_name, *args)
-        return parent.context(method_name, *args) if parent.respond_to?(:context)
         return parent.runner_context.call(method_name, *args) if parent.respond_to?(:runner_context)
 
         raise "Parent #{parent} do not respond to .context or .runner_context (Runner: #{runner})"
       end
+
+      # @param method_name [Symbol]
+      # @return [EacCli::Runner::ContextResponders::Parent]
+      def parent_responder(method_name)
+        ::EacCli::Runner::ContextResponders::Parent.new(self, method_name)
+      end
     end
   end
 end

data/sub/eac_cli/lib/eac_cli/runner/context_responders/base.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  module Runner
+    module ContextResponders
+      class Base
+        acts_as_abstract :call, :callable?
+        common_constructor :context, :method_name do
+          self.method_name = method_name.to_sym
+        end
+        delegate :parent, :runner, to: :context
+
+        def if_callable
+          return false unless callable?
+
+          yield(self)
+          true
+        end
+      end
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/runner/context_responders/parent.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_cli/runner/context_responders/base'
+
+module EacCli
+  module Runner
+    module ContextResponders
+      class Parent < ::EacCli::Runner::ContextResponders::Base
+        def callable?
+          parent.if_present(false) do |v|
+            next true if v.respond_to?(method_name)
+
+            v.if_respond(:runner_context, false) { |w| w.parent_respond_to?(method_name) }
+          end
+        end
+
+        def call(*args, &block)
+          return parent.runner_context.call(method_name, *args, &block) if
+            parent.respond_to?(:runner_context)
+
+          raise "Parent #{parent} do not respond to .context or .runner_context (Runner: #{runner})"
+        end
+      end
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/runner/context_responders/runner.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_cli/runner/context_responders/base'
+
+module EacCli
+  module Runner
+    module ContextResponders
+      class Runner < ::EacCli::Runner::ContextResponders::Base
+        def callable?
+          runner.respond_to?(method_name)
+        end
+
+        def call(*args, &block)
+          runner.send(method_name, *args, &block)
+        end
+      end
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/runner/context_responders/runner_missing_method.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_cli/runner/context_responders/base'
+
+module EacCli
+  module Runner
+    module ContextResponders
+      class RunnerMissingMethod < ::EacCli::Runner::ContextResponders::Base
+        def callable?
+          responder_runner.present?
+        end
+
+        def call(*args, &block)
+          responder_runner.send(method_name, *args, &block)
+        end
+
+        private
+
+        def responder_runner
+          parent.if_present(nil) do |v|
+            next v if v.respond_to?(method_name) && v.for_context?(method_name)
+
+            v.if_respond(:runner_context, nil) do |w|
+              w.runner_missing_method_responder(method_name).send(__method__)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/runner/context_responders/set.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_cli/runner/context_responders/base'
+
+module EacCli
+  module Runner
+    module ContextResponders
+      class Set < ::EacCli::Runner::ContextResponders::Base
+        attr_reader :responders_names
+
+        def initialize(context, method_name, responders_names)
+          super(context, method_name)
+          @responders_names = responders_names
+        end
+
+        def callable?
+          responders_instances.any?(&:callable?)
+        end
+
+        def call(*args, &block)
+          caller = responder_to_call
+          return caller.call(*args, &block) if caller
+
+          raise ::NameError, "No method \"#{method_name}\" found in #{runner} or in its ancestors"
+        end
+
+        private
+
+        def responder_class(class_name)
+          ::EacCli::Runner::ContextResponders.const_get(class_name.to_s.camelize)
+        end
+
+        def responders_instances
+          responders_names.lazy.map { |name| responder_class(name).new(context, method_name) }
+        end
+
+        def responder_to_call
+          responders_instances.lazy.select(&:callable?).first
+        end
+      end
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/runner/context_responders.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  module Runner
+    module ContextResponders
+      require_sub __FILE__
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/runner/for_context.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/module_ancestors_variable/set'
+
+module EacCli
+  module Runner
+    module ForContext
+      common_concern
+
+      module ClassMethods
+        # @param methods_names [Enumerable<Symbol>]
+        # @return [void]
+        def for_context(*methods_names)
+          for_context_methods.merge(methods_names.map(&:to_sym))
+        end
+
+        # @param method_name [Symbol]
+        # @return [Boolean]
+        def for_context?(method_name)
+          for_context_methods.include?(method_name.to_sym)
+        end
+
+        private
+
+        # @return [EacRubyUtils::ModuleAncestorsVariable::Set<Symbol>]
+        def for_context_methods
+          @for_context_methods ||=
+            ::EacRubyUtils::ModuleAncestorsVariable::Set.new(self, __method__)
+        end
+      end
+
+      # @param method_name [Symbol]
+      # @return [Boolean]
+      def for_context?(method_name)
+        self.class.for_context?(method_name)
+      end
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/runner/instance_methods.rb

@@ -30,13 +30,15 @@ module EacCli
       end
 
       def respond_to_missing?(method, include_all = false)
-        runner_context.respond_to_call?(method) || super
+        runner_context.runner_missing_method_responder(method).callable? || super
       end
 
       def method_missing(method, *args, &block)
-        return super unless runner_context.respond_to_call?(method)
+        runner_context.runner_missing_method_responder(method).if_callable do |v|
+          return v.call(*args, &block)
+        end
 
-        runner_context.call(method, *args, &block)
+        super
       end
     end
   end

data/sub/eac_cli/lib/eac_cli/runner.rb

@@ -42,6 +42,7 @@ module EacCli
 
       extend AfterClassMethods
       include InstanceMethods
+      include ::EacCli::Runner::ForContext
       include ActiveSupport::Callbacks
       define_callbacks :run
     end

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

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

data/sub/eac_cli/spec/lib/eac_cli/runner/for_context_spec.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner'
+
+::RSpec.describe ::EacCli::Runner do
+  let(:parent_runner_class) do
+    example = self
+    ::Class.new do
+      include example.described_class
+
+      def self.name
+        'ParentRunnerClass'
+      end
+
+      for_context :method_for_context
+
+      def run; end
+
+      def method_for_context; end
+
+      def method_not_for_context; end
+    end
+  end
+
+  let(:child_runner_class_1) do
+    example = self
+    ::Class.new do
+      include example.described_class
+
+      def self.name
+        'ChildRunnerClass1'
+      end
+
+      def run
+        method_for_context
+        runner_context.call(:method_for_context)
+        runner_context.call(:method_not_for_context)
+      end
+    end
+  end
+
+  let(:child_runner_class_2) do
+    example = self
+    ::Class.new do
+      include example.described_class
+
+      def self.name
+        'ChildRunnerClass2'
+      end
+
+      def run
+        method_not_for_context
+      end
+    end
+  end
+
+  let(:parent_runner) { parent_runner_class.create }
+  let(:context_args) { [{ argv: [], parent: parent_runner }] }
+  let(:child_runner) { child_runner_class.create(*context_args) }
+
+  it { expect(parent_runner.for_context?(:method_for_context)).to eq(true) }
+  it { expect(parent_runner.for_context?(:method_not_for_context)).to eq(false) }
+
+  context 'when method is for context' do
+    let(:child_runner_class) { child_runner_class_1 }
+
+    it do
+      expect { child_runner.run }.not_to raise_error
+    end
+  end
+
+  context 'when method is not for context' do
+    let(:child_runner_class) { child_runner_class_2 }
+
+    it do
+      expect { child_runner.run }.to raise_error(::NameError)
+    end
+  end
+end

data/sub/eac_cli/spec/lib/eac_cli/runner_with/subcommands_spec.rb

@@ -19,6 +19,9 @@ RSpec.describe ::EacCli::RunnerWith::Subcommands do
       end
 
       delegate :root_var, to: :parsed
+      for_context :method_in_parent_runner
+
+      def method_in_parent_runner; end
     end
   end
 
@@ -31,7 +34,10 @@ RSpec.describe ::EacCli::RunnerWith::Subcommands do
         pos_arg :child_var
       end
 
-      def run; end
+      def run
+        runner_context.call(:method_in_parent_runner)
+        method_in_parent_runner
+      end
     end
   end
 
@@ -45,6 +51,10 @@ RSpec.describe ::EacCli::RunnerWith::Subcommands do
     it { expect(instance.parsed.subcommand_args).to eq(%w[--child-opt 456]) }
     it { expect(instance.subcommand_runner.parsed.child_opt).to eq(true) }
     it { expect(instance.subcommand_runner.parsed.child_var).to eq('456') }
+
+    it do
+      expect { instance.run_run }.not_to raise_error
+    end
   end
 
   context 'when subcommand is not supplied' do

data/sub/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.2'
-  s.add_dependency 'eac_cli', '~> 0.31'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.30', '>= 0.30.3'
+  s.add_dependency 'eac_cli', '~> 0.35'
   s.add_dependency 'eac_fs', '~> 0.16'
-  s.add_dependency 'eac_ruby_utils', '~> 0.112'
+  s.add_dependency 'eac_ruby_utils', '~> 0.117'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end