Merge branch 'main' into extract-env-writer

* main: Inline util method only used in one place
basecamp · Sep 16, 2023 · 85ce65a · 85ce65a
2 parents b2d2a25 + 12a82a6
commit 85ce65a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/lib/kamal/configuration.rb b/lib/kamal/configuration.rb
@@ -53,7 +53,14 @@ def version
   end
 
   def abbreviated_version
-    Kamal::Utils.abbreviate_version(version)
+    if version
+      # Don't abbreviate <sha>_uncommitted_<etc>
+      if version.include?("_")
+        version
+      else
+        version[0...7]
+      end
+    end
   end
 
   def minimum_version

diff --git a/lib/kamal/utils.rb b/lib/kamal/utils.rb
@@ -79,18 +79,6 @@ def escape_shell_value(value)
       .gsub(DOLLAR_SIGN_WITHOUT_SHELL_EXPANSION_REGEX, '\$')
   end
 
-  # Abbreviate a git revhash for concise display
-  def abbreviate_version(version)
-    if version
-      # Don't abbreviate <sha>_uncommitted_<etc>
-      if version.include?("_")
-        version
-      else
-        version[0...7]
-      end
-    end
-  end
-
   def uncommitted_changes
     `git status --porcelain`.strip
   end