avm-tools 0.85.1 → 0.86.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43d475cc5c1bf70580258451dfada46e601167d1b4304f102fd334b21862a922
-  data.tar.gz: 0b2230eb8368b7315e437d7218144bbeaffe735887fa86fd6dec6647c545bd4a
+  metadata.gz: 3d94c38f057d3459362f2f15eba68de92e72a7141f03a5c029e920db648eb34b
+  data.tar.gz: 2719a55cb7b994c496349331e4b5a40a11307e4fe92d889914d3005836d68398
 SHA512:
-  metadata.gz: 3d45fbfd1797ba0e24a1c44cec1a260c1a12b457f486991f55befde788de312959084d78717fedb7ef593731399aa9be9534512e3e9af1c71c7ac706cde3b262
-  data.tar.gz: 5d539d2be00bfc34491192fe927b98ec977af4f474790afaf03eda326b5db8749cbfa8e97ef98981c5663a444f3a703c6189a5b7688582b95cef44458648d7e1
+  metadata.gz: 54d1c5271e6d30791bbc6a9cd6084f21ef2e171f3b64e21c315aa41f4bf2f289ae4c8725f74280a0f008d4a6fb32ce85f71fcf3f5e83d46a5ef14d48dc7a6174
+  data.tar.gz: 2c717894f623ab3bfd4b8b489c01adf8cc564a638c374fa1f7dbc5f9be715461ae4b1f8847b22d48a383e51775754eac408d8f6273260ff32dd1837acd5b30dd

data/lib/avm/projects/stereotypes/git/update.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/patches/class/i18n'
+
+module Avm
+  module Projects
+    module Stereotypes
+      class Git
+        class Update
+          require_sub __FILE__
+          enable_simple_cache
+          enable_console_speaker
+          common_constructor :instance
+
+          delegate :git_repo, to: :instance
+
+          def run
+            clean_all
+            selected_subrepos.map do |f|
+              infov 'Subrepo', f
+              on_speaker_node do |node|
+                node.stderr_line_prefix = '  '
+                ::Avm::Projects::Stereotypes::Git::Update::Subrepo.new(self, f).run
+              end
+            end
+          end
+
+          def selected_subrepos_uncached
+            git_repo.command('subrepo', '-q', 'status').execute!.split("\n").map(&:strip)
+                    .select(&:present?).map(&:to_pathname)
+          end
+
+          def clean_all
+            infom 'Cleaning'
+            git_repo.command('subrepo', 'clean', '--all').execute!
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/projects/stereotypes/git/update/subrepo.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'eac_launcher/git/base'
+require 'avm/git/commit'
+
+module Avm
+  module Projects
+    module Stereotypes
+      class Git
+        class Update
+          class Subrepo
+            TRANSLATE_CLASS = self
+
+            require_sub __FILE__, include_modules: true
+            enable_simple_cache
+            enable_console_speaker
+            common_constructor :parent_update, :subpath do
+              self.subpath = subpath.to_pathname
+            end
+
+            delegate :git_repo, :instance, to: :parent_update
+
+            def run
+              run_banner
+              if base_commit.sha1 == pull_commit.sha1
+                infom 'No new commit (No changes)'
+              elsif fix_message.present?
+                on_fix_message_present
+              else
+                warn 'No fix message found'
+              end
+            end
+
+            private
+
+            def base_commit_uncached
+              ::Avm::Git::Commit.new(git_repo, git_repo.rev_parse('HEAD'))
+            end
+
+            def on_fix_message_present
+              infom 'Fixing message...'
+              infov 'Message', fix_message
+              git_repo.command('commit', '--amend', '-m', fix_message).execute!
+            end
+
+            def pull_commit_uncached
+              base_commit
+              infom 'Pulling subrepo...'
+              git_repo.command('subrepo', 'pull', '--force', subpath).execute!
+              ::Avm::Git::Commit.new(
+                ::EacLauncher::Git::Base.new(git_repo.root_path.to_path),
+                git_repo.rev_parse('HEAD')
+              )
+            end
+
+            def run_banner
+              infov 'Base SHA1', base_commit.sha1
+              infov 'Pull SHA1', pull_commit.sha1
+            end
+
+            def fix_message
+              TRANSLATE_CLASS.translate(
+                fix_message_translate_key, subpath: subpath, name: subpath.basename,
+                                           __locale: instance.locale
+              )
+            end
+
+            def fix_message_translate_key
+              if gitrepo_only_changed?
+                :gitrepo_only_changed_fix_message
+              else
+                :content_updated_fix_message
+              end
+            end
+
+            def gitrepo_only_changed?
+              pull_commit.files.count == 1 &&
+                ::File.basename(pull_commit.files.first.path) == '.gitrepo'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.85.1'
+    VERSION = '0.86.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.85.1
+  version: 0.86.0
 platform: ruby
 authors:
 - Esquilo Azul Company
@@ -460,6 +460,8 @@ files:
 - lib/avm/projects/stereotypes/git.rb
 - lib/avm/projects/stereotypes/git/local_project_mixin.rb
 - lib/avm/projects/stereotypes/git/publish.rb
+- lib/avm/projects/stereotypes/git/update.rb
+- lib/avm/projects/stereotypes/git/update/subrepo.rb
 - lib/avm/projects/stereotypes/git/warp.rb
 - lib/avm/projects/stereotypes/git_subrepo.rb
 - lib/avm/projects/stereotypes/git_subrepo/publish.rb