eac_tools 0.8.0 → 0.11.0

data/sub/avm/lib/avm/sources/base.rb

@@ -2,6 +2,8 @@
 
 require 'avm/registry'
 require 'avm/scms/null'
+require 'avm/with_application_stereotype'
+require 'avm/with_dynamic_runners'
 require 'eac_git'
 require 'eac_ruby_utils/core_ext'
 
@@ -9,6 +11,8 @@ module Avm
   module Sources
     class Base
       require_sub __FILE__, include_modules: true
+      include ::Avm::WithApplicationStereotype
+      include ::Avm::WithDynamicRunners
       compare_by :path
       enable_abstract_methods
       enable_simple_cache

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

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

data/sub/avm/lib/avm/with_application_stereotype.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner_with/subcommands'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module WithApplicationStereotype
+    common_concern do
+      include ClassMethods
+    end
+
+    module ClassMethods
+      # @return [Module]
+      def stereotype_namespace_module
+        module_parent.module_parent
+      end
+    end
+
+    def stereotype_namespace_module
+      self.class.stereotype_namespace_module
+    end
+  end
+end

data/sub/avm/lib/avm/with_dynamic_runners.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner_with/subcommands'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module WithDynamicRunners
+    # @return [Hash<String, EacCli::Runner>]
+    def extra_available_subcommands
+      extra_available_subcommands_from_runners_module
+    end
+
+    # @return [Hash<String, EacCli::Runner>]
+    def extra_available_subcommands_from_runners_module
+      self.class.ancestors.reverse.inject({}) do |a, e|
+        a.merge(RunnersFromModule.new(e).result)
+      end
+    end
+
+    class RunnersFromModule
+      enable_simple_cache
+      common_constructor :the_module
+
+      # @return [Hash<String, EacCli::Runner>]
+      def result
+        return {} if runners_module.blank?
+
+        ::EacCli::RunnerWith::Subcommands.subcommands_from_module(runners_module)
+      end
+
+      def runners_module_uncached
+        return nil if the_module.module_parent.blank?
+
+        begin
+          the_module.module_parent.const_get('Runners')
+        rescue ::NameError
+          nil
+        end
+      end
+    end
+  end
+end

data/sub/{avm-tools/spec/lib/avm/instances/application_spec.rb → avm/spec/lib/avm/applications/base_spec.rb}

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'avm/instances/application'
+require 'avm/applications/base'
 
-RSpec.describe ::Avm::Instances::Application do
+RSpec.describe ::Avm::Applications::Base do
   let(:instance) { described_class.new('avm-tools') }
 
   ::EacRubyUtils::Rspec
     .default_setup
-    .stub_eac_config_node(self, ::File.join(__dir__, 'application_spec_fixture.yml'))
+    .stub_eac_config_node(self, ::File.join(__dir__, 'base_spec_fixture.yml'))
 
   describe '#id' do
     it { expect(instance.id).to eq('avm-tools') }

data/sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.24'
-  s.add_dependency 'eac_ruby_utils', '~> 0.05', '>= 0.95.2'
+  s.add_dependency 'avm', '~> 0.28'
+  s.add_dependency 'eac_ruby_utils', '~> 0.96'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources/docker/runner.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacGenericBase0
+    module Sources
+      module Docker
+        class Runner
+          CONTAINER_SOURCE_PATH = '/app'
+
+          enable_abstract_methods
+          abstract_methods :docker_image
+
+          runner_with :help do
+            desc 'Run a Docker container with source mapped.'
+            arg_opt '-c', '--command-arg', 'Arguments for [COMMAND] [ARG...].', optional: true,
+                                                                                repeat: true
+          end
+
+          def run
+            start_banner
+            docker_container.run_command.system!
+          end
+
+          def start_banner
+            infov 'Image', docker_image
+            infov 'Command', ::Shellwords.join(command_args)
+          end
+
+          def bash_command_args
+            %w[/bin/bash]
+          end
+
+          def command_args
+            if parsed.command_arg.any?
+              parsed.command_arg
+            else
+              default_command_args
+            end
+          end
+
+          def default_command_args
+            bash_command_args
+          end
+
+          def docker_container
+            docker_image.container
+              .volume(runner_context.call(:subject).path, CONTAINER_SOURCE_PATH)
+              .interactive(true).tty(true).command_args(command_args)
+          end
+
+          # @return [EacDocker::Images::Base]
+          def docker_image
+            raise_abstract_method __method__
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources/docker.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacGenericBase0
+    module Sources
+      module Docker
+        require_sub __FILE__
+      end
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacGenericBase0
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,6 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
+  s.add_dependency 'avm', '~> 0.29'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.4'
   s.add_dependency 'avm-eac_rails_base1', '~> 0.4', '>= 0.4.1'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'curb', '~> 0.9.11'

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/instances/base'
+require 'avm/eac_redmine_base0/instances/runners'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class Base < ::Avm::Instances::Base
+      end
+    end
+  end
+end

data/sub/{avm-tools/lib/avm/tools/runner/eac_redmine_base0 → avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners}/docker.rb

@@ -3,9 +3,9 @@
 require 'avm/docker/runner'
 
 module Avm
-  module Tools
-    class Runner
-      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
+  module EacRedmineBase0
+    module Instances
+      module Runners
         class Docker < ::Avm::Docker::Runner
           def use_default_registry?
             false

data/sub/{avm-tools/lib/avm/tools/runner/eac_redmine_base0 → avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners}/project_rename.rb

@@ -4,9 +4,9 @@ require 'eac_cli/core_ext'
 require 'avm/eac_rails_base1/runner/code_runner'
 
 module Avm
-  module Tools
-    class Runner
-      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
+  module EacRedmineBase0
+    module Instances
+      module Runners
         class ProjectRename
           runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle do
             pos_arg :from

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      module Runners
+        require_sub __FILE__
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/runners/base.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_base0/instance'
+require 'avm/eac_redmine_base0/deploy'
+require 'avm/eac_redmine_base0/apache_host'
+require 'avm/eac_rails_base1/runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Runners
+      class Base < ::Avm::EacRailsBase1::Runner
+        require_sub __FILE__
+
+        STEREOTYPE_NAME = 'EacRedmineBase0'
+
+        class << self
+          def stereotype_name
+            STEREOTYPE_NAME
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/runners/core_update.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
+require 'avm/eac_rails_base1/sources/base'
 require 'avm/eac_redmine_base0/core_update'
 require 'eac_cli/core_ext'
-require 'avm/eac_rails_base1/sources/base'
-require 'avm/eac_redmine_base0/sources/runners'
-require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacRedmineBase0

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources/runners/docker.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/sources/docker/runner'
+require 'avm/eac_ubuntu_base0/docker_image'
+
+module Avm
+  module EacRedmineBase0
+    module Sources
+      module Runners
+        class Docker < ::Avm::EacGenericBase0::Sources::Docker::Runner
+          # @return [Avm::EacUbuntuBase0::DockerImage]
+          def docker_image
+            ::Avm::EacUbuntuBase0::DockerImage.new
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.9.1'
+    VERSION = '0.11.0'
   end
 end

data/sub/avm-tools/avm-tools.gemspec

@@ -15,10 +15,9 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.4'
-  s.add_dependency 'avm', '~> 0.22'
+  s.add_dependency 'avm', '~> 0.27'
   s.add_dependency 'avm-eac_asciidoctor_base0', '~> 0.3', '>= 0.3.4'
   s.add_dependency 'avm-eac_rails_base0', '~> 0.3'
-  s.add_dependency 'avm-eac_redmine_base0', '~> 0.5', '>= 0.5.2'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.8'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.1'

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/tools/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class ApplicationStereotypes
+        class List
+          runner_with :help, :output
+
+          def run
+            infov 'Found', stereotypes.count
+            run_output
+          end
+
+          def output_content
+            stereotypes.map { |s| "#{s}\n" }.join
+          end
+
+          private
+
+          def stereotypes
+            ::Avm::Registry.application_stereotypes.available
+              .sort_by { |s| [s.name, s.namespace_module] }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class ApplicationStereotypes
+        require_sub __FILE__
+        runner_with :help, :subcommands do
+          subcommands
+        end
+      end
+    end
+  end
+end

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

@@ -22,6 +22,7 @@ module Avm
           def base_banner
             infov 'ID', instance.id
             infov 'Application ID', instance.application.id
+            infov 'Application stereotype', instance.application.stereotype
             infov 'Suffix', instance.suffix
           end
 

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/instances/base'
+require 'avm/registry'
 require 'eac_cli/core_ext'
 
 module Avm
@@ -14,10 +15,14 @@ module Avm
           subcommands
         end
 
+        def extra_available_subcommands
+          instance.if_present({}, &:extra_available_subcommands)
+        end
+
         private
 
         def instance_uncached
-          ::Avm::Instances::Base.by_id(parsed.instance_id)
+          ::Avm::Registry.instances.detect(parsed.instance_id)
         end
       end
     end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.122.0'
+    VERSION = '0.125.0'
   end
 end

data/sub/eac_docker/Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec
+
+local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/sub/{avm-tools/sub/eac_docker → eac_docker}/eac_docker.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.74'
-  s.add_dependency 'eac_templates', '~> 0.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.96'
+  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3', '>= 0.3.3'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/{avm-tools/sub/eac_docker → eac_docker}/lib/eac_docker/container.rb

@@ -34,7 +34,7 @@ module EacDocker
       end
     end
 
-    def volume(left_part, right_part = null)
+    def volume(left_part, right_part = nil)
       immutable_volume(right_part.if_present(left_part) { |v| "#{left_part}:#{v}" })
     end
 
@@ -43,8 +43,9 @@ module EacDocker
     end
 
     def run_command_args
-      run_command_boolean_args + run_command_capabilities_args + run_command_envs_args +
-        run_command_volumes_args + [image.provide.id] + command_args
+      %w[boolean capabilities envs volumes]
+        .inject([]) { |a, e| a + send("run_command_#{e}_args") } +
+        [image.provide.id] + command_args
     end
 
     def stop

data/sub/{avm-tools/sub/eac_docker → eac_docker}/lib/eac_docker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacDocker
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/immutable/array_accessor.rb

@@ -8,13 +8,26 @@ module EacRubyUtils
   module Immutable
     class ArrayAccessor < ::EacRubyUtils::Immutable::BaseAccessor
       def apply(klass)
+        apply_singular(klass)
+        apply_plural(klass)
+      end
+
+      def apply_plural(klass)
         accessor = self
-        klass.send(:define_method, name) do |value|
-          accessor.immutable_value_set(self, value)
+        klass.send(:define_method, ::ActiveSupport::Inflector.pluralize(name)) do |*args|
+          case args.count
+          when 0 then next accessor.immutable_value_get(self)
+          when 1 then next accessor.immutable_value_set(self, args.first)
+          else
+            raise ::ArgumentError, "wrong number of arguments (given #{args.count}, expected 0..1)"
+          end
         end
+      end
 
-        klass.send(:define_method, ::ActiveSupport::Inflector.pluralize(name)) do
-          accessor.immutable_value_get(self)
+      def apply_singular(klass)
+        accessor = self
+        klass.send(:define_method, name) do |value|
+          accessor.immutable_value_push(self, value)
         end
       end
 
@@ -22,11 +35,15 @@ module EacRubyUtils
         super || []
       end
 
-      def immutable_value_set(object, value)
+      def immutable_value_push(object, value)
         duplicate_object(object) do |old_value|
           (old_value || []) + [value]
         end
       end
+
+      def immutable_value_set(object, value)
+        duplicate_object(object) { |_old_value| value }
+      end
     end
   end
 end

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

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

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+::RSpec.describe ::EacRubyUtils::Immutable do
+  let(:stub_class) do
+    the_described_class = described_class
+    ::Class.new do
+      include the_described_class
+
+      immutable_accessor :array_attr, type: :array
+    end
+  end
+
+  let(:initial_instance) { stub_class.new }
+
+  it do
+    expect(initial_instance.array_attrs).to eq([])
+  end
+
+  context 'when array_attr pushs for' do
+    let(:change1_instance) { initial_instance.array_attr('A') }
+
+    it { expect(change1_instance).to be_a(initial_instance.class) }
+    it { expect(change1_instance.object_id).not_to eq(initial_instance.object_id) }
+    it { expect(change1_instance.array_attrs).to eq(%w[A]) }
+
+    context 'when array_attrs sets for' do
+      let(:change2_instance) { initial_instance.array_attrs(%w[B]) }
+
+      it { expect(change2_instance).to be_a(initial_instance.class) }
+      it { expect(change2_instance.object_id).not_to eq(change1_instance.object_id) }
+      it { expect(change2_instance.array_attrs).to eq(%w[B]) }
+    end
+  end
+end