eac_tools 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a07350e5f6e203f916c6b9ef70f92f59eff8d4c3af4159a086385608d56119b
-  data.tar.gz: 03f349d5cee7e0865d05c26fb7e8a2e394f070cc22199bd4b306a81131f955af
+  metadata.gz: 4e7be8c10a31eca92c292ca5a2aff340237809512a2477c04b9212b9a246264d
+  data.tar.gz: 7de8fb83e7fbc7583c0577e5de1a561952b17d1b2768951e6706f645933966bb
 SHA512:
-  metadata.gz: c44c9eedc11252a33e9f23cc07a13bd732b2808fd9d63900fa6a7d3583f15758dc0b561533ceb2f271e628d135e05786398744efce321ac8022219c55458da76
-  data.tar.gz: 83a02656f81b1248636ba07fbe6b96ebccbd74f3d4c2a09587e5b2f8561a03832a57ac75d79a6db6fed85edb67462c2b347fed11954258b43ad3b74d543c98ab
+  metadata.gz: 71a2a76a1b55a74f18f7aa18db4b25c269c8ffff5e397669ff0d8782fe21db1269e2b571dbf1d7b2b0fa70a696e2cccbdf0921d57a329ff62a15de115d8d1bd4
+  data.tar.gz: f5a62fb8592908556546226ff6232eef6b8be3a7d72f87080dd2b31a38cfdb60c724069439037942549b72b319672ebd1af1e06bfb378d526f0a2014c1499318

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.34.0)
-      avm (~> 0.45)
+    eac_tools (0.35.0)
+      avm (~> 0.46)
       avm-eac_asciidoctor_base0 (~> 0.7, >= 0.7.1)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.2, >= 0.2.1)
@@ -11,9 +11,9 @@ PATH
       avm-eac_redmine_base0 (~> 0.16)
       avm-eac_redmine_plugin_base0 (~> 0.3)
       avm-eac_ruby_base1 (~> 0.22)
-      avm-eac_webapp_base0 (~> 0.9)
+      avm-eac_webapp_base0 (~> 0.9, >= 0.9.1)
       avm-eac_wordpress_base0 (~> 0.2, >= 0.2.1)
-      avm-tools (~> 0.138)
+      avm-tools (~> 0.139)
       eac_ruby_utils (~> 0.104)
 
 PATH
@@ -88,8 +88,8 @@ PATH
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.9.0)
-      avm (~> 0.45)
+    avm-eac_webapp_base0 (0.9.1)
+      avm (~> 0.46)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_postgresql_base0 (~> 0.2)
       avm-eac_ubuntu_base0 (~> 0.3)
@@ -113,16 +113,25 @@ PATH
       eac_ruby_utils (~> 0.103)
       eac_templates (~> 0.3, >= 0.3.2)
 
+PATH
+  remote: sub/avm-git
+  specs:
+    avm-git (0.5.0)
+      avm (~> 0.46)
+      avm-files (~> 0.4, >= 0.4.1)
+      eac_git (~> 0.12, >= 0.12.3)
+      eac_ruby_utils (~> 0.104)
+
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.138.0)
+    avm-tools (0.139.0)
       aranha-parsers (~> 0.14, >= 0.14.3)
-      avm (~> 0.45)
+      avm (~> 0.46)
       avm-eac_ruby_base1 (~> 0.22)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.4, >= 0.4.1)
-      avm-git (~> 0.4)
+      avm-git (~> 0.5)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
       eac_git (~> 0.12, >= 0.12.3)
@@ -134,10 +143,10 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.45.0)
+    avm (0.46.0)
       eac_cli (~> 0.28)
       eac_config (~> 0.11, >= 0.11.1)
-      eac_docker (~> 0.4, >= 0.4.2)
+      eac_docker (~> 0.5)
       eac_git (~> 0.12, >= 0.12.3)
       eac_ruby_utils (~> 0.104)
       eac_templates (~> 0.3, >= 0.3.2)
@@ -163,9 +172,9 @@ PATH
 PATH
   remote: sub/eac_docker
   specs:
-    eac_docker (0.4.2)
-      eac_ruby_utils (~> 0.96)
-      eac_templates (~> 0.3, >= 0.3.1)
+    eac_docker (0.5.0)
+      eac_ruby_utils (~> 0.104)
+      eac_templates (~> 0.3, >= 0.3.2)
 
 PATH
   remote: sub/eac_fs
@@ -230,10 +239,6 @@ GEM
       avm (~> 0.7)
       eac_ruby_utils (~> 0.77, >= 0.77.1)
       eac_templates (~> 0.3)
