Commit 3cde3fa60fbeed3cc98aeafeb7f0e92d936e494b

Authored by Will Farrington

Merge branch 'master' of https://github.com/boxen/our-boxen

Conflicts:
	Puppetfile

Showing 20 changed files Inline Diff

/.bundle 1 1 /.bundle
2 /.librarian
3 /.tmp
/bin 2 4 /bin
/config/local.rb 3 5 /config/local.rb
/log 4 6 /log
/tmp 5 7 /tmp
/vendor/cache 6 8 /vendor/cache
/.tmp/ 7 9 /vendor/puppet/cache
/modules/ 8 10 /shared/*
/.librarian/ 9 11 !/shared/README.md
10 12
source "http://rubygems.org" 1 1 source "http://rubygems.org"
2 2
gem "boxen", "0.0.0", # FIX: just during extraction/porting 3 3 gem "boxen", "~> 0.0"
:path => File.expand_path("../../boxen", __FILE__) 4 4 gem "librarian-puppet", "~> 0.9"
5
gem "librarian-puppet", "0.9.5" 6
PATH 1
remote: /Users/wfarr/boxen/boxen 2
specs: 3
boxen (0.0.0) 4
ansi 5
highline 6
json_pure 7
octokit 8
puppet 9
10
GEM 11 1 GEM
remote: http://rubygems.org/ 12 2 remote: http://rubygems.org/
specs: 13 3 specs:
addressable (2.3.2) 14 4 addressable (2.3.2)
ansi (1.4.3) 15 5 ansi (1.4.3)
6 boxen (0.0.0)
7 ansi (~> 1.4)
8 highline (~> 1.6)
9 json_pure (~> 1.7)
10 octokit (~> 1.15)
11 puppet (~> 3.0)
facter (1.6.12) 16 12 facter (1.6.12)
faraday (0.8.4) 17 13 faraday (0.8.4)
multipart-post (~> 1.1) 18 14 multipart-post (~> 1.1)
faraday_middleware (0.8.8) 19 15 faraday_middleware (0.8.8)
faraday (>= 0.7.4, < 0.9) 20 16 faraday (>= 0.7.4, < 0.9)
hashie (1.2.0) 21 17 hashie (1.2.0)
hiera (1.1.0.rc1) 22 18 hiera (1.1.0.rc1)
json 23 19 json
highline (1.6.15) 24 20 highline (1.6.15)
json (1.7.5) 25 21 json (1.7.5)
json_pure (1.7.5) 26 22 json_pure (1.7.5)
librarian-puppet (0.9.5) 27 23 librarian-puppet (0.9.5)
json 28 24 json
puppet 29 25 puppet
thor (~> 0.15) 30 26 thor (~> 0.15)
multi_json (1.3.6) 31 27 multi_json (1.3.6)
multipart-post (1.1.5) 32 28 multipart-post (1.1.5)
octokit (1.15.1) 33 29 octokit (1.15.1)
addressable (~> 2.2) 34 30 addressable (~> 2.2)
faraday (~> 0.8) 35 31 faraday (~> 0.8)
faraday_middleware (~> 0.8) 36 32 faraday_middleware (~> 0.8)
hashie (~> 1.2) 37 33 hashie (~> 1.2)
multi_json (~> 1.3) 38 34 multi_json (~> 1.3)
puppet (3.0.0) 39 35 puppet (3.0.0)
facter (>= 1.6.11) 40 36 facter (>= 1.6.11)
hiera (>= 1.0.0rc) 41 37 hiera (>= 1.0.0rc)
thor (0.16.0) 42 38 thor (0.16.0)
43 39
PLATFORMS 44 40 PLATFORMS
ruby 45 41 ruby
46 42
DEPENDENCIES 47 43 DEPENDENCIES
boxen (= 0.0.0)! 48 44 boxen (~> 0.0)
# This file manages Puppet module dependencies. 1 1 # This file manages Puppet module dependencies.
# 2 2 #
# It works a lot like Bundler. We provide some core modules by default. 3 3 # It works a lot like Bundler. We provide some core modules by default.
# This ensures at least the ability to construct a basic environment. 4 4 # This ensures at least the ability to construct a basic environment.
5 5
# Includes many of our custom types and providers, as well as global config. 6 6 # Includes many of our custom types and providers, as well as global config.
# Required. 7 7 # Required.
mod "boxen", "0.0.1.1", :github_tarball => "boxen/puppet-boxen" 8 8 #mod "boxen", "0.0.1.1", :github_tarball => "boxen/puppet-boxen"
9 9
# Core modules for a basic development environment. 10 10 # Core modules for a basic development environment.
# You can replace some/most of those if you want, but it's not recommended. 11 11 # You can replace some/most of those if you want, but it's not recommended.
%w(ruby rbenv nvm nodejs git hub inifile sudo homebrew xcode).each do |modulename| 12 12 #%w(ruby rbenv nvm nodejs git hub inifile sudo homebrew xcode).each do |modulename|
mod modulename, "0.0.1", :github_tarball => "boxen/puppet-#{modulename}" 13 13 # mod modulename, "0.0.1", :github_tarball => "boxen/puppet-#{modulename}"
end 14 14 #end
15 15
# Add your custom modules here. 16 16 # Add your custom modules here.
# There are tons available at https://github.com/boxen. 17 17 # There are tons available at https://github.com/boxen.
18
GITHUBTARBALL 1
remote: boxen/puppet-boxen 2
specs: 3
boxen (0.0.1.1) 4
5
GITHUBTARBALL 6
remote: boxen/puppet-git 7
specs: 8
git (0.0.1) 9
10
GITHUBTARBALL 11
remote: boxen/puppet-homebrew 12
specs: 13
homebrew (0.0.1) 14
15
GITHUBTARBALL 16
remote: boxen/puppet-hub 17
specs: 18
hub (0.0.1) 19
20
GITHUBTARBALL 21
remote: boxen/puppet-inifile 22
specs: 23
inifile (0.0.1) 24
25
GITHUBTARBALL 26
remote: boxen/puppet-nodejs 27
specs: 28
nodejs (0.0.1) 29
30
GITHUBTARBALL 31
remote: boxen/puppet-nvm 32
specs: 33
nvm (0.0.1) 34
35
GITHUBTARBALL 36
remote: boxen/puppet-rbenv 37
specs: 38
rbenv (0.0.1) 39
40
GITHUBTARBALL 41
remote: boxen/puppet-ruby 42
specs: 43
ruby (0.0.1) 44
45
GITHUBTARBALL 46
remote: boxen/puppet-sudo 47
specs: 48
sudo (0.0.1) 49
50
GITHUBTARBALL 51
remote: boxen/puppet-xcode 52
specs: 53
xcode (0.0.1) 54
55
DEPENDENCIES 56 1 DEPENDENCIES
require boxen::environment 1 1 # require boxen::environment
require homebrew::repo 2 2 # require homebrew::repo
3 3
Exec { 4 4 # Exec {
group => 'staff', 5 5 # group => 'staff',
logoutput => on_failure, 6 6 # logoutput => on_failure,
user => $luser, 7 7 # user => $luser,
8 8
path => [ 9 9 # path => [
"${boxen::config::home}/rbenv/shims", 10 10 # "${boxen::config::home}/rbenv/shims",
"${boxen::config::home}/homebrew/bin", 11 11 # "${boxen::config::home}/homebrew/bin",
'/usr/bin', 12 12 # '/usr/bin',
'/bin', 13 13 # '/bin',
'/usr/sbin', 14 14 # '/usr/sbin',
'/sbin' 15 15 # '/sbin'
] 16 16 # ]
} 17 17 # }
18 18
File { 19 19 # File {
group => 'staff', 20 20 # group => 'staff',
owner => $luser 21 21 # owner => $luser
} 22 22 # }
23 23
Package { 24 24 # Package {
provider => homebrew, 25 25 # provider => homebrew,
require => Class['homebrew'] 26 26 # require => Class['homebrew']
} 27 27 # }
28 28
Repository { 29 29 # Repository {
provider => git, 30 30 # provider => git,
extra => [ 31 31 # extra => [
'--recurse-submodules' 32 32 # '--recurse-submodules'
], 33 33 # ],
require => Class['git'] 34 34 # require => Class['git']
} 35 35 # }
36 36
Service { 37 37 # Service {
provider => ghlaunchd 38 38 # provider => ghlaunchd
} 39 39 # }
40 40
node default { 41 41 # node default {
include git 42 42 # include git
} 43 43 # }
44 44
#!/bin/sh 1 1 #!/bin/sh
# Make sure all our local dependencies are available. 2 2 # Make sure all our local dependencies are available.
3 3
4 set -e
5
# FIX: only sudo if gem home isn't writable 4 6 # FIX: only sudo if gem home isn't writable
5 7
(gem spec bundler -v '~> 1.2.0' > /dev/null 2>&1) || 6 8 (gem spec bundler -v '~> 1.2.0' > /dev/null 2>&1) ||
sudo gem install bundler --no-rdoc --no-ri 7 9 sudo gem install bundler --no-rdoc --no-ri
8 10
# We don't want old config hanging around. 9 11 # We don't want old config hanging around.
10 12
rm -rf .bundle/config 11 13 rm -rf .bundle/config
14 rm -rf .librarian/puppet/config
12 15
# Export CC to explicitly set the compiler used for cexts. 13 16 # Export CC to explicitly set the compiler used for cexts.
14 17
export CC=gcc 15 18 export CC=gcc
File was created 1 # Shared Puppet Modules
2
vendor/puppet/cache/boxen-puppet-boxen-0.0.1.1.tar.gz
No preview for this file type
vendor/puppet/cache/boxen-puppet-boxen-0.0.1.tar.gz
No preview for this file type
vendor/puppet/cache/boxen-puppet-git-0.0.1.tar.gz
No preview for this file type
vendor/puppet/cache/boxen-puppet-homebrew-0.0.1.tar.gz
No preview for this file type
vendor/puppet/cache/boxen-puppet-hub-0.0.1.tar.gz
No preview for this file type
vendor/puppet/cache/boxen-puppet-inifile-0.0.1.tar.gz
No preview for this file type
vendor/puppet/cache/boxen-puppet-nodejs-0.0.1.tar.gz
No preview for this file type
vendor/puppet/cache/boxen-puppet-nvm-0.0.1.tar.gz
No preview for this file type
vendor/puppet/cache/boxen-puppet-rbenv-0.0.1.tar.gz
No preview for this file type
vendor/puppet/cache/boxen-puppet-ruby-0.0.1.tar.gz
No preview for this file type
vendor/puppet/cache/boxen-puppet-sudo-0.0.1.tar.gz
No preview for this file type
vendor/puppet/cache/boxen-puppet-xcode-0.0.1.tar.gz
No preview for this file type