slugbuilder 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8390ed6955989466405c4b13f75dda4c613e22ee
-  data.tar.gz: 3ffbc59def65e419090be1033c442100597a4fbb
+  metadata.gz: cb87dc3ed77ea296b19898a00200f0469cb407d9
+  data.tar.gz: 58ccceb510e3d604513e1943dd89243313019bf1
 SHA512:
-  metadata.gz: ca3c527f6d8dd812693a090f5475934821d31f20c88e58ca8f81df0ed81344b6361d6e0d54e33cdcf9c89092303b036cfb9475ca525195bced1dbc55303f64ca
-  data.tar.gz: acfa79622b0d7b7fcbcd4036105fda5991baa4e4bb43c06d06e78fd9c56e96f79e3d71b468565638bba494e13e5f9566a219001f6d86b4a970bb309ed9a48916
+  metadata.gz: 6fe75e669008c12e2b150b3aa5ad8a2012124059acc6fc2ce39aab8c6558ad8ce0dbcee1b3d81db01925296888c9f9a1e31580c1708b0ab887f8ef2263934e60
+  data.tar.gz: 1d962f7f520feea5bda73cf3e10601028584d25e697cba73c8b6ef3b26a04966c9c4dce8525c0535faa5949b8fe7bfa9a940e3e50389bf86bc5e237f4d184646

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 1.2.0 (2017-2-1)
+
+Fixed:
+
+- Support multiple buildpacks such that they correctly pass environment variables to succeeding buildpacks [00c3010](../../commit/00c3010)
+- Add support for buildpack compile's `ENV_DIR` argument. [06cbecd](../../commit/06cbecd)
+- Handle errors on git commands [051e281](../../commit/051e281)
+- Run buildpacks without context of preexisting environment [d5767e8](../../commit/d5767e8)
+
+Added:
+
+- Show error backtrace [21cfc90](../../commit/21cfc90)
+- Set `REQUEST_ID` and `SOURCE_VERSION` environment variables [c8834c1](../../commit/c8834c1) and [8804f50](../../commit/8804f50)
+
 ## 1.1.0 (2017-1-27)
 
 Fixed:

data/README.md

@@ -108,6 +108,7 @@ Alternatively, a block can be passed to the `initialize` method to the same effe
   - `repo` String: The git repo identifier
   - `git_ref` String: The git branchname or SHA
   - `git_sha` String: The git SHA (even if the git ref was a branch name)
+  - `request_id` String: The unique id of the build request
   - `stats` Hash:
     - setup `Float`: Amount of time spent in setup
     - build `Float`: Total amount of time spent in build (compile/build/slug)

data/lib/slugbuilder/builder.rb

@@ -11,6 +11,7 @@ module Slugbuilder
       @cache_dir = Shellwords.escape(Slugbuilder.config.cache_dir)
       @output_dir = Slugbuilder.config.output_dir
       @buildpacks_dir = File.join(@cache_dir, 'buildpacks')
+      @env_dir = File.join(@base_dir, 'environment')
       @repo = repo
       @git_ref = git_ref
       @git_dir = Shellwords.escape(File.join(@base_dir, 'git', repo))
@@ -24,6 +25,11 @@ module Slugbuilder
     end
 
     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
       @slug_file = slug_name ? "#{slug_name}.tgz" : Shellwords.escape("#{@repo.gsub('/', '.')}.#{@git_ref}.#{@git_sha}.tgz")
@@ -31,7 +37,9 @@ module Slugbuilder
 
       prebuild.call(repo: @repo, git_ref: @git_ref) if prebuild
 
-      build_and_release
+      with_clean_env do
+        build_and_release
+      end
       stitle("Setup completed in #{@setup_time} seconds")
       stitle("Build completed in #{@build_time} seconds")
       stext("Application compiled in #{@compile_time} seconds")
@@ -45,22 +53,35 @@ module Slugbuilder
         output: build_output.join('')
       }
 
-      postbuild.call(repo: @repo, git_ref: @git_ref, git_sha: @git_sha, stats: stats, slug: File.join(@output_dir, @slug_file)) if postbuild
+      postbuild.call(repo: @repo, git_ref: @git_ref, git_sha: @git_sha, request_id: @request_id, stats: stats, slug: File.join(@output_dir, @slug_file)) if postbuild
       if block_given?
-        yield(repo: @repo, git_ref: @git_ref, git_sha: @git_sha, stats: stats, slug: File.join(@output_dir, @slug_file))
+        yield(repo: @repo, git_ref: @git_ref, git_sha: @git_sha, request_id: @request_id, stats: stats, slug: File.join(@output_dir, @slug_file))
       end
       return true
     rescue => e
-      stitle("Failed: #{e}")
+      stitle("Failed: #{e}\n#{e.backtrace.join("\n")}")
       return false
+    ensure
+      restore_env
     end
 
 
     private
 
+    def restore_env
+      ENV.delete_if { true }
+      ENV.update(@old_env)
+    end
+
+    def with_clean_env
+      ENV.delete_if { true }
+      yield
+      restore_env
+    end
+
     def wipe_cache
       FileUtils.rm_rf(@cache_dir)
-      FileUtils.mkdir_p(File.join(@cache_dir, 'buildpacks'))
+      FileUtils.mkdir_p(@buildpacks_dir)
     end
 
     def build_and_release
