eac_tools 0.31.1 → 0.33.0

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.42'
+  s.add_dependency 'avm', '~> 0.45'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
   s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.103'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

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

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/entries/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_templates/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class ApacheHost
+        APACHE_DIRECTORY_EXTRA_CONFIG_KEY = 'install.apache_directory_extra_config'
+        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::Entries::Jobs::Base
+
+        def directory_extra_config
+          instance.entry(APACHE_DIRECTORY_EXTRA_CONFIG_KEY).value.if_present { |v| "  #{v}\n" }
+        end
+
+        def no_ssl_site_content
+          ::Avm::EacWebappBase0::Instances::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.install_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
+end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'avm/entries/jobs/base'
+require 'avm/eac_ubuntu_base0/apache'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class ApachePath
+        JOBS = %w[write_available_conf enable_conf reload_apache].freeze
+        include ::Avm::Entries::Jobs::Base
+
+        def content
+          ::Avm::EacWebappBase0::Instances::ApachePath.template.child('default.conf')
+                                                      .apply(variables_source)
+        end
+
+        def document_root
+          instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_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
+end

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

@@ -4,7 +4,7 @@ require 'avm/instances/base'
 require 'avm/eac_postgresql_base0/instance_with'
 require 'avm/data/instance/files_unit'
 require 'avm/data/instance/package'
-require 'avm/eac_webapp_base0/deploy/file_unit'
+require 'avm/eac_webapp_base0/instances/deploy/file_unit'
 require 'avm/eac_webapp_base0/instances/runners'
 require 'avm/eac_ubuntu_base0/instances/base'
 

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/path_string'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      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
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/build.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'avm/files/appender'
+require 'avm/files/deploy'
+require 'eac_ruby_utils/envs'
+require 'eac_ruby_utils/fs/temp'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Deploy
+        module Build
+          private
+
+          attr_accessor :build_dir
+
+          def append_instance_content
+            ::Avm::Files::Appender
+              .new
+              .variables_source_set(variables_source)
+              .append_templatized_directory(template.path)
+              .append_templatized_directories(appended_directories)
+              .append_file_content(version_target_path, version)
+              .write_appended_on(build_dir)
+          end
+
+          def build_dir_env
+            ::EacRubyUtils::Envs.local
+          end
+
+          def create_build_dir
+            self.build_dir = ::EacRubyUtils::Fs::Temp.directory
+          end
+
+          def remove_build_dir
+            build_dir&.remove
+          end
+
+          def build_content
+            infom 'Writing Git source code...'
+            ::Avm::Git::Commit.new(git, commit_sha1).deploy_to_env_path(
+              build_dir_env,
+              build_dir
+            ).variables_source_set(variables_source).run
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/file_unit.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Deploy
+        class FileUnit < ::SimpleDelegator
+          attr_reader :data_key, :fs_path_subpath
+
+          def initialize(deploy, data_key, fs_path_subpath)
+            super(deploy)
+            @data_key = data_key
+            @fs_path_subpath = fs_path_subpath
+          end
+
+          def run
+            assert_source_directory
+            link_source_target
+          end
+
+          def assert_source_directory
+            infom "Asserting \"#{data_key}\" source directory..."
+            instance.host_env.command('mkdir', '-p', source_path).execute!
+          end
+
+          def source_path
+            ::File.join(instance.install_data_path, data_key.to_s)
+          end
+
+          def target_path
+            ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
+                        fs_path_subpath.to_s)
+          end
+
+          def link_source_target
+            infom "Linking \"#{data_key}\" directory..."
+            instance.host_env.command('rm', '-rf', target_path).execute!
+            instance.host_env.command('ln', '-s', source_path, target_path).execute!
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/git_info.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Deploy
+        module GitInfo
+          def commit_sha1_uncached
+            git_fetch
+            r = git.rev_parse(git_reference_found)
+            return r if r
+
+            raise ::Avm::Result::Error, "No commit SHA1 found for \"#{git_reference_found}\""
+          end
+
+          def git_fetch_uncached
+            infom "Fetching remote \"#{git_remote_name}\" from \"#{git_repository_path}\"..."
+            git.fetch(git_remote_name)
+          end
+
+          def git_reference
+            options[OPTION_REFERENCE] || DEFAULT_REFERENCE
+          end
+
+          def git_reference_found_uncached
+            %w[git_reference instance_branch master_branch].map { |b| send(b) }.find(&:present?) ||
+              raise(
+                ::Avm::Result::Error,
+                'No git reference found (Searched for option, instance and master)'
+              )
+          end
+
+          def git_remote_hashs_uncached
+            git.remote_hashs(git_remote_name)
+          end
+
+          def git_remote_name
+            ::Avm::Git::DEFAULT_REMOTE_NAME
+          end
+
+          def git_repository_path
+            instance.source_instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
+          end
+
+          def git_uncached
+            ::Avm::Launcher::Git::Base.new(git_repository_path)
+          end
+
+          def instance_branch
+            remote_branch(instance.id)
+          end
+
+          def remote_branch(name)
+            git_remote_hashs.key?("refs/heads/#{name}") ? "#{git_remote_name}/#{name}" : nil
+          end
+
+          def master_branch
+            remote_branch('master')
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/version.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Deploy
+        module Version
+          VERSION_TARGET_PATH = 'VERSION'
+
+          def version
+            ([::Time.now, commit_sha1] + version_git_refs).join('|')
+          end
+
+          def version_git_refs
+            git_remote_hashs.select { |_name, sha1| sha1 == commit_sha1 }.keys
+                            .map { |ref| ref.gsub(%r{\Arefs/}, '') }.reject { |ref| ref == 'HEAD' }
+          end
+
+          def version_target_path
+            VERSION_TARGET_PATH
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/deploy/write_on_target.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Deploy
+        module WriteOnTarget
+          def write_on_target
+            ::Avm::Files::Deploy.new(
+              instance.host_env,
+              instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
+            ).append_plain_directory(build_dir).run
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'active_support/callbacks'
+require 'avm/entries/jobs/base'
+require 'avm/git'
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/core_ext'
+require 'avm/launcher/git/base'
+require 'net/http'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Deploy
+        require_sub __FILE__, include_modules: true
+
+        DEFAULT_REFERENCE = 'HEAD'
+
+        REQUEST_TEST_JOB = 'request_test'
+        JOBS = (%w[create_build_dir build_content append_instance_content write_on_target
+                   setup_files_units assert_instance_branch] + [REQUEST_TEST_JOB]).freeze
+
+        include ::Avm::Entries::Jobs::Base
+
+        lists.add_symbol :option, :appended_directories, :no_request_test, :reference
+
+        def option_list
+          ::Avm::EacWebappBase0::Instances::Deploy.lists.option
+        end
+
+        def run
+          super
+        ensure
+          remove_build_dir
+        end
+
+        def start_banner
+          infov 'Instance', instance
+          infov 'Git reference (User)', git_reference.if_present('- BLANK -')
+          infov 'Git remote name', git_remote_name
+          infov 'Git reference (Found)', git_reference_found
+          infov 'Git commit SHA1', commit_sha1
+          infov 'Appended directories', appended_directories
+        end
+
+        def setup_files_units
+          instance.class.const_get('FILES_UNITS').each do |data_key, fs_path_subpath|
+            FileUnit.new(self, data_key, fs_path_subpath).run
+          end
+        end
+
+        def assert_instance_branch
+          infom 'Setting instance branch...'
+          git.execute!('push', git_remote_name, "#{commit_sha1}:refs/heads/#{instance.id}", '-f')
+        end
+
+        def request_test
+          infom 'Requesting web interface...'
+          uri = URI(instance.read_entry('web.url'))
+          response = ::Net::HTTP.get_response(uri)
+          infov 'Response status', response.code
+          fatal_error "Request to #{uri} failed" unless response.code.to_i == 200
+        end
+
+        protected
+
+        def jobs
+          r = super
+          r.delete(REQUEST_TEST_JOB) if options[OPTION_NO_REQUEST_TEST]
+          r
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.8.0'
+    VERSION = '0.9.0'
   end
 end