-    avm-git (0.4.0)
-      avm-files (~> 0.1)
-      eac_git (~> 0.11)
-      eac_ruby_utils (~> 0.76)
     clipboard (1.3.6)
     colorize (0.8.1)
     concurrent-ruby (1.1.10)
@@ -361,6 +366,7 @@ DEPENDENCIES
   avm-eac_webapp_base0!
   avm-eac_wordpress_base0!
   avm-files!
+  avm-git!
   avm-tools!
   eac_cli!
   eac_config!

data/lib/eac_tools/version.rb

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

data/sub/avm/avm.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'eac_cli', '~> 0.28'
   s.add_dependency 'eac_config', '~> 0.11', '>= 0.11.1'
-  s.add_dependency 'eac_docker', '~> 0.4', '>= 0.4.2'
+  s.add_dependency 'eac_docker', '~> 0.5'
   s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.3'
   s.add_dependency 'eac_ruby_utils', '~> 0.104'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'

data/sub/{avm-tools → avm}/lib/avm/launcher/publish/base.rb

@@ -1,16 +1,13 @@
 # frozen_string_literal: true
 
 require 'avm/launcher/errors/base'
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Launcher
     module Publish
       class Base
-        attr_reader :instance
-
-        def initialize(instance)
-          @instance = instance
-        end
+        common_constructor :instance
 
         def run
           s = check

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

@@ -10,8 +10,6 @@ module Avm
     lists.add_symbol :category, :application_stereotypes, :instances, :runners, :scms,
                      :source_generators, :sources
 
-    WITH_PATH = [CATEGORY_SCMS, CATEGORY_SOURCES].freeze
-
     class << self
       enable_simple_cache
 

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

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

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

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.45'
+  s.add_dependency 'avm', '~> 0.46'
   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'

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

@@ -15,7 +15,8 @@ module Avm
         include ::Avm::Entries::Jobs::Base
 
         def directory_extra_config
-          instance.entry(APACHE_DIRECTORY_EXTRA_CONFIG_KEY).value.if_present { |v| "  #{v}\n" }
+          instance.entry(APACHE_DIRECTORY_EXTRA_CONFIG_KEY).optional_value
+                  .if_present { |v| "  #{v}\n" }
         end
 
         def no_ssl_site_content

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

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

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/git/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-git'
+  s.version     = Avm::Git::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'avm', '~> 0.46'
+  s.add_dependency 'avm-files', '~> 0.4', '>= 0.4.1'
+  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.3'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+
+  s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
+end

