Conflicts:
	Puppetfile
This commit is contained in:
Will Farrington 2012-10-03 11:36:57 -07:00
commit 3cde3fa60f
20 changed files with 66 additions and 126 deletions

8
.gitignore vendored
View file

@ -1,9 +1,11 @@
/.bundle /.bundle
/.librarian
/.tmp
/bin /bin
/config/local.rb /config/local.rb
/log /log
/tmp /tmp
/vendor/cache /vendor/cache
/.tmp/ /vendor/puppet/cache
/modules/ /shared/*
/.librarian/ !/shared/README.md

View file

@ -1,6 +1,4 @@
source "http://rubygems.org" source "http://rubygems.org"
gem "boxen", "0.0.0", # FIX: just during extraction/porting gem "boxen", "~> 0.0"
:path => File.expand_path("../../boxen", __FILE__) gem "librarian-puppet", "~> 0.9"
gem "librarian-puppet", "0.9.5"

View file

@ -1,18 +1,14 @@
PATH
remote: /Users/wfarr/boxen/boxen
specs:
boxen (0.0.0)
ansi
highline
json_pure
octokit
puppet
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
addressable (2.3.2) addressable (2.3.2)
ansi (1.4.3) ansi (1.4.3)
boxen (0.0.0)
ansi (~> 1.4)
highline (~> 1.6)
json_pure (~> 1.7)
octokit (~> 1.15)
puppet (~> 3.0)
facter (1.6.12) facter (1.6.12)
faraday (0.8.4) faraday (0.8.4)
multipart-post (~> 1.1) multipart-post (~> 1.1)
@ -45,5 +41,5 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
boxen (= 0.0.0)! boxen (~> 0.0)
librarian-puppet (= 0.9.5) librarian-puppet (~> 0.9)

View file

@ -5,13 +5,13 @@
# Includes many of our custom types and providers, as well as global config. # Includes many of our custom types and providers, as well as global config.
# Required. # Required.
mod "boxen", "0.0.1.1", :github_tarball => "boxen/puppet-boxen" #mod "boxen", "0.0.1.1", :github_tarball => "boxen/puppet-boxen"
# Core modules for a basic development environment. # Core modules for a basic development environment.
# You can replace some/most of those if you want, but it's not recommended. # 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| #%w(ruby rbenv nvm nodejs git hub inifile sudo homebrew xcode).each do |modulename|
mod modulename, "0.0.1", :github_tarball => "boxen/puppet-#{modulename}" # mod modulename, "0.0.1", :github_tarball => "boxen/puppet-#{modulename}"
end #end
# Add your custom modules here. # Add your custom modules here.
# There are tons available at https://github.com/boxen. # There are tons available at https://github.com/boxen.

View file

@ -1,68 +1,2 @@
GITHUBTARBALL
remote: boxen/puppet-boxen
specs:
boxen (0.0.1.1)
GITHUBTARBALL
remote: boxen/puppet-git
specs:
git (0.0.1)
GITHUBTARBALL
remote: boxen/puppet-homebrew
specs:
homebrew (0.0.1)
GITHUBTARBALL
remote: boxen/puppet-hub
specs:
hub (0.0.1)
GITHUBTARBALL
remote: boxen/puppet-inifile
specs:
inifile (0.0.1)
GITHUBTARBALL
remote: boxen/puppet-nodejs
specs:
nodejs (0.0.1)
GITHUBTARBALL
remote: boxen/puppet-nvm
specs:
nvm (0.0.1)
GITHUBTARBALL
remote: boxen/puppet-rbenv
specs:
rbenv (0.0.1)
GITHUBTARBALL
remote: boxen/puppet-ruby
specs:
ruby (0.0.1)
GITHUBTARBALL
remote: boxen/puppet-sudo
specs:
sudo (0.0.1)
GITHUBTARBALL
remote: boxen/puppet-xcode
specs:
xcode (0.0.1)
DEPENDENCIES DEPENDENCIES
boxen (= 0.0.1.1)
git (= 0.0.1)
homebrew (= 0.0.1)
hub (= 0.0.1)
inifile (= 0.0.1)
nodejs (= 0.0.1)
nvm (= 0.0.1)
rbenv (= 0.0.1)
ruby (= 0.0.1)
sudo (= 0.0.1)
xcode (= 0.0.1)

View file

@ -1,43 +1,43 @@
require boxen::environment # require boxen::environment
require homebrew::repo # require homebrew::repo
Exec { # Exec {
group => 'staff', # group => 'staff',
logoutput => on_failure, # logoutput => on_failure,
user => $luser, # user => $luser,
path => [ # path => [
"${boxen::config::home}/rbenv/shims", # "${boxen::config::home}/rbenv/shims",
"${boxen::config::home}/homebrew/bin", # "${boxen::config::home}/homebrew/bin",
'/usr/bin', # '/usr/bin',
'/bin', # '/bin',
'/usr/sbin', # '/usr/sbin',
'/sbin' # '/sbin'
] # ]
} # }
File { # File {
group => 'staff', # group => 'staff',
owner => $luser # owner => $luser
} # }
Package { # Package {
provider => homebrew, # provider => homebrew,
require => Class['homebrew'] # require => Class['homebrew']
} # }
Repository { # Repository {
provider => git, # provider => git,
extra => [ # extra => [
'--recurse-submodules' # '--recurse-submodules'
], # ],
require => Class['git'] # require => Class['git']
} # }
Service { # Service {
provider => ghlaunchd # provider => ghlaunchd
} # }
node default { # node default {
include git # include git
} # }

View file

@ -1,6 +1,8 @@
#!/bin/sh #!/bin/sh
# Make sure all our local dependencies are available. # Make sure all our local dependencies are available.
set -e
# FIX: only sudo if gem home isn't writable # FIX: only sudo if gem home isn't writable
(gem spec bundler -v '~> 1.2.0' > /dev/null 2>&1) || (gem spec bundler -v '~> 1.2.0' > /dev/null 2>&1) ||
@ -9,6 +11,7 @@
# We don't want old config hanging around. # We don't want old config hanging around.
rm -rf .bundle/config rm -rf .bundle/config
rm -rf .librarian/puppet/config
# Export CC to explicitly set the compiler used for cexts. # Export CC to explicitly set the compiler used for cexts.
@ -17,3 +20,7 @@ export CC=gcc
# Bundle install unless we're already up to date. # Bundle install unless we're already up to date.
bundle install --binstubs bin --path .bundle --quiet "$@" bundle install --binstubs bin --path .bundle --quiet "$@"
# Install all our Puppet dependencies.
bin/librarian-puppet install --path=shared

3
shared/README.md Normal file
View file

@ -0,0 +1,3 @@
# Shared Puppet Modules
This module directory is managed by librarian-puppet.

Binary file not shown.

Binary file not shown.

Binary file not shown.