chef-sugar 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caa6d7d523f36a96b77fbbb6b405c77fe6245c8c
-  data.tar.gz: c300171c8b01b7664afa7660eae39417c63f26f4
+  metadata.gz: d7235d14da8dc38078d5628514c42b4207f899a0
+  data.tar.gz: dd480e8c7951928e2474a0d7a1f68fb9504be3a2
 SHA512:
-  metadata.gz: 605a75aafd4c650900c9963afbb97dfdc0dcc064ce24737de8d59c11491360d155e18e1cc34d6182564a5d0bc49f94156add3b819559f7eaf48c87ee6b0a483e
-  data.tar.gz: 9daa3408b7a6a465c8f59df7a9043d7b726ac7dfefe00845a9113672d5e912f506fdc0156fd1ae858917d9529e8f79d7168737ffe5ddc6afe1b88c55cc2cbd41
+  metadata.gz: 842a39ed8a9ecfc1fbcd5d125002c16cd16433ee03b74a5f89baf943f5339208473083b08ad88efef182f8055d72b46bb32a1d9f90f90233f6c170dae75b1aed
+  data.tar.gz: 9e2d7737880a73558af1bb24299f07be8f88172bcf5fbb0b6a02aac2859ebbf753b5acffa3590010485591f96398ef9eb33cb8b55e7d0244d0fa40b3d64c285d

data/CHANGELOG.md

@@ -2,6 +2,15 @@ Chef Sugar Changelog
 =========================
 This file is used to list changes made in each version of the chef-sugar cookbook and gem.
 
+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)
 -------------------
 ### Improvements

data/lib/chef/sugar/architecture.rb

@@ -25,7 +25,8 @@ class Chef
       # @return [Boolean]
       #
       def _64_bit?(node)
-        node['kernel']['machine'] == 'x86_64'
+        %w(x86_64 ppc64 s390x ia64 sparc64 aarch64 arch64 arm64)
+          .include?(node['kernel']['machine'])
       end
 
       #

data/lib/chef/sugar/shell.rb

@@ -73,7 +73,7 @@ class Chef
       #
       # @param [String] cmd
       #   the command to check
-      # @param [String] version
+      # @param [String] expected_version
       #   the version to check
       # @param [String] flag
       #   the flag to use to check the version of the binary
@@ -82,13 +82,17 @@ class Chef
       #   true if the command exists and is at the given version, false
       #   otherwise
       #
-      def installed_at_version?(cmd, version, flag = '--version')
-        installed?(cmd) &&
-          if version.is_a?(Regexp)
-            !version_for(cmd, flag).match(version).nil?
-          else
-            version_for(cmd, flag).include?(version)
-          end
+      def installed_at_version?(cmd, expected_version, flag = '--version')
+        return false if !installed?(cmd)
+
+        version = version_for(cmd, flag)
+        return false if version.nil?
+
+        if expected_version.is_a?(Regexp)
+          !version.match(expected_version).nil?
+        else
+          version.include?(expected_version)
+        end
       end
 
       #

data/lib/chef/sugar/vagrant.rb

@@ -55,7 +55,7 @@ class Chef
       # @return (see vagrant?)
       #
       def vagrant_domain?(node)
-        node.key?('domain') && node['domain'].include?('vagrantup.com')
+        node.key?('domain') && !node['domain'].nil? && node['domain'].include?('vagrantup.com')
       end
 
       #
@@ -65,7 +65,7 @@ class Chef
       # @return (see vagrant?)
       #
       def vagrant_user?(node)
-        node.key?('etc') && node['etc'].key?('passwd') && !!node['etc']['passwd']['vagrant']
+        node.key?('etc') && node['etc'].key?('passwd') && node['etc']['passwd'].key?('vagrant')
       end
     end
 

data/lib/chef/sugar/version.rb

@@ -16,6 +16,6 @@
 
 class Chef
   module Sugar
-    VERSION = '2.3.0'
+    VERSION = '2.3.1'
   end
 end

data/metadata.rb

@@ -14,4 +14,4 @@ For the most up-to-date information and documentation, please visit the [Chef
 Sugar project page on GitHub](https://github.com/sethvargo/chef-sugar).
 EOH
 
-version          '2.3.0'
+version          '2.3.1'

data/recipes/default.rb

@@ -18,7 +18,7 @@
 #
 
 chef_gem('chef-sugar') do
-  version '2.3.0'
+  version '2.3.1'
   action  :nothing
 end.run_action(:install)
 

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

@@ -3,10 +3,14 @@ require 'spec_helper'
 describe Chef::Sugar::Architecture do
   it_behaves_like 'a chef sugar'
 
+  _64_bit_machines = %w(x86_64 ppc64 s390x ia64 sparc64 aarch64 arch64 arm64)
+
   describe '#_64_bit?' do
-    it 'returns true when the system is 64 bit' do
-      node = { 'kernel' => { 'machine' => 'x86_64' } }
-      expect(described_class._64_bit?(node)).to be true
+    _64_bit_machines.each do |arch|
+      it "returns true when the system is #{arch}" do
+        node = { 'kernel' => { 'machine' => arch } }
+        expect(described_class._64_bit?(node)).to be true
+      end
     end
 
     it 'returns false when the system is not 64 bit' do
@@ -21,9 +25,11 @@ describe Chef::Sugar::Architecture do
       expect(described_class._32_bit?(node)).to be true
     end
 
-    it 'returns false when the system is not 32 bit' do
-      node = { 'kernel' => { 'machine' => 'x86_64' } }
-      expect(described_class._32_bit?(node)).to be false
+    _64_bit_machines.each do |arch|
+      it "returns false when the system is #{arch}" do
+        node = { 'kernel' => { 'machine' => arch } }
+        expect(described_class._32_bit?(node)).to be false
+      end
     end
   end
 end

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

@@ -76,6 +76,12 @@ describe Chef::Sugar::Shell do
       expect(described_class.installed_at_version?('mongo', '4.5.6')).to be false
     end
 
+    it 'returns false if #version_for is nil' do
+      allow(described_class).to receive(:which).and_return(true)
+      allow(described_class).to receive(:version_for).and_return(nil)
+      expect(described_class.installed_at_version?('mongo', '4.5.6')).to be false
+    end
+
     it 'returns false if the command is not installed' do
       allow(described_class).to receive(:which).and_return(nil)
       expect(described_class.installed_at_version?('mongo', '1.0.0')).to be false

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

@@ -14,6 +14,16 @@ describe Chef::Sugar::Vagrant do
       expect(described_class.vagrant?(node)).to be true
     end
 
+    it 'returns false when the domain is nil' do
+      node = { 'domain' => nil }
+      expect(described_class.vagrant?(node)).to be false
+    end
+
+    it 'returns false when the domain is not vagrantup.com' do
+      node = { 'domain' => 'sethvargo.com' }
+      expect(described_class.vagrant?(node)).to be false
+    end
+
     it 'returns true when the vagrant user exists on the system' do
       node = { 'etc' => { 'passwd' => { 'vagrant' => {} } } }
       expect(described_class.vagrant?(node)).to be true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-sugar
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler