slugbuilder 2.0.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 367b7b519e31d8a09a34a4a5be8d0d7fcc7f84d4
-  data.tar.gz: 76ebf745bb4ac19173043db02eb11eac64c51b8b
+  metadata.gz: 323e6ddccbd05d566ad68ebaeee4454c844e2619
+  data.tar.gz: 7dbbed35c573e65f0ea3acb87fc9501ac2f88295
 SHA512:
-  metadata.gz: 8121ef7398200674364e88db19bb757c5a3c2012b4f4202f3af102e858b55e1f69770af91a963b36c386ef4438e077eb6a124a8a5caa8a88a74d4122bb207339
-  data.tar.gz: 7697a17820a6305ff5d3671cd3e1072238b976873ac7a0baf41d2ecf139c0ee9531f118ea574b383db869645af6cdfce4c3ba05e6be6d72b230f1134de991434
+  metadata.gz: 31864f4e69cd18c296a93ddff917c10cd545cc06baa4a7271bc8a070e56f0560bcd3ddc2bc2dd050a20137c47da49bfb389ea4345ec1fcfa8b84612d59a36e18
+  data.tar.gz: d80c8a58653ef8e26e059eb7ce81950ae532500439bb3887fce9e5488557594efdad22e40c8a9a4df24608dd14d2a329fbadd503210d19a1add80575cca45ca5

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 3.0.0 (2017-7-12)
+
+Changed:
+
+  - Allow configuration of `STACK` environment variable. Now defaults to `heroku-16` instead of `cedar-14`. This is a potentially breaking change. [4ce8c61](../../commit/4ce8c61)
+
+Added:
+
+  - Improved error messaging from buildpacks. Rather than showing the stack trace from slugbuilder, show the data piped to stderr where the error occurred. [dbf5142](../../commit/dbf5142)
+
 ## 2.0.2 (2017-5-26)
 
 Fixed:

data/README.md

@@ -151,6 +151,7 @@ Slugbuilder.config.output_dir = './slugs'
   'git@github.com:heroku/heroku-buildpack-nodejs.git',
   'https://github.com/heroku/heroku-buildpack-ruby.git#37ed188'
 ]
+@heroku_stack = 'heroku-16'
 ```
 
 **base_dir**
@@ -189,6 +190,12 @@ Buildpacks is an array of valid git clone-able [buildpack](https://devcenter.her
 
 > Defaults to []
 
+**heroku_stack**
+
+This is a string configuration option that may affect how certain buildpacks run. It is set as the `$STACK` environment variable. See [Heroku's documentation](https://devcenter.heroku.com/articles/stack) for more information about where this comes from. eg: 'heroku-16', 'cedar-14'
+
+> Defaults to 'heroku-16'
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/slugbuilder/builder.rb

@@ -2,6 +2,7 @@ require 'securerandom'
 require 'shellwords'
 require 'yaml'
 require 'fileutils'
+require 'open3'
 
 module Slugbuilder
   class Builder
@@ -33,7 +34,7 @@ module Slugbuilder
       FileUtils.mkdir_p(@env_dir)
 
       @buildpacks = buildpacks
-      @env = env
+      @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")
       wipe_cache if clear_cache
 
@@ -61,7 +62,7 @@ module Slugbuilder
       end
       return true
     rescue => e
-      stitle("Failed: #{e}\n#{e.backtrace.join("\n")}")
+      stitle("Failed: #{e}\n")
       return false
     ensure
       restore_env
@@ -120,7 +121,7 @@ module Slugbuilder
     def set_environment
       load_env_file("#{@cache_dir}/env")
       load_env_file("#{@build_dir}/.env")
-      ENV['STACK'] = 'cedar-14'
+      ENV['STACK'] = Slugbuilder.config.heroku_stack
       @request_id = SecureRandom.urlsafe_base64(32)
       ENV['REQUEST_ID'] = @request_id
       ENV['SOURCE_VERSION'] = @git_sha
@@ -132,7 +133,7 @@ module Slugbuilder
       ENV['APP_DIR'] = @build_dir
 
       stitle('Build environment')
-      ENV.each do |k, v|
+      ENV.to_h.merge(@env).each do |k, v|
         stext("#{k}=#{v}")
       end
     end
@@ -212,8 +213,8 @@ module Slugbuilder
       Dir.chdir(@build_dir) do
         script = "#{@build_dir}/bin/#{hook_name}"
         if File.exists?(script)
-          rc = run(script)
-          fail "Failed to run #{script}" if rc != 0
+          rc, errs = run_echo(script)
+          fail "#{errs.join('\n')}\nFailed to run #{script}" if rc != 0
         end
       end
     end
@@ -237,8 +238,8 @@ module Slugbuilder
     end
 
     def compile(buildpack)
-      rc = run_echo("#{buildpack}/bin/compile '#{@build_dir}' '#{@cache_dir}' '#{@env_dir}'")
-      fail "Couldn't compile application using buildpack #{buildpack}" if rc != 0
+      rc, errs = run_echo("#{buildpack}/bin/compile '#{@build_dir}' '#{@cache_dir}' '#{@env_dir}'")
+      fail "#{errs.join('\n')}\nCouldn't compile application using buildpack #{buildpack}" if rc != 0
     end
 
     def release(buildpack)
@@ -254,14 +255,15 @@ module Slugbuilder
 
     def build_slug
       rc = 1
+      errs = []
       # use pigz if available
       compression = `which pigz` != '' ? '--use-compress-program=pigz' : ''
       if File.exists?("#{@build_dir}/.slugignore")
-        rc = run_echo("tar --exclude='.git' #{compression} -X #{@build_dir}/.slugignore -C #{@build_dir} -cf #{File.join(@output_dir, @slug_file)} .")
+        rc, errs = run_echo("tar --exclude='.git' #{compression} -X #{@build_dir}/.slugignore -C #{@build_dir} -cf #{File.join(@output_dir, @slug_file)} .")
       else
-        rc = run_echo("tar --exclude='.git' #{compression} -C #{@build_dir} -cf #{File.join(@output_dir, @slug_file)} .")
+        rc, errs = run_echo("tar --exclude='.git' #{compression} -C #{@build_dir} -cf #{File.join(@output_dir, @slug_file)} .")
       end
-      fail "Couldn't create slugfile" if rc != 0
+      fail "#{errs.join('\n')}\nCouldn't create slugfile" if rc != 0
     end
 
     def slug_size
@@ -329,20 +331,24 @@ module Slugbuilder
     end
 
     def run(cmd)
-      IO.popen(cmd) do |io|
-        until io.eof?
-          data = io.gets
-          yield data if block_given?
+      Open3.popen3(cmd) do |stdin, stdout, stderr, thread|
+        until stdout.eof? && stderr.eof?
+          out = stdout.gets
+          err = stderr.gets
+          yield(out, err) if block_given?
         end
+        thread.value.exitstatus
       end
-      $?.exitstatus
     end
 
     def run_echo(cmd)
-      run(cmd) do |line|
-        build_output << line
-        @stdout.print(line)
+      errors = []
+      status = run(cmd) do |stdout, stderr|
+        build_output << stdout if stdout
+        errors << stderr if stderr
+        @stdout.print(stdout)
       end
+      [status, errors]
     end
 
     def load_export_env(file)

data/lib/slugbuilder/configuration.rb

@@ -17,7 +17,7 @@ module Slugbuilder
 
   class Configuration
     attr_accessor :base_dir, :cache_dir, :output_dir,
-      :git_service, :buildpacks, :protocol
+      :git_service, :buildpacks, :protocol, :heroku_stack
 
     def initialize
       @base_dir = '/tmp/slugbuilder'
@@ -26,6 +26,7 @@ module Slugbuilder
       @git_service = 'github.com'
       @protocol = 'https'
       @buildpacks = []
+      @heroku_stack = 'heroku-16'
     end
   end
 end

data/lib/slugbuilder/version.rb

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

metadata

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