@@ -94,10 +115,12 @@ module Slugbuilder
       load_env_file("#{@cache_dir}/env")
       load_env_file("#{@build_dir}/.env")
       ENV['STACK'] = 'cedar-14'
+      @request_id = SecureRandom.urlsafe_base64(32)
+      ENV['REQUEST_ID'] = @request_id
+      ENV['SOURCE_VERSION'] = @git_sha
 
-      @env.each do |k, v|
-        ENV[k.to_s] = v.to_s
-      end
+      # write user envs to files
+      write_user_envs(@env)
 
       ENV['HOME'] = @build_dir
       ENV['APP_DIR'] = @build_dir
@@ -110,7 +133,7 @@ module Slugbuilder
 
     def create_dirs
       FileUtils.mkdir_p(@base_dir)
-      FileUtils.mkdir_p(File.join(@cache_dir, 'buildpacks'))
+      FileUtils.mkdir_p(@buildpacks_dir)
       FileUtils.mkdir_p(@output_dir)
       # clear old build
       FileUtils.rm_rf(@build_dir)
@@ -121,7 +144,7 @@ module Slugbuilder
       Dir.chdir(@git_dir) do
         # checkout branch or sha
         # get branch from origin so it is always the most recent
-        rc = run("git fetch --all && (git checkout origin/#{@git_ref} || git checkout #{@git_ref}) 2>&1")
+        rc = run("git fetch --quiet --all && (git checkout --quiet origin/#{@git_ref} || git checkout --quiet #{@git_ref})")
         fail "Failed to fetch and checkout: #{@git_ref}" if rc != 0
         @git_sha = `git rev-parse HEAD`.strip
       end
@@ -129,7 +152,7 @@ module Slugbuilder
 
     def download_repo
       stitle("Fetching #{@repo}")
-      rc = run("git clone git@#{Slugbuilder.config.git_service}:#{@repo}.git #{@git_dir} 2>&1")
+      rc = run("git clone --quiet git@#{Slugbuilder.config.git_service}:#{@repo}.git #{@git_dir}")
       fail "Failed to download repo: #{@repo}" if rc != 0
     end
 
@@ -153,13 +176,13 @@ module Slugbuilder
         if !existing_buildpacks.include?(buildpack_name)
           # download buildpack
           stitle("Fetching buildpack: #{buildpack_name}")
-          rc = run("git clone --depth=1 #{buildpack_url} #{@buildpacks_dir}/#{buildpack_name} 2>&1")
+          rc = run("git clone --quiet --depth=1 #{buildpack_url} #{@buildpacks_dir}/#{buildpack_name}")
           fail "Failed to download buildpack: #{buildpack_name}" if rc != 0
         else
           # fetch latest
           stitle("Using cached buildpack. Ensuring latest version of buildpack: #{buildpack_name}")
           Dir.chdir("#{@buildpacks_dir}/#{buildpack_name}") do
-            rc = run('git pull 2>&1')
+            rc = run('git pull --quiet')
             fail "Failed to update: #{buildpack_name}" if rc != 0
           end
         end
@@ -176,6 +199,10 @@ module Slugbuilder
         buildpack = File.join(@buildpacks_dir, buildpack_name)
         if run("#{buildpack}/bin/detect #{@build_dir}") == 0
           @compile_time += realtime { compile(buildpack) }
+
+          # load environment for subsequent buildpacks
+          load_export_env(File.join(buildpack, 'export'))
+
           release(buildpack)
         end
       end
@@ -183,14 +210,14 @@ module Slugbuilder
     end
 
     def compile(buildpack)
-      rc = run_echo("#{buildpack}/bin/compile '#{@build_dir}' '#{@cache_dir}'")
+      rc = run_echo("#{buildpack}/bin/compile '#{@build_dir}' '#{@cache_dir}' '#{@env_dir}'")
       fail "Couldn't compile application using buildpack #{buildpack}" if rc != 0
     end
 
     def release(buildpack)
       # should create .release
       release_file = File.open("#{@build_dir}/.release", 'w')
-      rc = run("#{buildpack}/bin/release '#{@build_dir}' '#{@cache_dir}'") do |line|
+      rc = run("#{buildpack}/bin/release '#{@build_dir}'") do |line|
         release_file.print(line)
       end
       release_file.close
@@ -267,6 +294,29 @@ module Slugbuilder
       end
     end
 
+    def load_export_env(file)
+      if File.exists?(file)
+        exports = IO.read(file).split('export')
+        exports.each do |line|
+          parts = line.split(/=/, 2)
+          next if parts.length != 2
+          name, val = parts
+          name.strip!
+          val = val.strip.split(/\n/).join.gsub('"', '')
+
+          ENV[name] = `echo "#{val}"`.strip
+        end
+      end
+    end
+
+    def write_user_envs(envs)
+      envs.each do |key, val|
+        File.open(File.join(@env_dir, key.to_s), 'w') do |file|
+          file.write(val.to_s)
+        end
+      end
+    end
+
     def load_env_file(file)
       if File.exists?(file)
         new_envs = IO.readlines(file)
@@ -277,7 +327,6 @@ module Slugbuilder
           parts = line.split(/=/, 2)
           next if parts.length != 2
 
-          ENV[parts[0]] = parts[1]
           @env[parts[0]] = parts[1]
         end
       end

data/lib/slugbuilder/version.rb

@@ -1,3 +1,3 @@
 module Slugbuilder
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

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