chef-sugar 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e302495d54fd2ab9c684d7f14aa9cbd1a4fec669
-  data.tar.gz: 74531fd32eb4b31afb0dd12f7490c7d2a25526ab
+  metadata.gz: b5c2bcc53914b4dfa467833f774600428d3120a8
+  data.tar.gz: c114d8423104080333d2a8d2f1d9dabaa465b4fc
 SHA512:
-  metadata.gz: 2a68af78673536af03376c879442090b269319b16dc79a0bdd12fa768db20d83fcd14bc151ef794bb44b1b28e1654582c3c484944fac48fb22d615731455b1de
-  data.tar.gz: dec8f58a0fac8e97867673f9122fae92e0cd7ddd9b1386fc099446476c56e597618789f79c2f361521fb2df45f040742c06b16e5d378df671df439e771f2fad8
+  metadata.gz: 8023ee95ec201759a0cfd025c6bc40b7e614864119710e970389a0b7e16948b0442727082e0849393c258b1284a4051bc8f3532e3a03ae9d0177619ea3b46e34
+  data.tar.gz: 8f727b0ba3e4bfb884ca82a921bb3956e95e252b79b1d355fb4e2ed7fc51b6ca25c9063e7226801f65a604871e98e0be41d8fb10e5ab268443dbf498a7c10d6f

data/.kitchen.yml

@@ -3,11 +3,13 @@ driver:
 
 provisioner:
   name: chef_zero
-  require_chef_omnibus: 11.8.0
+  deprecations_as_errors: true
 
 platforms:
-  - name: ubuntu-12.04
-  - name: centos-6.4
+  - name: centos-6.8
+  - name: centos-7.3
+  - name: ubuntu-14.04
+  - name: ubuntu-16.04
 
 suites:
   - name: default

data/.travis.yml

@@ -1,8 +1,10 @@
 sudo: false
 
 rvm:
-  - 2.1
-  - 2.2
+  - 2.1.9
+  - 2.2.6
+  - 2.3.1
+  - 2.4.0
 
 branches:
   only:

data/CHANGELOG.md

@@ -1,28 +1,37 @@
-Chef Sugar Changelog
-=========================
+# Chef Sugar Changelog
+
 This file is used to list changes made in each version of the chef-sugar cookbook and gem.
 
-v3.4.0 (2016-07-18)
--------------------
+## v3.5.0 (2016-07-12)
+
+- Improve the systemd check to not fail on older kernels or Windows hosts
+- Add detection of macOS 10.11 and 10.12
+
+## v3.4.0 (2016-07-18)
+
 ### Improvements
+
 - Add `virtual?` and `physical?` methods
 - Add Scaleway C1 server (arm arch) support
 - Add IMB s390x support
 - Add missing Ubuntu release names
 
 ### Bug Fixes
+
 - Drop Ruby 2.0.0 support from Travis test matrix
 - Pin to Rack 1.6 (dev dep)
 
-v3.3.0 (2016-01-11)
--------------------
+## v3.3.0 (2016-01-11)
+
 ### Improvements
+
 - Break up `Chef::Sugar::Constraints` into a class and a dsl file
 - Add `platform_version` method with full constraints comparison support
 
-v3.2.0 (2015-12-10)
--------------------
+## v3.2.0 (2015-12-10)
+
 ### Improvements
+
 - Add platform matchers for `debian` and `fedora`
 - Add `openvz` support under virtualization
 - Add init system detection support
@@ -30,41 +39,47 @@ v3.2.0 (2015-12-10)
 - Add additional `aix` helpers
 
 ### Bug Fixes
+
 - Properly expose `Architecture#i386?` in the DSL
 
-v3.1.1 (2015-06-23)
--------------------
+## 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)
--------------------
+## v3.0.2 (2015-03-26)
+
 ### Improvements
+
 - Add helpers for `ppc64` and `ppc64le` architecture
 
 ### Bug Fixes
+
 - Adjustments to error message
 
-v3.0.1 (2015-03-20)
--------------------
+## v3.0.1 (2015-03-20)
+
 ### Breaking Changes
-- Rename `compile_time` `to at_compile_time` - if your recipes are affected by
-  this breaking change, your Chef Client run will produce a verbose error
-  message with details on how to fix the error.
 
-v3.0.0 (2015-03-17)
--------------------
+- Rename `compile_time` `to at_compile_time` - if your recipes are affected by this breaking change, your Chef Client run will produce a verbose error message with details on how to fix the error.
+
+## v3.0.0 (2015-03-17)
+
 ### Breaking Changes
