cutlass 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 961e907148a5b772e1b645f2d7e85d6740cd65f7cb30d6e349f06c4fb4b02d93
-  data.tar.gz: f9d03dbdcbd11888f27ebbf8ce31f476a6bf6d0255ad8f6104aa582cf7d7a9f1
+  metadata.gz: a26c39e3aed992a3bce384c77603c159473bdb1a0f39bd86e996806ce26c6c3e
+  data.tar.gz: d829ea4b01eef4b6ac709510cafcac39768b2470852a4db12f8b04fa26231a34
 SHA512:
-  metadata.gz: 296d6173de09abeb96b1db5c2a6aa7bf76b6e8f0b989ca56209fca31fd7316b1a6286f4f4fa7b4cd803c91d588fa239402bc1b2590212322849eaf6390d7167f
-  data.tar.gz: a9b811887444f5ac573df9b456119d834fff5ad86b36f3f6809e0ef4590f788ed43bfe6095371563fc548058c9d030e5ccfb92e697841123eeb6e1d9382c08ed
+  metadata.gz: 39ceffa9e16f1b0c76e3894bdca69d6bd6a83a19ec90d4f34a593e7361935672800befb0761339571a2cb3dcf4434d8e21f5e96550160038adf9e4d4dc2789a1
+  data.tar.gz: f59429e16a53e8085dbf57fe86ef132e365df58bb014f13d2588814c0617235c9f3f6de389a302243f2cdfa6f6d28ea0f500e0f72e094837666825451fdfff37

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## [Unreleased]
 
+- Lock LocalBuildpack when generating images to prevent process race conditions https://github.com/heroku/cutlass/pull/9
+
+## 0.1.6
+
+- Remove premature error checking from Cutlass.default_buildpack_paths https://github.com/heroku/cutlass/pull/8
+
+## 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

data/Gemfile.lock

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

data/lib/cutlass.rb

@@ -24,11 +24,7 @@ module Cutlass
   end
 
   def self.default_buildpack_paths=(paths)
-    paths = Array(paths).map { |path| Pathname(path) }
-
-    paths.each do |path|
-      raise "Path must exist on disk #{path}" unless path.exist?
-    end
+    paths = Array(paths).map { |path| path.respond_to?(:exist?) ? path : Pathname(path) }
 
     @default_buildpack_paths = paths
   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

@@ -29,6 +29,20 @@ module Cutlass
       @built = false
       @directory = Pathname(directory)
       @image_name = "cutlass_local_buildpack_#{SecureRandom.hex(10)}"
+
+      @mutex_file = Tempfile.new
+    end
+
+    def file_lock
+      file = File.open(@mutex_file.path, File::CREAT)
+      file.flock(File::LOCK_EX)
+      yield
+    ensure
+      file.close
+    end
+
+    def exist?
+      @directory.exist?
     end
 
     def teardown
@@ -44,13 +58,14 @@ module Cutlass
     end
 
     def call
-      return if built?
-      raise "must be directory: #{@directory}" unless @directory.directory?
-
-      @built = true
+      file_lock do
+        return if built?
+        raise "must be directory: #{@directory}" unless @directory.directory?
+        @built = true
 
-      call_build_sh
-      call_pack_buildpack_package
+        call_build_sh
+        call_pack_buildpack_package
+      end
 
       self
     end
@@ -86,7 +101,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.2"
+  VERSION = "0.1.7"
 end

metadata

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