boxen 1.4.2 → 1.5.0

data/boxen.gemspec

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

@@ -1,10 +1,11 @@
 require "json"
 require "boxen/config"
 
-config   = Boxen::Config.load
-facts    = {}
-factsdir = "#{config.homedir}/config/facts"
-dot_boxen = "#{ENV['HOME']}/.boxen"
+config      = Boxen::Config.load
+facts       = {}
+factsdir    = "#{config.homedir}/config/facts"
+dot_boxen   = "#{ENV['HOME']}/.boxen"
+user_config = "#{dot_boxen}/config.json"
 
 facts["github_login"]  = config.login
 facts["github_email"]  = config.email
@@ -22,7 +23,11 @@ Dir["#{config.homedir}/config/facts/*.json"].each do |file|
 end
 
 if File.exist? dot_boxen
-  facts.merge! JSON.parse(File.read(dot_boxen))
+  if File.directory?(dot_boxen) && File.file?(user_config)
+    facts.merge! JSON.parse(File.read(user_config))
+  else
+    facts.merge! JSON.parse(File.read(dot_boxen))
+  end
 end
 
 facts.each { |k, v| Facter.add(k) { setcode { v } } }

data/src/keychain-helper.c

@@ -64,6 +64,9 @@ int main(int argc, char **argv) {
     OSStatus find_key = SecKeychainFindGenericPassword(
       NULL, strlen(service), service, strlen(login), login, &len, &buf, &item);
 
+    if (find_key == errSecItemNotFound) {
+      return find_key;
+    }
     if (find_key != 0) {
       REPORT_KEYCHAIN_ERROR(find_key);
       return 1;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boxen
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi