avm-tools 0.52.0 → 0.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3764f4ca13b2ddc71f8c85c48e0b5d60652083caf844402118dde252bbf556ac
-  data.tar.gz: '095d96b661591d076a37287c723ac69833a0b167474d4ac32c6157767662c60f'
+  metadata.gz: df83da96c07da9eadc8be286bd954d0fd8905a2ff0376da5b109289cb8d90635
+  data.tar.gz: 8825abbc5032bd4e7d76031caa85782b3e792f588cc8c5e8811c5ed7fc4232f0
 SHA512:
-  metadata.gz: ed3c88ad9c85b8bb726f48f2a3dc08639bda36fdd71c28bc8b191e619956632ebaf3703a70f0bbf43eb4497f969aeca46b97e4e0e59da2c082acdaf2fa8971c7
-  data.tar.gz: 3e637c06cbe3a99a0b2b63f3d6fce68b5798e9e8d2bec94c92bcad2862d4322963073c7a15e05855b9604defcc6a6c84bb474f7934171c54276d674f4ea87211
+  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/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/_commits.rb

@@ -7,10 +7,7 @@ module Avm
     module Issue
       class Complete
         def commits_result
-          ::Avm::Result.success_or_error(
-            commits.any? ? 'yes' : 'none',
-            commits.any?
-          )
+          ::Avm::Result.success_or_error(commits.any?, 'yes', 'none')
         end
 
         def commits_uncached

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/_local_branch.rb

@@ -19,13 +19,13 @@ module Avm
         end
 
         def branch_name_result
-          ::Avm::Result.success_or_error(branch_name, issue_id.present?)
+          ::Avm::Result.success_or_error(issue_id.present?, branch_name)
         end
 
         def branch_hash_result
           ::Avm::Result.success_or_error(
-            branch_hash,
-            branch_hash.present?
+            branch_hash.present?,
+            branch_hash
           )
         end
 
@@ -33,10 +33,7 @@ module Avm
           return ::Avm::Result.neutral('No branch hash') unless branch_hash
 
           r = follow_master?
-          ::Avm::Result.success_or_error(
-            r ? 'yes' : 'no',
-            r
-          )
+          ::Avm::Result.success_or_error(r, 'yes', 'no')
         end
 
         def follow_master?

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

@@ -17,7 +17,7 @@ module Avm
                     else
                       r.fetch(:stderr) + "\n#{::Shellwords.join(dry_push_args)}"
                     end
-          ::Avm::Result.success_or_error(message, r.fetch(:exit_code).zero?)
+          ::Avm::Result.success_or_error(r.fetch(:exit_code).zero?, message)
         end
 
         def push

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', r)
+          ::Avm::Result.success_or_error(clean_workspace?, 'yes', 'no')
+        end
+
+        def clean_workspace?
+          @git.dirty_files.none?
         end
       end
     end

data/lib/avm/git/subrepo_check.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_launcher/git/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class SubrepoCheck
+      require_sub __FILE__, include_modules: true
+      enable_console_speaker
+      enable_simple_cache
+
+      BLANK_TEXT = 'BLANK'
+
+      common_constructor :subrepo, :options
+
+      def blank_text
+        BLANK_TEXT
+      end
+
+      def check_remote?
+        options.fetch(:check_remote) ? true : false
+      end
+
+      def fix_parent?
+        options.fetch(:fix_parent) ? true : false
+      end
+
+      private
+
+      def result_uncached
+        return ::Avm::Result.error('Parent failed') if parent_result.error?
+        return ::Avm::Result.error('Remote failed') if remote_result.error?
+
+        ::Avm::Result.success('Parent and remote ok')
+      end
+    end
+  end
+end