heroku_hatchet 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40a7783798f36bd73a9f7388a2d5614db7697d15
-  data.tar.gz: 70cd5a4911173e7269f10a166d111936dd2bb436
+  metadata.gz: e9898ba7bdc65d51d6325bde26c4e535e1be6a6a
+  data.tar.gz: 44a7a2d536cb66d078aae101d9f83c749038a40a
 SHA512:
-  metadata.gz: '0859831e7c516f3473ba21aead36e95fb56ea094d4f3277d5b4572257c66b05718c9a5b897fb614e23b87cf8687996e498ced6d1c18a6ba4b82f4cf4d6cee4fc'
-  data.tar.gz: 0c04795175b7d71237a20ea329ef8b35f900c4e7f173ad167914801853fd6bf0846e7bf865e0c1115f0db65443d65bdc0117d89d416004a3184abd5f4794313d
+  metadata.gz: aebf4597dc112b0974fe619e12d61609967098616ad69f9a5280c51e84e596c26abfd87aac41933966ecdc1f5cb760551973d97e943af0e17b5c13417ef6c5c6
+  data.tar.gz: a5445945bc151a63295b62169e5832a4b1910591d4f95830e97d3a8e21b57c6004706f290ecf5e6cbc32e683c237bfdb89fbafb5f5477cb48baa6b5d3c84efea

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 3.0.2
 
+- SSH no longer needed for travis setup
+- Remove Heroku.rb dependency
+
+## 3.0.2
+
 - Use https for git clones
 
 ## 3.0.1

data/README.md

@@ -295,7 +295,7 @@ 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_travis
+before_script: bundle exec rake hatchet:setup_ci
 ```
 
 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).

data/hatchet.gemspec

@@ -19,17 +19,16 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "platform-api",  "~> 2"
-  gem.add_dependency "heroku-api",    "~> 0"
-  gem.add_dependency "activesupport", "~> 4"
+  gem.add_dependency "activesupport", "~> 5"
   gem.add_dependency "rrrretry",      "~> 1"
   gem.add_dependency "anvil-cli",     "~> 0"
   gem.add_dependency "excon",         "~> 0"
   gem.add_dependency "thor",          "~> 0"
   gem.add_dependency "repl_runner",   "~> 0.0.3"
   gem.add_dependency "threaded",      "~> 0"
+  gem.add_dependency 'minitest-retry', '~> 0.1.9'
 
-
-  gem.add_development_dependency "minitest",       "~> 4.2"
+  gem.add_development_dependency "minitest",       "~> 5.1"
   gem.add_development_dependency "rake",           "~> 10"
   gem.add_development_dependency "mocha",          "~> 1"
   gem.add_development_dependency "parallel_tests", "~> 0"

data/lib/hatchet.rb

@@ -1,4 +1,3 @@
-require 'heroku/api'
 require 'anvil/engine'
 require 'active_support/core_ext/object/blank'
 require 'rrrretry'

data/lib/hatchet/app.rb

@@ -1,3 +1,4 @@
+require 'securerandom'
 require 'shellwords'
 require 'platform-api'
 

data/lib/hatchet/tasks.rb

@@ -1,20 +1,10 @@
-config_ssh = <<-RUBY
-
-Host heroku.com
-    StrictHostKeyChecking no
-    CheckHostIP no
-    UserKnownHostsFile=/dev/null
-Host github.com
-    StrictHostKeyChecking no
-RUBY
-
 namespace :hatchet do
-  task :setup_travis do
+  task :setup_ci do
     puts "== Setting Up Travis =="
-    netrc = "#{ENV['HOME']}/.netrc"
-    unless File.exists?(netrc)
-      File.open(netrc, 'w') do |file|
-        file.write <<EOF
+    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')}
@@ -25,9 +15,6 @@ EOF
      "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",
-     "echo '#{config_ssh}' >> ~/.ssh/config",
-     "ssh-keygen -f ~/.ssh/id_rsa -t rsa -N ''",
-     "yes | heroku keys:add -y"
     ].each do |command|
       puts "== Running: #{command}"
       Bundler.with_clean_env do
@@ -38,10 +25,7 @@ EOF
     puts "== Done =="
   end
 
-  task :teardown_travis do
-    ['heroku keys:remove'].each do |command|
-      puts "== Running: #{command}"
-      `#{command}`
-    end
+  task :setup_travis do
+    Rake::Task["hatchet:setup_ci"].invoke
   end
 end

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

data/test/hatchet/ci_test.rb

@@ -1,6 +1,5 @@
 require 'test_helper'
 
-
 class CITest < Minitest::Test
 
   def test_ci_create_app_with_stack

data/test/test_helper.rb

@@ -9,6 +9,9 @@ Bundler.require
 require 'minitest/autorun'
 require "mocha/setup"
 
+require 'minitest/retry'
+Minitest::Retry.use!
+
 # Not needed if you're using the most recent version
 if defined?(MiniTest::Unit::TestCase)
   Minitest::Test = MiniTest::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Richard Schneeman
@@ -24,34 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: heroku-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rrrretry
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +122,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement