one dot oh

.gitignore

@@ -1,10 +1,12 @@
 /.bundle
 /.librarian
 /.ruby-version
+/.snapshot
 /.tmp
 /bin
 /config/local.rb
 /log
+/tmp
 /shared/*
 !/shared/README.md
-/tmp
+/vendor/gems/

Gemfile

@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
-gem "boxen", "0.7.3"
+gem "boxen", "~> 1.0"
+gem "open4", "~> 1.3"
 
 group :development do
   gem "aws-sdk"

Gemfile.lock

@@ -7,11 +7,11 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    boxen (0.7.3)
+    boxen (1.0.0)
       ansi (~> 1.4)
       hiera (~> 1.0.0)
       highline (~> 1.6)
-      json_pure (~> 1.7)
+      json_pure (>= 1.7.7, < 2.0)
       librarian-puppet (~> 0.9)
       octokit (~> 1.15)
       puppet (~> 3.0)
@@ -26,11 +26,10 @@ GEM
     highline (1.6.15)
     json (1.7.7)
     json_pure (1.7.7)
-    librarian-puppet (0.9.7)
+    librarian-puppet (0.9.8)
       json
-      puppet
       thor (~> 0.15)
-    multi_json (1.6.0)
+    multi_json (1.6.1)
     multipart-post (1.1.5)
     net-ssh (2.6.5)
     netrc (0.7.7)
@@ -42,6 +41,7 @@ GEM
       hashie (~> 1.2)
       multi_json (~> 1.3)
       netrc (~> 0.7.7)
+    open4 (1.3.0)
     puppet (3.1.0)
       facter (~> 1.6)
       hiera (~> 1.0)
@@ -58,6 +58,7 @@ PLATFORMS
 
 DEPENDENCIES
   aws-sdk
-  boxen (= 0.7.3)
+  boxen (~> 1.0)
   net-ssh
+  open4 (~> 1.3)
   rbvmomi

Puppetfile

@@ -16,23 +16,23 @@ end
 # Includes many of our custom types and providers, as well as global
 # config. Required.
 
-github "boxen", "0.2.4"
+github "boxen", "1.0.0"
 
 # Core modules for a basic development environment. You can replace
 # some/most of these if you want, but it's not recommended.
 
-github "dnsmasq",  "0.2.1"
-github "gcc",      "0.0.2"
-github "git",      "0.1.0"
-github "homebrew", "0.3.2"
-github "hub",      "0.0.1"
+github "dnsmasq",  "1.0.0"
+github "gcc",      "1.0.0"
+github "git",      "1.0.0"
+github "homebrew", "1.0.0"
+github "hub",      "1.0.0"
 github "inifile",  "0.9.0", :repo => "cprice-puppet/puppetlabs-inifile"
-github "nginx",    "0.2.1"
-github "nodejs",   "0.0.2"
-github "nvm",      "0.0.5"
-github "ruby",     "0.7.1"
+github "nginx",    "1.0.0"
+github "nodejs",   "1.0.0"
+github "nvm",      "1.0.0"
+github "ruby",     "1.0.0"
 github "stdlib",   "3.0.0", :repo => "puppetlabs/puppetlabs-stdlib"
-github "sudo",     "0.0.1"
+github "sudo",     "1.0.0"
 
 # Optional/custom modules. There are tons available at
 # https://github.com/boxen.

Puppetfile.lock

@@ -1,57 +1,57 @@
 GITHUBTARBALL
   remote: boxen/puppet-boxen
   specs:
-    boxen (0.2.4)
+    boxen (1.0.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-dnsmasq
   specs:
-    dnsmasq (0.2.1)
+    dnsmasq (1.0.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-gcc
   specs:
-    gcc (0.0.2)
+    gcc (1.0.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-git
   specs:
-    git (0.1.0)
+    git (1.0.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-homebrew
   specs:
-    homebrew (0.3.2)
+    homebrew (1.0.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-hub
   specs:
-    hub (0.0.1)
+    hub (1.0.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-nginx
   specs:
-    nginx (0.2.1)
+    nginx (1.0.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-nodejs
   specs:
-    nodejs (0.0.2)
+    nodejs (1.0.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-nvm
   specs:
-    nvm (0.0.5)
+    nvm (1.0.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-ruby
   specs:
-    ruby (0.7.1)
+    ruby (1.0.0)
 
 GITHUBTARBALL
   remote: boxen/puppet-sudo
   specs:
-    sudo (0.0.1)
+    sudo (1.0.0)
 
 GITHUBTARBALL
   remote: cprice-puppet/puppetlabs-inifile
@@ -64,17 +64,17 @@ GITHUBTARBALL
     stdlib (3.0.0)
 
 DEPENDENCIES
-  boxen (= 0.2.4)
-  dnsmasq (= 0.2.1)
-  gcc (= 0.0.2)
-  git (= 0.1.0)
-  homebrew (= 0.3.2)
-  hub (= 0.0.1)
+  boxen (= 1.0.0)
+  dnsmasq (= 1.0.0)
+  gcc (= 1.0.0)
+  git (= 1.0.0)
+  homebrew (= 1.0.0)
+  hub (= 1.0.0)
   inifile (= 0.9.0)
-  nginx (= 0.2.1)
-  nodejs (= 0.0.2)
-  nvm (= 0.0.5)
-  ruby (= 0.7.1)
+  nginx (= 1.0.0)
+  nodejs (= 1.0.0)
+  nvm (= 1.0.0)
+  ruby (= 1.0.0)
   stdlib (= 3.0.0)
-  sudo (= 0.0.1)
+  sudo (= 1.0.0)
 

script/boxen-git-credential

@@ -1,20 +1,11 @@
 #!/usr/bin/ruby
 # Provide git credentials using Boxen's config.
 
-unless command = ARGV.shift
+unless command = ARGV[0]
   this = File.basename $0
   abort "Usage: #{this} <get|store|erase>"
 end
 
-# We only support get.
-
-exit 0 unless command == "get"
-
-# Make sure we're looking for github.com stuff.
-
-attrs = Hash[$stdin.read.split($/).map { |l| l.split("=") }]
-exit 1 unless attrs["host"] == "github.com"
-
 require "pathname"
 
 # Put us where we belong, in the root dir of our boxen repo.
@@ -29,10 +20,27 @@ ENV.keys.select { |k| /^BUNDLE_/i }.each { |k| ENV.delete k }
 # Set up our local configuration, deps, and load path.
 
 load "config/basic.rb"
-
 require "boxen/config"
 
 config = Boxen::Config.load
+input  = $stdin.read
+attrs  = Hash[input.split($/).map { |l| l.split("=") }]
+
+if command != "get" || attrs["host"] != "github.com"
+  require "open4"
+
+  fallback   = ENV["BOXEN_GIT_CREDENTIAL_FALLBACK"]
+  fallback ||= "#{config.homedir}/homebrew/bin/git-credential-osxkeychain"
+
+  status = Open4.popen4 fallback, *ARGV do |pid, stdin, stdout, stderr|
+    stdin.write input
+    stdin.puts
+
+    $stdout.write stdout.read
+  end
+
+  exit status.exitstatus
+end
 
 puts "username=#{config.login}"
 puts "password=#{config.password}"