data/sub/avm-git/lib/avm/git/auto_commit/commit_info.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module AutoCommit
+      class CommitInfo
+        enable_immutable
+
+        immutable_accessor :fixup, :message
+
+        def git_commit_args
+          r = fixup.if_present([]) { |v| ['--fixup', v.sha1] }
+          r += message.if_present([]) { |v| ['--message', v] }
+          return r if r.any?
+
+          raise 'Argument list is empty'
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/auto_commit/rules/base.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Base
+          class << self
+            def keys
+              [long_key, short_key]
+            end
+
+            def long_key
+              name.demodulize.variableize
+            end
+
+            def short_key
+              long_key[0, 1]
+            end
+          end
+
+          def with_file(file)
+            self.class.const_get('WithFile').new(self, file)
+          end
+
+          class WithFile
+            common_constructor :rule, :file
+
+            def new_commit_info
+              ::Avm::Git::AutoCommit::CommitInfo.new
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/auto_commit/rules/last.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Last < ::Avm::Git::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            def commit_info
+              file.commits.last.if_present { |v| new_commit_info.fixup(v) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/auto_commit/rules/manual.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Manual < ::Avm::Git::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            enable_speaker
+
+            COMMIT_FORMAT = '%h - %s (%cr)'
+            SKIP_OPTION = 's'
+
+            def commit_info
+              return nil unless file.commits.any?
+
+              commits_banner
+              input('Which commit?', list: commits_by_position).if_present do |v|
+                new_commit_info.fixup(v)
+              end
+            end
+
+            def commits_banner
+              file.commits.each_with_index do |commit, _index|
+                infov "    #{commit.position}", format_commit(commit)
+              end
+              infov "    #{SKIP_OPTION}", 'skip'
+            end
+
+            def commits_by_position
+              (file.commits.map { |commit| [commit.position.to_s, commit] } + [[SKIP_OPTION, nil]])
+                .to_h
+            end
+
+            def format_commit(commit)
+              commit.format(COMMIT_FORMAT)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/auto_commit/rules/new.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+require 'avm/git/auto_commit_path'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class New < ::Avm::Git::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            def auto_commit_path
+              ::Avm::Git::AutoCommitPath.new(file.git, file.path)
+            end
+
+            def commit_info
+              new_commit_info.message(auto_commit_path.commit_message)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/auto_commit/rules/nth.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Nth < ::Avm::Git::AutoCommit::Rules::Base
+          SHORT_KEY = 't'
+
+          class << self
+            def short_key
+              SHORT_KEY
+            end
+          end
+
+          common_constructor :number do
+            self.number = number.to_i
+          end
+
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            def commit_info
+              file.commits(number - 1).if_present { |v| new_commit_info.fixup(v) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/auto_commit/rules/unique.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/git/auto_commit/rules/base'
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        class Unique < ::Avm::Git::AutoCommit::Rules::Base
+          class WithFile < ::Avm::Git::AutoCommit::Rules::Base::WithFile
+            def commit_info
+              return nil unless file.commits.count == 1
+
+              new_commit_info.fixup(file.commits.first)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/auto_commit/rules.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+::EacRubyUtils.require_sub __FILE__
+
+module Avm
+  module Git
+    module AutoCommit
+      module Rules
+        RULES_CLASSES = %w[last manual new nth unique]
+                        .map { |key| ::Avm::Git::AutoCommit::Rules.const_get(key.camelcase) }
+
+        class << self
+          def parse(string)
+            parts = string.split(':')
+
+            klass = rule_class_by_key(parts.shift)
+            klass.new(*parts)
+          end
+
+          def rule_class_by_key(key)
+            RULES_CLASSES.find { |klass| klass.keys.include?(key) } ||
+              raise("Rule not find with key \"#{key}\" (Available: " +
+                RULES_CLASSES.flat_map(&:keys).join(', ') + ')')
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/auto_commit_path/ruby.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class AutoCommitPath
+      module Ruby
+        RUBY_CLASS_NAME_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z}, %r{app/[^/]+/(.+)\.rb\z}].freeze
+
+        def ruby_class_name
+          RUBY_CLASS_NAME_PATTERNS.each do |pattern|
+            pattern.if_match(relative_path.to_path, false) { |m| return m[1].camelize }
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/auto_commit_path.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class AutoCommitPath
+      require_sub __FILE__, include_modules: true
+      common_constructor :git, :path do
+        self.path = path.to_pathname
+      end
+
+      def class_name
+        ruby_class_name || relative_path.to_path
+      end
+
+      def commit_message
+        r = class_name
+        r += ': remove' unless path.file?
+        r + '.'
+      end
+
+      def relative_path
+        path.expand_path.relative_path_from(git.root_path.expand_path)
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/commit/class_methods.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class Commit
+      module ClassMethods
+        common_concern
+
+        module ClassMethods
+          def target_url_to_env_path(target_url)
+            uri = ::Addressable::URI.parse(target_url)
+            uri.scheme = 'file' if uri.scheme.blank?
+            [uri_to_env(uri), uri.path]
+          end
+
+          private
+
+          def uri_to_env(uri)
+            case uri.scheme
+            when 'file' then ::EacRubyUtils::Envs.local
+            when 'ssh' then ::EacRubyUtils::Envs.ssh(uri)
+            else "Invalid schema \"#{uri.schema}\" (URI: #{uri})"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/commit/deploy.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'addressable'
+require 'eac_ruby_utils/core_ext'
+require 'avm/files/appendable'
+require 'avm/files/deploy'
+
+module Avm
+  module Git
+    class Commit
+      class Deploy
+        include ::Avm::Files::Appendable
+        enable_simple_cache
+
+        attr_reader :build_dir, :commit, :target_env, :target_path
+
+        def initialize(commit, target_env, target_path)
+          @commit = commit
+          @target_env = target_env
+          @target_path = target_path
+        end
+
+        def run
+          fd = ::Avm::Files::Deploy.new(target_env, target_path)
+          fd.append_tar_output_command(git_archive_command)
+          fd.appended.push(*appended)
+          fd.run
+        end
+
+        private
+
+        def git_archive_command
+          commit.git.command('archive', '--format=tar', commit.sha1)
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/commit/deploy_methods.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class Commit
+      module DeployMethods
+        def deploy_to_env_path(target_env, target_path)
+          Deploy.new(self, target_env, target_path)
+        end
+
+        def deploy_to_url(target_url)
+          Deploy.new(self, *self.class.target_url_to_env_path(target_url))
+        end
+      end
+    end
+  end
+end