Skip to content
Permalink
Browse files

merge upstream.

  • Loading branch information...
kieran-bamforth committed Sep 18, 2016
2 parents 2c40e25 + f836fde commit aa99351da2a47102a2a53f2d18d91299ab1e1cfb
@@ -1,6 +1,6 @@
source "https://rubygems.org"

gem "boxen", "~> 2.8.0"
gem "boxen", "~> 2.9.0"
gem "hiera", "~> 1.3.3"
gem "librarian-puppet", "~> 1.0.9"
gem "puppet", "3.7.1"
@@ -8,7 +8,7 @@ GEM
builder (~> 3.0)
jmespath (~> 1.0)
multi_json (~> 1.0)
boxen (2.8.0)
boxen (2.9.0)
ansi (~> 1.4)
hiera (~> 1.0)
highline (~> 1.6.0)
@@ -21,7 +21,7 @@ GEM
diff-lcs (1.2.5)
facter (2.4.4)
CFPropertyList (~> 2.2.6)
faraday (0.9.1)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
hiera (1.3.4)
json_pure
@@ -81,7 +81,7 @@ PLATFORMS

DEPENDENCIES
aws-sdk-core (~> 2.0.11)
boxen (~> 2.8.0)
boxen (~> 2.9.0)
deep_merge (~> 1.0)
hiera (~> 1.3.3)
librarian-puppet (~> 1.0.9)
@@ -38,14 +38,14 @@ github "module_data", "0.0.4", :repo => "ripienaar/puppet-module-data"
# Core modules for a basic development environment. You can replace
# some/most of these if you want, but it's not recommended.

github "brewcask", "0.0.6"
github "brewcask", "0.0.7"
github "dnsmasq", "2.0.1"
github "foreman", "1.2.0"
github "gcc", "3.0.2"
github "git", "2.8.1"
github "git", "2.10.0"
github "go", "2.1.0"
github "homebrew", "2.0.2"
github "hub", "1.4.1"
github "hub", "1.4.3"
github "inifile", "1.4.1", :repo => "puppetlabs/puppetlabs-inifile"
github "nginx", "1.7.0"
github "nodejs", "5.0.0"
@@ -16,7 +16,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-brewcask
specs:
brewcask (0.0.6)
brewcask (0.0.7)

GITHUBTARBALL
remote: boxen/puppet-chrome
@@ -66,7 +66,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-git
specs:
git (2.8.1)
git (2.10.0)

GITHUBTARBALL
remote: boxen/puppet-gitx
@@ -86,7 +86,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-hub
specs:
hub (1.4.1)
hub (1.4.3)

GITHUBTARBALL
remote: boxen/puppet-imagemagick
@@ -277,7 +277,7 @@ DEPENDENCIES
alfred (= 1.5.0)
autoconf (= 1.0.0)
boxen (= 3.11.1)
brewcask (= 0.0.6)
brewcask (= 0.0.7)
chrome (= 1.2.0)
dnsmasq (= 2.0.1)
docker (= 1.0.0)
@@ -288,11 +288,11 @@ DEPENDENCIES
flux (= 1.0.1)
foreman (= 1.2.0)
gcc (= 3.0.2)
git (= 2.8.1)
git (= 2.10.0)
gitx (= 1.2.0)
go (= 2.1.0)
homebrew (= 2.0.2)
hub (= 1.4.1)
hub (= 1.4.3)
imagemagick (= 1.3.0)
imagemagick (= 1.3.0)
inifile (= 1.4.1)
@@ -46,6 +46,7 @@ set -e
# native extensions won't fail, e.g. json
# See https://developer.apple.com/library/ios/releasenotes/developertools/rn-xcode/Introduction/Introduction.html
set +e
PATH=${PATH}:/usr/sbin
CLTOOLS_VERSION_CHECK=`pkgutil --pkg-info=com.apple.pkg.CLTools_Executables | awk '/^version:/ {print $2}' | egrep -q '^5\.1' 2>/dev/null`
if [ $? -eq 0 ]; then
export ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future
@@ -60,7 +61,7 @@ set -e
}
PATH="/Library/Ruby/bin:$(gem which bundler | sed -e 's!lib/bundler.rb!bin!'):$PATH"
# Use checksums to quickly determine if we need to re-bundle

PATH=${PATH}:/sbin
checksum_bundle() {
(((find Gemfile Gemfile.lock bin -type f) | xargs cat) && /usr/bin/ruby -v && bundle -v) | md5
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit aa99351

Please sign in to comment.
You can’t perform that action at this time.