bard 0.55.0 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7b5104dd7439dfc79a1c608bebc1481c9a1d1ced133a637b94593acb944a6a0
-  data.tar.gz: 85d8e12e5957a3a16a74ff6cf400b3ccf4a58f6ad15171d656ef18a0dddf1967
+  metadata.gz: e3317e259bb381214d5b61c3813055bdd55c2be030d9867e7910fcfa91a5177d
+  data.tar.gz: 5e11367f99e7f86889f9302a61d41720f6cf987f11c342389a65971a687f6b58
 SHA512:
-  metadata.gz: 656e71d268890def82ef43283375d91e4b1f88fa4007c58b7f855be64946210ae32d4db518faafc9301e0c7baf17b763f90d6866f3df06f3c5e51813ca3c4cee
-  data.tar.gz: be4a640a1eb96fe264cf25d7b1c22c11766e3a4647580c8d7d4a19f06fe5afd3b34e9882f11636b3fe0c37e1ae2ae44bfbb923d6d5051ef9cf637fda5b5aacec
+  metadata.gz: 938fd14dd007599afa2d35e6f12bc687bd7dd95e66e49eb972819b4a6dedc34222e8cac61b8dc4248e24373c8749efc4f9f18b6db00298922fc93aa41f6618fb
+  data.tar.gz: 2502c3f75458d951ce17dae65b53b1ad1e222f9638f6d8c9efd9baf2d40929ea398793c823a502c9be6830b90a199bf24d0ec468c3e3044a28c6c7b696e29973

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.56.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.56.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -179,7 +179,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.