bard 0.55.0 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7b5104dd7439dfc79a1c608bebc1481c9a1d1ced133a637b94593acb944a6a0
-  data.tar.gz: 85d8e12e5957a3a16a74ff6cf400b3ccf4a58f6ad15171d656ef18a0dddf1967
+  metadata.gz: 185f8659f83ac6f3ddcc4922db94061b58a610d09d1da8bd92de1c30f3be1d3f
+  data.tar.gz: 2552ea154c16e106b64c2e7b4db26eb1a0dfb92e99d5e158a93cc818620de14b
 SHA512:
-  metadata.gz: 656e71d268890def82ef43283375d91e4b1f88fa4007c58b7f855be64946210ae32d4db518faafc9301e0c7baf17b763f90d6866f3df06f3c5e51813ca3c4cee
-  data.tar.gz: be4a640a1eb96fe264cf25d7b1c22c11766e3a4647580c8d7d4a19f06fe5afd3b34e9882f11636b3fe0c37e1ae2ae44bfbb923d6d5051ef9cf637fda5b5aacec
+  metadata.gz: d5db740a15a9b346f96ba6cdf1ba2e82841ef5c9f18fa07d7068a47de6d7b7490cb93388622af030e70471905d0ed58c100b73e9c1105ea17754233cbdfec573
+  data.tar.gz: a82d8134445429bf9562c47ec4921a52dc32f81082ef82529d5fd97b1ffa2610f317569496ed577525639720f647194f46c87d1f88ac695242e557313ef3d327

data/install_files/.github/workflows/deploy.yml

@@ -0,0 +1,26 @@
+name: deploy
+on:
+  pull_request:
+    types:
+      - closed
+jobs:
+  deploy:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Install SSH key
+        uses: shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}
+          known_hosts: unnecessary
+          config: |
+            Host *
+              StrictHostKeyChecking no
+              UserKnownHostsFile=/dev/null
+      - name: deploy
+        run: bundle exec bard deploy --skip-ci
+

data/lib/bard/git.rb

@@ -8,14 +8,22 @@ module Bard::CLI::Git
   end
 
   def current_sha
-    `git rev-parse HEAD`.chomp
+    sha_of("HEAD")
   end
 
   def fast_forward_merge?(root, branch)
-    root_head = `git rev-parse #{root}`.chomp
-    branch_head = `git rev-parse #{branch}`.chomp
+    root_head = sha_of(root)
+    branch_head = sha_of(branch)
     common_ancestor = `git merge-base #{root_head} #{branch_head}`.chomp
     common_ancestor == root_head
   end
+
+  def up_to_date_with_remote? branch
+    sha_of(branch) == sha_of("origin/#{branch}")
+  end
+
+  def sha_of ref
+    `git rev-parse #{ref}`.chomp
+  end
 end
 

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.55.0"
+  VERSION = "0.57.0"
 end
 

data/lib/bard.rb

@@ -40,7 +40,7 @@ class Bard::CLI < Thor
     branch = Git.current_branch
 
     if branch == "master"
-      run_crucial "git push origin master:master"
+      run_crucial "git push origin #{branch}:#{branch}" if !Git.up_to_date_with_remote?(branch)
       invoke :ci, [branch], options.slice("local-ci") unless options["skip-ci"]
 
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.55.0
+  version: 0.57.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -140,6 +140,7 @@ files:
 - features/support/io.rb
 - install_files/.github/workflows/cache-ci.yml
 - install_files/.github/workflows/ci.yml
+- install_files/.github/workflows/deploy.yml
 - install_files/apt_dependencies.rb
 - install_files/ci
 - install_files/setup
@@ -179,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.4
 signing_key: 
 specification_version: 4
 summary: CLI to automate common development tasks.