boxen 0.2.3 → 0.2.4

data/.gitignore

@@ -1,5 +1,7 @@
 /.bundle
+/.env.local.rb
 /.rbenv-version
 /Gemfile.lock
 /bin
 /boxen-*.gem
+/puppet

data/README.md

@@ -1,7 +1,45 @@
 # Boxen
 
-Manage development boxes with love (and Puppet).
+Manage Mac development boxes with love (and Puppet).
+
+## Rules for Services
+
+0. Run on a nonstandard port, usually default port + 1000 or 10000.
+
+0. Install with a custom Boxen homebrew formula.
+
+0. Suffix the Homebrew package's version, starting with `-boxen1`.
+
+0. Run as a launchd service in the `com.boxen` namespace, e.g.,
+   `com.boxen.dnsmasq`.
+
+0. Store config, data, and log files in
+   `$BOXEN_HOME/{config,data,log}. This will normally require
+   customization of a service's Homebrew formula.
+
+Sometimes it's not possible to follow these rules, but try hard.
 
 ## Contributing
 
 Use the OS X system Ruby (1.8.7). Run `script/tests` often. Open PR's.
+
+### Managing Boxen's Puppet Modules
+
+There are roughly nine million puppet modules under the
+[Boxen GitHub organization][boxen]. To clone them all, run
+`script/sync-puppet`. This script will make sure every
+`boxen/puppet-*` repo is cloned under the `./puppet`, which is ignored
+by Git.
+
+[boxen]: https://github.com/boxen
+
+Because it uses the GitHub API, `script/sync-puppet` requires the
+`GITHUB_LOGIN` and `GITHUB_PASSWORD` environment variables to be set.
+If you don't want to provide them every time, you can set them in
+`.env.local.rb`, which is also ignored by Git. For example, your
+`.env.local.rb` might look like this:
+
+```ruby
+ENV["GITHUB_LOGIN"]    = "jbarnette"
+ENV["GITHUB_PASSWORD"] = "adventures"
+```

data/boxen.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "boxen"
-  gem.version       = "0.2.3"
+  gem.version       = "0.2.4"
   gem.authors       = ["John Barnette", "Will Farrington"]
   gem.email         = ["jbarnette@github.com", "wfarr@github.com"]
   gem.description   = "Manage Mac development boxes with love (and Puppet)."

data/lib/boxen/puppeteer.rb

@@ -12,11 +12,15 @@ module Boxen
       @config = config
     end
 
+    def caffeinate
+      "/usr/bin/caffeinate -dis"
+    end
+
     def command
       manifest = "#{config.repodir}/manifests/site.pp"
       puppet   = "#{config.repodir}/bin/puppet"
 
-      [puppet, "apply", flags, manifest].flatten
+      [caffeinate, puppet, "apply", flags, manifest].flatten
     end
 
     def flags
@@ -69,7 +73,9 @@ module Boxen
 
         ENV["GITHUB_API_TOKEN"] = config.token
 
-        unless system librarian, "install", "--path=#{config.repodir}/shared"
+        # caffeinate ensures the system will not sleep during a run
+        unless system caffeinate,
+                      librarian, "install", "--path=#{config.repodir}/shared"
           abort "Can't run Puppet, fetching dependencies with librarian failed."
         end
       end

data/lib/facter/boxen.rb

@@ -3,7 +3,7 @@ require "boxen/config"
 
 config   = Boxen::Config.load
 facts    = {}
-factsdir = File.join config.homedir, "config", "facts"
+factsdir = "#{config.homedir}/config/facts"
 
 facts["github_login"]  = config.login
 facts["github_email"]  = config.email
@@ -13,7 +13,8 @@ facts["github_token"]  = config.token
 facts["boxen_home"]    = config.homedir
 facts["boxen_srcdir"]  = config.srcdir
 facts["boxen_repodir"] = config.repodir
-facts["luser"]         = config.user
+facts["boxen_user"]    = config.user
+facts["luser"]         = config.user # this is goin' away
 
 Dir["#{config.homedir}/config/facts/*.json"].each do |file|
   facts.merge! JSON.parse File.read file

data/script/release

@@ -9,9 +9,16 @@ cd $(dirname "$0")/..
 
 # Build a new gem archive.
 
-rm boxen-*.gem
+rm -rf boxen-*.gem
 gem build -q boxen.gemspec
 
+# Make sure we're on the master branch.
+
+(git branch | grep '* master') || {
+  echo "Only release from the master branch."
+  exit 1
+}
+
 # Figure out what version we're releasing.
 
 tag=v`ls boxen-*.gem | sed 's/^boxen-\(.*\)\.gem$/\1/'`

data/script/sync-puppet

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+# Make sure all boxen/puppet-* repos are cloned under ./puppet.
+
+require "fileutils"
+require "pathname"
+
+# Put us where we belong, in the root dir of boxen.
+
+Dir.chdir Pathname.new(__FILE__).realpath + "../.."
+
+# Load the local env in case creds are set there.
+
+load ".env.local.rb" if File.file? ".env.local.rb"
+
+# Make sure we're up to date.
+
+abort "Bootstrap failed." unless system "script/bootstrap"
+
+require "bundler/setup"
+require "octokit"
+
+unless ENV["GITHUB_LOGIN"] && ENV["GITHUB_PASSWORD"]
+  abort "Please set the GITHUB_LOGIN and GITHUB_PASSWORD env vars."
+end
+
+api = Octokit::Client.new \
+  :login => ENV["GITHUB_LOGIN"], :password => ENV["GITHUB_PASSWORD"]
+
+# Gotta have a ./puppet dir.
+
+FileUtils.mkdir_p "puppet"
+
+# Clone boxen/puppet-* unless we have it already.
+
+api.organization_repositories("boxen").each do |repo|
+  next unless /^puppet-/ =~ repo.name
+
+  unless File.directory? dest = "puppet/#{repo.name}"
+    system "git", "clone", repo.clone_url, dest
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - John Barnette
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-03 00:00:00 -07:00
+date: 2012-10-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -175,6 +175,7 @@ files:
 - lib/facter/boxen.rb
 - script/bootstrap
 - script/release
+- script/sync-puppet
 - script/tests
 - test/boxen/test.rb
 - test/boxen_check_test.rb