discharger 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 124d11a54d0e01902289ad669c58ffff0a0f2d3440cd92ac2775ee7958b04b92
-  data.tar.gz: 43016830306332f19aada077073497b8dd8227e9ebcc5de69d3bf53cd86dae8c
+  metadata.gz: e2e691da215aea4ada1334022977bd115d761094b05d308105c4ef5ca772f7ba
+  data.tar.gz: a9aa28255523f17c93a9c4c63a127e9421215716431d16ba3701173a2a2e9941
 SHA512:
-  metadata.gz: d64755635d36299678b677de387c2a367a31776cd6d81fd9002e8fc3eb84826ace926d60b9d59ef2516034478737cd0105aa3d177f1083bc875031ea610b82b5
-  data.tar.gz: c4011249e3c1ae3763479b0a8bc267ef1a7ec709315f2c0866a1c4511cc9d5697d5b59cbad7ce74adae5e5b6974b6646898f36d677347d2b91adbcec27bb5ed6
+  metadata.gz: 5939a5d383a6ed2cd020d5c9e859769c5f6403fad7c3228da7c8e71ad82b2ad3709fc1c0d27e11ac897a407c557984f20b6688b87dd86b1ecba6101eeba0f867
+  data.tar.gz: 674780767621e9a78856ac0a914634ccbed7b8f07cf8c95b7b0bf5ce33590f2b07fad19d9b5dab7dcfe6ab684a9d4bfbf7858c2f4ea796c806d1b25fe71c5022

data/lib/discharger/task.rb

@@ -70,8 +70,8 @@ module Discharger
     #
     # @example
     #   syscall(
-    #     ["echo", "Hello, World!"],
-    #     ["ls", "-l"]
+    #     ["echo Hello, World!"],
+    #     ["ls -l"]
     #   )
     def syscall(*steps, output: $stdout, error: $stderr)
       success = false
@@ -137,18 +137,18 @@ module Discharger
         exit if input.chomp.match?(/^x/i)
 
         continue = syscall(
-          ["git", "checkout", working_branch],
-          ["git", "branch", "-D #{staging_branch}", "2>/dev/null || true"],
-          ["git", "branch", "-D #{production_branch}", "2>/dev/null || true"],
-          ["git", "fetch", "origin", "#{staging_branch}:#{staging_branch}", "#{production_branch}:#{production_branch}"],
-          ["git", "checkout", production_branch],
-          ["git", "rebase", staging_branch],
-          ["git", "tag", "-a v#{current_version}", "-m 'Release #{current_version}'"],
-          ["git", "push", "origin", "#{production_branch}:#{production_branch}", "v#{current_version}:v#{current_version}"],
-          ["git", "push", "origin", "v#{current_version}"]
+          ["git checkout #{working_branch}"],
+          ["git branch -D #{staging_branch} 2>/dev/null || true"],
+          ["git branch -D #{production_branch} 2>/dev/null || true"],
+          ["git fetch origin #{staging_branch}:#{staging_branch} #{production_branch}:#{production_branch}"],
+          ["git checkout #{production_branch}"],
+          ["git rebase #{staging_branch}"],
+          ["git tag -a v#{current_version} -m 'Release #{current_version}'"],
+          ["git push origin #{production_branch}:#{production_branch} v#{current_version}:v#{current_version}"],
+          ["git push origin v#{current_version}"]
         ) do
           tasker["#{name}:slack"].invoke("Released #{Qualify.name} #{current_version} to production.", release_message_channel, ":chipmunk:")
-          syscall ["git", "checkout", working_branch]
+          syscall ["git checkout #{working_branch}"]
         end
 
         abort "Release failed." unless continue
@@ -163,13 +163,13 @@ module Discharger
         tasker["reissue"].invoke
         new_version = Object.const_get(version_constant)
         new_version_branch = "bump/begin-#{new_version.tr(".", "-")}"
-        continue = syscall(["git", "checkout", "-b #{new_version_branch}"])
+        continue = syscall(["git checkout -b #{new_version_branch}"])
 
         abort "Bump failed." unless continue
 
         pr_url = "#{pull_request_url}/compare/#{working_branch}...#{new_version_branch}?expand=1&title=Begin%20#{current_version}"
 
-        syscall(["git", "push", "origin", new_version_branch, "--force"]) do
+        syscall(["git push origin #{new_version_branch} --force"]) do
           sysecho <<~MSG
             Branch #{new_version_branch} created.
 
@@ -179,7 +179,7 @@ module Discharger
             Opening PR: #{pr_url}
           MSG
         end.then do |success|
-          syscall ["open", pr_url] if success
+          syscall ["open #{pr_url}"] if success
         end
       end
 
@@ -187,14 +187,14 @@ module Discharger
         desc description
         task build: :environment do
           syscall(
-            ["git", "fetch", "origin", working_branch],
-            ["git", "checkout", working_branch],
-            ["git", "branch", "-D #{staging_branch}", "2> /dev/null || true"],
-            ["git", "checkout", "-b #{staging_branch}"],
-            ["git", "push", "origin", staging_branch, "--force"]
+            ["git fetch origin #{working_branch}"],
+            ["git checkout #{working_branch}"],
+            ["git branch -D #{staging_branch} 2>/dev/null || true"],
+            ["git checkout -b #{staging_branch}"],
+            ["git push origin #{staging_branch} --force"]
           ) do
             tasker["#{name}:slack"].invoke("Building #{app_name} #{commit_identifier.call} on #{staging_branch}.", release_message_channel)
-            syscall ["git", "checkout", working_branch]
+            syscall ["git checkout #{working_branch}"]
           end
         end
 
@@ -228,10 +228,11 @@ module Discharger
           current_version = Object.const_get(version_constant)
           finish_branch = "bump/finish-#{current_version.tr(".", "-")}"
 
-          syscall ["git", "fetch origin #{working_branch}"],
-            ["git", "checkout", working_branch],
-            ["git", "checkout", "-b #{finish_branch}"]
-
+          syscall(
+            ["git fetch origin #{working_branch}"],
+            ["git checkout #{working_branch}"],
+            ["git checkout -b #{finish_branch}"]
+          )
           sysecho <<~MSG
             Branch #{finish_branch} created.
 
@@ -256,7 +257,7 @@ module Discharger
 
           pr_url = "#{pull_request_url}/compare/#{finish_branch}?#{params.to_query}"
 
-          continue = syscall ["git", "push", "origin", finish_branch, "--force"] do
+          continue = syscall ["git push origin #{finish_branch} --force"] do
             sysecho <<~MSG
               Branch #{finish_branch} created.
               Open a PR to #{working_branch} to finalize the release.
@@ -269,7 +270,7 @@ module Discharger
             MSG
           end
           if continue
-            syscall ["git", "checkout", working_branch],
+            syscall ["git checkout #{working_branch}"],
               ["open", pr_url]
           end
         end
@@ -306,7 +307,7 @@ module Discharger
 
             Once the PR is **approved**, run 'rake release' to release the version.
           MSG
-          syscall ["open", pr_url]
+          syscall ["open #{pr_url}"]
         end
       end
     end

data/lib/discharger/version.rb

@@ -1,3 +1,3 @@
 module Discharger
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discharger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jim Gay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-16 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open3