boxen 1.0.1 → 1.0.2

data/README.md

@@ -1,4 +1,4 @@
-# Boxen
+# Boxen [![Build Status](https://travis-ci.org/boxen/boxen.png?branch=master)](https://travis-ci.org/boxen/boxen)
 
 Manage Mac development boxes with love (and Puppet).
 
@@ -44,3 +44,7 @@ and we can't just modify the sudoers file due to a chicken-egg problem.
 
 Use the OS X system Ruby (1.8.7). Run `script/tests` often. Open PR's.
 Use the CI.
+
+## Halp!
+
+Use Issues or #boxen on irc.freenode.net.

data/boxen.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "boxen"
-  gem.version       = "1.0.1"
+  gem.version       = "1.0.2"
   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/config.rb

@@ -102,10 +102,6 @@ module Boxen
     # Is full disk encryption required? Default is `true`. Respects
     # the `BOXEN_NO_FDE` environment variable.
 
-    def fde=(val)
-      @fde = val
-    end
-
     def fde?
       !ENV["BOXEN_NO_FDE"] && @fde
     end
@@ -230,7 +226,7 @@ module Boxen
     # `"/Users/#{user}/src"`.
 
     def srcdir
-      @srcdir || "/Users/#{user}/src"
+      @srcdir || ENV["BOXEN_SRC_DIR"] || "/Users/#{user}/src"
     end
 
     attr_writer :srcdir

data/lib/boxen/flags.rb

@@ -109,7 +109,7 @@ module Boxen
           @user = user
         end
 
-        o.on "--no-color", "Enable colors." do
+        o.on "--no-color", "Disable colors." do
           @color = false
         end
       end

data/lib/boxen/preflight/etc_my_cnf.rb

@@ -3,7 +3,7 @@ require "boxen/preflight"
 class Boxen::Preflight::EtcMyCnf < Boxen::Preflight
   def run
     abort "You have an /etc/my.cnf file.",
-      "This will confuse The Setup's MySQL a lot. Please remove it."
+      "This will confuse Boxen's MySQL a lot. Please remove it."
   end
 
   def ok?

data/lib/boxen/preflight/rvm.rb

@@ -3,7 +3,7 @@ require "boxen/preflight"
 class Boxen::Preflight::RVM < Boxen::Preflight
   def run
     abort "You have an rvm installed in ~/.rvm.",
-      "The Setup uses rbenv to install ruby, so please `rvm implode`"
+      "Boxen uses rbenv to install ruby, so please `rvm implode`"
   end
 
   def ok?

data/lib/boxen/puppeteer.rb

@@ -81,12 +81,15 @@ module Boxen
 
         ENV["GITHUB_API_TOKEN"] = config.token
 
-        unless system librarian, "install", "--path=#{config.repodir}/shared"
+        librarian_command = [librarian, "install", "--path=#{config.repodir}/shared"]
+        librarian_command << "--verbose" if config.debug?
+
+        warn librarian_command.join(" ") if config.debug?
+        unless system *librarian_command
           abort "Can't run Puppet, fetching dependencies with librarian failed."
         end
       end
 
-      warn command.join " " if config.debug?
       Boxen::Util.sudo *command
 
       Status.new($?.exitstatus)

data/script/build-keychain-helper

@@ -3,4 +3,4 @@
 set -e
 
 cd $(dirname "$0")/..
-cc -g -O2 -Wall -framework Security -o script/Boxen src/keychain-helper.c
+cc -g -O2 -Wall -framework Security -framework CoreFoundation -mmacosx-version-min=10.6 -o script/Boxen src/keychain-helper.c

data/src/keychain-helper.c

