eac_tools 0.10.0 → 0.12.0

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/config.ru

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# This file is used by Rack-based servers to start the application.
+
+require_relative 'config/environment'
+
+run Rails.application

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/db/schema.rb

@@ -0,0 +1 @@
+

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/lib/ability.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class Ability < ::EacRailsBase0::AppBase::Ability
+  def initialize(user)
+    super(user)
+    user ||= ::EacUsersSupport::User.new
+    for_all_permissions(user)
+    logged_permissions(user) unless user.new_record?
+  end
+
+  private
+
+  def for_all_permissions(_user)
+    can :read, :welcome
+  end
+
+  def logged_permissions(_user)
+    can :manage, :all
+  end
+end

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/lib/ability_mapping.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/simple_cache'
+
+class AbilityMapping < ::EacRailsBase0::AppBase::AbilityMapping
+  def initialize
+    super
+    map_action 'Welcome', 'index', :read, :welcome
+  end
+end

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/spec/ruby_style_spec.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/sub/avm-eac_rails_base0/template/avm/eac_rails_base0/source_generators/base/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
+
+::RSpec.configure do |conf|
+  conf.global_fixtures = :all
+end

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

@@ -12,6 +12,7 @@ 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'

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/version.rb

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

data/sub/avm-tools/README.textile

@@ -26,14 +26,3 @@ h2. Instance's entries suffixes
 | system.username | Name of user that runs instance | @host_id->system.username or self->ssh.username@ |
 | web.url | Root URL to web interface | @nil@ |
 | web.hostname | Hostname of web interface | @web.url->hostname@ |
-
-h2. Instances' types hierarchy
-
-* base
-** eac_ruby_base0
-** eac_ubuntu_base0
-** eac_webapp_base0
-*** eac_rails_base1
-**** eac_rails_base0
-**** eac_redmine_base0
-*** eac_wordpress_base0

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

@@ -15,10 +15,8 @@ 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.27'
+  s.add_dependency 'avm', '~> 0.30'
   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/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/runner/source_generate.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'avm/runners/base'
+require 'eac_cli/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class SourceGenerate
+        runner_with :help do
+          pos_arg :stereotype_name
+          pos_arg :target_path
+        end
+
+        def run
+          start_banner
+          generate
+        end
+
+        def generate
+          infom 'Generating...'
+          generator.perform
+          success "Source generated in \"#{generator.target_path}\""
+        end
+
+        def start_banner
+          infov 'Stereotype', stereotype_name
+          infov 'Target path', target_path
+          infov 'Generator', generator.class
+        end
+
+        def generator_uncached
+          ::Avm::Registry.source_generators.detect_optional(stereotype_name, target_path) ||
+            fatal_error("No generator found for stereotype \"#{stereotype_name}\"")
+        end
+
+        delegate :stereotype_name, to: :parsed
+
+        def target_path
+          parsed.target_path.to_pathname
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.124.0'
+    VERSION = '0.127.0'
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/require_sub/base.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/listable'
+require 'eac_ruby_utils/require_sub/sub_file'
+
+module EacRubyUtils
+  module RequireSub
+    class Base
+      INCLUDE_MODULES_MAP = {
+        nil => nil,
+        false => nil,
+        true => :include,
+        include: :include,
+        prepend: :prepend
+      }.freeze
+
+      include ::EacRubyUtils::Listable
+      lists.add_symbol :option, :base, :include_modules, :require_dependency
+
+      attr_reader :file, :options
+
+      def initialize(file, options = {})
+        @file = file
+        @options = self.class.lists.option.hash_keys_validate!(options)
+      end
+
+      # @return [Boolean]
+      def active_support_require?
+        options[OPTION_REQUIRE_DEPENDENCY] ? true : false
+      end
+
+      def apply
+        require_sub_files
+        include_modules
+      end
+
+      def base
+        options[OPTION_BASE] || raise('Option :base not setted')
+      end
+
+      def base?
+        options[OPTION_BASE] ? true : false
+      end
+
+      def include_modules
+        sub_files.each(&:include_module)
+      end
+
+      def include_or_prepend_method
+        return INCLUDE_MODULES_MAP.fetch(options[OPTION_INCLUDE_MODULES]) if
+        INCLUDE_MODULES_MAP.key?(options[OPTION_INCLUDE_MODULES])
+
+        raise ::ArgumentError, "Invalid value for 'options[OPTION_INCLUDE_MODULES]':" \
+          " \"#{options[OPTION_INCLUDE_MODULES]}\""
+      end
+
+      def require_sub_files
+        sub_files.each(&:require_file)
+      end
+
+      def sub_files
+        @sub_files ||= Dir["#{File.dirname(file)}/#{::File.basename(file, '.*')}/*.rb"].sort
+                         .map { |path| ::EacRubyUtils::RequireSub::SubFile.new(self, path) }
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/require_sub/sub_file.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'active_support/dependencies'
+require 'active_support/inflector'
+
+module EacRubyUtils
+  module RequireSub
+    class SubFile
+      attr_reader :owner, :path
+
+      def initialize(owner, path)
+        @owner = owner
+        @path = path
+      end
+
+      def base_constant
+        return nil unless owner.base?
+
+        owner.base.const_get(constant_name)
+      rescue ::NameError
+        nil
+      end
+
+      def constant_name
+        ::ActiveSupport::Inflector.camelize(::File.basename(path, '.rb'))
+      end
+
+      def include_module
+        return unless module?
+
+        owner.include_or_prepend_method.if_present do |v|
+          owner.base.send(v, base_constant)
+        end
+      end
+
+      def module?
+        base_constant.is_a?(::Module) && !base_constant.is_a?(::Class)
+      end
+
+      def require_file
+        active_support_require || autoload_require || kernel_require
+      end
+
+      private
+
+      def active_support_require
+        return false unless owner.active_support_require?
+
+        ::Kernel.require_dependency(path)
+        true
+      end
+
+      def autoload_require
+        return false unless owner.base?
+
+        basename = ::File.basename(path, '.*')
+        return false if basename.start_with?('_')
+
+        owner.base.autoload ::ActiveSupport::Inflector.camelize(basename), path
+        true
+      end
+
+      def kernel_require
+        ::Kernel.require(path)
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/require_sub.rb

