gempilot 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a9a46b6f3c9121afd8b129b511f2d05107bd97009d3274f840b80779aba3187
-  data.tar.gz: e41500827ee11aa83827feb8c43fb36a115383a7cd6a52619f49d6487d05f9ce
+  metadata.gz: ab55a4c336ff8612280f38c41b6c4471e9f7791ae9fd40998af6608c016f5031
+  data.tar.gz: 1d29b54f07c0c66a0a6781a394d29d0cb73c14ceba5c3cf8278601e5e1db4df9
 SHA512:
-  metadata.gz: '059d2fd4b08bf84d5f8bec7f2d13907362b73bc51222c56641292423a2df753c45f6b279d7e1abb0586a453d2979243b7d964d0e4cbf908a768f714f3bf6cbae'
-  data.tar.gz: febb87bfccb1ae993e298848a4cc7b8b4a084479ead1850799bc9dfa1496d886fddeba6d49ff62ddbe171efcd74c7d8f3d561bfc6151856048ad81bc430b824f
+  metadata.gz: 22f56e4d465bd05cfb95f4286599ae1c8242c56a63855aefad5878b74eb277dae5f0a497f11a43ccc2e4539cb9e4b18345907fe991ca8a4b93657fb9265138d7
+  data.tar.gz: 7edb37e82f9f3595bfe6d2002684c8dec2a40dbd7b7cd04440dad519a2e68d521793831fd717786cb53f6466385eb264e2196e4f8c67500feb3ac08bb2eb28d3

data/lib/gempilot/origin.rb

@@ -5,7 +5,9 @@ module Gempilot
   ## Backs the +release:source_control_push+ task. Idempotent: pushing an
   ## already-pushed branch or tag is a no-op, so re-running a release never
   ## fails on an existing tag (unlike bundler's +already_tagged?+ guard, which
-  ## skips the push entirely once the tag exists locally).
+  ## skips the push entirely once the tag exists locally). From a detached
+  ## HEAD, such as a CI checkout of the tag, there is no branch to push, so
+  ## only the tag goes to +origin+.
   class Origin
     include StrictShell
 
@@ -16,21 +18,21 @@ module Gempilot
     end
 
     def push
-      sh "git", "push", remote, "refs/heads/#{branch}"
+      sh "git", "push", remote, "refs/heads/#{branch}" if branch
       sh "git", "push", remote, "refs/tags/#{tag}"
     end
 
     private
 
     def branch
-      @branch ||= resolve_branch
-    end
+      return @branch if defined?(@branch)
 
-    def resolve_branch
-      name = capture("git", "rev-parse", "--abbrev-ref", "HEAD")
-      raise "Cannot push from a detached HEAD; check out a branch first" if name == "HEAD"
+      @branch = attached_branch
+    end
 
-      name
+    def attached_branch
+      out, status = Open3.capture2("git", "symbolic-ref", "--quiet", "--short", "HEAD")
+      out.strip if status.success?
     end
 
     def remote
@@ -38,15 +40,10 @@ module Gempilot
     end
 
     def configured_remote
+      return unless branch
+
       out, status = Open3.capture2("git", "config", "--get", "branch.#{branch}.remote")
       out.strip if status.success?
     end
-
-    def capture(*args)
-      out, status = Open3.capture2(*args)
-      raise "Command #{args.join(" ").inspect} failed (exit #{status.exitstatus})" unless status.success?
-
-      out.strip
-    end
   end
 end

data/lib/gempilot/version.rb

@@ -1,3 +1,3 @@
 module Gempilot
-  VERSION = "0.3.4".freeze
+  VERSION = "0.3.5".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gempilot
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - David Gillis
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.22
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A toolkit for creating, managing, and releasing your own rubygems
 test_files: []