slugbuilder 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eeaac445621a0c0521008a3b7e92ef3a0faca8fa
-  data.tar.gz: 859fe6152e81018f187c89887e51015960610513
+  metadata.gz: 367b7b519e31d8a09a34a4a5be8d0d7fcc7f84d4
+  data.tar.gz: 76ebf745bb4ac19173043db02eb11eac64c51b8b
 SHA512:
-  metadata.gz: 15010197f5d99b3e1cf48fed3c5556a86349dfd9aebd74eba2caf5925cc8dd1f041601bed45db94ff09e8588043a6901e90e68ce870c4a74b3e78d92e7766818
-  data.tar.gz: 65273d2387626c01a8ac718c731635b02ead2c5624d0bf89adcc7d719df5bc7893d69b2e8b9e85dfb66a8bf454ba80ef6708b46674a87c00435c2937e06bf244
+  metadata.gz: 8121ef7398200674364e88db19bb757c5a3c2012b4f4202f3af102e858b55e1f69770af91a963b36c386ef4438e077eb6a124a8a5caa8a88a74d4122bb207339
+  data.tar.gz: 7697a17820a6305ff5d3671cd3e1072238b976873ac7a0baf41d2ecf139c0ee9531f118ea574b383db869645af6cdfce4c3ba05e6be6d72b230f1134de991434

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.0.2 (2017-5-26)
+
+Fixed:
+
+- Move location of buildpack caching to prevent buildpacks that try to clear the entire cache directory from deleting themselves in the middle of running. [7e444e1](../../commit/7e444e1)
+
+Added:
+
+- Improved error messaging [209eead](../../commit/209eead)
+
 ## 2.0.1 (2017-5-25)
 
 Fixed:

data/lib/slugbuilder/builder.rb

@@ -7,17 +7,17 @@ module Slugbuilder
   class Builder
     def initialize(repo:, git_ref:, stdout: $stdout)
       @stdout = stdout
-      @base_dir = Slugbuilder.config.base_dir
+      @base_dir = Shellwords.escape(Slugbuilder.config.base_dir)
       @cache_dir = Shellwords.escape(Slugbuilder.config.cache_dir)
-      @output_dir = Slugbuilder.config.output_dir
-      @buildpacks_dir = File.join(@cache_dir, 'buildpacks')
+      @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]}"
       @git_url = normalize_git_url(repo)
       @git_ref = git_ref
-      @git_dir = Shellwords.escape(File.join(@base_dir, 'git', @repo))
-      @build_dir = Shellwords.escape(File.join(@base_dir, @repo, git_ref))
+      @git_dir = File.join(@base_dir, 'git', @repo)
+      @build_dir = File.join(@base_dir, @repo, git_ref)
 
       setup
 
@@ -83,6 +83,8 @@ module Slugbuilder
 
     def wipe_cache
       FileUtils.rm_rf(@cache_dir)
+      FileUtils.rm_rf(@buildpacks_dir)
+      FileUtils.mkdir_p(@cache_dir)
       FileUtils.mkdir_p(@buildpacks_dir)
     end
 
@@ -136,6 +138,7 @@ module Slugbuilder
     end
 
     def create_dirs
+      FileUtils.mkdir_p(@cache_dir)
       FileUtils.mkdir_p(@base_dir)
       FileUtils.mkdir_p(@buildpacks_dir)
       FileUtils.mkdir_p(@output_dir)
@@ -196,7 +199,7 @@ module Slugbuilder
         # checkout hash
         if buildpack_matches[:hash]
           Dir.chdir("#{@buildpacks_dir}/#{buildpack_name}") do
-            rc = run("git checkout --quiet #{buildpack_matches[:hash]} && git reset origin --hard && git pull --quiet")
+            rc = run("git fetch --quiet --all && git checkout --quiet #{buildpack_matches[:hash]} && git reset origin --hard && git pull --quiet")
             fail "Failed to fetch and checkout: #{buildpack_matches[:hash]}" if rc != 0
           end
         end
@@ -208,7 +211,10 @@ module Slugbuilder
     def run_hook(hook_name)
       Dir.chdir(@build_dir) do
         script = "#{@build_dir}/bin/#{hook_name}"
-        run(script) if File.exists?(script)
+        if File.exists?(script)
+          rc = run(script)
+          fail "Failed to run #{script}" if rc != 0
+        end
       end
     end
 
@@ -243,7 +249,7 @@ module Slugbuilder
       end
       release_file.close
 
-      fail "Couldn't compile application using buildpack #{buildpack}" if rc != 0
+      fail "Couldn't release application using buildpack #{buildpack}" if rc != 0
     end
 
     def build_slug
@@ -279,6 +285,7 @@ module Slugbuilder
 
     def normalize_git_url(url)
       matches = parse_git_url(url)
+      fail "Invalid buildpack url: #{url}." unless matches
       if Slugbuilder.config.protocol == 'ssh'
         "git@#{matches[:host] || Slugbuilder.config.git_service}:#{matches[:org]}/#{matches[:name]}.git"
       else

data/lib/slugbuilder/version.rb

@@ -1,3 +1,3 @@
 module Slugbuilder
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slugbuilder
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Panoply Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler