discharger 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b30651d287520179cdce0626af6f8713eaf33c137fec4fde6d8d9313e2a0f2b
-  data.tar.gz: d0ec11e81f96f715e5482b3fc0d398551b75fced5eaee950eaee3f6f1106b7d1
+  metadata.gz: f399dc08de3d54286fe7030a7b7a0e15a2055f9aa62d760073f692f96b0e8b46
+  data.tar.gz: a1f5ce7018dc556f7b18da3fc837cfde7efb589de3c3527e9ad69ba78a78096d
 SHA512:
-  metadata.gz: 86ff6ac38f47d1c75fdb361b2e6dea8c39714b9d17670dda4c1361219ff65fef6631eece267ca8f0f151efc420d30e4e26a0adf4c84792e0c19b2b09289169cf
-  data.tar.gz: 86c2932d7eb56428b7e4bf22d14941317cc6dd2b8684b76bdebf1d2286480f10a59ef8f156d0bbbe12c8f417e9979ca9ae39179fd68cde1a469a4b1ce5a7ba73
+  metadata.gz: b04988a2af1edd4f28ffc2490839df815a4e551456f0d9c4e5a9e23f2ccb774e6e0b6ef313890c85e8fdf5f8bb273934fbaab30cf2088f6b933f272de65abcfb
+  data.tar.gz: 4be4ec992ed4e59d4335c8ad2110d603379ec729c402af8c85db2d7e606f19966a2c3d03aae82d45f7c072a060d76669f18649680270e6e42e83c5f86a289c04

data/lib/discharger/task.rb

@@ -37,6 +37,8 @@ module Discharger
     attr_accessor :commit_identifier
     attr_accessor :pull_request_url
 
+    attr_reader :last_message_ts
+
     # Reissue settings
     attr_accessor(
       *Reissue::Task.instance_methods(false).reject { |method|
@@ -145,7 +147,12 @@ module Discharger
           ["git push origin #{production_branch}:#{production_branch} v#{current_version}:v#{current_version}"],
           ["git push origin v#{current_version}"]
         ) do
-          tasker["#{name}:slack"].invoke("Released #{app_name} #{current_version} to production.", release_message_channel, ":chipmunk:")
+          tasker["#{name}:slack"].invoke("Released #{app_name} #{current_version} (#{commit_identifier.call}) to production.", release_message_channel, ":chipmunk:")
+          if last_message_ts.present?
+            text = File.read(Rails.root.join(changelog_file))
+            tasker["#{name}:slack"].reenable
+            tasker["#{name}:slack"].invoke(text, release_message_channel, ":log:", last_message_ts)
+          end
           syscall ["git checkout #{working_branch}"]
         end
 
@@ -199,17 +206,18 @@ module Discharger
           syscall(
             ["git fetch origin #{working_branch}"],
             ["git checkout #{working_branch}"],
+            ["git reset --hard origin/#{working_branch}"],
             ["git branch -D #{staging_branch} 2>/dev/null || true"],
             ["git checkout -b #{staging_branch}"],
             ["git push origin #{staging_branch} --force"]
           ) do
-            tasker["#{name}:slack"].invoke("Building #{app_name} #{commit_identifier.call} on #{staging_branch}.", release_message_channel)
+            tasker["#{name}:slack"].invoke("Building #{app_name} #{current_version} (#{commit_identifier.call}) on #{staging_branch}.", release_message_channel)
             syscall ["git checkout #{working_branch}"]
           end
         end
 
         desc "Send a message to Slack."
-        task :slack, [:text, :channel, :emoji] => :environment do |_, args|
+        task :slack, [:text, :channel, :emoji, :ts] => :environment do |_, args|
           args.with_defaults(
             channel: release_message_channel,
             emoji: nil
@@ -217,9 +225,11 @@ module Discharger
           client = Slack::Web::Client.new
           options = args.to_h
           options[:icon_emoji] = options.delete(:emoji) if options[:emoji]
+          options[:thread_ts] = options.delete(:ts) if options[:ts]
 
           sysecho "Sending message to Slack:".bg(:green).black + " #{args[:text]}"
           result = client.chat_postMessage(**options)
+          instance_variable_set(:@last_message_ts, result["ts"])
           sysecho %(Message sent: #{result["ts"]})
         end
 

data/lib/discharger/version.rb

@@ -1,3 +1,3 @@
 module Discharger
-  VERSION = "0.2.6"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discharger
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Jim Gay
+- Savannah Moore
 bindir: bin
 cert_chain: []
-date: 2025-01-24 00:00:00.000000000 Z
+date: 2025-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open3