eac_tools 0.15.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 435984e41a0bf529de374dc9e4640143f9e9caf7a26118d11ce65e6879488ed2
-  data.tar.gz: 99c63bd9a4b686211df32d65762873913e21b245a21535e3bc0f3ef8d9e81080
+  metadata.gz: 331f73c00105798972e35c3eb8049f412eceecf7ce6805f2b96be3d97999c3c9
+  data.tar.gz: ebe8e2dc8c9245bfa657a9ff036620280e4e81c808e85f98bc543758bac64738
 SHA512:
-  metadata.gz: 31d1736330d976d3a50e14fa312b2ce826227fea5da3fb3a9bfd846a9a870a7a36244f11f7ac77989bd6773f6f8dbf797ed4065b0061256dbaacd4468d047052
-  data.tar.gz: ec2df47e102ed54df74f8f35ffb52038d272c20879900c88aaf27058be34c0d2527a96b6f21c4c0dd81b0a70d42d1ff6e166d045a311c9cd411cdc89ebb2afbe
+  metadata.gz: 2cb086332be7545caf2bd3d288f35c11ab444b7dc826a7798f8b45c65e6e33a10e7209c19e72acb2a7c5ae5940cd55881c9c94fe9f4786c0093d2fe87cf7ada3
+  data.tar.gz: c4376b3c09a9c577c2c97e6434edbd13d268d21d09d1a6d5ec4e2808ca56d2c3cb3f094cdcda91e964eef70b6480407b693a8913af4b0b6427221580250ef8b4

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.15.0)
+    eac_tools (0.17.0)
       avm-eac_asciidoctor_base0 (~> 0.4)
       avm-eac_generic_base0 (~> 0.4)
       avm-eac_rails_base0 (~> 0.6, >= 0.6.1)
       avm-eac_rails_base1 (~> 0.4, >= 0.4.2)
       avm-eac_redmine_base0 (~> 0.11)
       avm-eac_redmine_plugin_base0 (~> 0.3)
-      avm-eac_ruby_base1 (~> 0.12)
+      avm-eac_ruby_base1 (~> 0.13)
       avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
-      avm-tools (~> 0.128)
+      avm-eac_wordpress_base0 (~> 0.1)
+      avm-tools (~> 0.130)
       eac_ruby_utils (~> 0.97)
 
 PATH
@@ -69,8 +70,8 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.12.0)
-      avm (~> 0.26)
+    avm-eac_ruby_base1 (0.13.0)
+      avm (~> 0.34)
       avm-eac_generic_base0 (~> 0.2)
       eac_ruby_utils (~> 0.95, >= 0.95.1)
 
@@ -84,26 +85,35 @@ PATH
       avm-eac_ubuntu_base0 (~> 0.3)
       eac_ruby_utils (~> 0.68)
 
+PATH
+  remote: sub/avm-eac_wordpress_base0
+  specs:
+    avm-eac_wordpress_base0 (0.1.0)
+      avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
+      eac_ruby_utils (~> 0.97)
+
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.128.0)
+    avm-tools (0.130.0)
       aranha-parsers (~> 0.4)
-      avm (~> 0.30)
+      avm (~> 0.34)
       avm-eac_ruby_base1 (~> 0.8)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.1)
       avm-git (~> 0.3, >= 0.3.1)
       clipboard (~> 1.3, >= 1.3.3)
       curb (~> 0.9.10)
+      eac_git (~> 0.12, >= 0.12.1)
       eac_ruby_base0 (~> 0.16, >= 0.16.4)
+      eac_templates (~> 0.3, >= 0.3.1)
       git (~> 1.7)
       ruby-progressbar (~> 1.10, >= 1.10.1)
 
 PATH
   remote: sub/avm
   specs:
-    avm (0.33.0)
+    avm (0.34.0)
       eac_cli (~> 0.27, >= 0.27.6)
       eac_config (~> 0.10)
       eac_docker (~> 0.3)
