releasinator 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 142b9a1c28929a601de19ffd0cbf8a9676c787b7
-  data.tar.gz: 2db14160b8162e371cb3490e972c8c0a7d2f3782
+  metadata.gz: 6ca80fa1b94bf914563cddabb0af5cc27f303e6c
+  data.tar.gz: bb274205de083b495f5866fee842af743893f877
 SHA512:
-  metadata.gz: e8e8f8e57c25244bc78e3bdbe23df9c33e1c54c2f64f2139cce64aecb9a3697df99245c8ef06cf71429f9af35dc41fe81d6cfcc581156c8dc3b1f8ab1ef88805
-  data.tar.gz: ad2d9f1ed2ad1487443486446d3c85dc5cb368a64884aacf67779e8d4c51bb8e57f0f3c9ff1cf5a8722f47957a9c58955c94310c003d6d9a89a7993da51b6f68
+  metadata.gz: b3c601f92e61146619786ee59c89529346de11f34e982b09b72d79d4ed2c0879493b1ed156dce7a3e990a6ea268fd76d0d3bb028cdfbe7596cb127fe513d31de
+  data.tar.gz: 668e599c2cf6b6bc7f92d8da6cfe346be23a0dae850709166caede3bada910fe8377bf206cabb7947b69a9afa2611a15d2cd4cbfb8debcc5893601fc47ff7534

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Releasinator release notes
 ==========================
 
+0.3.1
+-----
+* Fix regressed submodule origin/master validation to work properly with detached branches.
+
 0.3.0
 -----
 * Add new `validate:releasinator_version` task.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    releasinator (0.3.0)
+    releasinator (0.3.1)
       colorize (~> 0.7)
       configatron (~> 4.5)
       json (~> 1.8)

data/lib/git_util.rb

@@ -35,6 +35,10 @@ module Releasinator
       CommandProcessor.command("git symbolic-ref --short HEAD").strip
     end
 
+    def self.detached?
+      "" == CommandProcessor.command("git symbolic-ref --short -q HEAD | cat").strip
+    end
+
     def self.untracked_files
       CommandProcessor.command("git ls-files --others --exclude-standard")
     end
@@ -80,6 +84,9 @@ module Releasinator
       end
     end
 
+    def self.get_local_head_sha1
+      CommandProcessor.command("git rev-parse --verify head").strip
+    end
 
     def self.get_local_branch_sha1(branch_name)
       CommandProcessor.command("git rev-parse --verify #{branch_name}").strip

data/lib/releasinator/version.rb

@@ -1,3 +1,3 @@
 module Releasinator
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/validator.rb

@@ -273,7 +273,23 @@ module Releasinator
         Printer.success("Found " + submodules.count.to_s.bold + " submodules in .gitmodules.")
         submodules.each do |submodule|
           Dir.chdir(submodule.path) do
-            validate_local_matches_remote("master")
+            if GitUtil.detached?
+              local_sha1 = GitUtil.get_local_head_sha1()
+            else
+              local_branch_name = GitUtil.get_current_branch
+              local_sha1 = GitUtil.get_local_branch_sha1(local_branch_name)
+            end
+
+            origin_master_sha1 = GitUtil.get_remote_branch_sha1("master")
+
+            if local_sha1 != origin_master_sha1
+              abort_string = "Submodule #{Dir.pwd} not on latest master.  Currently at #{local_sha1}, but origin/master is at #{origin_master_sha1}."\
+              "\nYou should update this submodule to the latest in origin/master."
+              Printer.fail(abort_string)
+              abort()
+            else
+              Printer.success("Submodule #{Dir.pwd} matches origin/master.")
+            end
             validate_clean_git()
           end
         end
@@ -312,7 +328,7 @@ module Releasinator
       local_branch_sha1 = GitUtil.get_local_branch_sha1(branch_name)
       origin_branch_sha1 = GitUtil.get_remote_branch_sha1(branch_name)
       if local_branch_sha1 != origin_branch_sha1
-        abort_string = "Branches not in sync: #{Dir.pwd} at #{local_branch_sha1}, but origin/#{branch_name} is #{origin_branch_sha1}."\
+        abort_string = "Branches not in sync: #{Dir.pwd} branch:#{branch_name} at #{local_branch_sha1}, but origin/#{branch_name} is at #{origin_branch_sha1}."\
         "\nIf you received this error on the root project, you may need to:"\
         "\n  1. pull the latest changes from the remote,"\
         "\n  2. push changes up to the remote,"\

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: releasinator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - PayPal