Merge pull request #908 from nodenv/pull-ruby-build

pull ruby build

CONTRIBUTING.md

@@ -3,6 +3,10 @@
 > TODO
 > Use one of the scripts `script/update-*` to add a new Node version.
 
+## Updating OpenSSL
+
+Use `script/update-openssl`.
+
 ## Git configuration for fetching rbenv upstream
 
 In order to continually pull changes from rbenv/ruby-build into node-build, it is necessary to add rbenv/ruby-build as a git remote.

bin/node-build

@@ -1034,6 +1034,10 @@ if [ -n "$VERBOSE" ]; then
   tail -f "$LOG_PATH" &
   TAIL_PID=$!
   trap "kill $TAIL_PID" SIGINT SIGTERM EXIT
+else
+  if [ -z "$NODE_BUILD_TESTING" ]; then
+    echo "To follow progress, use 'tail -f $LOG_PATH' or pass --verbose" >&2
+  fi
 fi
 
 export LDFLAGS="-L${PREFIX_PATH}/lib ${LDFLAGS}"

script/update-openssl

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+raise "Usage: #{$0} NEW_VERSION SHA" unless ARGV.size == 2
+new_version, sha = ARGV
+
+major_minor = new_version.split('.')[0..1].join('.')
+
+Dir.glob('share/ruby-build/*') do |file|
+  contents = File.read(file)
+
+  openssl_package = "\"openssl-#{major_minor}"
+
+  next unless contents.include? openssl_package
+
+  lines = contents.lines
+  line = lines.find { |line| line.include? openssl_package }
+  old_version = line[/"openssl-([\d.]+[a-z]?)"/, 1] or raise
+  line.gsub!(old_version, new_version)
+  line.sub!(/\.tar\.gz#(\h+)"/, ".tar.gz##{sha}\"")
+  File.write(file, lines.join)
+end

test/test_helper.bash

@@ -3,6 +3,7 @@
 BATS_TMPDIR="$BATS_TEST_DIRNAME/tmp"
 export NODE_BUILD_CURL_OPTS=
 export NODE_BUILD_HTTP_CLIENT="curl"
+export NODE_BUILD_TESTING=true
 
 load ../node_modules/bats-support/load
 load ../node_modules/bats-assert/load