kitchenplan 2.1.13 → 2.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bb1eb5ec11dbe1b94ec47ef3bacb87b0ed8aa1b
-  data.tar.gz: b5cdffa26657ac57c55f580d040e32b8b4116cb9
+  metadata.gz: 50351efa8455e1c8c678e3c143da5f9efbd87b8c
+  data.tar.gz: d05791b51c58359e9b17cc77b79ddefc27164cea
 SHA512:
-  metadata.gz: b9a9301a9acd053ee4d8e190b0a461a1ed0f08d7e21ce3a2191326e5fd2c3f6b5433e0cf74ce458c5c057eeda3a39737f168b38e4645f1abe5705f0faf1c4ca3
-  data.tar.gz: 24542e71583d389a136e176b31b911471307da1f65652cd3e54191cdd45e6f9bd06ad6549d00ee7de2c453327d66f6ed687534dd3f172e257f8587f909295463
+  metadata.gz: ca30b323b3b13a2a8637e8f8ac05e6dc456ed491625ac76b1733bb6c23fcbed550a4c3ec6be816611602cdf82b3975cf0d1df13ae5bebfb7a2122fc09652a877
+  data.tar.gz: 1c1014b98c8fa88245a1a1995f406c7a6e23d3a45bd10dde5a1acd881688b9f51d820ee1787bbfd4e11b09d834e8fee7c43567efec198e7765b7467769399ff2

data/README.md

@@ -1,4 +1,4 @@
-# Kitchenplan [![Build Status](https://travis-ci.org/kitchenplan/kitchenplan.png?branch=master)](https://travis-ci.org/kitchenplan/kitchenplan)
+# Kitchenplan
 
 Kitchenplan is a small tool to fully automate the installation and configuration of an OSX workstation (or server for that matter) using Chef. But while doing so manually is not a trivial undertaking, Kitchenplan has abstracted away all the hard parts.
 

data/lib/kitchenplan/config.rb

@@ -18,7 +18,7 @@ module Kitchenplan
       self.detect_platform
       self.parse_default_config
       self.parse_people_config
-#      self.parse_system_config
+      self.parse_system_config
       self.parse_group_configs
     end
 
@@ -30,9 +30,9 @@ module Kitchenplan
       @platform = 'mac_os_x' # We only support osx at the moment, and it saves a large dependency
     end
 
-#    def hardware_model
-#      `system_profiler SPHardwareDataType | awk '/Identifier/ {print $3}' | tr -d '\n'`
-#    end
+   def hardware_model
+      `sysctl -n hw.model | tr -d '\n'`
+   end
 
     def parse_default_config
       default_config_path = 'config/default.yml'
@@ -44,10 +44,10 @@ module Kitchenplan
       @people_config = (YAML.load(ERB.new(File.read(people_config_path)).result) if File.exist?(people_config_path)) || {}
     end
 
-#    def parse_system_config
-#      system_config_path = "config/system/#{hardware_model}.yml"
-#      @system_config = (YAML.load(ERB.new(File.read(system_config_path)).result) if File.exist?(system_config_path)) || {}
-#    end
+    def parse_system_config
+      system_config_path = "config/system/#{hardware_model}.yml"
+      @system_config = (YAML.load(ERB.new(File.read(system_config_path)).result) if File.exist?(system_config_path)) || {}
+    end
 
     def parse_group_configs(group = (( @default_config['groups'] || [] ) | ( @people_config['groups'] || [] )))
       @group_configs = @group_configs || {}
@@ -95,16 +95,16 @@ module Kitchenplan
       config['attributes'].deep_merge!(people_attributes) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
 
       # lastly override from the system files
-      # system_recipes = @system_config['recipes'] || {}
-      # config['recipes'] |= system_recipes['global'] || []
-      # config['recipes'] |= system_recipes[@platform] || []
-      # config['attributes'] = {}
-      # config['attributes'].deep_merge!(@default_config['attributes'] || {}) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
-      # @group_configs.each do |group_name, group_config|
-      #   config['attributes'].deep_merge!(group_config['attributes']) { |key, old, new| Array.wrap(old) + Array.wrap(new) } unless group_config['attributes'].nil?
-      # end
-      # system_attributes = @system_config['attributes'] || {}
-      # config['attributes'].deep_merge!(system_attributes) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
+      system_recipes = @system_config['recipes'] || {}
+      config['recipes'] |= system_recipes['global'] || []
+      config['recipes'] |= system_recipes[@platform] || []
+      config['attributes'] = {}
+      config['attributes'].deep_merge!(@default_config['attributes'] || {}) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
+      @group_configs.each do |group_name, group_config|
+       config['attributes'].deep_merge!(group_config['attributes']) { |key, old, new| Array.wrap(old) + Array.wrap(new) } unless group_config['attributes'].nil?
+      end
+      system_attributes = @system_config['attributes'] || {}
+      config['attributes'].deep_merge!(system_attributes) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
 
       config
     end

data/templates/Cheffile.erb

@@ -1,10 +1,10 @@
 site "http://community.opscode.com/api/v1"
 
-cookbook "homebrewalt",           :github => "kitchenplan/chef-homebrewalt",    :ref => "v1.8.7"
+cookbook "homebrewalt",           :github => "kitchenplan/chef-homebrewalt",    :ref => "v1.8.8"
 cookbook "nodejs",                :github => "kitchenplan/chef-nodejs",         :ref => "v1.2"
-cookbook "applications",          :github => "kitchenplan/chef-applications",   :ref => "v2.0.5"
-cookbook "osxdefaults",           :github => "kitchenplan/chef-osxdefaults",    :ref => "v1.0.3"
-cookbook "dotfiles",              :github => "kitchenplan/chef-dotfiles",       :ref => "v1.3.1"
+cookbook "applications",          :github => "kitchenplan/chef-applications",   :ref => "v2.0.6"
+cookbook "osxdefaults",           :github => "kitchenplan/chef-osxdefaults",    :ref => "v1.0.4"
+cookbook "dotfiles",              :github => "kitchenplan/chef-dotfiles",       :ref => "v1.3.2"
 cookbook "drivers",               :github => "kitchenplan/chef-drivers",        :ref => "v1.0"
 cookbook "sudoalt",               :github => "kitchenplan/chef-sudoalt",        :ref => "v2.4"
 cookbook "dmg",                   :github => "opscode-cookbooks/dmg",           :ref => "v2.1.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchenplan
 version: !ruby/object:Gem::Version
-  version: 2.1.13
+  version: 2.1.14
 platform: ruby
 authors:
 - Roderik van der Veer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-30 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor