chef-sugar 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e0d5081147bfd7cd05eb8091c27da520a831e8
-  data.tar.gz: ae8139070b27cca2c83659be2d1bf23b14e31157
+  metadata.gz: 7a756ffa35fc9de2af5b25d862c38ec8fcd6c67f
+  data.tar.gz: f1bcb6ed7a4e85249f2701d7b4f5b31eb088ac2a
 SHA512:
-  metadata.gz: 4c2b69db6e0c2ec129c90bb89ba67c48fb65b68cbb83da240ddb22b72d0285b0b019a35733f8f61cb7c32e42ff8f3444a665f259fa04479c088d27a307d40ea9
-  data.tar.gz: da5c22f889074fd2e7d8c3f46f9429ae95524c521bd50e31c9af446ea14a4471176968da07579d67c1d7c69df5cd415b9e7edbbfa0c71c36b38470d49e18def4
+  metadata.gz: ad76496fedb799ce020db9d54fde348478144e24321a58bacdb3853a18d437e893627f9ca416526d6b99f824954b3fef79318c926eb05b37c90d84cbdb1b639d
+  data.tar.gz: 4c1c70570f5f5774f9541112f9be14d5ff65282c49d74d3e431c2b28ec8943a5c4d1000b1650ed9f47ad72f153874cbd8c3eafa300d394ba5aa69d4f3e802344

data/.travis.yml

@@ -5,4 +5,4 @@ rvm:
 
 bundler_args: --jobs 7
 
-script: bundle exec rspec --color --format progress
+script: bundle exec rake

data/CHANGELOG.md

@@ -2,6 +2,16 @@ Chef Sugar Changelog
 =========================
 This file is used to list changes made in each version of the chef-sugar cookbook and gem.
 
+v2.1.0 (2014-06-26)
+-------------------
+### Improvements
+- Add `solaris2?` matcher
+- Add `aix?` matcher
+- Add 'lxc?' matcher
+
+### Bug Fixes
+- Fix a bug in namespace memoization during attribute initialization
+
 v2.0.0 (2014-06-16)
 -------------------
 ### Breaking

data/README.md

@@ -273,6 +273,8 @@ node.deep_fetch('apache2', 'config', 'root') => node['apache2']['config']['root'
 - `redhat_enterprise_linux?`
 - `scientific_linux?`
 - `ubuntu?`
+- `solaris2?`
+- `aix?`
 
 There are also a series of dynamically defined matchers that map named operating system release versions and comparison operators in the form "#{platform}\_#{operator}\_#{name}?". For example:
 
@@ -374,6 +376,17 @@ http_request 'http://...' do
 end
 ```
 
+### Virtualization
+- `lxc?`
+
+#### Examples
+```ruby
+service 'ntpd' do
+  action [:enable, :start]
+  not_if { lxc? }
+end
+```
+
 ### Filters
 - `compile_time` - accepts a block of resources to run at compile time
 - `before` - insert resource in the collection before the given resource

data/Rakefile

@@ -1 +1,11 @@
 require 'bundler/gem_tasks'
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = [
+    '--color',
+    '--format progress',
+  ].join(' ')
+end
+
+task default: :spec

data/lib/chef/sugar.rb

@@ -35,6 +35,7 @@ class Chef
     require_relative 'sugar/shell'
     require_relative 'sugar/vagrant'
     require_relative 'sugar/version'
+    require_relative 'sugar/virtualization'
   end
 end
 

data/lib/chef/sugar/node.rb

@@ -130,9 +130,7 @@ EOH
     #   to prevent accidential method chaining if the block isn't closed
     #
     def namespace(*args, &block)
-      @namespace_options = {
-        precedence: default
-      }.merge(args.last.is_a?(Hash) ? args.pop : {})
+      @namespace_options = namespace_options.merge(args.last.is_a?(Hash) ? args.pop : {})
 
       keys = args.map(&:to_s)
 
@@ -161,6 +159,17 @@ EOH
 
     private
 
+    #
+    # The namespace options.
+    #
+    # @return [Hash]
+    #
+    def namespace_options
+      @namespace_options ||= {
+        precedence: default
+      }
+    end
+
     #
     # The current namespace. This is actually a reverse-ordered array that
     # vivifies the correct hash.#
@@ -178,7 +187,7 @@ EOH
     # @return [Hash<String, Hash>]
     #
     def vivified
-      current_namespace.inject(@namespace_options[:precedence]) do |hash, item|
+      current_namespace.inject(namespace_options[:precedence]) do |hash, item|
         hash[item] ||= {}
         hash[item]
       end

data/lib/chef/sugar/platform.rb

@@ -161,6 +161,30 @@ class Chef
         node['platform'] == 'enterprise'
       end
       alias_method :redhat_enterprise?, :redhat_enterprise_linux?
+
+      #
+      # Determine if the current node is solaris2
+      #
+      # @param [Chef::Node] node
+      #
+      # @return [Boolean]
+      #
+      def solaris2?(node)
+        node['platform'] == 'solaris2'
+      end
+      alias_method :solaris?, :solaris2?
+
+      #
+      # Determine if the current node is aix
+      #
+      # @param [Chef::Node] node
+      #
+      # @return [Boolean]
+      #
+      def aix?(node)
+        node['platform'] == 'aix'
+      end
+
     end
 
     module DSL

data/lib/chef/sugar/version.rb

@@ -16,6 +16,6 @@
 
 class Chef
   module Sugar
-    VERSION = '2.0.0'
+    VERSION = '2.1.0'
   end
 end

data/lib/chef/sugar/virtualization.rb

@@ -0,0 +1,41 @@
+#
+# Copyright 2014, Joseph J. Nuspl Jr. <nuspl@nvwls.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class Chef
+  module Sugar
+    module Virtualization
+      extend self
+
+      #
+      # Determine if the current node is running in a linux container.
+      #
+      # @param [Chef::Node] node
+      #
+      # @return [Boolean]
+      #   true if the machine is currently running in a container, false
+      #   otherwise
+      #
+      def lxc?(node)
+        node['virtualization'] && node['virtualization']['system'] == 'lxc'
+      end
+    end
+
+    module DSL
+      # @see Chef::Sugar::Virtualization#lxc?
+      def lxc?; Chef::Sugar::Virtualization.lxc?(node); end
+    end
+  end
+end

data/spec/unit/chef/sugar/platform_spec.rb

@@ -87,6 +87,30 @@ describe Chef::Sugar::Platform do
     end
   end
 
+  describe '#solaris2?' do
+    it 'returns true when the platform is solaris2' do
+      node = { 'platform' => 'solaris2' }
+      expect(described_class.solaris2?(node)).to be_truthy
+    end
+
+    it 'returns false when the platform is not solaris2' do
+      node = { 'platform' => 'windows' }
+      expect(described_class.solaris2?(node)).to be_falsey
+    end
+  end
+
+  describe '#aix?' do
+    it 'returns true when the platform is aix' do
+      node = { 'platform' => 'aix' }
+      expect(described_class.aix?(node)).to be_truthy
+    end
+
+    it 'returns false when the platform is not aix' do
+      node = { 'platform' => 'windows' }
+      expect(described_class.aix?(node)).to be_falsey
+    end
+  end
+
   context 'dynamic matchers' do
     describe '#ubuntu_after_lucid?' do
       it 'returns true when the version is later than 10.04' do

data/spec/unit/chef/sugar/virtualization_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Chef::Sugar::Virtualization do
+  it_behaves_like 'a chef sugar'
+
+  describe '#lxc?' do
+    it 'returns true when the machine is a linux contianer' do
+      node = { 'virtualization' => { 'system' => 'lxc' } }
+      expect(described_class.lxc?(node)).to be_truthy
+    end
+
+    it 'returns false when the virtual machine is not lxc' do
+      node = { 'virtualization' => { 'system' => 'vbox' } }
+      expect(described_class.lxc?(node)).to be_falsey
+    end
+
+    it 'returns false when the machine is not virtual' do
+      node = {}
+      expect(described_class.lxc?(node)).to be_falsey
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-sugar
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,6 +120,7 @@ files:
 - lib/chef/sugar/shell.rb
 - lib/chef/sugar/vagrant.rb
 - lib/chef/sugar/version.rb
+- lib/chef/sugar/virtualization.rb
 - metadata.rb
 - recipes/default.rb
 - spec/spec_helper.rb
@@ -140,6 +141,7 @@ files:
 - spec/unit/chef/sugar/run_context_spec.rb
 - spec/unit/chef/sugar/shell_spec.rb
 - spec/unit/chef/sugar/vagrant_spec.rb
+- spec/unit/chef/sugar/virtualization_spec.rb
 - spec/unit/recipes/default_spec.rb
 homepage: https://github.com/sethvargo/chef-sugar
 licenses:
@@ -161,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: A collection of helper methods and modules that make working with Chef recipes
@@ -185,5 +187,6 @@ test_files:
 - spec/unit/chef/sugar/run_context_spec.rb
 - spec/unit/chef/sugar/shell_spec.rb
 - spec/unit/chef/sugar/vagrant_spec.rb
+- spec/unit/chef/sugar/virtualization_spec.rb
 - spec/unit/recipes/default_spec.rb
 has_rdoc: