heroku_hatchet 5.0.3 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaba14f0335f61010579c2a28cebb4ddc3745673cd2bf9e60a79b9b77772fba1
-  data.tar.gz: 46d867946f075054f67d2a5a1262ef203cfe20e19f6f025b2761f76a65b5b886
+  metadata.gz: ce2fc5243218285fa0505cf41a9fc51d1f7cdfd3cb69ff57e83c11be6137f57e
+  data.tar.gz: f61248e6cfd590ce04ca68b0a5233336a56bb3b1f135580eb10ff5016b59b36b
 SHA512:
-  metadata.gz: c241f9a5422e4fba52afa9bb86c2e593452ab021bf111707deea9f6a132d7b4ea3afcba69b95575b82628838e5433e502ba9f64cf1cda8beaa8c764eb56dbd29
-  data.tar.gz: b65f318865923df9da5aeb17e86bb39a1633b787b0497a5d991361650d816925accb986a2c0b015d6b67c949fc0cf67408a83373810a46328c9c353e0203af8e
+  metadata.gz: 269805f1a98ccf64e772e66a503ad9e0558635eca7a7c04b12567b1335f059b7dfa17e4e704b8fca1c088d38672eafce1bd8f290c564a62d44911059f5eb7700
+  data.tar.gz: f0d1d0a640b5de56214acd122aaa918e3038ecc65ceef526c86c44585cd5ad253061f05252c40154c7edac57aa84d038a8216843198373c7a9b1d67b1662fb12

data/.circleci/config.yml

@@ -3,7 +3,16 @@ references:
   unit: &unit
     run:
       name: Run test suite
-      command: bundle exec parallel_test test/hatchet -n 11
+      command: PARALLEL_SPLIT_TEST_PROCESSES=25 bundle exec parallel_split_test spec/
+  restore: &restore
+    restore_cache:
+      keys:
+        - v1_bundler_deps-{{ .Environment.CIRCLE_JOB }}
+  save: &save
+    save_cache:
+      paths:
+        - ./vendor/bundle
+      key: v1_bundler_deps-{{ .Environment.CIRCLE_JOB }} # CIRCLE_JOB e.g. "ruby-2.5"
   hatchet_setup: &hatchet_setup
     run:
       name: Hatchet setup
@@ -14,31 +23,40 @@ references:
       name: install dependencies
       command: |
         bundle install --jobs=4 --retry=3 --path vendor/bundle
+        bundle update
+        bundle clean
+
 jobs:
   "ruby-2.5":
     docker:
       - image: circleci/ruby:2.5
     steps:
       - checkout
+      - <<: *restore
       - <<: *bundle
       - <<: *hatchet_setup
       - <<: *unit
+      - <<: *save
   "ruby-2.6":
     docker:
       - image: circleci/ruby:2.6
     steps:
       - checkout
+      - <<: *restore
       - <<: *bundle
       - <<: *hatchet_setup
       - <<: *unit
+      - <<: *save
   "ruby-2.7":
     docker:
       - image: circleci/ruby:2.7
     steps:
       - checkout
+      - <<: *restore
       - <<: *bundle
       - <<: *hatchet_setup
       - <<: *unit
+      - <<: *save
 
 workflows:
   version: 2

data/.gitignore

@@ -1,8 +1,10 @@
 .DS_Store
 test/fixtures/repos/*
+repo_fixtures/repos/*
 *.gem
 
 
 Gemfile.lock
 debug.rb
 .ruby-version
+.rspec_status

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## HEAD
 
+## 6.0.0
+
+- Rate throttling is now provided directly by `platform-api` (https://github.com/heroku/hatchet/pull/82)
+
 ## 5.0.3
 
 - Allow repos to be "locked" to master instead of a specific commit (https://github.com/heroku/hatchet/pull/80)

data/etc/ci_setup.rb

@@ -1,6 +1,14 @@
 #!/usr/bin/env ruby
-require 'bundler'
 require 'shellwords'
+
+STDOUT.sync = true
+
+def run_cmd(command)
+  puts "== Running: #{command}"
+  result = `#{command}`
+  raise "Command failed: #{command.inspect}\nResult: #{result}" unless $?.success?
+end
+
 puts "== Setting Up CI =="
 
 netrc_file = "#{ENV['HOME']}/.netrc"
@@ -14,18 +22,14 @@ machine api.heroku.com
   login #{ENV.fetch('HEROKU_API_USER')}
   password #{ENV.fetch('HEROKU_API_KEY')}
 EOF
-    `chmod 0600 "$HOME/.netrc"`
+    run_cmd 'chmod 0600 "$HOME/.netrc"'
   end
 end
 
-[
- "bundle exec hatchet ci:install_heroku",
- "bundle exec hatchet install",
- "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}"
-  result = `#{command}`
-  raise "Command failed: #{command.inspect}\nResult: #{result}" unless $?.success?
-end
+run_cmd "bundle exec hatchet ci:install_heroku"
+run_cmd "bundle exec hatchet install"
+run_cmd "git config --get user.email > /dev/null || git config --global user.email #{ENV.fetch('HEROKU_API_USER').shellescape}"
+run_cmd "git config --get user.name > /dev/null || git config --global user.name 'BuildpackTester'"
+
 puts "== Done =="
+

data/etc/setup_heroku.sh

@@ -1,6 +1,4 @@
 #!/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/hatchet.gemspec

@@ -18,18 +18,17 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "platform-api",  "~> 2"
+  gem.add_dependency "platform-api",  "3.0.0.pre.1 "
   gem.add_dependency "rrrretry",      "~> 1"
   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",       ">= 5.1"
+  gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake",           ">= 10"
   gem.add_development_dependency "mocha",          ">= 1"
-  gem.add_development_dependency "parallel_tests", ">= 2"
+  gem.add_development_dependency "parallel_split_test"
   gem.add_development_dependency "travis",         ">= 1"
-  gem.add_development_dependency "m"
+  gem.add_development_dependency "rspec-retry"
 end

data/hatchet.json

@@ -1,6 +1,6 @@
 {
   "hatchet": {
-    "directory": "test/fixtures"
+    "directory": "repo_fixtures"
   },
   "rails3":  ["sharpstone/rails3_mri_193"],
   "rails2":  ["sharpstone/rails2blog"],

data/hatchet.lock

@@ -1,17 +1,17 @@
 ---
-- - test/fixtures/repos/bundler/no_lockfile
+- - repo_fixtures/repos/bundler/no_lockfile
   - 1947ce9a9c276d5df1c323b2ad78d1d85c7ab4c0
-- - test/fixtures/repos/ci/rails5_ci_fails_no_database
+- - repo_fixtures/repos/ci/rails5_ci_fails_no_database
   - 3044f05febdfbbe656f0f5113cf5968ca07e34fd
-- - test/fixtures/repos/ci/rails5_ruby_schema_format
-  - 3e63c3e13f435cf4ab11265e9abd161cc28cc552
-- - test/fixtures/repos/default/default_ruby
+- - repo_fixtures/repos/ci/rails5_ruby_schema_format
+  - d76be86c66ae8f45ec611fb2c4d8eb3adac0ad4b
+- - repo_fixtures/repos/default/default_ruby
   - 6e642963acec0ff64af51bd6fba8db3c4176ed6e
-- - test/fixtures/repos/lock/lock_fail
+- - repo_fixtures/repos/lock/lock_fail
   - da748a59340be8b950e7bbbfb32077eb67d70c3c
-- - test/fixtures/repos/lock/lock_fail_master
+- - repo_fixtures/repos/lock/lock_fail_master
   - master
-- - test/fixtures/repos/rails2/rails2blog
+- - repo_fixtures/repos/rails2/rails2blog
   - b37357a498ae5e8429f5601c5ab9524021dc2aaa
-- - test/fixtures/repos/rails3/rails3_mri_193
+- - repo_fixtures/repos/rails3/rails3_mri_193
   - 88c5d0d067cfd11e4452633994a85b04627ae8c7

data/lib/hatchet/api_rate_limit.rb

@@ -25,15 +25,15 @@ class ApiRateLimit
   # to partially mitigate this, only check capacity every 5
   # api calls, or if the current capacity is under 1000
   def call
-    @called += 1
+    # @called += 1
 
-    if @called > 5 || @capacity < 1000
-      @called = 0
-      @capacity = @platform_api.rate_limit.info["remaining"]
-    end
+    # if @called > 5 || @capacity < 1000
+    #   @called = 0
+    #   @capacity = @platform_api.rate_limit.info["remaining"]
+    # end
 
-    sleep_time = (60/@capacity) if @capacity > 0.1 # no divide by zero
-    sleep(sleep_time || 60)
+    # sleep_time = (60/@capacity) if @capacity > 0.1 # no divide by zero
+    # sleep(sleep_time || 60)
 
     return @platform_api
   end

data/lib/hatchet/test_run.rb

@@ -181,10 +181,11 @@ module Hatchet
 
         source_put_url = @app.create_source
         Hatchet::RETRIES.times.retry do
-          @api_rate_limit.call
-          Excon.put(source_put_url,
-                    expects: [200],
-                    body:    File.read('slug.tgz'))
+          PlatformAPI.rate_throttle.call do
+            Excon.put(source_put_url,
+                      expects: [200],
+                      body:    File.read('slug.tgz'))
+          end
         end
       end
       return @app.source_get_url
@@ -192,8 +193,11 @@ module Hatchet
 
   private
     def get_contents_or_whatever(url)
-      @api_rate_limit.call
-      Excon.get(url, read_timeout: @pause).body
+      response = PlatformAPI.rate_throttle.call do
+        Excon.get(url, read_timeout: @pause)
+      end
+
+      return response.body
     rescue Excon::Error::Timeout
       ""
     end
@@ -216,9 +220,11 @@ module Hatchet
       options[:body] = JSON.generate(options[:body]) if options[:body]
 
       Hatchet::RETRIES.times.retry do
-        @api_rate_limit.call
-        connection = Excon.new("https://api.heroku.com")
-        return connection.request(options)
+        PlatformAPI.rate_throttle.call do
+          connection = Excon.new("https://api.heroku.com")
+
+          return connection.request(options)
+        end
       end
     end
   end

data/lib/hatchet/version.rb

@@ -1,3 +1,3 @@
 module Hatchet
-  VERSION = "5.0.3"
+  VERSION = "6.0.0"
 end

data/spec/hatchet/allow_failure_git_spec.rb

@@ -0,0 +1,15 @@
+require("spec_helper")
+
+describe "AllowFailureGitTest" do
+  it "allowed failure" do
+    Hatchet::GitApp.new("no_lockfile", allow_failure: true).deploy do |app|
+      puts app.output
+      expect(app.deployed?).to be_falsey
+      expect(app.output).to match("Gemfile.lock required")
+    end
+  end
+
+  it "failure with no flag" do
+    expect { Hatchet::GitApp.new("no_lockfile").deploy }.to(raise_error(Hatchet::App::FailedDeploy))
+  end
+end

data/spec/hatchet/app_spec.rb

@@ -0,0 +1,87 @@
+require("spec_helper")
+
+describe "AppTest" do
+  it "app with default" do
+    app = Hatchet::App.new("default_ruby", buildpacks: [:default])
+    expect(app.buildpacks.first).to match("https://github.com/heroku/heroku-buildpack-ruby")
+  end
+
+  it "create app with stack" do
+    stack = "heroku-16"
+    app = Hatchet::App.new("default_ruby", stack: stack)
+    app.create_app
+    expect(app.platform_api.app.info(app.name)["build_stack"]["name"]).to eq(stack)
+  end
+
+  it "before deploy" do
+    @called = false
+    @dir = false
+    app = Hatchet::App.new("default_ruby")
+    def app.push_with_retry!
+      # do nothing
+    end
+    app.before_deploy do
+      @called = true
+      @dir = Dir.pwd
+    end
+    app.deploy do
+      expect(@called).to eq(true)
+      expect(@dir).to eq(Dir.pwd)
+    end
+    expect(@dir).to_not eq(Dir.pwd)
+  end
+
+  it "auto commits code" do
+    string = "foo#{SecureRandom.hex}"
+    app = Hatchet::App.new("default_ruby")
+    def app.push_with_retry!
+      # do nothing
+    end
+    app.before_deploy do |app|
+      expect(app.send(:needs_commit?)).to eq(false)
+      `echo "#{string}" > Gemfile`
+      expect(app.send(:needs_commit?)).to eq(true)
+    end
+    app.deploy do
+      expect(File.read("Gemfile").chomp).to eq(string)
+      expect(app.send(:needs_commit?)).to eq(false)
+    end
+  end
+
+  it "nested in directory" do
+    string = "foo#{SecureRandom.hex}"
+    app = Hatchet::App.new("default_ruby")
+    def app.push_with_retry!
+      # do nothing
+    end
+    app.in_directory do
+      `echo "#{string}" > Gemfile`
+      dir = Dir.pwd
+      app.deploy do
+        expect(File.read("Gemfile").chomp).to eq(string)
+        expect(dir).to eq(Dir.pwd)
+      end
+    end
+  end
+
+  it "run" do
+    app = Hatchet::GitApp.new("default_ruby")
+    app.deploy do
+      expect(app.run("ls -a Gemfile 'foo bar #baz'")).to match(/ls: cannot access 'foo bar #baz': No such file or directory\s+Gemfile/)
+      expect((0 != $?.exitstatus)).to be_truthy
+      sleep(4)
+      app.run("ls erpderp", heroku: ({ "exit-code" => (Hatchet::App::SkipDefaultOption) }))
+      expect((0 == $?.exitstatus)).to be_truthy
+      sleep(4)
+      app.run("ls erpderp", heroku: ({ "no-tty" => nil }))
+      expect((0 != $?.exitstatus)).to be_truthy
+      sleep(4)
+      expect(app.run("echo \\$HELLO \\$NAME", raw: true, heroku: ({ "env" => "HELLO=ohai;NAME=world" }))).to match(/ohai world/)
+      sleep(4)
+      expect(app.run("echo \\$HELLO \\$NAME", raw: true, heroku: ({ "env" => "" }))).to_not match(/ohai world/)
+      sleep(4)
+      random_name = SecureRandom.hex
+      expect(app.run("mkdir foo; touch foo/#{random_name}; ls foo/")).to match(/#{random_name}/)
+    end
+  end
+end

data/spec/hatchet/ci_spec.rb

@@ -0,0 +1,58 @@
+require "spec_helper"
+
+describe "CIFourTest" do
+  it "error with bad app" do
+    string = SecureRandom.hex
+
+    Hatchet::GitApp.new("default_ruby").run_ci do |test_run|
+      expect(test_run.output).to_not match(string)
+      expect(test_run.output).to match("Installing rake")
+
+      run!("echo 'puts \"#{string}\"' >> Rakefile")
+      test_run.run_again
+
+      expect(test_run.output).to match(string)
+      expect(test_run.output).to match("Using rake")
+      expect(test_run.output).to_not match("Installing rake")
+    end
+  end
+
+  it "error with bad app" do
+    expect {
+      Hatchet::GitApp.new("rails5_ci_fails_no_database").run_ci { }
+    }.to raise_error(/PG::ConnectionBad: could not connect to server/)
+  end
+
+  it "error with bad app" do
+    @before_deploy_called = false
+    @before_deploy_dir_pwd = nil
+
+    before_deploy = -> do
+      @before_deploy_called = true
+      @before_deploy_dir_pwd = Dir.pwd
+    end
+
+    Hatchet::GitApp.new("rails5_ci_fails_no_database", allow_failure: true, before_deploy: before_deploy).run_ci do |test_run|
+      expect(test_run.status).to eq(:errored)
+      expect(@before_deploy_dir_pwd).to eq(Dir.pwd)
+      expect(@before_deploy_called).to be_truthy
+    end
+
+    expect(@before_deploy_dir_pwd).to_not eq(Dir.pwd)
+  end
+
+  it "ci create app with stack" do
+    app = Hatchet::GitApp.new("rails5_ruby_schema_format")
+    app.run_ci do |test_run|
+      expect(test_run.output).to match("Ruby buildpack tests completed successfully")
+      expect(test_run.status).to eq(:succeeded)
+      expect(app.pipeline_id).to_not be_nil
+
+      api_rate_limit = app.api_rate_limit.call
+      couplings = api_rate_limit.pipeline_coupling.list_by_pipeline(app.pipeline_id)
+      coupled_app = api_rate_limit.app.info(couplings.first["app"]["id"])
+      expect(coupled_app["name"]).to eq(app.name)
+    end
+    expect(app.pipeline_id).to be_nil
+  end
+end

data/spec/hatchet/config_spec.rb

@@ -0,0 +1,34 @@
+require("spec_helper")
+describe "ConfigTest" do
+  before { @config = Hatchet::Config.new }
+
+  it("config path for name") do
+    expect(@config.path_for_name("rails3_mri_193")).to(eq("repo_fixtures/repos/rails3/rails3_mri_193"))
+  end
+
+  it("config dirs") do
+    { "repo_fixtures/repos/bundler/no_lockfile" => "https://github.com/sharpstone/no_lockfile.git", "repo_fixtures/repos/default/default_ruby" => "https://github.com/sharpstone/default_ruby.git", "repo_fixtures/repos/rails2/rails2blog" => "https://github.com/sharpstone/rails2blog.git", "repo_fixtures/repos/rails3/rails3_mri_193" => "https://github.com/sharpstone/rails3_mri_193.git" }.each do |key, value|
+      assert_include(key, value, @config.dirs)
+    end
+  end
+
+  it("config repos") do
+    { "default_ruby" => "repo_fixtures/repos/default/default_ruby", "no_lockfile" => "repo_fixtures/repos/bundler/no_lockfile", "rails2blog" => "repo_fixtures/repos/rails2/rails2blog", "rails3_mri_193" => "repo_fixtures/repos/rails3/rails3_mri_193" }.each do |key, value|
+      assert_include(key, value, @config.repos)
+    end
+  end
+
+  it("no internal config raises no errors") do
+    @config.send(:set_internal_config!, {})
+    expect(@config.repo_directory_path).to(eq("./repos"))
+  end
+
+  it("github shortcuts") do
+    @config.send(:init_config!, "foo" => (["schneems/sextant"]))
+    expect(@config.dirs["./repos/foo/sextant"]).to(eq("https://github.com/schneems/sextant.git"))
+  end
+
+  private def assert_include(key, value, actual)
+    expect(actual[key]).to eq(value), "Expected #{actual.inspect} to include #{{ key => value }} but it did not"
+  end
+end