heroku_hatchet 2.0.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2724cc73ce141dda01c9cb487f5ec17d6aee3aa
-  data.tar.gz: abdf9b2be53bef8b915d37a95813cd900dd9a6d7
+  metadata.gz: d7fac9a7bda1bf9b9ee01876740f59342084d594
+  data.tar.gz: 26c04c978734810553e0d6fb67ecd5b0ab2dc47b
 SHA512:
-  metadata.gz: 7f9a3853d46f8e7d3d5f223328340bcdad156b5579cc3ab5d5ce54d916b6f0657335ff3a43396d991ad5dcea93585376725e60979e3dc8a1d2fbde0e685a6c5a
-  data.tar.gz: 7864116c20872b21b4b05f5d4f2102f752825c590a40b69184c1dcef3f697fdb48ac570a6c83c4ecd34da4c096d8c39d00a08593483ce4c6d854d17bb58dbbe8
+  metadata.gz: d4ade0ea4eb6be0cac69f1b434652ce9f08fd578309cb4c5fa68e969b75483b1cf7dbe8250ea5db4134aeee0e999cafeee06861786ea975649393687ccc2b8dc
+  data.tar.gz: d6b04a0aaf3fc458f32ed5d872ebff3ec4a385da6e95be8e5145740fd858111eaf30e791c12575a0b6512e97f985f5d08f71f8dad2dfd6c0fb22796c0cfbfd6b

data/.travis.yml

@@ -9,8 +9,10 @@ env:
   - HATCHET_BUILDPACK_BRANCH=master
   - HATCHET_RETRIES=3
   - HATCHET_APP_LIMIT=80
-  - secure: TvpZ0CrIe0FqjyTUOAtVqjHHrtF1esMroa00bYYRBas050/y7ygVpAn9utFZZChgt1PUbM48I01UaQglGxtmXVl3ahQXtPpXlzlwJOlDS09dlZFfLenkv530/pxIlpRtqk4q18gCoLBblXX7RZu3TGt0qds+o8dQrBzL6QifAHs=
+  - secure: KvuEChRTZYrWd1Q4PKt3YM5FkfuCAOtsKgjC4HDGjCYVNee3793XGwAr0e5LiQqrvHDmbJS7ZPelV3ptor2QJTdmZjPhu/tZKPMLQg7wm8vTcrJflkJDqJl6ECxd40zbUgmo+wSPSvx+K3ZGKqLF4D43vvFJaqBUoAVOGdt66c8=
+  - secure: XuJ4XUraWzNlfY9a+6Mh9lVlLuRY988YAaA8LKQOe2KAT5MRqcZzqlKOwDeTWK0tas68bzK7T8RT/L+6/nck0u5VrPHMhkc8QDBSqcle8kFcBxf/64EnCzB40lZoxvcdQ3wm8E41DRwsI7hAHLdVVNXC8f1/wQOAm77nOEvPdvM=
 sudo: false
+dist: trusty
 addons:
   apt:
     sources:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 3.0.0
+
+- Use v3 of the Heroku API because Heroku is deprecating v2
+
 ## 2.0.3
 
 - Fix CI support to include multi nodes of output.

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
 gemspec
+
+gem 'm'

data/hatchet.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "platform-api",  "~> 1"
+  gem.add_dependency "platform-api",  "~> 2"
   gem.add_dependency "heroku-api",    "~> 0"
   gem.add_dependency "activesupport", "~> 4"
   gem.add_dependency "rrrretry",      "~> 1"
@@ -29,11 +29,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency "threaded",      "~> 0"
 
 
-  gem.add_development_dependency "test-unit",      "~> 3.0"
-  gem.add_development_dependency "minitest",       "~> 4.0"
+  gem.add_development_dependency "minitest",       "~> 4.2"
   gem.add_development_dependency "rake",           "~> 10"
   gem.add_development_dependency "mocha",          "~> 1"
   gem.add_development_dependency "parallel_tests", "~> 0"
   gem.add_development_dependency "travis",         "~> 1"
 end
