Permalink
Browse files

Cardboardify

  • Loading branch information...
1 parent 8329b0f commit 511f36a1339fa1ae9404e103c1519ab8cb02e80e @jbarnette jbarnette committed Feb 13, 2013
Showing with 106 additions and 132 deletions.
  1. +7 −2 .gitignore
  2. +10 −5 CONTRIBUTING.md
  3. +2 −5 Gemfile
  4. +56 −23 Gemfile.lock
  5. +8 −4 README.md
  6. +0 −25 script/bootstrap
  7. +19 −0 script/cardboard-exec
  8. +0 −3 script/cibuild
  9. +1 −0 script/cibuild
  10. +0 −15 script/lint
  11. +1 −0 script/lint
  12. +0 −13 script/specs
  13. +1 −0 script/specs
  14. +0 −37 script/syntax
  15. +1 −0 script/syntax
View
@@ -1,2 +1,7 @@
-/.bundle/
-/bin/
+/.bundle
+/.ruby-version
+/spec/fixtures/.librarian
+/spec/fixtures/.tmp
+/spec/fixtures/Puppetfile.lock
+/spec/fixtures/modules
+/spec/fixtures/vendor
View
@@ -1,7 +1,12 @@
-#Contributing
+Thanks for contributing to Boxen! A couple of notes to help you out:
-* Fork it
-* Fix it
-* Test it
-* Pull Request it
+* We're conservative with version bumps, especially on services. We
+ tend to keep things aligned with what we're personally using in
+ development. If that doesn't work for your team, fork the module and
+ use it in your Boxen instead.
+* Otherwise, go crazy! Fork it, fix it, test it, pull request it.
+ Remember that a PR is the start of a conversation, not the end of one.
+
+:heart:,
+Boxen
View
@@ -1,6 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
-gem 'puppet', '3.0.0'
-gem 'puppet-lint', '0.3.1'
-gem 'puppetlabs_spec_helper', '0.3.0'
-gem 'rspec-puppet', '0.1.5'
+gem "cardboard", "~> 0.2"
View
@@ -1,40 +1,73 @@
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
+ addressable (2.3.2)
+ ansi (1.4.3)
+ boxen (0.8.1)
+ ansi (~> 1.4)
+ hiera (~> 1.0.0)
+ highline (~> 1.6)
+ json_pure (>= 1.7.7, < 2.0)
+ librarian-puppet (~> 0.9)
+ octokit (~> 1.15)
+ puppet (~> 3.0)
+ cardboard (0.2.0)
+ boxen (~> 0.8)
+ puppet-lint (~> 0.3)
+ puppetlabs_spec_helper (~> 0.4)
+ rspec-puppet (~> 0.1)
diff-lcs (1.1.3)
- facter (1.6.12)
- hiera (1.1.0.rc1)
+ facter (1.6.17)
+ faraday (0.8.5)
+ multipart-post (~> 1.1)
+ faraday_middleware (0.9.0)
+ faraday (>= 0.7.4, < 0.9)
+ hashie (1.2.0)
+ hiera (1.0.0)
+ highline (1.6.15)
+ json (1.7.7)
+ json_pure (1.7.7)
+ librarian-puppet (0.9.7)
json
- json (1.7.5)
+ puppet
+ thor (~> 0.15)
metaclass (0.0.1)
- mocha (0.12.6)
+ mocha (0.13.2)
metaclass (~> 0.0.1)
- puppet (3.0.0)
- facter (>= 1.6.11)
- hiera (>= 1.0.0rc)
- puppet-lint (0.3.1)
- puppetlabs_spec_helper (0.3.0)
+ multi_json (1.6.0)
+ multipart-post (1.1.5)
+ netrc (0.7.7)
+ octokit (1.23.0)
+ addressable (~> 2.2)
+ faraday (~> 0.8)
+ faraday_middleware (~> 0.9)
+ hashie (~> 1.2)
+ multi_json (~> 1.3)
+ netrc (~> 0.7.7)
+ puppet (3.1.0)
+ facter (~> 1.6)
+ hiera (~> 1.0)
+ puppet-lint (0.3.2)
+ puppetlabs_spec_helper (0.4.1)
mocha (>= 0.10.5)
rake
rspec (>= 2.9.0)
rspec-puppet (>= 0.1.1)
- rake (0.9.2.2)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.3)
+ rake (10.0.3)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.2)
+ rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.3)
- rspec-puppet (0.1.5)
+ rspec-mocks (2.12.2)
+ rspec-puppet (0.1.6)
rspec
+ thor (0.17.0)
PLATFORMS
ruby
DEPENDENCIES
- puppet (= 3.0.0)
- puppet-lint (= 0.3.1)
- puppetlabs_spec_helper (= 0.3.0)
- rspec-puppet (= 0.1.5)
+ cardboard (~> 0.2)
View
@@ -1,15 +1,19 @@
# Dropbox Puppet Module for Boxen
-Requires the `boxen` puppet module.
+Install [Dropbox](http://www.dropbox.com), an easy way to share files
+and folders on Mac OS X.
## Usage
```puppet
include dropbox
```
-## Developing
+## Required Puppet Modules
-Write code.
+* `boxen`
-Run `script/cibuild`.
+## Development
+
+Write code. Run `script/cibuild` to test it. Check the `script`
+directory for other useful tools.
View
@@ -1,25 +0,0 @@
-#!/bin/sh
-# Make sure all our local dependencies are available.
-
-# FIX: only sudo if gem home isn't writable
-
-(gem spec bundler -v '~> 1.2.0' > /dev/null 2>&1) ||
- sudo gem install bundler --no-rdoc --no-ri
-
-# We don't want old config hanging around.
-
-rm -rf .bundle/config
-
-# Export CC to explicitly set the compiler used for cexts.
-
-export CC=gcc
-
-# Bundle install unless we're already up to date.
-
-bundle install --binstubs bin --path .bundle --quiet "$@"
-
-if [[ -f spec/fixtures/Puppetfile ]]; then
- pushd spec/fixtures > /dev/null
- ../../bin/librarian-puppet install
- popd > /dev/null
-fi
View
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Make sure deps are available and run a Cardboard command.
+
+set -e
+
+cd $(dirname "$0")/..
+
+BUNDLE=.bundle
+BIN=$BUNDLE/binstubs
+SCRIPT=$(basename "$0")
+
+BUNDLE_ARGS="--binstubs $BIN --path $BUNDLE --quiet"
+[ "cibuild" = "$SCRIPT" ] && BUNDLE_ARGS="$BUNDLE_ARGS --no-quiet"
+
+rm -rf {$BIN,$BUNDLE/config}
+bundle install $BUNDLE_ARGS
+
+bundle exec cardboard bootstrap
+exec bundle exec cardboard "$SCRIPT" "$@"
View
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-script/bootstrap && script/syntax && script/specs && script/lint
View
View
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-[[ ! -f bin/puppet-lint ]] && {
- script/bootstrap
-}
-
-echo
-echo "puppet-lint"
-echo "-----------"
-
-bin/puppet-lint --fail-on-warnings --with-filename manifests
-
-[ $? -eq 0 ] && {
- echo "ALL OK"
-}
View
View
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-[[ ! -f bin/rspec ]] && {
- script/bootstrap
-}
-
-echo
-echo "Spec"
-echo "----"
-
-specs=`find spec -name '*_spec.rb' -not -path 'spec/fixtures/*' -print | tr "\n" ' '`
-
-bin/rspec ${specs} 2>/dev/null
View
View
@@ -1,37 +0,0 @@
-#!/bin/sh
-# syntax check puppet and ruby
-
-[[ ! -f bin/puppet ]] && {
- script/bootstrap
-}
-
-puppets=`find manifests -name '*.pp' -print 2>/dev/null`
-rubies=`find lib spec -name '*.rb' -not -path 'spec/fixtures/*' -print 2>/dev/null`
-templates=`find templates -type f -print 2>/dev/null`
-
-echo "Syntax"
-echo "------"
-
-for puppet in $puppets; do
- /bin/echo -n "${puppet}: "
- bin/puppet parser validate $puppet && echo "Syntax OK"
- if [ $? -ne 0 ]; then
- exit 1
- fi
-done
-
-for ruby in $rubies; do
- /bin/echo -n "${ruby}: "
- ruby -wc $ruby
- if [ $? -ne 0 ]; then
- exit 1
- fi
-done
-
-for template in $templates; do
- /bin/echo -n "${template}: "
- erb -P -x -T '-' ${template} | ruby -wc
- if [ $? -ne 0 ]; then
- exit 1
- fi
-done
View

0 comments on commit 511f36a

Please sign in to comment.