eac_tools 0.12.0 → 0.15.0

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

@@ -2,8 +2,8 @@
 
 require 'avm/registry'
 require 'avm/scms/null'
-require 'avm/with_application_stereotype'
-require 'avm/with_dynamic_runners'
+require 'avm/with/application_stereotype'
+require 'avm/with/extra_subcommands'
 require 'eac_git'
 require 'eac_ruby_utils/core_ext'
 
@@ -11,8 +11,8 @@ module Avm
   module Sources
     class Base
       require_sub __FILE__, include_modules: true
-      include ::Avm::WithApplicationStereotype
-      include ::Avm::WithDynamicRunners
+      include ::Avm::With::ApplicationStereotype
+      include ::Avm::With::ExtraSubcommands
       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.30.0'
+  VERSION = '0.33.0'
 end

data/sub/avm/lib/avm/with/application_stereotype.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module With
+    module ApplicationStereotype
+      common_concern do
+        include ClassMethods
+      end
+
+      module ClassMethods
+        # @return [Avm::ApplicationStereotype::Base]
+        def application_stereotype
+          @application_stereotype ||=
+            ::Avm::Registry.application_stereotypes.detect(application_stereotype_name)
+        end
+
+        # @return [String]
+        def application_stereotype_name
+          stereotype_namespace_module.name.demodulize
+        end
+
+        # @return [Module]
+        def stereotype_namespace_module
+          module_parent.module_parent
+        end
+      end
+
+      def stereotype_namespace_module
+        self.class.stereotype_namespace_module
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/with/extra_subcommands.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'eac_cli/runner_with/subcommands'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module With
+    module ExtraSubcommands
+      # @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
+end

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

@@ -13,56 +13,56 @@ RSpec.describe ::Avm::Instances::Base do
     .stub_eac_config_node(self, ::File.join(__dir__, 'base_spec_configs_storage.yml'))
 
   describe '#read_entry' do
-    context 'when a auto value is requested' do
-      {
-        'app_0' => {
-          fs_path: '/fs_root/app_0',
-          data_fs_path: '/data_fs_root/app_0',
-          ::Avm::Instances::EntryKeys::DATABASE_NAME => 'app_0',
-          ::Avm::Instances::EntryKeys::DATABASE_USERNAME => 'user1',
-          ::Avm::Instances::EntryKeys::DATABASE_PASSWORD => 'pass1',
-          ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => 'database.net',
-          ::Avm::Instances::EntryKeys::DATABASE_PORT => 5432,
-          ::Avm::Instances::EntryKeys::SSH_HOSTNAME => 'myhost.com',
-          ::Avm::Instances::EntryKeys::SSH_USERNAME => 'myuser',
-          ::Avm::Instances::EntryKeys::SSH_URL => 'ssh://otheruser@otherhost.com'
-        },
-        'app_2' => {
-          ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => '127.0.0.1',
-          ::Avm::Instances::EntryKeys::SOURCE_INSTANCE_ID => 'app_dev'
-        },
-        'app_3' => {
-          ::Avm::Instances::EntryKeys::DATABASE_SYSTEM => 'postgresql',
-          ::Avm::Instances::EntryKeys::DATABASE_NAME => 'app_1_db',
-          ::Avm::Instances::EntryKeys::DATABASE_USERNAME => 'user1',
-          ::Avm::Instances::EntryKeys::DATABASE_PASSWORD => 'pass1',
-          ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => 'database.net',
-          ::Avm::Instances::EntryKeys::DATABASE_PORT => 5432,
-          ::Avm::Instances::EntryKeys::MAILER_ID => 'mailer_0',
-          ::Avm::Instances::EntryKeys::MAILER_FROM => 'noreply@example.net',
-          ::Avm::Instances::EntryKeys::MAILER_REPLY_TO => nil,
-          ::Avm::Instances::EntryKeys::MAILER_SMTP_ADDRESS => 'smtp.example.net',
-          ::Avm::Instances::EntryKeys::MAILER_SMTP_PORT => '587',
-          ::Avm::Instances::EntryKeys::MAILER_SMTP_DOMAIN => 'example.net',
-          ::Avm::Instances::EntryKeys::MAILER_SMTP_USERNAME => 'a_user',
-          ::Avm::Instances::EntryKeys::MAILER_SMTP_PASSWORD => 'a_secret',
-          ::Avm::Instances::EntryKeys::MAILER_SMTP_AUTHENTICATION => 'plain',
-          ::Avm::Instances::EntryKeys::MAILER_SMTP_STARTTLS_AUTO => 'true'
-        },
-        'mailer_0' => {
-          ::Avm::Instances::EntryKeys::MAILER_FROM => 'noreply@example.net',
-          ::Avm::Instances::EntryKeys::MAILER_REPLY_TO => '',
-          ::Avm::Instances::EntryKeys::MAILER_SMTP_ADDRESS => 'smtp.example.net',
-          ::Avm::Instances::EntryKeys::MAILER_SMTP_PORT => '587',
-          ::Avm::Instances::EntryKeys::MAILER_SMTP_DOMAIN => 'example.net',
-          ::Avm::Instances::EntryKeys::MAILER_SMTP_USERNAME => 'a_user',
-          ::Avm::Instances::EntryKeys::MAILER_SMTP_PASSWORD => 'a_secret',
-          ::Avm::Instances::EntryKeys::MAILER_SMTP_AUTHENTICATION => 'plain',
-          ::Avm::Instances::EntryKeys::MAILER_SMTP_STARTTLS_AUTO => 'true'
-        }
-      }.each do |instance_id, values|
-        values.each do |input, expected|
-          it "read entry #{instance_id}.#{input} should return \"#{expected}\"" do
+    {
+      'app_0' => {
+        fs_path: '/fs_root/app_0',
+        data_fs_path: '/data_fs_root/app_0',
+        ::Avm::Instances::EntryKeys::DATABASE_NAME => 'app_0',
+        ::Avm::Instances::EntryKeys::DATABASE_USERNAME => 'user1',
+        ::Avm::Instances::EntryKeys::DATABASE_PASSWORD => 'pass1',
+        ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => 'database.net',
+        ::Avm::Instances::EntryKeys::DATABASE_PORT => 5432,
+        ::Avm::Instances::EntryKeys::INSTALL_HOSTNAME => 'myhost.com',
+        ::Avm::Instances::EntryKeys::INSTALL_USERNAME => 'myuser',
+        ::Avm::Instances::EntryKeys::INSTALL_URL => 'ssh://otheruser@otherhost.com'
+      },
+      'app_2' => {
+        ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => '127.0.0.1',
+        ::Avm::Instances::EntryKeys::SOURCE_INSTANCE_ID => 'app_dev'
+      },
+      'app_3' => {
+        ::Avm::Instances::EntryKeys::DATABASE_SYSTEM => 'postgresql',
+        ::Avm::Instances::EntryKeys::DATABASE_NAME => 'app_1_db',
+        ::Avm::Instances::EntryKeys::DATABASE_USERNAME => 'user1',
+        ::Avm::Instances::EntryKeys::DATABASE_PASSWORD => 'pass1',
+        ::Avm::Instances::EntryKeys::DATABASE_HOSTNAME => 'database.net',
+        ::Avm::Instances::EntryKeys::DATABASE_PORT => 5432,
+        ::Avm::Instances::EntryKeys::MAILER_ID => 'mailer_0',
+        ::Avm::Instances::EntryKeys::MAILER_FROM => 'noreply@example.net',
+        ::Avm::Instances::EntryKeys::MAILER_REPLY_TO => nil,
+        ::Avm::Instances::EntryKeys::MAILER_SMTP_ADDRESS => 'smtp.example.net',
+        ::Avm::Instances::EntryKeys::MAILER_SMTP_PORT => '587',
+        ::Avm::Instances::EntryKeys::MAILER_SMTP_DOMAIN => 'example.net',
+        ::Avm::Instances::EntryKeys::MAILER_SMTP_USERNAME => 'a_user',
+        ::Avm::Instances::EntryKeys::MAILER_SMTP_PASSWORD => 'a_secret',
+        ::Avm::Instances::EntryKeys::MAILER_SMTP_AUTHENTICATION => 'plain',
+        ::Avm::Instances::EntryKeys::MAILER_SMTP_STARTTLS_AUTO => 'true'
+      },
+      'mailer_0' => {
+        ::Avm::Instances::EntryKeys::MAILER_FROM => 'noreply@example.net',
+        ::Avm::Instances::EntryKeys::MAILER_REPLY_TO => '',
+        ::Avm::Instances::EntryKeys::MAILER_SMTP_ADDRESS => 'smtp.example.net',
+        ::Avm::Instances::EntryKeys::MAILER_SMTP_PORT => '587',
+        ::Avm::Instances::EntryKeys::MAILER_SMTP_DOMAIN => 'example.net',
+        ::Avm::Instances::EntryKeys::MAILER_SMTP_USERNAME => 'a_user',
+        ::Avm::Instances::EntryKeys::MAILER_SMTP_PASSWORD => 'a_secret',
+        ::Avm::Instances::EntryKeys::MAILER_SMTP_AUTHENTICATION => 'plain',
+        ::Avm::Instances::EntryKeys::MAILER_SMTP_STARTTLS_AUTO => 'true'
+      }
+    }.each do |instance_id, values|
+      values.each do |input, expected|
+        context "when a auto value is requested for \"#{instance_id}.#{input}\"" do
+          it ".read_entry should return \"#{expected}\"" do
             expect(described_class.by_id(instance_id).read_entry(input)).to eq(expected)
           end
         end

data/sub/avm/spec/lib/avm/instances/base_spec_configs_storage.yml

@@ -1,17 +1,19 @@
 ---
 app_0:
-  host_id: app_1
+  install:
+    id: app_1
 app_1:
   fs_path: /fs_root
   data_fs_path: /data_fs_root
-  host_id: app_2
+  install:
+    id: app_2
   database:
     name: app_1_db
     username: user1
     password: pass1
     hostname: database.net
 app_2:
-  ssh:
+  install:
     hostname: myhost.com
     username: myuser
     url: ssh://otheruser@otherhost.com

data/sub/avm-eac_asciidoctor_base0/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/lib/avm/tools/runner/eac_asciidoctor_base0.rb → avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/runners/base.rb}

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
 require 'avm/eac_webapp_base0/runner'
-require 'avm/eac_asciidoctor_base0'
 
 module Avm
-  module Tools
-    class Runner
-      class EacAsciidoctorBase0 < ::Avm::EacWebappBase0::Runner
+  module EacAsciidoctorBase0
+    module Runners
+      class Base < ::Avm::EacWebappBase0::Runner
         require_sub __FILE__
       end
     end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/runners.rb

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

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/runners/build.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'avm/tools/core_ext'
+require 'avm/eac_asciidoctor_base0/sources/build'
+require 'os'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Sources
+      module Runners
+        class Build
+          runner_with :help do
+            desc 'Build the project'
+            arg_opt '-d', '--target-dir', 'Directory to build'
+            bool_opt '--open', 'Show the result.'
+          end
+
+          def run
+            start_banner
+            build.run
+            open
+          end
+
+          private
+
+          def build_uncached
+            ::Avm::EacAsciidoctorBase0::Sources::Build.new(runner_context.call(:project),
+                                                           target_directory: parsed.target_dir)
+          end
+
+          def default_target_directory
+            runner_context.call(:project).root.join('build')
+          end
+
+          def open
+            return unless parsed.open?
+
+            infom "Opening \"#{open_path}\"..."
+            ::EacRubyUtils::Envs.local.command(OS.open_file_command, open_path).system!
+          end
+
+          def open_path
+            build.source_files.first.target_path
+          end
+
+          def start_banner
+            runner_context.call(:project_banner)
+            infov 'Target directory', build.target_directory
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/runners.rb

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

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.3.4'
+    VERSION = '0.4.0'
   end
 end