-

data/lib/hatchet/app.rb

@@ -28,7 +28,7 @@ module Hatchet
       @allow_failure = options[:allow_failure] || false
       @labs          = ([] << options[:labs]).flatten.compact
       @buildpack     = options[:buildpack] || options[:buildpack_url] || [HATCHET_BUILDPACK_BASE, HATCHET_BUILDPACK_BRANCH.call].join("#")
-      @reaper        = Reaper.new(heroku)
+      @reaper        = Reaper.new(platform_api: platform_api)
     end
 
     def allow_failure?
@@ -46,12 +46,14 @@ module Hatchet
 
     def set_config(options = {})
       options.each do |key, value|
-        heroku.put_config_vars(name, key => value)
+        # heroku.put_config_vars(name, key => value)
+        platform_api.config_var.update(name, key => value)
       end
     end
 
     def get_config
-      heroku.get_config_vars(name).body
+      # heroku.get_config_vars(name).body
+      platform_api.config_var.info_for_app(name)
     end
 
     def lab_is_installed?(lab)
@@ -59,7 +61,8 @@ module Hatchet
     end
 
     def get_labs
-      heroku.get_features(name).body
+      # heroku.get_features(name).body
+      platform_api.app_feature.list(name)
     end
 
     def set_labs!
@@ -67,12 +70,14 @@ module Hatchet
     end
 
     def set_lab(lab)
-      heroku.post_feature(lab, name)
+      # heroku.post_feature(lab, name)
+      platform_api.app_feature.update(name, lab, enabled: true)
     end
 
-    def add_database(db_name = 'heroku-postgresql:dev', match_val = "HEROKU_POSTGRESQL_[A-Z]+_URL")
+    def add_database(plan_name = 'heroku-postgresql:dev', match_val = "HEROKU_POSTGRESQL_[A-Z]+_URL")
       Hatchet::RETRIES.times.retry do
-        heroku.post_addon(name, db_name)
+        # heroku.post_addon(name, plan_name)
+        platform_api.addon.create(name, plan: plan_name )
         _, value = get_config.detect {|k, v| k.match(/#{match_val}/) }
         set_config('DATABASE_URL' => value)
       end
@@ -107,13 +112,17 @@ module Hatchet
     alias :no_debug? :not_debugging?
 
     def deployed?
-      !heroku.get_ps(name).body.detect {|ps| ps["process"].include?("web") }.nil?
+      # !heroku.get_ps(name).body.detect {|ps| ps["process"].include?("web") }.nil?
+      platform_api.formation.list(name).detect {|ps| ps["type"] == "web"}
     end
 
     def create_app
       3.times.retry do
         begin
-          heroku.post_app({ name: name, stack: stack }.delete_if {|k,v| v.nil? })
+          # heroku.post_app({ name: name, stack: stack }.delete_if {|k,v| v.nil? })
+          hash = { name: name, stack: stack }
+          hash.delete_if { |k,v| v.nil? }
+          platform_api.app.create(hash)
         rescue Heroku::API::Errors::RequestFailed => e
           @reaper.cycle if e.message.match(/app limit/)
           raise e
@@ -127,6 +136,8 @@ module Hatchet
       puts "Hatchet setup: #{name.inspect} for #{repo_name.inspect}"
       create_app
       set_labs!
+      # heroku.put_config_vars(name, 'BUILDPACK_URL' => @buildpack)
+      platform_api.buildpack_installation.update(name, updates: [{buildpack: @buildpack}])
       @app_is_setup = true
       self
     end
@@ -162,7 +173,7 @@ module Hatchet
       in_directory do
         self.setup!
         self.push_with_retry!
-        block.call(self, heroku, output) if block_given?
+        block.call(self, platform_api, output) if block_given?
       end
     ensure
       self.teardown!
@@ -201,6 +212,7 @@ module Hatchet
     end
 
     def heroku
+      raise "Not supported, use `platform_api` instead."
       @heroku ||= Heroku::API.new(api_key: api_key)
     end
 
@@ -253,7 +265,8 @@ module Hatchet
     end
 
     def platform_api
-      @platform_api ||= PlatformAPI.connect_oauth(api_key)
+      # We have to not use a cache due to https://github.com/heroku/platform-api/issues/73
+      @platform_api ||= PlatformAPI.connect_oauth(api_key, cache: Moneta.new(:Null))
     end
 
     private

data/lib/hatchet/git_app.rb

@@ -1,12 +1,6 @@
 module Hatchet
   # used for deploying a test app to heroku via git
   class GitApp < App
-    def setup!
-      super
-      heroku.put_config_vars(name, 'BUILDPACK_URL' => @buildpack)
-      self
-    end
-
     def git_repo
       "https://git.heroku.com/#{name}.git"
     end

data/lib/hatchet/reaper.rb

@@ -11,19 +11,20 @@ module Hatchet
     attr_accessor :apps
 
 
-    def initialize(heroku, regex = DEFAULT_REGEX)
-      @heroku = heroku
-      @regex  = regex
+    def initialize(platform_api:, regex: DEFAULT_REGEX)
+      @platform_api = platform_api
+      @regex        = regex
     end
 
     # Ascending order, oldest is last
     def get_apps
-      @apps         = @heroku.get_apps.body.sort_by {|app| DateTime.parse(app["created_at"]) }.reverse
-      @hatchet_apps = @apps.select {|app| app["name"].match(@regex) }
-      @apps
+      apps          = @platform_api.app.list.sort_by { |app| DateTime.parse(app["created_at"]) }.reverse
+      @app_count    = apps.count
+      @hatchet_apps = apps.select {|app| app["name"].match(@regex) }
     end
 
-    def cycle(apps = get_apps)
+    def cycle
+      get_apps
       if over_limit?
         if @hatchet_apps.count > 1
           destroy_oldest
@@ -37,28 +38,31 @@ module Hatchet
     end
 
     def destroy_oldest
-      oldest_name = @hatchet_apps.pop["name"]
-      destroy_by_name(oldest_name, "Hatchet app limit: #{HATCHET_APP_LIMT}")
-    rescue Heroku::API::Errors::NotFound
+      oldest = @hatchet_apps.pop
+      destroy_by_id(name: oldest["name"], id: oldest["id"], details: "Hatchet app limit: #{HATCHET_APP_LIMT}")
+    rescue Heroku::API::Errors::NotFound, Excon::Error::NotFound => e
+      puts "Error while destroying an app, maybe it's already deleted?"
+      puts oldest.inspect
+      puts e.inspect
       # app already deleted, cycle will catch if there's still too many
     end
 
     def destroy_all
       get_apps
       @hatchet_apps.each do |app|
-        destroy_by_name(app["name"])
+        destroy_by_id(name: app["name"], id: app["id"])
       end
     end
 
-    def destroy_by_name(name, details="")
-      puts "Destroying #{name.inspect}. #{details}"
-      @heroku.delete_app(name)
+    def destroy_by_id(name:, id:, details: "")
+      puts "Destroying #{name.inspect}: #{id}. #{details}"
+      @platform_api.app.delete(id)
     end
 
     private
 
     def over_limit?
-      @apps.count > HEROKU_APP_LIMIT || @hatchet_apps.count > HATCHET_APP_LIMT
+      @app_count > HEROKU_APP_LIMIT || @hatchet_apps.count > HATCHET_APP_LIMT
     end
   end
 end

data/lib/hatchet/tasks.rb

@@ -16,18 +16,18 @@ namespace :hatchet do
       File.open(netrc, 'w') do |file|
         file.write <<EOF
 machine git.heroku.com
-  login #{ENV['HEROKU_API_USER']}
-  password #{ENV['HEROKU_API_KEY']}
+  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['HEROKU_API_USER']}'`; fi",
+     "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"
+     "yes | heroku keys:add -y"
     ].each do |command|
       puts "== Running: #{command}"
       Bundler.with_clean_env do

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "2.0.3"
+  VERSION = "3.0.0"
 end

data/lib/hatchet.rb

@@ -12,8 +12,6 @@ require 'stringio'
 module Hatchet
 end
 
-
-
 require 'hatchet/version'
 require 'hatchet/reaper'
 require 'hatchet/test_run'

data/test/hatchet/allow_failure_git_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
-class AllowFailureGitTest < Test::Unit::TestCase
-
+class AllowFailureGitTest < Minitest::Test
   def test_allowed_failure
     Hatchet::GitApp.new("no_lockfile", allow_failure: true).deploy do |app|
       refute app.deployed?

data/test/hatchet/app_test.rb

@@ -1,9 +1,10 @@
 require 'test_helper'
 
-class AppTest < Test::Unit::TestCase
+class AppTest < Minitest::Test
   def test_create_app_with_stack
-    app = Hatchet::App.new("rails3_mri_193", stack: "cedar-14")
+    stack = "heroku-16"
+    app = Hatchet::App.new("default_ruby", stack: stack)
     app.create_app
-    assert_equal 'cedar-14', app.heroku.get_app(app.name).body["stack"]
+    assert_equal stack, app.platform_api.app.info(app.name)["build_stack"]["name"]
   end
 end

data/test/hatchet/ci_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 
-class CITest < Test::Unit::TestCase
+class CITest < Minitest::Test
 
   def test_ci_create_app_with_stack
     Hatchet::GitApp.new("rails5_ruby_schema_format").run_ci do |test_run|

data/test/hatchet/config_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ConfigTest < Test::Unit::TestCase
+class ConfigTest < Minitest::Test
 
   def setup
     @config = Hatchet::Config.new

data/test/hatchet/edit_repo_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EditRepoTest < Test::Unit::TestCase
+class EditRepoTest < Minitest::Test
   def test_can_deploy_git_app
     Hatchet::GitApp.new("default_ruby").in_directory do |app|
       msg = `touch foo`

data/test/hatchet/git_test.rb

@@ -1,14 +1,14 @@
 require 'test_helper'
 
-class GitAppTest < Test::Unit::TestCase
+class GitAppTest < Minitest::Test
   def test_can_deploy_git_app
-    Hatchet::GitApp.new("rails3_mri_193", buildpack: "https://github.com/heroku/heroku-buildpack-ruby.git").deploy do |app|
+    Hatchet::GitApp.new("rails5_ruby_schema_format").deploy do |app|
       assert true
-      assert_match '1.9.3', app.run("ruby -v")
+      assert_match '2.4.1', app.run("ruby -v")
 
       app.run("bash") do |cmd|
         # cmd.run("cd public/assets")
-        cmd.run("ls public/assets") {|r| assert_match "application.css", r}
+        cmd.run("ls public/") {|r| assert_match("assets", r) }
       end
     end
   end

data/test/hatchet/heroku_api_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class HerokuApiTest < Test::Unit::TestCase
+class HerokuApiTest < Minitest::Test
 
   def test_config_vars
     runner = Hatchet::Runner.new("no_lockfile").setup!

data/test/hatchet/labs_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class LabsTest < Test::Unit::TestCase
+class LabsTest < Minitest::Test
   def setup
     @buildpack_path = File.expand_path 'test/fixtures/buildpacks/heroku-buildpack-ruby'
   end

data/test/hatchet/multi_cmd_runner_test.rb

@@ -1,13 +1,12 @@
 require 'test_helper'
 
-class MultiCmdRunnerTest < Test::Unit::TestCase
+class MultiCmdRunnerTest < Minitest::Test
   # slow but needed, there are ghosts in the machine
   # by running common command multiple times we can find them
   def test_multi_repl_commands
     Hatchet::GitApp.new("default_ruby").deploy do |app|