@@ -327,6 +337,7 @@ DEPENDENCIES
   avm-eac_redmine_plugin_base0!
   avm-eac_ruby_base1!
   avm-eac_webapp_base0!
+  avm-eac_wordpress_base0!
   avm-tools!
   eac_cli!
   eac_config!

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.15.0'
+  VERSION = '0.17.0'
 end

data/sub/avm/lib/avm/registry/source_generators.rb

@@ -8,8 +8,9 @@ module Avm
     class SourceGenerators < ::Avm::Registry::FromGems
       # @return [Avm::Instances::Base, nil]
       def class_detect(klass, detect_args)
-        stereotype_name, target_path = detect_args
-        klass.application_stereotype.name == stereotype_name ? klass.new(target_path) : nil
+        detect_args = detect_args.dup
+        stereotype_name = detect_args.shift
+        klass.application_stereotype.name == stereotype_name ? klass.new(*detect_args) : nil
       end
     end
   end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/source_generators/option_list'
 require 'avm/with/application_stereotype'
 require 'eac_ruby_utils/core_ext'
 
@@ -7,8 +8,22 @@ module Avm
   module SourceGenerators
     class Base
       include ::Avm::With::ApplicationStereotype
-      common_constructor :target_path do
+
+      class << self
+        # @return [Avm::SourceGenerators::OptionList]
+        def option_list
+          Avm::SourceGenerators::OptionList.new
+        end
+      end
+
+      common_constructor :target_path, :options, default: [{}] do
         self.target_path = target_path.to_pathname
+        self.options = option_list.validate(options)
+      end
+
+      # @return [Avm::SourceGenerators::OptionList]
+      def option_list
+        self.class.option_list
       end
 
       def perform

data/sub/avm/lib/avm/source_generators/option.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Avm
+  module SourceGenerators
+    class Option
+      common_constructor :name, :description, default: [nil] do
+        self.name = name.to_sym
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/source_generators/option_list.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'avm/source_generators/option'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module SourceGenerators
+    class OptionList
+      enable_immutable
+      immutable_accessor :option, type: :array
+
+      alias immutable_option option
+
+      def option(*args)
+        immutable_option(::Avm::SourceGenerators::Option.new(*args))
+      end
+
+      # @return [Hash<Symbol, String>]
+      def validate(options_hash)
+        options_hash.transform_keys { |k| validate_option(k) }
+      end
+
+      def validate_option(option_name)
+        option_name = option_name.to_sym
+
+        return option_name if options.any? { |option| option.name == option_name }
+
+        raise "No option found with name \"#{option_name}\""
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/source_generators/runner.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/registry'
+require 'eac_cli/core_ext'
+
+module Avm
+  module SourceGenerators
+    class Runner
+      OPTION_NAME_VALUE_SEPARATOR = ':'
+
+      runner_with :help do
+        arg_opt '-o', '--option', 'Option for generator.', repeat: true, optional: true
+        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, options) ||
+          fatal_error("No generator found for stereotype \"#{stereotype_name}\"")
+      end
+
+      delegate :stereotype_name, to: :parsed
+
+      # @return [Hash<String, String>]
+      def options
+        parsed.option.map { |v| v.split(OPTION_NAME_VALUE_SEPARATOR) }.to_h
+      end
+
+      def target_path
+        parsed.target_path.to_pathname
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module Sources
+    class Runner
+      runner_with :help, :subcommands do
+        desc 'Root command for sources.'
+        arg_opt '-C', '--path', 'Path to the source.', default: '.'
+        subcommands
+      end
+
+      def extra_available_subcommands
+        optional_source.if_present({}, &:extra_available_subcommands)
+      end
+
+      def source_banner
+        infov 'Source', source
+      end
+
+      # @return [Pathname]
+      def source_path
+        parsed.path.to_pathname
+      end
+
+      private
+
+      def source_uncached
+        ::Avm::Registry.sources.detect(source_path)
+      end
+
+      def optional_source_uncached
+        ::Avm::Registry.sources.detect_optional(source_path)
+      end
+    end
+  end
+end

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

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

