kitchenplan 2.1.12 → 2.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f29ee402f5e533b4efa2ca7c89fa08c636d74c4
-  data.tar.gz: ec74ae077bb33d0f5c9f1c2cecdfd0c6a86eba31
+  metadata.gz: 4bb1eb5ec11dbe1b94ec47ef3bacb87b0ed8aa1b
+  data.tar.gz: b5cdffa26657ac57c55f580d040e32b8b4116cb9
 SHA512:
-  metadata.gz: 54e04c2fb57b1c5f561e2b5b2006fd4ed749573a46b5b6ec901bc8e8f37bf969ffb01dace4fc6003ade318960e3e100d4c06003bb67f7e88a3f8ac9cd8d5598d
-  data.tar.gz: d89d54865160e02efbf530df0ee30cbe36503aedcea0010493f40c98938427751d21e59deecd03793a18ab2111aca6680c049e819c57935ebcbc1e1edf751486
+  metadata.gz: b9a9301a9acd053ee4d8e190b0a461a1ed0f08d7e21ce3a2191326e5fd2c3f6b5433e0cf74ce458c5c057eeda3a39737f168b38e4645f1abe5705f0faf1c4ca3
+  data.tar.gz: 24542e71583d389a136e176b31b911471307da1f65652cd3e54191cdd45e6f9bd06ad6549d00ee7de2c453327d66f6ed687534dd3f172e257f8587f909295463

data/lib/kitchenplan/config.rb

@@ -11,12 +11,14 @@ module Kitchenplan
     attr_reader :platform
     attr_reader :default_config
     attr_reader :people_config
+    attr_reader :system_config
     attr_reader :group_configs
 
     def initialize
       self.detect_platform
       self.parse_default_config
       self.parse_people_config
+#      self.parse_system_config
       self.parse_group_configs
     end
 
@@ -28,6 +30,10 @@ 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 parse_default_config
       default_config_path = 'config/default.yml'
       @default_config = (YAML.load(ERB.new(File.read(default_config_path)).result) if File.exist?(default_config_path)) || {}
@@ -38,6 +44,11 @@ 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_group_configs(group = (( @default_config['groups'] || [] ) | ( @people_config['groups'] || [] )))
       @group_configs = @group_configs || {}
       defined_groups = group || []
@@ -69,13 +80,32 @@ module Kitchenplan
       people_recipes = @people_config['recipes'] || {}
       config['recipes'] |= people_recipes['global'] || []
       config['recipes'] |= people_recipes[@platform] || []
+
+      # First take the attributes from default.yml
       config['attributes'] = {}
       config['attributes'].deep_merge!(@default_config['attributes'] || {}) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
+
+      # then override and extend them with the group attributes
       @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
+
+      # then override and extend them with the people attributes
       people_attributes = @people_config['attributes'] || {}
       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) }
+
       config
     end
 

data/templates/Cheffile.erb

@@ -4,7 +4,7 @@ cookbook "homebrewalt",           :github => "kitchenplan/chef-homebrewalt",
 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"
+cookbook "dotfiles",              :github => "kitchenplan/chef-dotfiles",       :ref => "v1.3.1"
 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.12
+  version: 2.1.13
 platform: ruby
 authors:
 - Roderik van der Veer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor