cutlass 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37d5a2eca394ec89a59906c1c5146b73596912198f8eea6e8cc9f97604512907
-  data.tar.gz: 46f89fb2766576f84958aa163de11d9fe661829641a9b2c2f814b1aa9b74271d
+  metadata.gz: cdb173928f27587c6c7773c14449d42c074eab3903234d8d4721a67b0a99ffdf
+  data.tar.gz: abe99ef36a53e6225facc87cdcf941abfd4a10eae84ca350c9f8f6f69e2b6483
 SHA512:
-  metadata.gz: 634836ec72d9c6e0dd3acbd04c4b9dbcbb678ebfa9245ed9f5b1118096293e574b6e603e748575b02c85fc4d7a7ad81c805f5b6566d66d3bbdc144725cca8e04
-  data.tar.gz: 31f373061f0a75ef9efa2eaa2d332f7aa98b856ab7408070bfcb37302f7e38d459b1b96a13566d44ef0ca2c9d3c7b390de77cf6f0453b6b09e90502e0e579e0f
+  metadata.gz: 1c87fc56443a756fdbd26d4130b594d3e6f6133e85d1b5713bc37a01f6d26c3f6c2d198805eb92e6afa1f06c0f9a3f62a709d1a6f05a8162b33730e331b28e58
+  data.tar.gz: 362930d0ae55e20b08628a979e83965ea5d91fca9a0406c026c581e342b720ef0447a2cae2f46af4ebbed8e6d608406856474d613600ad57268fc53be10c0170

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 ## [Unreleased]
 
+## 0.1.6
+
+- Remove premature error checking from Cutlass.default_buildpack_paths
+
+## 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cutlass (0.1.1)
+    cutlass (0.1.6)
       docker-api (>= 2.0)
 
 GEM

data/README.md

@@ -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,19 @@ 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) }
+
+    @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

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/container_control.rb

@@ -29,8 +29,9 @@ module Cutlass
 
     def bash_exec(cmd, exception_on_failure: true)
       stdout_ish, stderr, status = @container.exec(["bash", "-c", cmd])
+      stdout = stdout_ish.first
 
-      result = BashResult.new(stdout: stdout_ish.first, stderr: stderr, status: status)
+      result = BashResult.new(stdout: stdout, stderr: stderr, status: status)
 
       return result if result.success?
       return result unless exception_on_failure

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.1"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cutlass
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 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