avm-tools 0.53.0 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f84588df0d4cd0ec0d2140c037681209a2d20ad2631dced23607886bef8d18f5
-  data.tar.gz: 9f2fbd2b970e79076c229d536e5b764d096688b51ef9d4d22646ad7a1b33ff6a
+  metadata.gz: '085a810ef05afe2de594a7acfc667d6634c431392f2e1d290ee5b9b65151bc56'
+  data.tar.gz: 0c3a8e05eebbaeb7a6d0dbe2fb97a8864628746e694b12922b5a1db032354577
 SHA512:
-  metadata.gz: 3bfad35dd4309a96a5a8f61b97cb1ba84203fd3ae20aac14394d6366269af231f8a50cafe8b9d9bb38c10fddd28dace0309738ef14d59ef64c2381faa166b5ff
-  data.tar.gz: 2eebd6a5654e278c8131630f500568ae6d4cf5f92f9eae4108b9ea497b3c229c539acc6f6c1dc6904109bcd2bdf4505f86682e0af3098503649bb7c6be8c13aa
+  metadata.gz: 12cc99637f0413895661d8598b383e446cf9750665ec9ba256152595bf9a2c188b64d420965e0e95b4d887ac50482754256379b169a6f743b393a1a343682a3d
+  data.tar.gz: 4c477631dcfad184ad24b0458b4da6e41b4a7c2f9a1672aaeea0c36c6145daebf27c7c67720b79e69d9da8def06e5d6deb11575a5b5f6a0c69a95a88b922ee56

data/Gemfile

@@ -4,10 +4,9 @@ source 'https://rubygems.org'
 
 gemspec
 
-gems_subdir = ::File.join(__dir__, 'vendor', 'gems')
+gems_subdir = ::File.join(__dir__, 'vendor')
 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/files/formatter.rb

@@ -12,7 +12,7 @@ module Avm
       enable_console_speaker
       common_constructor :source_paths, :options
 
-      FORMATS = %w[ruby html php python xml json generic_plain].freeze
+      FORMATS = %w[ruby php html python xml json generic_plain].freeze
 
       def run
         clear

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/git/issue/complete/_git_subrepos.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'avm/git/subrepo_checks'
+require 'eac_git/local'
+
+module Avm
+  module Git
+    module Issue
+      class Complete
+        def git_subrepos_result
+          return ::Avm::Result.error('Unclean workspace') unless clean_workspace?
+
+          r = ::Avm::Git::SubrepoChecks.new(::EacGit::Local.new(@git)).add_all_subrepos
+          r.check_remote = true
+          r.result
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/issue/complete/_validations.rb

@@ -16,6 +16,7 @@ module Avm
           commits: 'Commits?',
           bifurcations: 'Bifurcations?',
           dry_push: 'Dry push?',
+          git_subrepos: 'Git subrepos ok?',
           test: 'Test ok?'
         }.with_indifferent_access.freeze
 

data/lib/avm/git/issue/complete/_working_tree.rb

@@ -5,8 +5,11 @@ module Avm
     module Issue
       class Complete
         def clean_workspace_result
-          r = @git.dirty_files.none?
-          ::Avm::Result.success_or_error(r, 'yes', 'no')
+          ::Avm::Result.success_or_error(clean_workspace?, 'yes', 'no')
+        end
+
+        def clean_workspace?
+          @git.dirty_files.none?
         end
       end
     end

data/lib/avm/self.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_base0/application'
 require 'eac_ruby_utils/require_sub'
 require 'avm/instances/base'
 
@@ -8,6 +9,10 @@ module Avm
     ::EacRubyUtils.require_sub(__FILE__)
 
     class << self
+      def application
+        @application ||= ::EacRubyBase0::Application.new(::File.expand_path('../..', __dir__))
+      end
+
       def instance
         @instance ||= ::Avm::Self::Instance.by_id('avm-tools_self')
       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