+
 - Drop support for Ruby 1.9 (it might still work, but it is no longer officially supported)
 
 ### Improvements
+
 - Remove accidentially committed gem source
 - Bump development dependencies
 - Add `digitalocean?` matcher
@@ -75,74 +90,87 @@ v3.0.0 (2015-03-17)
 - Add dynamic platform/version matchers for Solaris
 
 ### Bug Fixes
+
 - Reset namespace_options when reaching top-level resources
 
-v2.5.0 (2015-01-05)
--------------------
+## v2.5.0 (2015-01-05)
+
 ### Improvements
+
 - Add `data_bag_item_for_environment` function
 - Add `kvm?` matcher
 - Add `virtualbox?` matcher
 
 ### Bug Fixes
-- Use `.key?` to check for hash key presence, raising an `AttributeDoesNotExist`
-  error sooner
 
-v2.4.1 (2014-10-12)
--------------------
+- Use `.key?` to check for hash key presence, raising an `AttributeDoesNotExist` error sooner
+
+## v2.4.1 (2014-10-12)
+
 - No changes from v2.4.0 - forced a new version upload to the Chef Supermarket
 
-v2.4.0 (2014-10-12)
--------------------
+## v2.4.0 (2014-10-12)
+
 ### Improvements
+
 - Add `docker?` matcher
 
-v2.3.2 (2014-10-07)
--------------------
+## v2.3.2 (2014-10-07)
+
 ### Big Fixues
+
 - Include `amd64` in `_64_bit?` check
 
-v2.3.1 (2014-10-07)
--------------------
+## v2.3.1 (2014-10-07)
+
 ### Improvements
+
 - Check all 64-bit architectures that may be reported by Ohai
 
 ### Bug Fixes
+
 - Be more tolerant of `nil` values return from sub functions
 - Check to make sure `node['domain']` is not `nil` before calling `#include?`
 
-v2.3.0 (2014-09-24)
--------------------
+## v2.3.0 (2014-09-24)
+
 ### Improvements
+
 - Add `vmware?` matcher
 - Allow the attribute DSL to access parent attributes
 
 ### Bug Fixes
+
 - Return `true` or `false` from all Boolean methods (instead of `nil` or truthy values)
 
-v2.2.0 (2014-08-20)
--------------------
+## v2.2.0 (2014-08-20)
+
 ### Improvements
+
 - Add `smartos?` matcher
 - Add `omnios?` matcher
 
-v2.1.0 (2014-06-26)
--------------------
+## 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)
--------------------
+## v2.0.0 (2014-06-16)
+
 ### Breaking
+
 - Remove `not_linux?` method
 - Remove `not_windows?` method
 
 ### Improvements
+
 - Miscellaneous spelling fixes
 - Update a failing unit test for `installed?`
 - Add Mac OS X to the list of platforms (Yosemite)
@@ -150,8 +178,8 @@ v2.0.0 (2014-06-16)
 - Fix `which` (and `installed?` and `installed_at_version?`) when given an absolute path
 - Fix `linux?` check to only return true on real linuxes
 
-v1.3.0 (2014-05-05)
--------------------
+## v1.3.0 (2014-05-05)
+
 - Check both `$stdout` and `$stderr` in `version_for`
 - Add additional platform versions
 - Make `includes_recipe?` a top-level API (instead of just Node)
@@ -160,21 +188,21 @@ v1.3.0 (2014-05-05)
 - Define `String#flush` as a core extension
 - Remove Stove
 
-v1.2.6 (2014-03-16)
--------------------
+## v1.2.6 (2014-03-16)
+
 - Fix a bug in `vagrant?` returning false on newer Vagrant versions
 - Remove Coveralls
 
-v1.2.4 (2014-03-13)
--------------------
+## v1.2.4 (2014-03-13)
+
 - See (1.2.2), but I botched the release
 
-v1.2.2 (2014-03-13)
--------------------
+## v1.2.2 (2014-03-13)
+
 - Fix a critical bug with `encrypted_data_bag_item` using the wrong key
 
-v1.2.0 (2014-03-09)
--------------------
+## v1.2.0 (2014-03-09)
+
 - Add `namespace` functionality for specifying attributes in a DSL
 - Add constraints helpers for comparing version strings
 - Add `require_chef_gem` to safely require and degrade if a gem is not installed
@@ -183,19 +211,19 @@ v1.2.0 (2014-03-09)
 - Add Stove for releasing
 - Updated copyrights for 2014
 
-v1.1.0 (2013-12-10)
--------------------
+## v1.1.0 (2013-12-10)
+
 - Add `cloudstack?` helper
 - Add data bag helpers
 - Remove foodcritic checks
 - Upgrade development gem versions
 - Randomize spec order
 
-v1.0.1 (2013-10-15)
--------------------
+## v1.0.1 (2013-10-15)
+
 - Add development recipe
 - Add `compile_time`, `before`, and `after` filters
 
-v1.0.0 (2013-10-15)
--------------------
+## v1.0.0 (2013-10-15)
+
 - First public release

data/chef-sugar.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/sethvargo/chef-sugar'
   spec.license       = 'Apache 2.0'
 
-  spec.required_ruby_version = '>= 1.9'
+  spec.required_ruby_version = '>= 2.1'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/chef/sugar.rb

@@ -30,6 +30,7 @@ class Chef
     require_relative 'sugar/init'
     require_relative 'sugar/ip'
     require_relative 'sugar/kernel'
+    require_relative 'sugar/kitchen'
     require_relative 'sugar/node'
     require_relative 'sugar/platform'
     require_relative 'sugar/platform_family'

data/lib/chef/sugar/init.rb

@@ -25,7 +25,8 @@ class Chef
       # @return [Boolean]
       #
       def systemd?(node)
-        IO.read('/proc/1/comm').chomp == 'systemd'
+        file = '/proc/1/comm'
+        File.exist?(file) && IO.read(file).chomp == 'systemd'
       end
 
       #

data/lib/chef/sugar/kitchen.rb

@@ -0,0 +1,40 @@
+#
+# Copyright 2013-2015, Seth Vargo <sethvargo@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 Kitchen
+      extend self
+
+      #
+      # Returns true if the current node is provisioned by Test Kitchen.
+      #
+      # @param [Chef::Node] node
+      #   the node to check
+      #
+      # @return [Boolean]
+      #
+      def kitchen?(node)
+        !ENV['TEST_KITCHEN'].nil?
+      end
+    end
+
+    module DSL
+      # @see Chef::Sugar::Kitchen#kitchen?
+      def kitchen?; Chef::Sugar::Kitchen.kitchen?(node); end
+    end
+  end
+end

data/lib/chef/sugar/platform.rb

@@ -40,6 +40,8 @@ class Chef
           'mountain_lion' => '10.8',
           'mavericks'     => '10.9',
           'yosemite'      => '10.10',
+          'el_capitan'    => '10.11',
+          'sierra'        => '10.12',
         },
         'solaris' => {
           '7'  => '5.7',

data/lib/chef/sugar/version.rb

@@ -16,6 +16,6 @@
 
 class Chef
   module Sugar
-    VERSION = '3.4.0'
+    VERSION = '3.5.0'
   end
 end

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

@@ -22,13 +22,22 @@ describe Chef::Sugar::Init do
         .and_return("systemd")
 
       node = {}
-      expect(described_class.systemd?(node)).to be true 
+      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
+
+    it 'is false when /proc/1/comm does not exist' do
+      allow(File).to receive(:exist?)
+        .with("/proc/1/comm")
+        .and_return(false)
+
+      node = {}
+      expect(described_class.systemd?(node)).to be false
+    end
   end
 
   describe '#upstart?' do

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

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Chef::Sugar::Kitchen do
+  it_behaves_like 'a chef sugar'
+
+  describe '#kitchen?' do
+    it 'is true when the TEST_KITCHEN environment variable is set' do
+      allow(ENV).to receive(:[]).with('TEST_KITCHEN').and_return('1')
+      node = {}
+      expect(described_class.kitchen?(node)).to be true
+    end
+
+    it 'is false when the TEST_KITCHEN environment variable is unset' do
+      node = {}
+      expect(described_class.kitchen?(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.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,6 +128,7 @@ files:
 - lib/chef/sugar/init.rb
 - lib/chef/sugar/ip.rb
 - lib/chef/sugar/kernel.rb
+- lib/chef/sugar/kitchen.rb
 - lib/chef/sugar/node.rb
 - lib/chef/sugar/platform.rb
 - lib/chef/sugar/platform_family.rb
@@ -152,6 +153,7 @@ files:
 - 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/kitchen_spec.rb
 - spec/unit/chef/sugar/node_spec.rb
 - spec/unit/chef/sugar/platform_family_spec.rb
 - spec/unit/chef/sugar/platform_spec.rb
@@ -173,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -181,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A collection of helper methods and modules that make working with Chef recipes
@@ -200,6 +202,7 @@ test_files:
 - 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/kitchen_spec.rb
 - spec/unit/chef/sugar/node_spec.rb
 - spec/unit/chef/sugar/platform_family_spec.rb
 - spec/unit/chef/sugar/platform_spec.rb