avm-tools 0.54.2 → 0.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b84d0393c577738f7356c886a99ef8e6c82343f9dd7d751cbf560dda774f32df
-  data.tar.gz: ffbb4bc86684f7422e7b49c38583a6f9d8df938c8471524e30eced6c6ea40a63
+  metadata.gz: df83da96c07da9eadc8be286bd954d0fd8905a2ff0376da5b109289cb8d90635
+  data.tar.gz: 8825abbc5032bd4e7d76031caa85782b3e792f588cc8c5e8811c5ed7fc4232f0
 SHA512:
-  metadata.gz: 1984afe6dca5217c4ac1085872901e0be97b8ede8a7ce023fb7e7ad87525c37af30e3cb174223c14b870c8a14c0a332d9c8ec6f01bf20f0e18d50e55ea306039
-  data.tar.gz: fa200e96cb2f36a56e980ec5e179dafe659035c1d8f95c4f6b2c352343d177cdb05aa7fa3bab86bb049931956d5a01c02e5dc0092bc87a659e064919c9dd1df7
+  metadata.gz: 3436be6aa4b6017e646f864501f5719d97fe39f9596ef6c2e233e43b2c247302d1d47733573b51d8d596934df9273875f89607762185bf0d27fa9ae8340042aa
+  data.tar.gz: bcbb3e38cbdd66d3e8095fb10b4ed1379ddbbb6c2df5e34bdd72e4043ef8b013a8fd08963675f4c0aa546229a39f887f17f060d8cd0c70597631f055e0dbafa1

data/Gemfile

@@ -6,8 +6,7 @@ gemspec
 
 gems_subdir = ::File.join(__dir__, 'vendor', 'gems')
 Dir["#{gems_subdir}/*"].each do |dir|
-  next unless ::File.directory?(dir)
+  next unless ::File.file?(::File.join(dir, 'Gemfile'))
 
-  basename = ::File.basename(dir)
-  gem basename, path: "#{gems_subdir}/#{basename}"
+  gem ::File.basename(dir), path: dir
 end

data/lib/avm/git/commit.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/simple_cache'
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Git
     class Commit
-      include ::EacRubyUtils::SimpleCache
+      require_sub __FILE__, include_modules: true
+      enable_simple_cache
 
       FIELDS = {
         author_name: '%an', author_email: '%ae', author_date: '%ai',

data/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/lib/avm/git/commit/deploy.rb

@@ -1,63 +1,25 @@
 # frozen_string_literal: true
 
 require 'addressable'
-require 'eac_ruby_utils/simple_cache'
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
+require 'eac_ruby_utils/core_ext'
 require 'avm/patches/object/template'
 
 module Avm
   module Git
     class Commit
-      class << self
-        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
-
-      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
-
       class Deploy
-        include ::EacRubyUtils::SimpleCache
+        require_sub __FILE__, include_modules: true
+        enable_simple_cache
 
-        attr_reader :commit, :target_env, :target_path, :appended_directories, :variables_source
+        attr_reader :build_dir, :commit, :target_env, :target_path, :variables_source
 
         def initialize(commit, target_env, target_path)
           @commit = commit
           @target_env = target_env
           @target_path = target_path
-          @appended_directories = []
           @variables_source = nil
         end
 
-        def append_directory(directory)
-          @appended_directories << directory
-          self
-        end
-
-        def append_directories(directories)
-          directories.each { |directory| append_directory(directory) }
-          self
-        end
-
         def variables_source_set(source)
           @variables_source = source
           self
@@ -66,7 +28,7 @@ module Avm
         def run
           on_build_dir do
             copy_git_content
-            appended_directories.each { |directory| copy_appended_directory(directory) }
+            copy_appended_content
             mkdir_target
             clear_content
             send_untar_package
@@ -76,8 +38,6 @@ module Avm
 
         private
 
-        attr_reader :build_dir
-
         def on_build_dir
           @build_dir = ::Dir.mktmpdir
           yield
@@ -89,12 +49,6 @@ module Avm
           git_archive_command.pipe(untar_git_archive_command).execute!
         end
 
-        def copy_appended_directory(directory)
-          raise 'Variables source not set' if variables_source.blank?
-
-          ::EacRubyUtils::Templates::Directory.new(directory).apply(variables_source, build_dir)
-        end
-
         def mkdir_target
           target_env.command('mkdir', '-p', target_path).execute!
         end

data/lib/avm/git/commit/deploy/appended.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Avm
+  module Git
+    class Commit
+      class Deploy
+        module Appended
+          require_sub __FILE__
+
+          def appended
+            @appended ||= []
+          end
+
+          def append_directory(directory)
+            appended << ::Avm::Git::Commit::Deploy::Appended::Directory.new(self, directory)
+            self
+          end
+
+          def append_directories(directories)
+            directories.each { |directory| append_directory(directory) }
+            self
+          end
+
+          def append_file_content(target_path, content)
+            appended << ::Avm::Git::Commit::Deploy::Appended::FileContent
+                        .new(self, target_path, content)
+            self
+          end
+
+          def copy_appended_content
+            appended.each(&:copy_to_build_dir)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/commit/deploy/appended/base.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class Commit
+      class Deploy
+        module Appended
+          class Base
+            common_constructor :deploy
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/commit/deploy/appended/directory.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/git/commit/deploy/appended/base'
+
+module Avm
+  module Git
+    class Commit
+      class Deploy
+        module Appended
+          class Directory < ::Avm::Git::Commit::Deploy::Appended::Base
+            attr_reader :source_path
+
+            def initialize(deploy, source_path)
+              super(deploy)
+              @source_path = source_path
+            end
+
+            def copy_to_build_dir
+              raise 'Variables source not set' if deploy.variables_source.blank?
+
+              ::EacRubyUtils::Templates::Directory.new(source_path).apply(
+                deploy.variables_source,
+                deploy.build_dir
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/commit/deploy/appended/file_content.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/git/commit/deploy/appended/base'
+
+module Avm
+  module Git
+    class Commit
+      class Deploy
+        module Appended
+          class FileContent < ::Avm::Git::Commit::Deploy::Appended::Base
+            attr_reader :target_path, :content
+
+            def initialize(deploy, target_path, content)
+              super(deploy)
+              @target_path = target_path
+              @content = content
+            end
+
+            def copy_to_build_dir
+              deploy.build_dir.to_pathname.join(target_path).write(content)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/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

data/lib/avm/stereotypes/eac_webapp_base0/deploy.rb

@@ -12,10 +12,9 @@ module Avm
   module Stereotypes
     module EacWebappBase0
       class Deploy
+        require_sub __FILE__, include_modules: true
         include ::ActiveSupport::Callbacks
 
-        require_relative 'deploy/_appended_directories'
-
         DEFAULT_REFERENCE = 'HEAD'
 
         enable_console_speaker
@@ -61,18 +60,16 @@ module Avm
 
         def git_deploy
           infom 'Deploying source code and appended content...'
-          build_git_commit.append_directory(template.path).append_directories(
-            appended_directories
-          ).run
-        end
-
-        def git_reference
-          options[:reference] || DEFAULT_REFERENCE
+          build_git_commit
+            .append_directory(template.path)
+            .append_directories(appended_directories)
+            .append_file_content(VERSION_TARGET_PATH, version)
+            .run
         end
 
         def setup_files_units
           instance.class.const_get('FILES_UNITS').each do |data_key, fs_path_subpath|
-            FilesUnit.new(self, data_key, fs_path_subpath).run
+            FileUnit.new(self, data_key, fs_path_subpath).run
           end
         end
 
@@ -89,42 +86,10 @@ module Avm
           fatal_error "Request to #{uri} failed" unless response.code.to_i == 200
         end
 
-        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_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_uncached
           ::EacLauncher::Git::Base.new(git_repository_path)
         end
 
-        def instance_branch
-          remote_branch(instance.id)
-        end
-
-        def master_branch
-          remote_branch('master')
-        end
-
-        def git_remote_name
-          ::Avm::Git::DEFAULT_REMOTE_NAME
-        end
-
-        def git_remote_hashs_uncached
-          git.remote_hashs(git_remote_name)
-        end
-
         def git_fetch_uncached
           infom "Fetching remote \"#{git_remote_name}\" from \"#{git_repository_path}\"..."
           git.fetch(git_remote_name)
@@ -133,10 +98,6 @@ module Avm
         def git_repository_path
           instance.source_instance.read_entry(:fs_path)
         end
-
-        def remote_branch(name)
-          git_remote_hashs.key?("refs/heads/#{name}") ? "#{git_remote_name}/#{name}" : nil
-        end
       end
     end
   end

data/lib/avm/stereotypes/eac_webapp_base0/deploy/appended_directories.rb

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

data/lib/avm/stereotypes/eac_webapp_base0/deploy/file_unit.rb

@@ -4,7 +4,7 @@ module Avm
   module Stereotypes
     module EacWebappBase0
       class Deploy
-        class FilesUnit < ::SimpleDelegator
+        class FileUnit < ::SimpleDelegator
           attr_reader :data_key, :fs_path_subpath
 
           def initialize(deploy, data_key, fs_path_subpath)

data/lib/avm/stereotypes/eac_webapp_base0/deploy/git_info.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Avm
+  module Stereotypes
+    module EacWebappBase0
+      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_reference
+            options[: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 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/lib/avm/stereotypes/eac_webapp_base0/deploy/version.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Avm
+  module Stereotypes
+    module EacWebappBase0
+      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
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.54.2'
+    VERSION = '0.55.0'
   end
 end

data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/require_sub.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/inflector'
+
 module EacRubyUtils
   class << self
     def require_sub(file, options = {})
@@ -26,6 +28,23 @@ module EacRubyUtils
 
     private
 
+    def active_support_require(path)
+      return false unless options[REQUIRE_DEPENDENCY_OPTION_KEY]
+
+      ::Kernel.require_dependency(path)
+      true
+    end
+
+    def autoload_require(path)
+      return false unless base?
+
+      basename = ::File.basename(path, '.*')
+      return false if basename.start_with?('_')
+
+      base.autoload ::ActiveSupport::Inflector.camelize(basename), path
+      true
+    end
+
     def include_modules
       return unless options[INCLUDE_MODULES_OPTION_KEY]
 
@@ -41,14 +60,22 @@ module EacRubyUtils
       options[BASE_OPTION_KEY] || raise('Option :base not setted')
     end
 
+    def base?
+      options[BASE_OPTION_KEY] ? true : false
+    end
+
+    def kernel_require(path)
+      ::Kernel.require(path)
+    end
+
     def require_sub_files
       Dir["#{File.dirname(file)}/#{::File.basename(file, '.*')}/*.rb"].sort.each do |path|
-        if options[REQUIRE_DEPENDENCY_OPTION_KEY]
-          require_dependency path
-        else
-          require path
-        end
+        require_sub_file(path)
       end
     end
+
+    def require_sub_file(path)
+      active_support_require(path) || autoload_require(path) || kernel_require(path)
+    end
   end
 end

data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.38.0'
+  VERSION = '0.39.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.54.2
+  version: 0.55.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -140,14 +140,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.39'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.39'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -274,7 +274,13 @@ files:
 - lib/avm/git.rb
 - lib/avm/git/auto_commit_path.rb
 - lib/avm/git/commit.rb
+- lib/avm/git/commit/class_methods.rb
 - lib/avm/git/commit/deploy.rb
+- lib/avm/git/commit/deploy/appended.rb
+- lib/avm/git/commit/deploy/appended/base.rb
+- lib/avm/git/commit/deploy/appended/directory.rb
+- lib/avm/git/commit/deploy/appended/file_content.rb
+- lib/avm/git/commit/deploy_methods.rb
 - lib/avm/git/commit/diff_tree_line.rb
 - lib/avm/git/commit/file.rb
 - lib/avm/git/file_auto_fixup.rb
@@ -353,8 +359,10 @@ files:
 - lib/avm/stereotypes/eac_webapp_base0.rb
 - lib/avm/stereotypes/eac_webapp_base0/apache_host.rb
 - lib/avm/stereotypes/eac_webapp_base0/deploy.rb
-- lib/avm/stereotypes/eac_webapp_base0/deploy/_appended_directories.rb
+- lib/avm/stereotypes/eac_webapp_base0/deploy/appended_directories.rb
 - lib/avm/stereotypes/eac_webapp_base0/deploy/file_unit.rb
+- lib/avm/stereotypes/eac_webapp_base0/deploy/git_info.rb
+- lib/avm/stereotypes/eac_webapp_base0/deploy/version.rb
 - lib/avm/stereotypes/eac_webapp_base0/instance.rb
 - lib/avm/stereotypes/eac_webapp_base0/runner/data.rb
 - lib/avm/stereotypes/eac_webapp_base0/runner/data/dump.rb

data/lib/avm/stereotypes/eac_webapp_base0/deploy/_appended_directories.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/path_string'
-
-module Avm
-  module Stereotypes
-    module EacWebappBase0
-      class Deploy
-        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[:appended_directories] || []
-        end
-      end
-    end
-  end
-end