data/sub/avm-eac_rails_base0/avm-eac_rails_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.80', '>= 0.80.2'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.4', '>= 0.4.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.97'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase0
-    VERSION = '0.6.0'
+    VERSION = '0.6.1'
   end
 end

data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -12,9 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.9', '>= 0.9.1'
+  s.add_dependency 'avm', '~> 0.31'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.11'
   s.add_dependency 'avm-eac_webapp_base0', '~> 0.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.97'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/systemd_unit.rb

@@ -38,7 +38,7 @@ module Avm
       end
 
       def user
-        instance.ssh_username
+        instance.install_username
       end
 
       private

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems/gemspec/add_or_replace_gem_line.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Rubygems
+      class Gemspec
+        class AddOrReplaceGemLine
+          enable_method_class
+          common_constructor :sender, :gem_name, :gem_specs
+          delegate :lines, to: :sender
+
+          DEPENDENCY_PREFIX = '  s.add_dependency'
+
+          def existing_gem_line_index
+            lines.index { |line| line.start_with?(gem_line_prefix) }
+          end
+
+          def result
+            if existing_gem_line_index.present?
+              replace_line
+            else
+              add_line
+            end
+          end
+
+          def add_line
+            lines.insert(add_line_index, new_gem_line)
+          end
+
+          def add_line_index
+            (gems_lines_start_index..(lines.count - 1)).each do |e|
+              return e if new_gem_line < lines[e]
+            end
+            lines.count
+          end
+
+          def gems_lines_start_index
+            lines.index { |line| line.start_with?(DEPENDENCY_PREFIX) } || lines.count
+          end
+
+          def new_gem_line
+            ([gem_line_prefix] + quoted_gem_specs).join(', ')
+          end
+
+          def gem_line_prefix
+            "#{DEPENDENCY_PREFIX} '#{gem_name}'"
+          end
+
+          def replace_line
+            lines[existing_gem_line_index] = new_gem_line
+          end
+
+          def quoted_gem_specs
+            gem_specs.map { |gem_spec| "'#{gem_spec}'" }
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems/gemspec/dependency.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Rubygems
+      class Gemspec
+        class Dependency
+          common_constructor :gemspec, :gem_name
+
+          def version_specs=(version_specs)
+            gemspec.add_or_replace_gem_line(gem_name, version_specs)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems/gemspec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Rubygems
+      class Gemspec
+        require_sub __FILE__, require_dependency: true
+
+        DEPENDENCY_LINE_PARSER = /s\.add_dependency\s*'(\S+)'/.to_parser { |m| m[1] }
+
+        class << self
+          def from_file(path)
+            new(path.read.each_line.map(&:rstrip))
+          end
+        end
+
+        common_constructor :lines
+
+        # @return [Avm::EacRubyBase1::Bundler::Gemfile::Dependency]
+        def dependency(gem_name)
+          ::Avm::EacRubyBase1::Rubygems::Gemspec::Dependency.new(self, gem_name)
+        end
+
+        # @return [Array<Avm::EacRubyBase1::Bundler::Gemfile::Dependency>]
+        def dependencies
+          lines.lazy.map { |line| DEPENDENCY_LINE_PARSER.parse(line) }.reject(&:blank?)
+            .map { |gem_name| dependency(gem_name) }.to_a
+        end
+
+        def write(path)
+          path.to_pathname.write(to_text)
+        end
+
+        def to_text
+          lines.map { |line| "#{line}\n" }.join
+        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.11.0'
+    VERSION = '0.12.0'
   end
 end

data/sub/avm-eac_webapp_base0/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-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/eac_webapp_base0/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-eac_webapp_base0'
+  s.version     = Avm::EacWebappBase0::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib,template}/**/*']
+
+  s.add_dependency 'avm', '~> 0.1'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.1'
+  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.1'
+  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
+  s.add_dependency 'eac_ruby_utils', '~> 0.68'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
+end