heroku_hatchet 4.0.6 → 4.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d083ce00b13be495fe3c6e2d19d66a75d4e390aa960d668edc2355f333653bdf
-  data.tar.gz: 2c3033b15be7d3a375ff4f8565f19f7b74da9269bd3f0d79a9b94d58db305810
+  metadata.gz: 2d62240ccab36896f21d254213e96976f8efbcb9294dd79c9a614f6167926a0d
+  data.tar.gz: 9b56fff4dc3217e079fb7e47ce43cd96c56632f72501a12cfbd476bda6be3acf
 SHA512:
-  metadata.gz: 8740ec9d580dbe263b393dea890c243dce35b062f08ade6a20d232ebc3b212cdd53f44f7d83d1c0102d693564fcbd840a4b5bc736fcb61628354a1a0ad7b6d4d
-  data.tar.gz: 11a08221b229977aebdb8be2f403ee4b93b45ab48c66ba0a6a8db5b06ed90379cdfdfa139724a948dfba75101f53357a094ff0d453e8105a7b7a56dd5090f225
+  metadata.gz: e31bbcca0a7e163acfe5c8ae66a0f7e9aa4296095bbf5e43e9fb53df852b6fc628bb428519c5939b566ed3fa047d9e8a670cba786cc3d97fd8191592f2432de2
+  data.tar.gz: bd9f296e0f5b2f28728f09b7d4aca5795f22659ab738e49d6cc88a438b49fcd3bb7a3524da8389f81d73377322ef012551542fcdef45cfa34d42d029dc6a75e5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## HEAD
 
+## 4.0.7
+
+- Exit code is now returned from `app.run` commands (https://github.com/heroku/hatchet/pull/58)
+- ci_setup.rb no longer emits an error when run on `sh` (https://github.com/heroku/hatchet/pull/57)
+
 ## 4.0.6
 
 - Setup script `hatchet ci:setup` added (https://github.com/heroku/hatchet/pull/55)

data/README.md

@@ -41,17 +41,11 @@ $ travis encrypt HEROKU_API_USER=<example@example.com> --add
 
 If you're running locally, your system credentials will be pulled from `heroku auth:token`
 
-You'll also need to trigger a "setup" step for CI tasks. There is a setup task you can use first you need to require it, likely in your Rakefile:
-
-```ruby
-require 'hatchet/tasks'
-```
-
-Then execute the script `hatchet:setup_ci`. You can do it on Travis CI like this:
+You'll also need to trigger a "setup" step for CI tasks. You can do it on Travis CI like this:
 
 ```
 # .travis.yml
-before_script: bundle exec rake hatchet:setup_ci
+before_script: bundle exec hatchet ci:setup
 ```
 
 and on Heroku CI like this:
@@ -61,7 +55,7 @@ and on Heroku CI like this:
   "environments": {
     "test": {
       "scripts": {
-        "test-setup": "bundle exec rake hatchet:setup_ci",
+        "test-setup": "bundle exec hatchet ci:setup",
       }
     }
   }
@@ -321,42 +315,21 @@ To run on travis you will need to configure your `.travis.yml` to run the approp
 
 For reference see the `.travis.yml` from [hatchet](https://github.com/heroku/hatchet/blob/master/.travis.yml) and the [heroku-ruby-buildpack](https://github.com/heroku/heroku-buildpack-ruby/blob/master/.travis.yml). To make running on travis easier there is a rake task in Hatchet that can be run before your tests are executed
 
-```
-before_script: bundle exec rake hatchet:setup_ci
+```yml
+before_script: bundle exec hatchet ci:setup
 ```
 
 I recommend signing up for a new heroku account for running your tests on travis, otherwise you will quickly excede your API limit. Once you have the new api token you can use this technique to [securely send travis the data](http://docs.travis-ci.com/user/environment-variables/#Secure-Variables).
 
-
-```
+```sh
 $ travis encrypt HEROKU_API_KEY=<token> --add
 ```
 
-You'll also need to download the Heroku CLI. Add the executable `etc/ci_setup.sh` to your project, with contents:
-
-```
-#!/usr/bin/env bash
-
-sudo apt-get -qq update
-sudo apt-get install software-properties-common
-curl --fail --retry 3 --retry-delay 1 --connect-timeout 3 --max-time 30 https://cli-assets.heroku.com/install-ubuntu.sh | sh
-```
-
-Be sure to change the file permissions with `chmod u+x etc/ci_setup.sh` so that the file is executable.
-
-To run this and download the Heroku cli, you will need to add this step before your install or script depending on your Travis setup process.
-
-```
-before_script:
-  - bash etc/ci_setup.sh
-```
-
 If your Travis tests are containerized, you may need sudo to complete this successfully. In that case, you'll need to add the following:
 
-```
+```yml
+before_script: bundle exec hatchet ci:setup
 sudo: required
-before_install:
-  - sudo bash etc/ci_setup.sh
 ```
 
 ## Extra App Commands

data/etc/ci_setup.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'bundler'
+require 'shellwords'
 puts "== Setting Up CI =="
 
 netrc_file = "#{ENV['HOME']}/.netrc"
@@ -16,8 +17,8 @@ end
 [
  "bundle exec hatchet ci:install_heroku",
  "bundle exec hatchet install",
- "if [ `git config --get user.email` ]; then echo 'already set'; else `git config --global user.email '#{ENV.fetch('HEROKU_API_USER')}'`; fi",
- "if [ `git config --get user.name` ];  then echo 'already set'; else `git config --global user.name  'BuildpackTester'`      ; fi",
+ "git config --get user.email > /dev/null || git config --global user.email #{ENV.fetch('HEROKU_API_USER').shellescape}",
+ "git config --get user.name > /dev/null || git config --global user.name 'BuildpackTester'",
 ].each do |command|
   puts "== Running: #{command}"
   Bundler.with_clean_env do

data/lib/hatchet/app.rb

@@ -108,8 +108,12 @@ 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 {|k,v| "--#{k.to_s.shellescape}=#{v.to_s.shellescape}"}.join(" ")
-      heroku_command = "heroku run #{command.to_s.shellescape} -a #{name} #{ heroku_options }"
+      heroku_options = (options.delete(:heroku) || {}).map do |k,v|
+        arg = "--#{k.to_s.shellescape}"
+        arg << "=#{v.to_s.shellescape}" unless v.nil?
+        arg
+      end.join(" ")
+      heroku_command = "heroku run -a #{name} #{heroku_options} --exit-code -- #{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.6"
+  VERSION = "4.0.7"
 end

data/test/hatchet/app_test.rb

@@ -62,4 +62,12 @@ class AppTest < Minitest::Test
       end
     end
   end
+  
+  def test_run
+    app = Hatchet::GitApp.new("default_ruby")
+    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
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.0.7
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-10 00:00:00.000000000 Z
+date: 2019-03-08 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.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Hatchet is a an integration testing library for developing Heroku buildpacks.