heroku_hatchet 4.0.8 → 4.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2757fc3e39814bfab066c368f2dd365e5252f4b9
-  data.tar.gz: 86bb1d5c5ed24462ccd99556420f327c8baceeac
+SHA256:
+  metadata.gz: aa8c793ec7b05a43ab97534009134ad65766e064affb0627879cfb87b0888171
+  data.tar.gz: f9daf304c274174ed187428db840a3db58d59576463f05f29739a8b134316d4b
 SHA512:
-  metadata.gz: bd74e5705b78273eb133189a1c807133a0840c1161ce478deb4a699a5641a69c81bd072f62b3531245780a421d0d127cd5f3643fe6e41aab38e7f8ea93e8ac38
-  data.tar.gz: de5f809bcd7b0f4ac6f121ebbb852057eb73b89e6370398e43635a5de6edee2cbffb05ece7b76d50751479152a7b1850fa54c765e787c004fb43067e1a57c670
+  metadata.gz: 85f82bb542f17d5af0630cb598edbeebf2f421de5d05f2226ddcfa90bfea94e274f9511e84cc4bcc6e8622bddd536b3dd981ab1fc4792882b5c085a88a0033ac
+  data.tar.gz: bd85ea35febfcc92381bf1c6570a82f58ba89d86b256c3092198ddf462e76c839e99f6aee81b19ea6ac4a99d826b8eb08f66eab9c02ae4847be31195d507fd31

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 4.0.9
+
+- Allow overriding of all App#run options, including option removal (by passing `Hatchet::App::SkipDefaultOption` as the value)
+
 ## 4.0.8
 
 - Fix `hatchet destroy` calling class from wrong module

data/lib/hatchet/app.rb

@@ -21,6 +21,8 @@ module Hatchet
       end
     end
 
+    SkipDefaultOption = Object.new
+
     def initialize(repo_name,
                    stack: "",
                    name: default_name,
@@ -108,12 +110,14 @@ module Hatchet
     # but programatically and with more control
     def run(cmd_type, command = nil, options = {}, &block)
       command        = cmd_type.to_s if command.nil?
-      heroku_options = (options.delete(:heroku) || {}).map do |k,v|
+      default_options = { "app" => name, "exit-code" => nil }
+      heroku_options = (default_options.merge(options.delete(:heroku) || {})).map do |k,v|
+        next if v == Hatchet::App::SkipDefaultOption # for forcefully removing e.g. --exit-code, a user can pass this
         arg = "--#{k.to_s.shellescape}"
-        arg << "=#{v.to_s.shellescape}" unless v.nil?
+        arg << "=#{v.to_s.shellescape}" unless v.nil? # nil means we include the option without an argument
         arg
       end.join(" ")
-      heroku_command = "heroku run -a #{name} #{heroku_options} --exit-code -- #{command}"
+      heroku_command = "heroku run #{heroku_options} -- #{command}"
       bundle_exec do
         if block_given?
           ReplRunner.new(cmd_type, heroku_command, options).run(&block)

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "4.0.8"
+  VERSION = "4.0.9"
 end

data/test/hatchet/app_test.rb

@@ -68,6 +68,16 @@ class AppTest < Minitest::Test
     app.deploy do
       assert_match /ls: cannot access 'foo bar #baz': No such file or directory\s+Gemfile/, app.run("ls -a Gemfile 'foo bar #baz'")
       assert (0 != $?.exitstatus) # $? is from the app.run use of backticks
+      sleep(3)
+      app.run("ls erpderp", nil, { :heroku => { "exit-code" => Hatchet::App::SkipDefaultOption } } )
+      assert (0 == $?.exitstatus) # $? is from the app.run use of backticks, but we asked the CLI not to return the program exit status by skipping the default "exit-code" option
+      sleep(3)
+      app.run("ls erpderp", nil, { :heroku => { "no-tty" => nil } } )
+      assert (0 != $?.exitstatus) # $? is from the app.run use of backticks
+      sleep(3)
+      assert_match /ohai world/, app.run('echo \$HELLO \$NAME', nil, { :heroku => { "env" => "HELLO=ohai;NAME=world" } } )
+      sleep(3)
+      refute_match /ohai world/, app.run('echo \$HELLO \$NAME', nil, { :heroku => { "env" => "" } } )
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 4.0.8
+  version: 4.0.9
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api
@@ -247,8 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Hatchet is a an integration testing library for developing Heroku buildpacks.