Skip to content
This repository was archived by the owner on Dec 2, 2020. It is now read-only.

Commit 159bfb7

Browse files
bryanvelosobryanveloso
committed
Merge branch 'master' into re-integrate
* master: make sure we have a libdir to work with bump cardboard dependency cardboardize Conflicts: manifests/init.pp
2 parents 14534d1 + 989c59b commit 159bfb7

11 files changed

Lines changed: 96 additions & 140 deletions

File tree

‎.gitignore‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
/.bundle/
2-
/bin/
3-
/spec/fixtures/.librarian/
4-
/spec/fixtures/.tmp/
5-
/spec/fixtures/modules/boxen/
6-
/spec/fixtures/modules/homebrew/
7-
/spec/fixtures/modules/stdlib/
8-
/spec/fixtures/modules/xquartz/
9-
/spec/fixtures/vendor/
1+
/.bundle
2+
/.ruby-version
3+
/spec/fixtures/.librarian
4+
/spec/fixtures/.tmp
5+
/spec/fixtures/Puppetfile.lock
6+
/spec/fixtures/modules
7+
/spec/fixtures/vendor

‎CONTRIBUTING.md‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
#Contributing
1+
Thanks for contributing to Boxen! A couple of notes to help you out:
22

3-
* Fork it
4-
* Fix it
5-
* Test it
6-
* Pull Request it
3+
* We're conservative with version bumps, especially on services. We
4+
tend to keep things aligned with what we're personally using in
5+
development. If that doesn't work for your team, fork the module and
6+
use it in your Boxen instead.
77

8+
* Otherwise, go crazy! Fork it, fix it, test it, pull request it.
9+
Remember that a PR is the start of a conversation, not the end of one.
10+
11+
:heart:,
12+
Boxen

‎Gemfile‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
source :rubygems
1+
source "https://rubygems.org"
22

3-
gem 'librarian-puppet', '0.9.7'
4-
gem 'puppet', '3.0.0'
5-
gem 'puppet-lint', '0.3.1'
6-
gem 'puppetlabs_spec_helper', '0.3.0'
7-
gem 'rspec-puppet', '0.1.6'
3+
gem "cardboard", "~> 1.0"

‎Gemfile.lock‎

Lines changed: 47 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,72 @@
11
GEM
2-
remote: http://rubygems.org/
2+
remote: https://rubygems.org/
33
specs:
4+
addressable (2.3.2)
5+
ansi (1.4.3)
6+
boxen (1.0.0)
7+
ansi (~> 1.4)
8+
hiera (~> 1.0.0)
9+
highline (~> 1.6)
10+
json_pure (>= 1.7.7, < 2.0)
11+
librarian-puppet (~> 0.9)
12+
octokit (~> 1.15)
13+
puppet (~> 3.0)
14+
cardboard (1.0.0)
15+
boxen (~> 1.0)
16+
puppet-lint (~> 0.3)
17+
puppetlabs_spec_helper (~> 0.4)
18+
rspec-puppet (~> 0.1)
419
diff-lcs (1.1.3)
5-
facter (1.6.13)
6-
hiera (1.1.0)
20+
facter (1.6.17)
21+
faraday (0.8.5)
22+
multipart-post (~> 1.1)
23+
faraday_middleware (0.9.0)
24+
faraday (>= 0.7.4, < 0.9)
25+
hashie (1.2.0)
26+
hiera (1.0.0)
27+
highline (1.6.15)
28+
json (1.7.7)
29+
json_pure (1.7.7)
30+
librarian-puppet (0.9.8)
731
json
8-
json (1.7.5)
9-
librarian-puppet (0.9.7)
10-
json
11-
puppet
1232
thor (~> 0.15)
1333
metaclass (0.0.1)
14-
mocha (0.12.7)
34+
mocha (0.13.2)
1535
metaclass (~> 0.0.1)
16-
puppet (3.0.0)
17-
facter (>= 1.6.11)
18-
hiera (>= 1.0.0rc)
19-
puppet-lint (0.3.1)
20-
puppetlabs_spec_helper (0.3.0)
36+
multi_json (1.6.0)
37+
multipart-post (1.1.5)
38+
netrc (0.7.7)
39+
octokit (1.23.0)
40+
addressable (~> 2.2)
41+
faraday (~> 0.8)
42+
faraday_middleware (~> 0.9)
43+
hashie (~> 1.2)
44+
multi_json (~> 1.3)
45+
netrc (~> 0.7.7)
46+
puppet (3.1.0)
47+
facter (~> 1.6)
48+
hiera (~> 1.0)
49+
puppet-lint (0.3.2)
50+
puppetlabs_spec_helper (0.4.1)
2151
mocha (>= 0.10.5)
2252
rake
2353
rspec (>= 2.9.0)
2454
rspec-puppet (>= 0.1.1)
25-
rake (0.9.2.2)
55+
rake (10.0.3)
2656
rspec (2.12.0)
2757
rspec-core (~> 2.12.0)
2858
rspec-expectations (~> 2.12.0)
2959
rspec-mocks (~> 2.12.0)
3060
rspec-core (2.12.2)
3161
rspec-expectations (2.12.1)
3262
diff-lcs (~> 1.1.3)
33-
rspec-mocks (2.12.1)
63+
rspec-mocks (2.12.2)
3464
rspec-puppet (0.1.6)
3565
rspec
36-
thor (0.16.0)
66+
thor (0.17.0)
3767

3868
PLATFORMS
3969
ruby
4070

4171
DEPENDENCIES
42-
librarian-puppet (= 0.9.7)
43-
puppet (= 3.0.0)
44-
puppet-lint (= 0.3.1)
45-
puppetlabs_spec_helper (= 0.3.0)
46-
rspec-puppet (= 0.1.6)
72+
cardboard (~> 1.0)

‎README.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
# Python Puppet Module for Boxen
22

3-
Requires the following boxen modules:
4-
5-
* `boxen`
6-
* `homebrew`
7-
83
## Usage
94

105
For now this is lightweight.
116
We'll want to add virtualenv support someday.
127

138
```puppet
149
include python
15-
```
10+
```
11+
12+
## Required Puppet Modules
13+
14+
* `boxen`
15+
* `homebrew`
16+
* `stdlib`

‎script/bootstrap‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎script/cardboard-exec‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/sh
2+
# Make sure deps are available and run a Cardboard command.
3+
4+
set -e
5+
6+
cd $(dirname "$0")/..
7+
8+
BUNDLE=.bundle
9+
BIN=$BUNDLE/binstubs
10+
SCRIPT=$(basename "$0")
11+
12+
BUNDLE_ARGS="--binstubs $BIN --path $BUNDLE --quiet"
13+
[ "cibuild" = "$SCRIPT" ] && BUNDLE_ARGS="$BUNDLE_ARGS --no-quiet"
14+
15+
rm -rf {$BIN,$BUNDLE/config}
16+
bundle install $BUNDLE_ARGS
17+
18+
bundle exec cardboard bootstrap
19+
exec bundle exec cardboard "$SCRIPT" "$@"

‎script/cibuild‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎script/cibuild‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cardboard-exec

‎script/lint‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)