heroku_tool 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54667e338f64d0555965c42828d5e5363bded258cb60e55af76e5a2339bb9c03
-  data.tar.gz: c1d86d98c1ade53354d5e7f1d54d3bac19d6749e57bdd24cd17400d2172cd6d4
+  metadata.gz: 4b5e399a4542b07992fbc0e896bf8b1f6fca73cb3abf66647c0c741e013ee910
+  data.tar.gz: b06141618a185a433edbb74786d6ea572a0079220bf22f4f6724b87a86e8ac30
 SHA512:
-  metadata.gz: bfcd540d5d6072385d293792819d519a5bf717a7eeca4bde76eac45975e9e967ef2fca9a85b38c173d7a5088f5e76d0e9e76c39dd6adff810f869ea6a60167e8
-  data.tar.gz: 15dde81dbe811594f2abdc88ed79b9d60c5b5e76b0c920b1ecf97de93c92d493a72776b0f3e2e9b3f456ec5f2d25eb5bc232edb4ec29b19ac845407d19853d21
+  metadata.gz: 54d7a075669af48e1a62a59cf077ce577114e565487b1997f0bad47edb2f26c74250a82ea9b501f058ef66ec4ec4157086ba3c96aaed66f163b24c70aa2b7096
+  data.tar.gz: ea5187d7722b88eb0cf01065ae624f65effa27457257a3e6081b22294dbc3e893a0d3d74c0cff36cbd7a38c01c51a1b68db057688c9a1fc27789fab6c8dde047

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.9.1
+
+support url in heroku targets
+
 ## v0.9.0
 
 - BREAKING CHANGE: Heroku::Configuration has been renamed to HerokuTool::Configuration and is now must be an instance not a class method

data/lib/heroku_tool/commander.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "open3"
+
 module HerokuTool
   class Commander
     # @return [HerokuTool::HerokuTargets::HerokuTarget]
@@ -65,10 +67,10 @@ module HerokuTool
     end
 
     # @return [Boolean] true if the command was successful
-    def puts_and_system(cmd)
-      puts cmd
+    def puts_and_system(cmd, *args)
+      puts([cmd, *args].join(" "))
       puts "-------------"
-      system_with_clean_env(cmd).tap do |result|
+      system_with_clean_env(cmd, *args).tap do |result|
         if result
           puts "-------------"
         else
@@ -77,30 +79,31 @@ module HerokuTool
       end
     end
 
-    def puts_and_exec(cmd)
-      puts cmd
-      exec_with_clean_env(cmd)
+    def puts_and_exec(cmd, *args)
+      puts([cmd, *args].join(" "))
+      exec_with_clean_env(cmd, *args)
     end
 
-    def exec_with_clean_env(cmd)
-      if defined?(Bundler) && Bundler.respond_to?(:with_unbundled_env)
-        Bundler.with_unbundled_env { `#{cmd}` }
+    def exec_with_clean_env(cmd, *args)
+      output, _status = if defined?(Bundler) && Bundler.respond_to?(:with_unbundled_env)
+        Bundler.with_unbundled_env { Open3.capture2(cmd, *args) }
       elsif defined?(Bundler)
-        Bundler.with_clean_env { `#{cmd}` }
+        Bundler.with_clean_env { Open3.capture2(cmd, *args) }
       else
-        `#{cmd}`
+        Open3.capture2(cmd, *args)
       end
+      output
     end
 
     protected
 
-    def system_with_clean_env(cmd)
+    def system_with_clean_env(cmd, *args)
       if defined?(Bundler) && Bundler.respond_to?(:with_unbundled_env)
-        Bundler.with_unbundled_env { system cmd }
+        Bundler.with_unbundled_env { system(cmd, *args) }
       elsif defined?(Bundler)
-        Bundler.with_clean_env { system cmd }
+        Bundler.with_clean_env { system(cmd, *args) }
       else
-        system cmd
+        system(cmd, *args)
       end
     end
   end

data/lib/heroku_tool/heroku_targets.rb

@@ -103,6 +103,10 @@ module HerokuTool
         @values[:migrate_in_release_phase]
       end
 
+      def url
+        @values[:url]
+      end
+
       def to_s
         display_name
       end

data/lib/heroku_tool/tasks/heroku.thor

@@ -194,24 +194,35 @@ class Heroku < Thor
     end
 
     def notify_bugsnag_of_deploy_tracking(deploy_ref:, revision:)
-      api_key = ENV["BUGSNAG_API_KEY"]
-      data = %W[
-        apiKey=#{api_key}
-        releaseStage=#{target.trackable_release_stage}
-        repository=#{target.repository}
-        revision=#{revision}
-        appVersion=#{deploy_ref_describe(deploy_ref)}
-      ].join("&")
-      if api_key.blank?
+      api_key = ENV["BUGSNAG_API_KEY"].presence || "API_KEY"
+
+      app_version = deploy_ref_describe(deploy_ref)
+      json_data = {
+        apiKey: api_key,
+        appVersion: app_version,
+        sourceControl: {
+          repository: target.repository,
+          revision: revision
+        },
+        releaseStage: target.trackable_release_stage
+      }
+
+      args = [
+        "-H", "Content-Type: application/json",
+        "-H", "apiKey: #{api_key}",
+        "-H", "appVersion: #{app_version}",
+        "-d", json_data.to_json,
+        "https://build.bugsnag.com"
+      ]
+      if api_key == "API_KEY"
         puts "\n" + ("*" * 80) + "\n"
-        command = "curl -d #{data} http://notify.bugsnag.com/deploy"
-        puts command
+        puts("curl #{args.join(" ")}")
         puts "\n" + ("*" * 80) + "\n"
         puts "NB: can't notify unless you specify BUGSNAG_API_KEY and rerun"
         puts "  thor heroku:deploy_tracking #{target.name} #{deploy_ref}"
-      else
-        puts_and_system "curl -d \"#{data}\" http://notify.bugsnag.com/deploy"
+        return
       end
+      puts_and_system("curl", *args)
     end
   end
 

data/lib/heroku_tool/version.rb

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

data/release_notes/__TEMPLATE__.md

@@ -0,0 +1,4 @@
+$VERSION Release Notes
+
+*Changes since $PREVIOUS*
+

data/release_notes/v0.9.2.md

@@ -0,0 +1,5 @@
+v0.9.2 Release Notes
+
+*Changes since v0.9.1*
+
+- update and fix bugsnag deploy tracking (#17)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_tool
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Tim Diggins
@@ -150,6 +150,8 @@ files:
 - lib/heroku_tool/tasks/db_drop_all_tables.rake
 - lib/heroku_tool/tasks/heroku.thor
 - lib/heroku_tool/version.rb
+- release_notes/__TEMPLATE__.md
+- release_notes/v0.9.2.md
 - templates/Rakefile
 - templates/heroku.thor
 - templates/heroku_targets.yml
@@ -171,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.11
 specification_version: 4
 summary: Tool for configurable one-shot deployment and db managment with heroku and
   rails