data/sub/avm-eac_wordpress_base0/avm-eac_wordpress_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.41'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.102'
+  s.add_dependency 'avm', '~> 0.45'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.9'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
 
   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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/apache_host'
+require 'avm/eac_webapp_base0/instances/apache_host'
 
 module Avm
   module EacWordpressBase0
     module Instances
-      class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
+      class ApacheHost < ::Avm::EacWebappBase0::Instances::ApacheHost
         def document_root
           instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
         end

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/eac_webapp_base0/deploy'
+require 'avm/eac_webapp_base0/instances/deploy'
 
 module Avm
   module EacWordpressBase0
     module Instances
-      class Deploy < ::Avm::EacWebappBase0::Deploy
+      class Deploy < ::Avm::EacWebappBase0::Instances::Deploy
       end
     end
   end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWordpressBase0
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

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

@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.3'
-  s.add_dependency 'avm', '~> 0.44'
+  s.add_dependency 'avm', '~> 0.45'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.21'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.4', '>= 0.4.1'
   s.add_dependency 'avm-git', '~> 0.4'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
-  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.2'
+  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.3'
   s.add_dependency 'eac_ruby_base0', '~> 0.17'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'git', '~> 1.12'

data/sub/avm-tools/lib/avm/tools/runner/{app_src → source}/info.rb

@@ -5,7 +5,7 @@ require 'avm/tools/core_ext'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Info
           SOURCE_PROPERTIES = {
             path: 'Path',

data/sub/avm-tools/lib/avm/tools/runner/{app_src → source}/issue/complete.rb

@@ -6,7 +6,7 @@ require 'avm/git/issue/complete'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Issue
           class Complete
             runner_with :confirmation, :help do

data/sub/avm-tools/lib/avm/tools/runner/{app_src → source}/issue/deliver.rb

@@ -6,7 +6,7 @@ require 'avm/git/issue/deliver'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Issue
           class Deliver
             runner_with :confirmation, :help do

data/sub/avm-tools/lib/avm/tools/runner/{app_src → source}/issue.rb

@@ -5,7 +5,7 @@ require 'avm/tools/core_ext'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Issue
           require_sub __FILE__
           runner_with :help, :subcommands do

data/sub/avm-tools/lib/avm/tools/runner/{app_src → source}/ruby/bundler/gemfile_lock/git.rb

@@ -5,7 +5,7 @@ require 'eac_ruby_base0/core_ext'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Ruby
           class Bundler
             class GemfileLock

data/sub/avm-tools/lib/avm/tools/runner/{app_src → source}/ruby/bundler/gemfile_lock.rb

@@ -5,7 +5,7 @@ require 'eac_ruby_base0/core_ext'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Ruby
           class Bundler
             class GemfileLock

data/sub/avm-tools/lib/avm/tools/runner/{app_src → source}/ruby/bundler.rb

@@ -5,7 +5,7 @@ require 'eac_ruby_base0/core_ext'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Ruby
           class Bundler
             require_sub __FILE__

data/sub/avm-tools/lib/avm/tools/runner/{app_src → source}/ruby.rb

@@ -5,7 +5,7 @@ require 'eac_cli/core_ext'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Ruby
           require_sub __FILE__
           runner_with :help, :subcommands do

data/sub/avm-tools/lib/avm/tools/runner/{app_src → source}/subs.rb

@@ -5,7 +5,7 @@ require 'avm/tools/core_ext'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Subs
           PADDING = '  '
 

data/sub/avm-tools/lib/avm/tools/runner/{app_src → source}/test.rb

@@ -6,7 +6,7 @@ require 'avm/sources/tests/builder'
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class Source < ::Avm::Sources::Runner
         class Test
           runner_with :help do
             desc 'Test local project.'
@@ -83,7 +83,7 @@ module Avm
           def unit_result(unit)
             (
               [unit.result.to_label] +
-              %i[stdout stderr].map { |label| "#{label.to_s.upcase}: #{unit.logs[label]}" }
+                %i[stdout stderr].map { |label| "#{label.to_s.upcase}: #{unit.logs[label]}" }
             ).join(' | '.blue)
           end
         end