data/sub/avm/spec/lib/avm/sources/runner_spec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'avm/sources/runner'
+
+::RSpec.describe ::Avm::Sources::Runner do
+  it do
+    expect { described_class.run(argv: %w[--help]) }.not_to raise_error
+  end
+end

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

@@ -10,9 +10,9 @@ Gem::Specification.new do |s|
   s.authors     = ['Put here the authors']
   s.summary     = 'Put here de description.'
 
-  s.files = Dir['{lib,locale}/**/*']
+  s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.26'
+  s.add_dependency 'avm', '~> 0.34'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.2'
   s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.1'
 

data/sub/{avm-tools/lib/avm/ruby/gems/generator.rb → avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators/base.rb}

@@ -1,22 +1,33 @@
 # frozen_string_literal: true
 
 require 'avm/eac_ruby_base1/sources/base'
+require 'avm/source_generators/base'
 require 'eac_templates/core_ext'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Ruby
-    module Gems
-      class Generator
+  module EacRubyBase1
+    module SourceGenerators
+      class Base < ::Avm::SourceGenerators::Base
         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
-        common_constructor :root_directory, :options, default: [{}] do
-          self.root_directory = root_directory.to_pathname
-          run
+
+        class << self
+          def option_list
+            OPTIONS.inject(super) { |a, e| a.option(*e) }
+          end
+        end
+
+        def root_directory
+          target_path
         end
 
         def eac_ruby_gem_support_version
@@ -35,6 +46,15 @@ module Avm
           name.split('-').join('/')
         end
 
+        def perform
+          infov 'Root directory', root_directory
+          infov 'Gem name', name
+          JOBS.each do |job|
+            infom "Generating #{job.humanize}..."
+            send("generate_#{job}")
+          end
+        end
+
         def root_module
           lib_path.camelize
         end
@@ -101,15 +121,6 @@ module Avm
           template_apply('version', "lib/#{lib_path}/version.rb")
         end
 
-        def run
-          infov 'Root directory', root_directory
-          infov 'Gem name', name
-          JOBS.each do |job|
-            infom "Generating #{job.humanize}..."
-            send("generate_#{job}")
-          end
-        end
-
         def self_gem_uncached
           ::Avm::EacRubyBase1::Sources::Base.new(root_directory)
         end
@@ -154,7 +165,7 @@ module Avm
           end
 
           def options_version
-            options["#{gem_name}_version".to_sym].if_present do |v|
+            options["#{gem_name}_version".dasherize.to_sym].if_present do |v|
               ::Gem::Version.new(v)
             end
           end

data/sub/{avm-tools/lib/avm/ruby/gems.rb → avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators.rb}

@@ -3,8 +3,8 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Ruby
-    module Gems
+  module EacRubyBase1
+    module SourceGenerators
       require_sub __FILE__
     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.12.0'
+    VERSION = '0.13.0'
   end
 end

data/sub/{avm-tools/spec/lib/avm/tools/runner/ruby/gems/generate_spec.rb → avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec.rb}

@@ -1,22 +1,24 @@
 # frozen_string_literal: true
 
-require 'avm/tools/runner'
+require 'avm/eac_ruby_base1/source_generators/base'
+require 'avm/source_generators/runner'
 
-RSpec.describe ::Avm::Tools::Runner::Ruby::Gems::Generate do
-  let(:targets_root) { ::Pathname.new('generate_spec_files').expand_path(__dir__) }
+RSpec.describe ::Avm::EacRubyBase1::SourceGenerators::Base do
+  let(:targets_root) { ::Pathname.new('base_spec_files').expand_path(__dir__) }
 
   %w[mygem dashed-mygem].each do |gem_name|
     context "when runner is executed for #{gem_name}" do
+      let(:stereotype) { 'EacRubyBase1' }
       let(:target_dir) { targets_root.join(gem_name) }
       let(:temp_dir) { ::EacRubyUtils::Fs::Temp.directory }
       let(:gem_path) { temp_dir.join(gem_name) }
       let(:argv) do
