eac_tools 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8e33f3e6179cddcf3aaa81d8bed6e2396944fb81bc6064ebaaf2101301db2ff
-  data.tar.gz: 6217ef998e5b4222b90295be158905905e12573cf1d83ace772a70325de003c4
+  metadata.gz: 435984e41a0bf529de374dc9e4640143f9e9caf7a26118d11ce65e6879488ed2
+  data.tar.gz: 99c63bd9a4b686211df32d65762873913e21b245a21535e3bc0f3ef8d9e81080
 SHA512:
-  metadata.gz: 49ab7e7819b789a1b13fb29c86c93f8b11c36f5b7d7b4ccc7e42aa62e211b5989c6f1fc5e04db2fa39266cbbb192286ad444ee55d0be1e31e7977895376418d5
-  data.tar.gz: 4cd10a7625697c078772c15883487e35644986a5bccaff9a06e4ad0f5467fffe82db0ab17aa404dfd3245112bf1c5f924bd247cbe361614ba5021cd0156902f0
+  metadata.gz: 31d1736330d976d3a50e14fa312b2ce826227fea5da3fb3a9bfd846a9a870a7a36244f11f7ac77989bd6773f6f8dbf797ed4065b0061256dbaacd4468d047052
+  data.tar.gz: ec2df47e102ed54df74f8f35ffb52038d272c20879900c88aaf27058be34c0d2527a96b6f21c4c0dd81b0a70d42d1ff6e166d045a311c9cd411cdc89ebb2afbe

data/Gemfile.lock

@@ -1,16 +1,28 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.14.0)
+    eac_tools (0.15.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-tools (~> 0.127)
+      avm-eac_webapp_base0 (~> 0.3, >= 0.3.1)
+      avm-tools (~> 0.128)
       eac_ruby_utils (~> 0.97)
 
+PATH
+  remote: sub/avm-eac_asciidoctor_base0
+  specs:
+    avm-eac_asciidoctor_base0 (0.4.0)
+      asciidoctor (~> 2.0, >= 2.0.12)
+      avm-eac_webapp_base0 (~> 0.2)
+      eac_ruby_utils (~> 0.63)
+      os
+      rouge (~> 3.26)
+
 PATH
   remote: sub/avm-eac_generic_base0
   specs:
@@ -62,13 +74,22 @@ PATH
       avm-eac_generic_base0 (~> 0.2)
       eac_ruby_utils (~> 0.95, >= 0.95.1)
 
+PATH
+  remote: sub/avm-eac_webapp_base0
+  specs:
+    avm-eac_webapp_base0 (0.3.1)
+      avm (~> 0.1)
+      avm-eac_generic_base0 (~> 0.1)
+      avm-eac_postgresql_base0 (~> 0.1)
+      avm-eac_ubuntu_base0 (~> 0.3)
+      eac_ruby_utils (~> 0.68)
+
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.127.0)
+    avm-tools (0.128.0)
       aranha-parsers (~> 0.4)
       avm (~> 0.30)
-      avm-eac_asciidoctor_base0 (~> 0.3, >= 0.3.4)
       avm-eac_ruby_base1 (~> 0.8)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.1)
@@ -82,7 +103,7 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.32.0)
+    avm (0.33.0)
       eac_cli (~> 0.27, >= 0.27.6)
       eac_config (~> 0.10)
       eac_docker (~> 0.3)
@@ -164,12 +185,6 @@ GEM
       ofx-parser (~> 1.1.0)
     asciidoctor (2.0.17)
     ast (2.4.2)
-    avm-eac_asciidoctor_base0 (0.3.4)
-      asciidoctor (~> 2.0, >= 2.0.12)
-      avm-eac_webapp_base0 (~> 0.2)
-      eac_ruby_utils (~> 0.63)
-      os
-      rouge (~> 3.26)
     avm-eac_postgresql_base0 (0.2.0)
       avm (~> 0.12, >= 0.12.1)
       eac_ruby_utils (~> 0.82)
@@ -177,12 +192,6 @@ GEM
       avm (~> 0.7)
       eac_ruby_utils (~> 0.77, >= 0.77.1)
       eac_templates (~> 0.3)
-    avm-eac_webapp_base0 (0.3.0)
-      avm (~> 0.1)
-      avm-eac_generic_base0 (~> 0.1)
-      avm-eac_postgresql_base0 (~> 0.1)
-      avm-eac_ubuntu_base0 (~> 0.3)
-      eac_ruby_utils (~> 0.68)
     avm-files (0.3.2)
       avm (~> 0.6)
       eac_fs (~> 0.5)
@@ -310,12 +319,14 @@ PLATFORMS
 
 DEPENDENCIES
   avm!
+  avm-eac_asciidoctor_base0!
   avm-eac_generic_base0!
   avm-eac_rails_base0!
   avm-eac_rails_base1!
   avm-eac_redmine_base0!
   avm-eac_redmine_plugin_base0!
   avm-eac_ruby_base1!
+  avm-eac_webapp_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.14.0'
+  VERSION = '0.15.0'
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/instances/entries'
+require 'avm/entries/base'
 require 'avm/registry'
 require 'eac_ruby_utils/core_ext'
 
@@ -9,7 +9,7 @@ module Avm
     class Base
       enable_simple_cache
       require_sub __FILE__, include_modules: true
-      include ::Avm::Instances::Entries
+      include ::Avm::Entries::Base
 
       LOCAL_INSTANCE_SUFFIX = 'dev'
 

data/sub/avm/lib/avm/entries/auto_values/entry.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_config/node'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module AutoValues
+      class Entry
+        class << self
+          def auto_value_method_name(suffix)
+            "auto_#{suffix.to_s.gsub('.', '_')}"
+          end
+        end
+
+        common_constructor :entries_provider, :suffix
+
+        def auto_value_method
+          self.class.auto_value_method_name(suffix)
+        end
+
+        def found?
+          entries_provider.respond_to?(auto_value_method, true)
+        end
+
+        def value
+          entries_provider.if_respond(auto_value_method)
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/auto_values.rb

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

data/sub/avm/lib/avm/{instances/entries.rb → entries/base.rb}

@@ -1,17 +1,21 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avm/instances/entry'
+require 'avm/entries/entry'
 
 module Avm
-  module Instances
-    module Entries
+  module Entries
+    module Base
+      def entries_provider_id
+        id
+      end
+
       def entry(suffix, options = {})
-        ::Avm::Instances::Entry.new(self, suffix, options)
+        ::Avm::Entries::Entry.new(self, suffix, options)
       end
 
       def path_prefix
-        @path_prefix ||= [id].freeze
+        @path_prefix ||= [entries_provider_id].freeze
       end
 
       def read_entry(entry_suffix, options = {})

data/sub/avm/lib/avm/{instances → entries}/entry.rb

@@ -1,25 +1,16 @@
 # frozen_string_literal: true
 
+require 'avm/entries/auto_values/entry'
 require 'eac_config/node'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Instances
+  module Entries
     class Entry
-      class << self
-        def auto_value_method_name(suffix)
-          "auto_#{suffix.to_s.gsub('.', '_')}"
-        end
-      end
-
       common_constructor :parent, :suffix, :options
 
       def auto_value
-        parent.respond_to?(auto_value_method, true) ? parent.send(auto_value_method) : nil
-      end
-
-      def auto_value_method
-        self.class.auto_value_method_name(suffix)
+        ::Avm::Entries::AutoValues::Entry.new(parent, suffix).value
       end
 
       def full_path

data/sub/avm/lib/avm/entries.rb

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

data/sub/avm/lib/avm/instances/base/auto_values/mailer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/instances/entry'
+require 'avm/entries/auto_values/entry'
+require 'avm/entries/entry'
 require 'avm/instances/entry_keys'
 
 module Avm
@@ -11,7 +12,7 @@ module Avm
           ::Avm::Instances::EntryKeys.all.select { |c| c.to_s.start_with?('mailer.') }
             .reject { |c| c == ::Avm::Instances::EntryKeys::MAILER_ID }
             .each do |mailer_key|
-            define_method ::Avm::Instances::Entry.auto_value_method_name(mailer_key) do
+            define_method ::Avm::Entries::AutoValues::Entry.auto_value_method_name(mailer_key) do
               mailer_auto_common(mailer_key)
             end
           end

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

@@ -4,7 +4,7 @@ require 'avm/with/application_stereotype'
 require 'avm/with/extra_subcommands'
 require 'eac_ruby_utils/require_sub'
 require 'eac_ruby_utils/simple_cache'
-require 'avm/instances/entries'
+require 'avm/entries/base'
 
 module Avm
   module Instances
@@ -13,7 +13,7 @@ module Avm
       enable_listable
       enable_simple_cache
       require_sub __FILE__, include_modules: true
-      include ::Avm::Instances::Entries
+      include ::Avm::Entries::Base
       include ::Avm::With::ExtraSubcommands
       include ::Avm::With::ApplicationStereotype
 

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

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

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_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

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/apache_host.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_templates/core_ext'
+
+module Avm
+  module EacWebappBase0
+    class ApacheHost
+      JOBS = %w[write_available_no_ssl_site enable_no_ssl_site remove_ssl_site reload_apache
+                run_certbot enable_ssl_site reload_apache].freeze
+      include ::Avm::Jobs::Base
+
+      def no_ssl_site_content
+        ::Avm::EacWebappBase0::ApacheHost
+          .template.child('no_ssl.conf')
+          .apply(variables_source)
+      end
+
+      def ssl?
+        options[:certbot]
+      end
+
+      private
+
+      def apache_uncached
+        ::Avm::EacUbuntuBase0::Apache.new(instance.host_env)
+      end
+
+      def enable_no_ssl_site
+        infom 'Enabling no SSL site...'
+        no_ssl_site.enable
+      end
+
+      def enable_ssl_site
+        return unless ssl?
+
+        infom 'Enabling SSL site...'
+        ssl_site.enable
+      end
+
+      def no_ssl_site_uncached
+        apache.site(instance.id)
+      end
+
+      def reload_apache
+        infom 'Reloading Apache...'
+        apache.service('reload')
+      end
+
+      def remove_ssl_site
+        infom 'Removing SSL site...'
+        ssl_site.remove
+      end
+
+      def run_certbot
+        return unless ssl?
+
+        infom 'Running Certbot...'
+        instance.host_env.command(
+          'sudo', 'certbot', '--apache', '--domain', instance.read_entry('web.hostname'),
+          '--redirect', '--non-interactive', '--agree-tos',
+          '--email', instance.read_entry('admin.email')
+        ).system!
+      end
+
+      def ssl_site_uncached
+        apache.site(no_ssl_site.name + '-le-ssl')
+      end
+
+      def write_available_no_ssl_site
+        infom 'Writing no SSL site conf...'
+        no_ssl_site.write(no_ssl_site_content)
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/apache_path.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'avm/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    class ApachePath
+      JOBS = %w[write_available_conf enable_conf reload_apache].freeze
+      include ::Avm::Jobs::Base
+
+      def content
+        ::Avm::EacWebappBase0::ApachePath.template.child('default.conf').apply(variables_source)
+      end
+
+      def document_root
+        instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+      end
+
+      def extra_content
+        ''
+      end
+
+      private
+
+      def apache_uncached
+        ::Avm::EacUbuntuBase0::Apache.new(instance.host_env)
+      end
+
+      def enable_conf
+        infom 'Enabling configuration...'
+        conf.enable
+      end
+
+      def reload_apache
+        infom 'Reloading Apache...'
+        apache.service('reload')
+      end
+
+      def conf_uncached
+        apache.conf(instance.id)
+      end
+
+      def write_available_conf
+        infom 'Writing available configuration...'
+        conf.write(content)
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/deploy/appended_directories.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avm/path_string'
+
+module Avm
+  module EacWebappBase0
+    class Deploy
+      module AppendedDirectories
+        APPENDED_DIRECTORIES_ENTRY_KEY = 'deploy.appended_directories'
+
+        def appended_directories
+          appended_directories_from_instance_entry + appended_directories_from_options
+        end
+
+        def appended_directories_from_instance_entry
+          ::Avm::PathString.paths(instance.read_entry_optional(APPENDED_DIRECTORIES_ENTRY_KEY))
+        end
+
+        def appended_directories_from_options
+          options[OPTION_APPENDED_DIRECTORIES] || []
+        end
+      end
+    end
+  end
+end