slugbuilder 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 323e6ddccbd05d566ad68ebaeee4454c844e2619
-  data.tar.gz: 7dbbed35c573e65f0ea3acb87fc9501ac2f88295
+  metadata.gz: 48283f8e0f78cce2b59471ee691f5ccd4dd7eaf4
+  data.tar.gz: ed16664c599345ff763eb13e192cdb0b91a1fbe7
 SHA512:
-  metadata.gz: 31864f4e69cd18c296a93ddff917c10cd545cc06baa4a7271bc8a070e56f0560bcd3ddc2bc2dd050a20137c47da49bfb389ea4345ec1fcfa8b84612d59a36e18
-  data.tar.gz: d80c8a58653ef8e26e059eb7ce81950ae532500439bb3887fce9e5488557594efdad22e40c8a9a4df24608dd14d2a329fbadd503210d19a1add80575cca45ca5
+  metadata.gz: 3419f4d23079eb49aad5b2569ddcae120aec78d111e77513c398aa3c7d276df0e0235d40d2a923c5583d332c6d3c3982247759004cdeead66335dd009d6d35b7
+  data.tar.gz: 27da415e5895ec988c59ddceb79847bc00ba6ce0131b70b2b60b2e935666585a000358d8287e32645fa858ba0abace61d49b88cbc318269857e2cc90c9c2204e

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 3.1.0 (2017-11-2)
+
+Fixed:
+
+- Avoid collisions on concurrent builds to the same repo. Each build now has its own environment and build output folder. [f3f36aa](../../commit/f3f36aa)
+
+Improved:
+
+- Scope cache to repo. This is more in line with how Heroku handles the cache and might help prevent bad caches. [21dc073](../../commit/21dc073)
+
 ## 3.0.0 (2017-7-12)
 
 Changed:

data/README.md

@@ -98,7 +98,7 @@ Alternatively, a Proc can be passed to `build` method's keyword argument `prebui
 
 `build` builds the slug and writes build information to `STDOUT`.
 
-- `slug_name` String (optional): Override default name of slug (repo.git_ref.git_sha.tgz with the `/` in repo replaced by `.`)
+- `slug_name` String (optional): Override default name of slug (repo.git_ref.git_sha.random_hex.tgz with the `/` in repo replaced by `.`)
 - `clear_cache` Boolean (optional): destroys the cache before building when true
 - `env` Hash (optional): an optional hash of environment variables
 - `buildpacks` Array (optional): optionally set buildpacks to be used for that particular build. defaults to `Slugbuilder.config.buildpacks`. Buildpacks should be in the form `<organization>/<repository_name>`, `https://<git_service>/<organization>/<repository_name>.git`, or `git@<git_service>:<organization>/<repository_name>.git`
@@ -162,7 +162,7 @@ This is the base directory that builds and apps are stored in.
 
 **cache_dir**
 
-This is the directory where the cache lives.
+This is the directory where the cache lives. Each repo has its own cache (eg. `cache-dir/org/repo`)
 
 > Defaults to `/tmp/slugbuilder-cache`
 

data/lib/slugbuilder/builder.rb

@@ -9,16 +9,16 @@ module Slugbuilder
     def initialize(repo:, git_ref:, stdout: $stdout)
       @stdout = stdout
       @base_dir = Shellwords.escape(Slugbuilder.config.base_dir)
-      @cache_dir = Shellwords.escape(Slugbuilder.config.cache_dir)
       @output_dir = Shellwords.escape(Slugbuilder.config.output_dir)
       @buildpacks_dir = File.join(@base_dir, 'buildpacks')
-      @env_dir = File.join(@base_dir, 'environment')
       repo_matches = parse_git_url(repo)
       @repo = "#{repo_matches[:org]}/#{repo_matches[:name]}"
+      @cache_dir = File.join(Shellwords.escape(Slugbuilder.config.cache_dir), @repo)
+      @env_dir = File.join(@base_dir, 'environment', SecureRandom.hex)
       @git_url = normalize_git_url(repo)
       @git_ref = git_ref
       @git_dir = File.join(@base_dir, 'git', @repo)
-      @build_dir = File.join(@base_dir, @repo, git_ref)
+      @build_dir = File.join(@base_dir, @repo, git_ref, SecureRandom.hex)
 
       setup
 
@@ -29,13 +29,11 @@ module Slugbuilder
 
     def build(clear_cache: false, env: {}, prebuild: nil, postbuild: nil, slug_name: nil, buildpacks: Slugbuilder.config.buildpacks)
       @old_env = ENV.to_h
-      # clear environment from previous builds
-      FileUtils.rm_rf(@env_dir)
       FileUtils.mkdir_p(@env_dir)
 
       @buildpacks = buildpacks
       @env = env.map { |k, v| [k.to_s, v.to_s] }.to_h
-      @slug_file = slug_name ? "#{slug_name}.tgz" : Shellwords.escape("#{@repo.gsub('/', '.')}.#{@git_ref}.#{@git_sha}.tgz")
+      @slug_file = slug_name ? "#{slug_name}.tgz" : Shellwords.escape("#{@repo.gsub('/', '.')}.#{@git_ref}.#{@git_sha}.#{SecureRandom.hex}.tgz")
       wipe_cache if clear_cache
 
       prebuild.call(repo: @repo, git_ref: @git_ref, git_url: @git_url) if prebuild
@@ -60,6 +58,10 @@ module Slugbuilder
       if block_given?
         yield(repo: @repo, git_ref: @git_ref, git_sha: @git_sha, git_url: @git_url, request_id: @request_id, stats: stats, slug: File.join(@output_dir, @slug_file))
       end
+
+      # clear environment and build
+      FileUtils.rm_rf(@env_dir)
+      FileUtils.rm_rf(@build_dir)
       return true
     rescue => e
       stitle("Failed: #{e}\n")
@@ -143,8 +145,6 @@ module Slugbuilder
       FileUtils.mkdir_p(@base_dir)
       FileUtils.mkdir_p(@buildpacks_dir)
       FileUtils.mkdir_p(@output_dir)
-      # clear old build
-      FileUtils.rm_rf(@build_dir)
       FileUtils.mkdir_p(File.join(@build_dir, '.profile.d'))
     end
 

data/lib/slugbuilder/version.rb

@@ -1,3 +1,3 @@
 module Slugbuilder
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slugbuilder
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Panoply Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler