avm-git 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1b4c7e2df892e08fd3acc46995c6c353476d2f278dbea6d7f4f6610f59c147d
-  data.tar.gz: abfc3a667d26edfd434b471314772e14df09a54fb3c5921cad56c51f2361d400
+  metadata.gz: fd42a24152f0e8d274a949a9deb85c7e488ca50ee8d2343d416726a5b56d1c76
+  data.tar.gz: 219a048ed9d9468c803e510211f7518433a61a7ffab4e238ad320e4854af780e
 SHA512:
-  metadata.gz: df7fdde7ab8665aec13a8c1d89279de503a75dc034122c0cfd4b907056741631d834876745431c006ef474107e99075aaf3a3080e700a8d0526d5f4b3afaf110
-  data.tar.gz: a575f67380e389681bbbe28e7d1f738b43eda8d8b2a8578117ba52f2d14d215afe510e6edb4c3fd57f302c0ae5b247eff4cdb188518b8b4eea1c95d67cee6255
+  metadata.gz: 10d0657d1221fd5686a6b912f0453d2220314c761e4bade985dcc7426db84c91aea6a23d678414e183fe10d7ea72b92376857d1132d93e2bf8033648f52561b3
+  data.tar.gz: bef8e125f600ec5da2b01d2e1e87a9b4ceaf9f13325fcba7f6a93217d41f45a5355b475bcc459012a0265768f942ea092f289ebf698d9e0394cc0e5a0e453025

data/lib/avm/git/launcher/base/underlying.rb

@@ -19,16 +19,14 @@ module Avm
             r
           end
 
-          def execute(*args)
-            command(*args).execute
-          end
-
-          def execute!(*args)
-            command(*args).execute!
-          end
-
-          def system!(*args)
-            command(*args).system!
+          %w[execute execute! system system!].each do |exec_type|
+            define_method exec_type do |*args|
+              begin
+                command(*args).send(exec_type)
+              rescue ::EacRubyUtils::Envs::Command::ExecError
+                raise ::Avm::Git::Launcher::Error
+              end
+            end
           end
 
           def init

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'avm/files/appendable'
+require 'avm/files/deploy'
+require 'avm/scms/base'
+require 'avm/scms/commit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class Commit < ::Avm::Scms::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_repo.command('archive', '--format=tar', commit.id)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/scms/git/commit/deploy_methods.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/git/commit'
+require 'avm/git/scms/git/commit/deploy'
+require 'avm/scms/base'
+require 'avm/scms/commit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class Commit < ::Avm::Scms::Commit
+          module DeployMethods
+            def deploy_to_env_path(target_env, target_path)
+              ::Avm::Git::Scms::Git::Commit::Deploy.new(self, target_env, target_path)
+            end
+
+            def deploy_to_url(target_url)
+              ::Avm::Git::Scms::Git::Commit::Deploy.new(
+                self,
+                *::Avm::Git::Commit.target_url_to_env_path(target_url)
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/git/scms/git/commit.rb

@@ -8,10 +8,12 @@ module Avm
     module Scms
       class Git < ::Avm::Scms::Base
         class Commit < ::Avm::Scms::Commit
+          require_sub __FILE__, include_modules: true
           common_constructor :git_scm, :git_commit do
             git_commit.assert_argument(::EacGit::Local::Commit, 'git_commit')
           end
           delegate :git_repo, to: :git_scm
+          delegate :id, to: :git_commit
 
           # @return [Array<Pathname>]
           def changed_files

data/lib/avm/git/scms/git.rb

@@ -18,7 +18,7 @@ module Avm
         end
 
         # @return [Avm::Git::Scms::Git::Commit,nil]
-        def commitize(source)
+        def commit(source)
           if source.is_a?(::Avm::Git::Scms::Git::Commit)
             return source if source.git_repo == self
 
@@ -36,7 +36,7 @@ module Avm
           git_repo.command('add', '.').execute!
           git_repo.command('commit', '-m',
                            message.call_if_proc.if_present(COMMIT_DIRTY_DEFAULT_MESSAGE)).execute!
-          commitize(git_repo.head)
+          commit(git_repo.head)
         end
 
         # @return [Avm::Git::Scms::Git::Commit,nil]
@@ -53,7 +53,7 @@ module Avm
 
         # @return [Avm::Git::Scms::Git::Commit]
         def reset_and_commit(commit_to_reset, message)
-          git_repo.command('reset', '--soft', commitize(commit_to_reset).git_commit.id).execute!
+          git_repo.command('reset', '--soft', commit(commit_to_reset).git_commit.id).execute!
           commit_dirty(message)
         end
 

data/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.7.0'
+    VERSION = '0.9.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-git
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,68 +16,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.53'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.53'
 - !ruby/object:Gem::Dependency
   name: avm-files
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: eac_git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.104'
+        version: '0.106'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.106.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.104'
+        version: '0.106'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.106.1
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -145,8 +139,6 @@ files:
 - lib/avm/git/auto_commit_path/ruby.rb
 - lib/avm/git/commit.rb
 - lib/avm/git/commit/class_methods.rb
-- lib/avm/git/commit/deploy.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
@@ -197,6 +189,8 @@ files:
 - lib/avm/git/scms/git.rb
 - lib/avm/git/scms/git/change_tracker.rb
 - lib/avm/git/scms/git/commit.rb
+- lib/avm/git/scms/git/commit/deploy.rb
+- lib/avm/git/scms/git/commit/deploy_methods.rb
 - lib/avm/git/scms/git_subrepo.rb
 - lib/avm/git/scms/provider.rb
 - lib/avm/git/subrepo_check.rb

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

@@ -1,38 +0,0 @@
-# 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/lib/avm/git/commit/deploy_methods.rb

@@ -1,19 +0,0 @@
-# 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