heroku_tool 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b5e399a4542b07992fbc0e896bf8b1f6fca73cb3abf66647c0c741e013ee910
-  data.tar.gz: b06141618a185a433edbb74786d6ea572a0079220bf22f4f6724b87a86e8ac30
+  metadata.gz: 5aff0c40aebac826f0c564531114ce61762c7e1fed7ad87b281160c7b27bccd0
+  data.tar.gz: b8ff4953f2f385b49f7a25a8f276bdce0e5221f34db9a5207b3f60fb3ebe1c63
 SHA512:
-  metadata.gz: 54d7a075669af48e1a62a59cf077ce577114e565487b1997f0bad47edb2f26c74250a82ea9b501f058ef66ec4ec4157086ba3c96aaed66f163b24c70aa2b7096
-  data.tar.gz: ea5187d7722b88eb0cf01065ae624f65effa27457257a3e6081b22294dbc3e893a0d3d74c0cff36cbd7a38c01c51a1b68db057688c9a1fc27789fab6c8dde047
+  metadata.gz: 7275494d3fbd74ac696cd30394b8a7969594c6c77e2ad9aac787a1562247956a3b28de99940a6f085da2b55d99337a3a207c66b441710c0f50c2328d92055783
+  data.tar.gz: 8a49007bd74cd1b5cedf559e3d7ad0afaae2765eef98d9c25b2003e04afedb7c422052f168d2fc6e3fb4ec090beb28583fc05719c785703230a18764b9d2f9fe

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v0.9.3
+
+record the app revision using git describe, at the beginning of the process (in case of accidental branch switches)
+
+## v0.9.2
+
+update and fix bugsnag deploy tracking
+
 ## v0.9.1
 
 support url in heroku targets

data/lib/heroku_tool/commander.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "open3"
+require "shellwords"
 
 module HerokuTool
   class Commander
@@ -14,13 +15,21 @@ module HerokuTool
       @configuration = configuration
     end
 
+    # The deploy ref is resolved to a commit once, before anything else happens, and that commit is what gets
+    # described, pushed and recorded: checking out another branch (or fetching) while the deploy is running
+    # doesn't change what is deployed or how it is reported.
+    #
+    # @return [String, false] the revision (commit sha) that was deployed, or false if the deploy failed
     def deploy(deploy_ref, with_maintenance:)
-      deploy_ref_description = deploy_ref_describe(deploy_ref)
+      revision = resolve_revision(deploy_ref)
+      return false unless revision
+
+      deploy_ref_description = deploy_ref_describe(revision)
       puts "Deploy #{deploy_ref_description} to #{target} with migrate=#{target.migrate_in_release_phase ? "(during release phase)" : migrate_outside_of_release_phase?} with_maintenance=#{with_maintenance} "
 
-      output_to_be_deployed(deploy_ref)
+      output_to_be_deployed(revision)
       configuration.before_deploying(self, target, deploy_ref_description)
-      successful_push = puts_and_system "git push -f #{target.git_remote} #{deploy_ref || target}^{}:#{target.heroku_target_ref}"
+      successful_push = puts_and_system "git push -f #{target.git_remote} #{revision}:#{target.heroku_target_ref}"
 
       return false unless successful_push
 
@@ -32,12 +41,22 @@ module HerokuTool
       app_revision_env_var = configuration.app_revision_env_var
       if app_revision_env_var && app_revision_env_var != "HEROKU_SLUG_COMMIT"
         # HEROKU_SLUG_COMMIT is automatically set by https://devcenter.heroku.com/articles/dyno-metadata
-        puts_and_system %{heroku config:set #{app_revision_env_var}=$(git describe --always #{deploy_ref}) -a #{target.heroku_app}}
+        puts_and_system "heroku config:set #{app_revision_env_var}=#{Shellwords.escape(deploy_ref_description)} -a #{target.heroku_app}"
       end
 
       maintenance_off if with_maintenance
       configuration.after_deploying(self, target, deploy_ref_description)
-      true
+      revision
+    end
+
+    # @return [String, nil] the sha of the commit that deploy_ref (or the target's deploy_ref) points at right now
+    def resolve_revision(deploy_ref = nil)
+      deploy_ref ||= target.deploy_ref
+      revision = `git rev-parse --verify --quiet #{deploy_ref}^{commit}`.strip
+      return revision unless revision.empty?
+
+      puts "❌ Can't resolve '#{deploy_ref}' to a commit"
+      nil
     end
 
     def maintenance_on
@@ -55,7 +74,7 @@ module HerokuTool
     end
 
     def deploy_ref_describe(deploy_ref = nil)
-      `git describe #{deploy_ref || target.deploy_ref}`.strip
+      `git describe --always #{deploy_ref || target.deploy_ref}`.strip
     end
 
     def output_to_be_deployed(since_deploy_ref = nil)

data/lib/heroku_tool/tasks/heroku.thor

@@ -135,9 +135,9 @@ class Heroku < Thor
     check_deploy_ref(deploy_ref)
     with_maintenance = options[:maintenance].nil? && migrate_outside_of_release_phase? || options[:maintenance] || false
     deploy_ref ||= target.deploy_ref
-    success = commander.deploy(deploy_ref, with_maintenance: with_maintenance)
-    if success
-      deploy_tracking(target_name, deploy_ref)
+    deployed_revision = commander.deploy(deploy_ref, with_maintenance: with_maintenance)
+    if deployed_revision
+      deploy_tracking(target_name, deployed_revision)
     else
       exit(-1)
     end

data/lib/heroku_tool/version.rb

@@ -1,3 +1,3 @@
 module HerokuTool
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_tool
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Tim Diggins
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.11
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Tool for configurable one-shot deployment and db managment with heroku and
   rails