chef-sugar 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1c350bec3615fb748a196a3d32b0d1d41b4ba10
-  data.tar.gz: 61f7b084a157918874116324b02080e65492cac4
+  metadata.gz: d4243d6a2e55c5d3e83160d715431a740038e4b4
+  data.tar.gz: 8f9091cee17fb78613e10c113b37ba13d247be49
 SHA512:
-  metadata.gz: 13baa00e6ceb58dac38479fd292234e791ef6ab594aadeb0cf5efd3daee4ac49c0f490003821c214eda68f1c862375ed4d005b0fac24f043cd59c4d35f1910a4
-  data.tar.gz: bb170b7fe5fb8aec96087c408b4ad13b67a302be94b5905fdca7834b71f9ef6bac6334bd24c4760ad4e1045f0aafbc801fb873267a940839409eaac7a1961ef6
+  metadata.gz: f017af9a225a646e6e3d9676d9186497d48cbc15e79a0fd4ca09d0658cd0dd2fc71432275c1b1ca586cab9a5cc53ff4f7c8ef65c104970928b6a4c8b2565c431
+  data.tar.gz: 4f93d063e15757b9ad0adf442ab4d4172862a3b18eb0c85ed26867b2556e2c1cb71d9d5c06bb92503ddad3403fa2876d7c9edac68581ec8b8a933dc12a097fa1

data/CHANGELOG.md

@@ -2,6 +2,30 @@ Chef Sugar Changelog
 =========================
 This file is used to list changes made in each version of the chef-sugar cookbook and gem.
 
+v3.2.0 (2015-12-10)
+-------------------
+### Improvements
+- Add platform matchers for `debian` and `fedora`
+- Add `openvz` support under virtualization
+- Add init system detection support
+- Add support for `nexus`, `ios_xr` platforms and `wrlinux` platform_family
+- Add additional `aix` helpers
+
+### Bug Fixes
+- Properly expose `Architecture#i386?` in the DSL
+
+v3.1.1 (2015-06-23)
+-------------------
+### Improvements
+- Update Intel CPU types based on existing Fauxhai data
+- Update SPARC logic and 32/64-bit logic for x86 and i386
+
+### Bug Fixes
+- Fix 32-bit logic
+- Fix default behavior to include chef-sugar at compile time
+- Fix Chef 12.1.0 warnings for chef_gem compile time install
+- Fix `redhat_enterprise_linux?` matcher
+
 v3.0.2 (2015-03-26)
 -------------------
 ### Improvements

data/README.md

@@ -82,6 +82,7 @@ API
 - `sparc?`
 - `ppc64?`
 - `ppc64le?`
+- `powerpc?`
 
 #### Examples
 ```ruby
@@ -249,6 +250,31 @@ class Chef
 end
 ```
 
+### Init
+- `systemd?` - detect if init system is systemd
+- `upstart?` - detect if init system is upstart
+- `runit?` - detect if init system is runit
+
+#### Examples
+```ruby
+systemd_service 'my-service' do
+  description 'My Service'
+  install do
+    wanted_by 'multi-user.target'
+  end
+  service do
+    exec_start '/usr/bin/myserviced'
+  end
+  action [:create, :enable, :start]
+  only_if { systemd? }
+end
+
+cookbook_file '/etc/init/my-service.conf' do
+  source 'my-service.conf'
+  only_if { upstart? }
+end
+```
+
 ### IP
 - `best_ip_for` - determine the best IP address for the given "other" node, preferring local IP addresses over public ones.
 
@@ -296,6 +322,9 @@ node.deep_fetch('apache2', 'config', 'root') => node['apache2']['config']['root'
 - `aix?`
 - `smartos?`
 - `omnios?`
+- `raspbian?`
+- `nexus?`
+- `ios_xr?`
 
 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:
 
@@ -334,6 +363,7 @@ end
 - `slackware?`
 - `suse?`
 - `windows?`
+- `wrlinux?`
 
 #### Examples
 ```ruby
@@ -404,6 +434,7 @@ end
 - `lxc?`
 - `virtualbox?`
 - `vmware?`
+- `openvz?`
 
 #### Examples
 ```ruby

data/lib/chef/sugar.rb

@@ -26,6 +26,7 @@ class Chef
     require_relative 'sugar/data_bag'
     require_relative 'sugar/docker'
     require_relative 'sugar/filters'
+    require_relative 'sugar/init'
     require_relative 'sugar/ip'
     require_relative 'sugar/kernel'
     require_relative 'sugar/node'

data/lib/chef/sugar/architecture.rb

@@ -26,7 +26,7 @@ class Chef
       #
       def _64_bit?(node)
         %w(amd64 x86_64 ppc64 ppc64le s390x ia64 sparc64 aarch64 arch64 arm64 sun4v sun4u)
-          .include?(node['kernel']['machine'])
+          .include?(node['kernel']['machine']) || ( node['kernel']['bits'] == '64' )
       end
 
       #
@@ -88,6 +88,16 @@ class Chef
         %w(ppc64le)
           .include?(node['kernel']['machine'])
       end
+
+      #
+      # Determine if the current architecture is PowerPC
+      #
+      # @return [Boolean]
+      #
+      def powerpc?(node)
+        %w(powerpc)
+          .include?(node['kernel']['machine'])
+      end
     end
 
     module DSL
@@ -96,7 +106,9 @@ class Chef
 
       # @see Chef::Sugar::Architecture#_32_bit?
       def _32_bit?; Chef::Sugar::Architecture._32_bit?(node); end
-      alias_method :i386?, :_32_bit?
+
+      # @see Chef::Sugar::Architecture#intel?
+      def i386?; Chef::Sugar::Architecture.i386?(node); end
 
       # @see Chef::Sugar::Architecture#intel?
       def intel?; Chef::Sugar::Architecture.intel?(node); end
@@ -109,6 +121,9 @@ class Chef
 
       # @see Chef::Sugar::Architecture#ppc64le?
       def ppc64le?; Chef::Sugar::Architecture.ppc64le?(node); end
+
+      # @see Chef::Sugar::Architecture#powerpc?
+      def powerpc?; Chef::Sugar::Architecture.powerpc?(node); end
     end
   end
 end

data/lib/chef/sugar/init.rb

@@ -0,0 +1,61 @@
+#
+# Copyright 2015, Nathan Williams <nath.e.will@gmail.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 Init
+      extend self
+
+      #
+      # Determine if the current init system is systemd.
+      #
+      # @return [Boolean]
+      #
+      def systemd?(node)
+        IO.read('/proc/1/comm').chomp == 'systemd'
+      end
+
+      #
+      # Determine if the current init system is upstart.
+      #
+      # @return [Boolean]
+      #
+      def upstart?(node)
+        File.executable?('/sbin/initctl')
+      end
+
+      #
+      # Determine if the current init system is runit.
+      #
+      # @return [Boolean]
+      #
+      def runit?(node)
+        File.executable?('/sbin/runit-init')
+      end
+    end
+
+    module DSL
+      # @see Chef::Sugar::Init#systemd?
+      def systemd?; Chef::Sugar::Init.systemd?(node); end
+
+      # @see Chef::Sugar::Init#upstart?
+      def upstart?; Chef::Sugar::Init.upstart?(node); end
+
+      # @see Chef::Sugar::Init#runit?
+      def runit?; Chef::Sugar::Init.runit?(node); end
+    end
+  end
+end

data/lib/chef/sugar/platform.rb

@@ -112,6 +112,17 @@ class Chef
         node['platform'] == 'ubuntu'
       end
 
+      #
+      # Determine if the current node is debian (platform, not platform_family).
+      #
+      # @param [Chef::Node] node
+      #
+      # @return [Boolean]
+      #
+      def debian_platform?(node)
+        node['platform'] == 'debian'
+      end
+
       #
       # Determine if the current node is amazon linux.
       #
@@ -171,6 +182,17 @@ class Chef
       end
       alias_method :redhat_enterprise?, :redhat_enterprise_linux?
 
+      #
+      # Determine if the current node is fedora (platform, not platform_family).
+      #
+      # @param [Chef::Node] node
+      #
+      # @return [Boolean]
+      #
+      def fedora_platform?(node)
+        node['platform'] == 'fedora'
+      end
+
       #
       # Determine if the current node is solaris2
       #
@@ -215,6 +237,39 @@ class Chef
       def omnios?(node)
         node['platform'] == 'omnios'
       end
+
+      #
+      # Determine if the current node is raspbian
+      #
+      # @param [Chef::Node] node
+      #
+      # @return [Boolean]
+      #
+      def raspbian?(node)
+        node['platform'] == 'raspbian'
+      end
+
+      #
+      # Determine if the current node is a Cisco nexus device
+      #
+      # @param [Chef::Node] node
+      #
+      # @return [Boolean]
+      #
+      def nexus?(node)
+        node['platform'] == 'nexus'
+      end
+
+      #
+      # Determine if the current node is a Cisco IOS-XR device
+      #
+      # @param [Chef::Node] node
+      #
+      # @return [Boolean]
+      #
+      def ios_xr?(node)
+        node['platform'] == 'ios_xr'
+      end
     end
 
     module DSL

data/lib/chef/sugar/platform_family.rb

@@ -145,6 +145,17 @@ class Chef
         node['platform_family'] == 'windows'
       end
 
+      #
+      # Determine if the current node is a member of the wrlinux family.
+      #
+      # @param [Chef::Node] node
+      #
+      # @return [Boolean]
+      #
+      def wrlinux?(node)
+        node['platform_family'] == 'wrlinux'
+      end
+
       #
       # Determine if the current system is a linux derivative
       #
@@ -161,6 +172,7 @@ class Chef
           rhel
           slackware
           suse
+          wrlinux
         ).include?(node['platform_family'])
       end
     end

data/lib/chef/sugar/version.rb

@@ -16,6 +16,6 @@
 
 class Chef
   module Sugar
-    VERSION = '3.1.1'
+    VERSION = '3.2.0'
   end
 end

data/lib/chef/sugar/virtualization.rb

@@ -70,6 +70,19 @@ class Chef
       def vmware?(node)
         node.key?('virtualization') && node['virtualization']['system'] == 'vmware'
       end
+
+      #
+      # Determine if the current node is running under openvz.
+      #
+      # @param [Chef::Node] node
+      #
+      # @return [Boolean]
+      #   true if the machine is currently running under openvz, false
+      #   otherwise
+      #
+      def openvz?(node)
+        node.key?('virtualization') && node['virtualization']['system'] == 'openvz'
+      end
     end
 
     module DSL
@@ -84,6 +97,9 @@ class Chef
 
       # @see Chef::Sugar::Virtualization#vmware?
       def vmware?; Chef::Sugar::Virtualization.vmware?(node); end
+
+      # @see Chef::Sugar::Virtualization#openvz?
+      def openvz?; Chef::Sugar::Virtualization.openvz?(node); end
     end
   end
 end

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

@@ -14,6 +14,16 @@ describe Chef::Sugar::Architecture do
       end
     end
 
+    it 'returns true when ohai provides the bittiness' do
+      node = { 'kernel' => { 'bits' => '64' } }
+      expect(described_class._64_bit?(node)).to be true
+    end
+
+    it 'returns false when ohai provides the bittiness' do
+      node = { 'kernel' => { 'bits' => '32' } }
+      expect(described_class._64_bit?(node)).to be false
+    end
+
     it 'returns false when the system is not 64 bit' do
       node = { 'kernel' => { 'machine' => 'i386' } }
       expect(described_class._64_bit?(node)).to be false
@@ -62,6 +72,12 @@ describe Chef::Sugar::Architecture do
     end
   end
 
+  describe '#powerpc?' do
+    it 'returns true when the system is IBM POWER or powerpc' do
+      node = { 'kernel' => { 'machine' => 'powerpc' } }
+    end
+  end
+
   describe '#sparc?' do
     it 'returns true when the system is SPARC sun4u' do
       node = { 'kernel' => { 'machine' => 'sun4u' } }

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

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe Chef::Sugar::Init do
+  it_behaves_like 'a chef sugar'
+
+  before(:each) do
+    allow(IO).to receive(:read)
+      .with("/proc/1/comm")
+      .and_return("init")
+    allow(File).to receive(:executable?)
+      .with("/sbin/initctl")
+      .and_return(false)
+    allow(File).to receive(:executable?)
+      .with("/sbin/runit-init")
+      .and_return(false)
+  end
+
+  describe '#systemd?' do
+    it 'is true when /proc/1/comm is systemd' do
+      allow(IO).to receive(:read)
+        .with("/proc/1/comm")
+        .and_return("systemd")
+
+      node = {}
+      expect(described_class.systemd?(node)).to be true 
+    end
+
+    it 'is false when /proc/1/comm is not systemd' do
+      node = {}
+      expect(described_class.systemd?(node)).to be false
+    end
+  end
+
+  describe '#upstart?' do
+    it 'is true when /sbin/initctl is executable' do
+      allow(File).to receive(:executable?)
+        .with("/sbin/initctl")
+        .and_return(true)
+
+      node = {}
+      expect(described_class.upstart?(node)).to be true
+    end
+
+    it 'is false when /sbin/initctl is not executable' do
+      node = {}
+      expect(described_class.upstart?(node)).to be false
+    end
+  end
+
+  describe '#runit?' do
+    it 'is true when /sbin/runit-init is executable' do
+      allow(File).to receive(:executable?)
+        .with("/sbin/runit-init")
+        .and_return(true)
+
+      node = {}
+      expect(described_class.runit?(node)).to be true
+    end
+
+    it 'is false when /sbin/runit-init is not executable' do
+      node = {}
+      expect(described_class.runit?(node)).to be false
+    end
+  end
+end

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

@@ -135,6 +135,18 @@ describe Chef::Sugar::PlatformFamily do
     end
   end
 
+  describe '#wrlinux?' do
+    it 'returns true when the platform_family is wrlinux' do
+      node = { 'platform_family' => 'wrlinux' }
+      expect(described_class.wrlinux?(node)).to be true
+    end
+
+    it 'returns false when the platform_family is not wrlinux' do
+      node = { 'platform_family' => 'debian' }
+      expect(described_class.wrlinux?(node)).to be false
+    end
+  end
+
   describe '#linux?' do
     it 'returns true when the platform_family is Debian' do
       node = { 'platform_family' => 'debian' }
@@ -146,6 +158,11 @@ describe Chef::Sugar::PlatformFamily do
       expect(described_class.linux?(node)).to be true
     end
 
+    it 'returns true when the platform_family is wrlinux' do
+      node = { 'platform_family' => 'wrlinux' }
+      expect(described_class.linux?(node)).to be true
+    end
+
     it 'returns false when the platform_family is Windows' do
       node = { 'platform_family' => 'windows' }
       expect(described_class.linux?(node)).to be false

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

@@ -135,6 +135,42 @@ describe Chef::Sugar::Platform do
     end
   end
 
+  describe '#raspbian?' do
+    it 'returns true when platform is raspbian' do
+      node = { 'platform' => 'raspbian' }
+      expect(described_class.raspbian?(node)).to be true
+    end
+
+    it 'returns false when the platform is not raspbian' do
+      node = { 'platform' => 'windows' }
+      expect(described_class.raspbian?(node)).to be false
+    end
+  end
+
+  describe '#nexus' do
+    it 'returns true when the platform is nexus' do
+      node = { 'platform' => 'nexus' }
+      expect(described_class.nexus?(node)).to be true
+    end
+
+    it 'returns false when the platform is not nexus' do
+      node = { 'platform' => 'windows' }
+      expect(described_class.nexus?(node)).to be false
+    end
+  end
+
+  describe '#ios_xr' do
+    it 'returns true when the platform is ios_xr' do
+      node = { 'platform' => 'ios_xr' }
+      expect(described_class.ios_xr?(node)).to be true
+    end
+
+    it 'returns false when the platform is not ios_xr' do
+      node = { 'platform' => 'windows' }
+      expect(described_class.ios_xr?(node)).to be false
+    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

@@ -70,4 +70,21 @@ describe Chef::Sugar::Virtualization do
       expect(described_class.vmware?(node)).to be false
     end
   end
+
+  describe '#openvz?' do
+    it 'returns true when the machine is under openvz' do
+      node = { 'virtualization' => { 'system' => 'openvz' } }
+      expect(described_class.openvz?(node)).to be true
+    end
+
+    it 'returns false when the virtual machine is not under openvz' do
+      node = { 'virtualization' => { 'system' => 'kvm' } }
+      expect(described_class.openvz?(node)).to be false
+    end
+
+    it 'returns false when the machine is not virtual' do
+      node = {}
+      expect(described_class.openvz?(node)).to be false
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-sugar
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,6 +110,7 @@ files:
 - lib/chef/sugar/data_bag.rb
 - lib/chef/sugar/docker.rb
 - lib/chef/sugar/filters.rb
+- lib/chef/sugar/init.rb
 - lib/chef/sugar/ip.rb
 - lib/chef/sugar/kernel.rb
 - lib/chef/sugar/node.rb
@@ -133,6 +134,7 @@ files:
 - spec/unit/chef/sugar/core_extensions/string_spec.rb
 - spec/unit/chef/sugar/data_bag_spec.rb
 - spec/unit/chef/sugar/docker_spec.rb
+- spec/unit/chef/sugar/init_spec.rb
 - spec/unit/chef/sugar/ip_spec.rb
 - spec/unit/chef/sugar/kernel_spec.rb
 - spec/unit/chef/sugar/node_spec.rb
@@ -164,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A collection of helper methods and modules that make working with Chef recipes
@@ -180,6 +182,7 @@ test_files:
 - spec/unit/chef/sugar/core_extensions/string_spec.rb
 - spec/unit/chef/sugar/data_bag_spec.rb
 - spec/unit/chef/sugar/docker_spec.rb
+- spec/unit/chef/sugar/init_spec.rb
 - spec/unit/chef/sugar/ip_spec.rb
 - spec/unit/chef/sugar/kernel_spec.rb
 - spec/unit/chef/sugar/node_spec.rb