heroku_hatchet 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f291b6db177c6d7a5077a8737ea4d059bf4d45fcb488f1d0cdd191afc86b9112
-  data.tar.gz: dd7437aa06e8b99e5a2ebeb1ee4fdec8fe1469c3fa8500e01376494df62b236c
+  metadata.gz: d083ce00b13be495fe3c6e2d19d66a75d4e390aa960d668edc2355f333653bdf
+  data.tar.gz: 2c3033b15be7d3a375ff4f8565f19f7b74da9269bd3f0d79a9b94d58db305810
 SHA512:
-  metadata.gz: fb6bcc97860fe4f3d6d8ae37ade5ad6d2f8e66c2338730ebf6c1643ee848787aedf4e09e99280ef56b1c8c7c337c0e94ebf6bb6ca439ec6a16ce8645c58b500e
-  data.tar.gz: ff1ddf35e6c2331d7db2430637967f36272333af3d18d8ea0c3a83a16995cf5389fe27635fef69630c9a30f96c5967afa7cd480478edfdf60c33bb61fee2dbd5
+  metadata.gz: 8740ec9d580dbe263b393dea890c243dce35b062f08ade6a20d232ebc3b212cdd53f44f7d83d1c0102d693564fcbd840a4b5bc736fcb61628354a1a0ad7b6d4d
+  data.tar.gz: 11a08221b229977aebdb8be2f403ee4b93b45ab48c66ba0a6a8db5b06ed90379cdfdfa139724a948dfba75101f53357a094ff0d453e8105a7b7a56dd5090f225

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
 - 2.3.1
-before_script: bundle exec rake hatchet:setup_travis
+before_script:
+  - bundle exec hatchet ci:setup
 script: bundle exec parallel_test test/hatchet -n 9
 after_script: bundle exec rake hatchet:teardown_travis
 env:
@@ -11,11 +12,5 @@ env:
   - HATCHET_APP_LIMIT=80
   - secure: KvuEChRTZYrWd1Q4PKt3YM5FkfuCAOtsKgjC4HDGjCYVNee3793XGwAr0e5LiQqrvHDmbJS7ZPelV3ptor2QJTdmZjPhu/tZKPMLQg7wm8vTcrJflkJDqJl6ECxd40zbUgmo+wSPSvx+K3ZGKqLF4D43vvFJaqBUoAVOGdt66c8=
   - secure: XuJ4XUraWzNlfY9a+6Mh9lVlLuRY988YAaA8LKQOe2KAT5MRqcZzqlKOwDeTWK0tas68bzK7T8RT/L+6/nck0u5VrPHMhkc8QDBSqcle8kFcBxf/64EnCzB40lZoxvcdQ3wm8E41DRwsI7hAHLdVVNXC8f1/wQOAm77nOEvPdvM=
-sudo: false
+sudo: true
 dist: trusty
-addons:
-  apt:
-    sources:
-    - heroku
-    packages:
-    - heroku-toolbelt

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 4.0.6
+
+- Setup script `hatchet ci:setup` added (https://github.com/heroku/hatchet/pull/55)
+
 ## 4.0.5
 
 - Allow for using locally checked in repo and skip the hatchet.lock dance (https://github.com/heroku/hatchet/pull/53)

data/README.md

@@ -332,15 +332,31 @@ I recommend signing up for a new heroku account for running your tests on travis
 $ travis encrypt HEROKU_API_KEY=<token> --add
 ```
 
-You'll also need these specified in your travis.yml:
+You'll also need to download the Heroku CLI. Add the executable `etc/ci_setup.sh` to your project, with contents:
 
 ```
-addons:
-  apt:
-    sources:
-    - heroku
-    packages:
-    - heroku-toolbelt
+#!/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:
+
+```
+sudo: required
+before_install:
+  - sudo bash etc/ci_setup.sh
 ```
 
 ## Extra App Commands

data/bin/hatchet

@@ -17,6 +17,24 @@ require 'date'
 require 'yaml'
 
 class HatchetCLI < Thor
+  desc "ci:install_heroku", "installs the `heroku` cli"
+  define_method("ci:install_heroku") do
+    if `which heroku` && $?.success?
+      puts "The `heroku` command is already installed"
+      return
+    else
+      puts "installing `heroku` command"
+    end
+    script = File.expand_path File.join(__dir__, "../etc/setup_heroku.sh")
+    cmd(script)
+  end
+
+  desc "ci:setup", "sets up project to run on a linux CI environment"
+  define_method("ci:setup") do
+    script = File.expand_path File.join(__dir__, "../etc/ci_setup.rb")
+    cmd(script)
+  end
+
   desc "install", "installs repos defined in 'hatchet.json'"
   def install
     warn_dot_ignore!
@@ -46,12 +64,6 @@ class HatchetCLI < Thor
     self.lock if missing_commit
   end
 
-  def load_lockfile
-    return YAML.safe_load(File.read('hatchet.lock')).to_h
-  rescue Errno::ENOENT => e
-    raise "No such file found `hatchet.lock` please run `$ bundle exec hatchet lock`"
-  end
-
   desc "locks to specific git commits", "updates hatchet.lock"
   def lock
     lock_hash = {}
@@ -98,6 +110,11 @@ class HatchetCLI < Thor
   end
 
   private
+  def load_lockfile
+    return YAML.safe_load(File.read('hatchet.lock')).to_h
+  rescue Errno::ENOENT => e
+    raise "No such file found `hatchet.lock` please run `$ bundle exec hatchet lock`"
+  end
 
   def bad_repo?(url)
     `git ls-remote --exit-code -h "#{url}"`

data/etc/ci_setup.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+require 'bundler'
+puts "== Setting Up CI =="
+
+netrc_file = "#{ENV['HOME']}/.netrc"
+unless File.exists?(netrc_file)
+  File.open(netrc_file, 'w') do |file|
+    file.write <<-EOF
+machine git.heroku.com
+login #{ENV.fetch('HEROKU_API_USER')}
+password #{ENV.fetch('HEROKU_API_KEY')}
+EOF
+  end
+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",
+].each do |command|
+  puts "== Running: #{command}"
+  Bundler.with_clean_env do
+    result = `#{command}`
+    raise "Command failed: #{command.inspect}\nResult: #{result}" unless $?.success?
+  end
+end
+puts "== Done =="

data/etc/setup_heroku.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+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

data/lib/hatchet/tasks.rb

@@ -1,28 +1,8 @@
 namespace :hatchet do
   task :setup_ci do
-    puts "== Setting Up Travis =="
-    netrc_file = "#{ENV['HOME']}/.netrc"
-    unless File.exists?(netrc_file)
-      File.open(netrc_file, 'w') do |file|
-        file.write <<-EOF
-machine git.heroku.com
-  login #{ENV.fetch('HEROKU_API_USER')}
-  password #{ENV.fetch('HEROKU_API_KEY')}
-EOF
-      end
-    end
-    [
-     "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",
-    ].each do |command|
-      puts "== Running: #{command}"
-      Bundler.with_clean_env do
-        result = `#{command}`
-        raise "Command failed: #{command.inspect}\nResult: #{result}" unless $?.success?
-      end
-    end
-    puts "== Done =="
+    script = File.expand_path = File.join(__dir__, "../../etc/ci_setup.rb")
+    out = `#{script}`
+    raise "Command #{script.inspect} failed\n#{out}"
   end
 
   task :setup_travis do

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "4.0.5"
+  VERSION = "4.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api
@@ -194,6 +194,8 @@ files:
 - README.md
 - Rakefile
 - bin/hatchet
+- etc/ci_setup.rb
+- etc/setup_heroku.sh
 - hatchet.gemspec
 - hatchet.json
 - hatchet.lock