-        %w[ruby gems generate --eac-ruby-utils-version=0.35.0
-           --eac-ruby-gem-support-version=0.2.0] + [gem_path.to_path]
+        %w[--option eac-ruby-utils-version:0.35.0 --option eac-ruby-gem-support-version:0.2.0] +
+          [stereotype, gem_path.to_path]
       end
 
       before do
-        ::Avm::Tools::Runner.run(argv: argv)
+        ::Avm::SourceGenerators::Runner.run(argv: argv)
       end
 
       after do

data/sub/avm-eac_wordpress_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_wordpress_base0/avm-eac_wordpress_base0.gemspec

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/eac_wordpress_base0/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-eac_wordpress_base0'
+  s.version     = Avm::EacWordpressBase0::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib,template}/**/*']
+
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.3', '>= 0.3.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.97'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
+end

data/sub/avm-eac_wordpress_base0/lib/avm/eac_wordpress_base0/instances/apache_host.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/apache_host'
+
+module Avm
+  module EacWordpressBase0
+    module Instances
+      class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
+        def document_root
+          instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+        end
+
+        def extra_content
+          "AssignUserID #{system_user} #{system_group}"
+        end
+
+        def system_user
+          instance.read_entry('system.username')
+        end
+
+        def system_group
+          instance.read_entry('system.groupname')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entry_keys'
+require 'avm/eac_webapp_base0/instance'
+
+module Avm
+  module EacWordpressBase0
+    module Instances
+      class Base < ::Avm::EacWebappBase0::Instance
+        FILES_UNITS = { uploads: 'wp-content/uploads', themes: 'wp-content/themes' }.freeze
+
+        def database_unit
+          web_url = read_entry(::Avm::Instances::EntryKeys::WEB_URL)
+          super.after_load do
+            info 'Fixing web addresses...'
+            run_sql(<<~SQL)
+              update wp_options
+              set option_value = '#{web_url}'
+              where option_name in ('siteurl', 'home')
+            SQL
+          end
+        end
+      end
+    end
+  end
+end

data/sub/{avm-tools/lib/avm/eac_wordpress_base0 → avm-eac_wordpress_base0/lib/avm/eac_wordpress_base0/instances}/deploy.rb

@@ -4,7 +4,9 @@ require 'avm/eac_webapp_base0/deploy'
 
 module Avm
   module EacWordpressBase0
-    class Deploy < ::Avm::EacWebappBase0::Deploy
+    module Instances
+      class Deploy < ::Avm::EacWebappBase0::Deploy
+      end
     end
   end
 end

data/sub/{avm-tools/sub/avm-eac_ubuntu_base0/lib/avm/eac_ubuntu_base0 → avm-eac_wordpress_base0/lib/avm/eac_wordpress_base0}/instances.rb

@@ -3,7 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module EacUbuntuBase0
+  module EacWordpressBase0
     module Instances
       require_sub __FILE__
     end

data/sub/{avm-tools/lib/avm/tools/runner/eac_wordpress_base0.rb → avm-eac_wordpress_base0/lib/avm/eac_wordpress_base0/runners/base.rb}

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
 require 'avm/eac_webapp_base0/runner'
-require 'avm/eac_wordpress_base0'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Tools
-    class Runner
-      class EacWordpressBase0 < ::Avm::EacWebappBase0::Runner
+  module EacWordpressBase0
+    module Runners
+      class Base < ::Avm::EacWebappBase0::Runner
         require_sub __FILE__
       end
     end

data/sub/{avm-tools/sub/avm-git/lib/avm/git/organize.rb → avm-eac_wordpress_base0/lib/avm/eac_wordpress_base0/runners.rb}

@@ -3,8 +3,8 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Git
-    module Organize
+  module EacWordpressBase0
+    module Runners
       require_sub __FILE__
     end
   end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Avm
-  module Git
-    VERSION = '0.4.0'
+  module EacWordpressBase0
+    VERSION = '0.1.0'
   end
 end