-      app.add_database
 
-      assert_raise ReplRunner::UnregisteredCommand do
+      assert_raise(ReplRunner::UnregisteredCommand) do
         app.run("ls", 2) do |ls| # will return right away, should raise error
           ls.run("cat")
         end

data/test/test_helper.rb

@@ -1,12 +1,22 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'hatchet'
 
+require 'bundler'
 Bundler.require
 
-require 'test/unit'
+# require 'test/unit'
+
+require 'minitest/autorun'
 require "mocha/setup"
 
-def assert_tests_run
+# Not needed if you're using the most recent version
+if defined?(MiniTest::Unit::TestCase)
+  Minitest::Test = MiniTest::Unit::TestCase
+end
+
+def assert_raise(*args, &block)
+  assert_raises(*args, &block)
 end
 
 
+ENV['HATCHET_BUILDPACK_BRANCH'] = "master"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_hatchet
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Richard Schneeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: heroku-api
   requirement: !ruby/object:Gem::Requirement
@@ -136,34 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -252,7 +238,6 @@ files:
 - test/fixtures/buildpacks/null-buildpack/bin/release
 - test/fixtures/buildpacks/null-buildpack/hatchet.json
 - test/fixtures/buildpacks/null-buildpack/readme.md
-- test/hatchet/allow_failure_anvil_test.rb
 - test/hatchet/allow_failure_git_test.rb
 - test/hatchet/app_test.rb
 - test/hatchet/ci_test.rb
@@ -262,7 +247,6 @@ files:
 - test/hatchet/heroku_api_test.rb
 - test/hatchet/labs_test.rb
 - test/hatchet/multi_cmd_runner_test.rb
-- test/hatchet/reaper_test.rb
 - test/test_helper.rb
 homepage: https://github.com/heroku/hatchet
 licenses:
@@ -294,7 +278,6 @@ test_files:
 - test/fixtures/buildpacks/null-buildpack/bin/release
 - test/fixtures/buildpacks/null-buildpack/hatchet.json
 - test/fixtures/buildpacks/null-buildpack/readme.md
-- test/hatchet/allow_failure_anvil_test.rb
 - test/hatchet/allow_failure_git_test.rb
 - test/hatchet/app_test.rb
 - test/hatchet/ci_test.rb
@@ -304,5 +287,4 @@ test_files:
 - test/hatchet/heroku_api_test.rb
 - test/hatchet/labs_test.rb
 - test/hatchet/multi_cmd_runner_test.rb
-- test/hatchet/reaper_test.rb
 - test/test_helper.rb

data/test/hatchet/allow_failure_anvil_test.rb

@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class AllowFailureAnvilTest < Test::Unit::TestCase
-end

data/test/hatchet/reaper_test.rb

@@ -1,31 +0,0 @@
-require 'test_helper'
-
-class ReaperTest < Test::Unit::TestCase
-
-  def test_destroy_by_name
-    heroku = mock('heroku')
-    reaper = Hatchet::Reaper.new(heroku)
-    heroku.expects(:delete_app).with("my-app-name")
-    reaper.destroy_by_name("my-app-name")
-  end
-
-  def test_destroy_all
-    heroku = stub(:get_apps =>
-      stub(:body => [{
-          'name' => 'hatchet-t-123',
-          'created_at' => DateTime.new.to_s
-        },{
-          'name' => 'hatchet-t-abc',
-          'created_at' => DateTime.new.to_s
-        },{
-          'name' => 'my-app-name',
-          'created_at' => DateTime.new.to_s
-        }
-      ])
-    )
-    reaper = Hatchet::Reaper.new(heroku)
-    heroku.expects(:delete_app).with('hatchet-t-123')
-    heroku.expects(:delete_app).with('hatchet-t-abc')
-    reaper.destroy_all
-  end
-end