cutlass 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e4919b3ae4b9ca86167db61346a78a53b2502c0405b1e0d0f2e9b0568f29453
-  data.tar.gz: 6b69081ae0e60fafe6ae5a5e06af8f2f35aef1e4a425af6bfc4a6231fc71217b
+  metadata.gz: 746dcb9487d8f83d93a3195f4d933d494eff593f4308170e5d29f2a57c226597
+  data.tar.gz: c239092e284958eca4e0533d8e187ea865adc0fd93958fc92df63c9e534b6700
 SHA512:
-  metadata.gz: fe65cc9cf7765ca5b4229b62e0003c783cda266a8fb0f684ed7889c4e4284820d2839781b3dab6f8c57a69d07c73b097817180bfc3dd332206a33b1a0ec3b585
-  data.tar.gz: be0f8a81aa6a6e728c78b009b73bb42a57ff0fe406c3de89e12ce988a57e40fbc420abfc93c44089b2f036d575595bc4419dbd40ceef8f993f11e9d48fb5fcbd
+  metadata.gz: 93567e242b02a379b1521389038fbdbd0e48c67f462246589f4ad95ceaee6d90e6a4b90cb72ae1e91d9f030850b69b2586ed41be10e43c39a6785631682e6a35
+  data.tar.gz: d81805bbb176004b418aa1b8de608afa95966dfa10d9c5b26cdfd2722935a4950ffe617b7cc7a1101d0f57941bb1f518fe222895b19a1ae2d0f7d35f939b892c

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 ## [Unreleased]
 
+## 0.1.5
+
+- Expect build.sh scripts to produce a directory named "target" https://github.com/heroku/cutlass/pull/7
+
+## 0.1.4
+
+- Cutlass.default_buildpack_paths= now accepts a LocalBuildpack https://github.com/heroku/cutlass/pull/6
+
+## 0.1.3
+
+- Do not connect to docker if it's not needed https://github.com/heroku/cutlass/pull/5
+
+## 0.1.2
+
+- App.new accepts a buildpack array with the `:default` symbol which acts as a shortcut for `Cutlass.default_buildpack_paths` https://github.com/heroku/cutlass/pull/4
+- `Cutlass.default_buildpack_paths=` raises an error if you pass in a path that does not exist. https://github.com/heroku/cutlass/pull/4
+
+## 0.1.1
+
+- Fix App#pack_build with no block https://github.com/heroku/cutlass/pull/3
+
 ## [0.1.0] - 2021-03-29
 
 - Initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cutlass (0.1.0)
+    cutlass (0.1.5)
       docker-api (>= 2.0)
 
 GEM
@@ -13,7 +13,7 @@ GEM
     docker-api (2.1.0)
       excon (>= 0.47.0)
       multi_json
-    excon (0.79.0)
+    excon (0.80.1)
     multi_json (1.15.0)
     parallel (1.20.1)
     parallel_split_test (0.9.1)
@@ -38,7 +38,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.11.0)
+    rubocop (1.12.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -53,8 +53,8 @@ GEM
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    standard (1.0.4)
-      rubocop (= 1.11.0)
+    standard (1.0.5)
+      rubocop (= 1.12.1)
       rubocop-performance (= 1.10.1)
     unicode-display_width (2.0.0)
     yard (0.9.26)
@@ -74,4 +74,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.1.4
+   2.2.15

data/README.md

@@ -33,7 +33,7 @@ Cutlass.config do |config|
   config.default_builder = "heroku/buildpacks:18"
 
   # Where do your test fixtures live?
-  config.default_repos_dir = [File.join(__dir__, "..", "repos", "ruby_apps")]
+  config.default_repo_dirs = [File.join(__dir__, "..", "repos", "ruby_apps")]
 
   # Where does your buildpack live?
   # Can be a directory or a Cutlass:LocalBuildpack instance
@@ -135,7 +135,7 @@ In additon to the standard `package.toml` interface, if this directory has a `bu
 
 - @param repo_name [String] the path to a directory on disk, or the name of a directory inside of the `config.default_repos_dir`.
 - @param builder [String] the name of a CNB "builder" used to build the app against. Defaults to `config.default_builder`.
-- @param buildpacks [Array<String>] the array of buildpacks to build the app against. Defaults to `config.default_buildpack_paths`.
+- @param buildpacks [Array<String>] the array of buildpacks to build the app against. Defaults to `config.default_buildpack_paths`. If you pass in a symbol of `:default` it will substitute `Cutlass.default_buildpack_paths`. That means passing in `["heroku/nodejs", :default]` is a shortcut for `["heroku/nodejs, Cutlass.default_buildpack_paths].flatten`.
 - @param config [Hash{Symbol => String}, Hash{String => String}] env vars to set against the app before it is built.
 - @param exception_on_failure: [Boolean] when truthy failures on `app.pack_build` will result in an exception. Default is true.
 

data/lib/cutlass.rb

@@ -20,8 +20,23 @@ module Cutlass
 
   class << self
     # Cutlass.default_builder
-    # Cutlass.default_buildpack_paths
-    attr_accessor :default_builder, :default_buildpack_paths
+    attr_accessor :default_builder
+  end
+
+  def self.default_buildpack_paths=(paths)
+    paths = Array(paths).map { |path| path.respond_to?(:exist?) ? path : Pathname(path) }
+
+    paths.each do |path|
+      raise "Path must exist on disk #{path}" unless path.exist?
+    end
+
+    @default_buildpack_paths = paths
+  end
+
+  def self.default_buildpack_paths
+    raise "Must set Cutlass.default_buildpack_paths to a non-empty value" if @default_buildpack_paths.empty? || @default_buildpack_paths.nil?
+
+    @default_buildpack_paths
   end
 
   @default_buildpack_paths = []

data/lib/cutlass/app.rb

@@ -34,7 +34,7 @@ module Cutlass
       @warn_io = warn_io
       @builder = builder
       @image_name = image_name
-      @buildpacks = buildpacks
+      @buildpacks = Array(buildpacks).map { |buildpack| buildpack == :default ? Cutlass.default_buildpack_paths : buildpack }.flatten
       @source_path_name = source_path_name
       @exception_on_failure = exception_on_failure
     end
@@ -110,7 +110,9 @@ module Cutlass
       on_teardown { build.teardown }
 
       @builds << build
-      yield build.call
+      build.call
+
+      yield build if block_given?
     end
 
     def transaction

data/lib/cutlass/clean_test_env.rb

@@ -35,9 +35,9 @@ module Cutlass
       @skip_keys << key
     end
 
-    def self.record
+    def self.record(docker: ENV["CUTLASS_CHECK_DOCKER"])
       @env_diff = EnvDiff.new(skip_keys: @skip_keys)
-      @docker_diff = DockerDiff.new
+      @docker_diff = DockerDiff.new if docker
     end
 
     def self.check(docker: ENV["CUTLASS_CHECK_DOCKER"])

data/lib/cutlass/local_buildpack.rb

@@ -31,6 +31,10 @@ module Cutlass
       @image_name = "cutlass_local_buildpack_#{SecureRandom.hex(10)}"
     end
 
+    def exist?
+      @directory.exist?
+    end
+
     def teardown
       return unless built?
 
@@ -86,7 +90,11 @@ module Cutlass
       puts result.stdout if Cutlass.debug?
       puts result.stderr if Cutlass.debug?
 
-      return if result.success?
+      if result.success?
+        @directory = @directory.join("target")
+        raise "Expected #{build_sh} to produce a directory #{@directory} but it did not" unless @directory.exist?
+        return
+      end
 
       raise <<~EOM
         Buildpack build step failed!

data/lib/cutlass/version.rb

@@ -2,5 +2,5 @@
 
 module Cutlass
   # Version
-  VERSION = "0.1.0"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cutlass
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - schneems
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api