@@ -1,134 +1,11 @@
 # frozen_string_literal: true
 
-require 'active_support/inflector'
-require 'active_support/dependencies'
-require 'eac_ruby_utils/listable'
+require 'eac_ruby_utils/require_sub/base'
 
 module EacRubyUtils
   class << self
     def require_sub(file, options = {})
-      ::EacRubyUtils::RequireSub.new(file, options).apply
-    end
-  end
-
-  class RequireSub
-    INCLUDE_MODULES_MAP = {
-      nil => nil,
-      false => nil,
-      true => :include,
-      include: :include,
-      prepend: :prepend
-    }.freeze
-
-    include ::EacRubyUtils::Listable
-    lists.add_symbol :option, :base, :include_modules, :require_dependency
-
-    attr_reader :file, :options
-
-    def initialize(file, options = {})
-      @file = file
-      @options = self.class.lists.option.hash_keys_validate!(options)
-    end
-
-    def apply
-      require_sub_files
-      include_modules
-    end
-
-    def base
-      options[OPTION_BASE] || raise('Option :base not setted')
-    end
-
-    def base?
-      options[OPTION_BASE] ? true : false
-    end
-
-    def include_modules
-      sub_files.each(&:include_module)
-    end
-
-    def include_or_prepend_method
-      return INCLUDE_MODULES_MAP.fetch(options[OPTION_INCLUDE_MODULES]) if
-        INCLUDE_MODULES_MAP.key?(options[OPTION_INCLUDE_MODULES])
-
-      raise ::ArgumentError, "Invalid value for 'options[OPTION_INCLUDE_MODULES]':" \
-         " \"#{options[OPTION_INCLUDE_MODULES]}\""
-    end
-
-    def require_sub_files
-      sub_files.each(&:require_file)
-    end
-
-    def sub_files
-      @sub_files ||= Dir["#{File.dirname(file)}/#{::File.basename(file, '.*')}/*.rb"].sort
-                       .map { |path| SubFile.new(self, path) }
-    end
-
-    class SubFile
-      attr_reader :owner, :path
-
-      def initialize(owner, path)
-        @owner = owner
-        @path = path
-      end
-
-      def base_constant
-        return nil unless owner.base?
-
-        owner.base.const_get(constant_name)
-      rescue ::NameError
-        nil
-      end
-
-      def constant_name
-        ::ActiveSupport::Inflector.camelize(::File.basename(path, '.rb'))
-      end
-
-      def include_module
-        return unless module?
-
-        owner.include_or_prepend_method.if_present do |v|
-          owner.base.send(v, base_constant)
-        end
-      end
-
-      def include_or_prepend_method
-        return :include if owner.options[OPTION_INCLUDE_MODULES]
-        return :prepend if owner.options[OPTION_PREPEND_MODULES]
-
-        nil
-      end
-
-      def module?
-        base_constant.is_a?(::Module) && !base_constant.is_a?(::Class)
-      end
-
-      def require_file
-        active_support_require || autoload_require || kernel_require
-      end
-
-      private
-
-      def active_support_require
-        return false unless owner.options[OPTION_REQUIRE_DEPENDENCY]
-
-        ::Kernel.require_dependency(path)
-        true
-      end
-
-      def autoload_require
-        return false unless owner.base?
-
-        basename = ::File.basename(path, '.*')
-        return false if basename.start_with?('_')
-
-        owner.base.autoload ::ActiveSupport::Inflector.camelize(basename), path
-        true
-      end
-
-      def kernel_require
-        ::Kernel.require(path)
-      end
+      ::EacRubyUtils::RequireSub::Base.new(file, options).apply
     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.96.0'
+  VERSION = '0.96.1'
 end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/{require_sub_spec.rb → require_sub/base_spec.rb}

@@ -5,7 +5,7 @@ require 'eac_ruby_utils/require_sub'
 class RequireSubStubClass
 end
 
-RSpec.describe ::EacRubyUtils::RequireSub do
+RSpec.describe ::EacRubyUtils::RequireSub::Base do
   let(:instance) { described_class.new(__FILE__, base: RequireSubStubClass, include_modules: true) }
 
   before do