@@ -1,6 +1,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <Security/Security.h>
+#include <CoreFoundation/CFString.h>
+
+#define REPORT_KEYCHAIN_ERROR(err_val)  do { \
+fprintf(stderr, "Boxen Keychain Helper: Encountered error code: %d\n", err_val); \
+fprintf(stderr, "Error: %s\n", CFStringGetCStringPtr(SecCopyErrorMessageString(err_val, NULL), kCFStringEncodingMacRoman)); \
+} while(0)
 
 int key_exists_p(
   const char *service,
@@ -17,7 +23,10 @@ int key_exists_p(
   if (ret == 0) {
     return 0;
   } else {
-    fprintf(stderr, "Boxen Keychain Helper: Encountered error code: %d\n", ret);
+    if (ret != errSecItemNotFound) {
+       // Item not found is not an error in predicate method context.
+       REPORT_KEYCHAIN_ERROR(ret);
+    }
     return ret;
   }
 }
@@ -47,7 +56,7 @@ int main(int argc, char **argv) {
     );
 
     if (create_key != 0) {
-      fprintf(stderr, "Boxen Keychain Helper: Encountered error code: %d\n", create_key);
+      REPORT_KEYCHAIN_ERROR(create_key);
       return 1;
     }
 
@@ -56,7 +65,7 @@ int main(int argc, char **argv) {
       NULL, strlen(service), service, strlen(login), login, &len, &buf, &item);
 
     if (find_key != 0) {
-      fprintf(stderr, "Boxen Keychain Helper: Encountered error code: %d\n", find_key);
+      REPORT_KEYCHAIN_ERROR(find_key);
       return 1;
     }
 

data/test/boxen_config_test.rb

@@ -29,28 +29,33 @@ class BoxenConfigTest < Boxen::Test
   end
 
   def test_fde_env_var
-    val = ENV['BOXEN_NO_FDE']
+    val = ENV["BOXEN_NO_FDE"]
 
-    ENV['BOXEN_NO_FDE'] = '1'
+    ENV["BOXEN_NO_FDE"] = "1"
     refute @config.fde?
 
-    ENV['BOXEN_NO_FDE'] = val
+    ENV["BOXEN_NO_FDE"] = val
   end
 
   def test_homedir
+    val = ENV["BOXEN_HOME"]
+    ENV["BOXEN_HOME"] = nil
+
     assert_equal "/opt/boxen", @config.homedir
 
     @config.homedir = "foo"
     assert_equal "foo", @config.homedir
+
+    ENV["BOXEN_HOME"] = val
   end
 
   def test_homedir_env_var_boxen_home
-    val = ENV['BOXEN_NO_FDE']
+    val = ENV["BOXEN_HOME"]
 
-    ENV['BOXEN_HOME'] = 'foo'
+    ENV["BOXEN_HOME"] = "foo"
     assert_equal "foo", @config.homedir
 
-    ENV['BOXEN_HOME'] = val
+    ENV["BOXEN_HOME"] = val
   end
 
   def test_initialize
@@ -69,12 +74,12 @@ class BoxenConfigTest < Boxen::Test
   end
 
   def test_logfile_env_var
-    val = ENV['BOXEN_LOG_FILE']
+    val = ENV["BOXEN_LOG_FILE"]
 
-    ENV['BOXEN_LOG_FILE'] = 'foo'
+    ENV["BOXEN_LOG_FILE"] = "foo"
     assert_equal "foo", @config.logfile
 
-    ENV['BOXEN_LOG_FILE'] = val
+    ENV["BOXEN_LOG_FILE"] = val
   end
 
   def test_login
@@ -122,12 +127,12 @@ class BoxenConfigTest < Boxen::Test
   end
 
   def test_puppetdir_env_var
-    val = ENV['BOXEN_PUPPET_DIR']
+    val = ENV["BOXEN_PUPPET_DIR"]
 
-    ENV['BOXEN_PUPPET_DIR'] = 'foo'
+    ENV["BOXEN_PUPPET_DIR"] = "foo"
     assert_equal "foo", @config.puppetdir
 
-    ENV['BOXEN_PUPPET_DIR'] = val
+    ENV["BOXEN_PUPPET_DIR"] = val
   end
 
   def test_repodir
@@ -141,12 +146,12 @@ class BoxenConfigTest < Boxen::Test
   def test_repodir_env_var
     @config.repodir = nil
 
-    val = ENV['BOXEN_REPO_DIR']
+    val = ENV["BOXEN_REPO_DIR"]
 
-    ENV['BOXEN_REPO_DIR'] = 'foo'
+    ENV["BOXEN_REPO_DIR"] = "foo"
     assert_equal "foo", @config.repodir
 
-    ENV['BOXEN_REPO_DIR'] = val
+    ENV["BOXEN_REPO_DIR"] = val
   end
 
   def test_reponame
@@ -155,12 +160,12 @@ class BoxenConfigTest < Boxen::Test
   end
 
   def test_reponame_env_var
-    val = ENV['BOXEN_REPO_NAME']
+    val = ENV["BOXEN_REPO_NAME"]
 
-    ENV['BOXEN_REPO_NAME'] = 'env/var'
+    ENV["BOXEN_REPO_NAME"] = "env/var"
     assert_equal "env/var", @config.reponame
 
-    ENV['BOXEN_REPO_NAME'] = val
+    ENV["BOXEN_REPO_NAME"] = val
   end
 
   def test_reponame_git_config
@@ -194,11 +199,27 @@ class BoxenConfigTest < Boxen::Test
   end
 
   def test_srcdir
+    val = ENV["BOXEN_SRC_DIR"]
+    ENV["BOXEN_SRC_DIR"] = nil
+
     @config.expects(:user).returns "foo"
     assert_equal "/Users/foo/src", @config.srcdir
 
     @config.srcdir = "elsewhere"
     assert_equal "elsewhere", @config.srcdir
+
+    ENV["BOXEN_SRC_DIR"] = val
+  end
+
+  def test_srcdir_env_var
+    @config.srcdir = nil
+
+    val = ENV["BOXEN_SRC_DIR"]
+
+    ENV["BOXEN_SRC_DIR"] = "Projects"
+    assert_equal "Projects", @config.srcdir
+
+    ENV["BOXEN_SRC_DIR"] = val
   end
 
   def test_stealth?
@@ -209,12 +230,12 @@ class BoxenConfigTest < Boxen::Test
   end
 
   def test_stealth_env_var
-    val = ENV['BOXEN_NO_ISSUE']
+    val = ENV["BOXEN_NO_ISSUE"]
 
-    ENV['BOXEN_NO_ISSUE'] = '1'
+    ENV["BOXEN_NO_ISSUE"] = "1"
     assert @config.stealth?
 
-    ENV['BOXEN_NO_ISSUE'] = val
+    ENV["BOXEN_NO_ISSUE"] = val
   end
 
   def test_token
@@ -225,7 +246,7 @@ class BoxenConfigTest < Boxen::Test
   end
 
   def test_user
-    ENV['USER'] = 'foo'
+    ENV["USER"] = "foo"
     assert_equal "foo", @config.user
 
     @config.user = "bar"
@@ -233,8 +254,8 @@ class BoxenConfigTest < Boxen::Test
   end
 
   def test_api
-    @config.login    = login = 'someuser'
-    @config.password = pass  = 's3kr!7'
+    @config.login    = login = "someuser"
+    @config.password = pass  = "s3kr!7"
 
     api = Object.new
     Octokit::Client.expects(:new).with(:login => login, :password => pass).once.returns(api)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - John Barnette
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-14 00:00:00 -08:00
+date: 2013-03-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency