chef-sugar 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84e4ca4897116b3bbebc4ee5793028a00dea4069
-  data.tar.gz: 8f824034670f45f3b410cc427f3fc483e0f7d5b1
+  metadata.gz: d1c350bec3615fb748a196a3d32b0d1d41b4ba10
+  data.tar.gz: 61f7b084a157918874116324b02080e65492cac4
 SHA512:
-  metadata.gz: 9f4b0c8adc010dccea2d920e2315c735a093fb630e2dd9d1367c31a06610ce4fcee7fae632dd32e15629ccdec117434d4a56a8188aee4a1182a5f779305add3d
-  data.tar.gz: b32b2f55093c5f19ae0942206a3177048637a8b362a456c181d22ac9006d6bd40fce7e8d7b473773f0d250c32610baf2549dbc1c75dce991a1351043250cbc34
+  metadata.gz: 13baa00e6ceb58dac38479fd292234e791ef6ab594aadeb0cf5efd3daee4ac49c0f490003821c214eda68f1c862375ed4d005b0fac24f043cd59c4d35f1910a4
+  data.tar.gz: bb170b7fe5fb8aec96087c408b4ad13b67a302be94b5905fdca7834b71f9ef6bac6334bd24c4760ad4e1045f0aafbc801fb873267a940839409eaac7a1961ef6

data/README.md

@@ -4,7 +4,7 @@ Chef Sugar
 [![Build Status](http://img.shields.io/travis/sethvargo/chef-sugar.svg?style=flat-square)][travis]
 
 [gem]: https://rubygems.org/gems/chef-sugar
-[travis]: http://travis-ci.org/sethvargo/chef-suguar
+[travis]: http://travis-ci.org/sethvargo/chef-sugar
 
 Chef Sugar is a Gem & Chef Recipe that includes series of helpful sugar of the Chef core and other resources to make a cleaner, more lean recipe DSL, enforce DRY principles, and make writing Chef recipes an awesome experience!
 

data/lib/chef/sugar/architecture.rb

@@ -25,7 +25,7 @@ class Chef
       # @return [Boolean]
       #
       def _64_bit?(node)
-        %w(amd64 x86_64 ppc64 ppc64le s390x ia64 sparc64 aarch64 arch64 arm64)
+        %w(amd64 x86_64 ppc64 ppc64le s390x ia64 sparc64 aarch64 arch64 arm64 sun4v sun4u)
           .include?(node['kernel']['machine'])
       end
 
@@ -39,7 +39,15 @@ class Chef
       def _32_bit?(node)
         !_64_bit?(node)
       end
-      alias_method :i386?, :_32_bit?
+
+      #
+      # Determine if the current architecture is i386
+      #
+      # @return [Boolean]
+      #
+      def i386?(node)
+        _32_bit?(node) && intel?(node)
+      end
 
       #
       # Determine if the current architecture is Intel.
@@ -47,7 +55,7 @@ class Chef
       # @return [Boolean]
       #
       def intel?(node)
-        %w(i86pc)
+        %w(i86pc i386 x86_64 amd64 i686)
           .include?(node['kernel']['machine'])
       end
 

data/lib/chef/sugar/platform.rb

@@ -167,7 +167,7 @@ class Chef
       # @return [Boolean]
       #
       def redhat_enterprise_linux?(node)
-        node['platform'] == 'enterprise'
+        node['platform'] == 'redhat'
       end
       alias_method :redhat_enterprise?, :redhat_enterprise_linux?
 

data/lib/chef/sugar/version.rb

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

data/recipes/default.rb

@@ -19,9 +19,16 @@
 
 gem_version = run_context.cookbook_collection[cookbook_name].metadata.version
 
-chef_gem('chef-sugar') do
-  version gem_version
-  action  :nothing
-end.run_action(:install)
+if Chef::Resource::ChefGem.instance_methods(false).include?(:compile_time)
+  chef_gem 'chef-sugar' do
+    version gem_version
+    compile_time true
+  end
+else
+  chef_gem 'chef-sugar' do
+    version gem_version
+    action :nothing
+  end.run_action(:install)
+end
 
 require 'chef/sugar'

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

@@ -3,7 +3,8 @@ require 'spec_helper'
 describe Chef::Sugar::Architecture do
   it_behaves_like 'a chef sugar'
 
-  _64_bit_machines = %w(amd64 x86_64 ppc64 ppc64le s390x ia64 sparc64 aarch64 arch64 arm64)
+  _64_bit_machines = %w(amd64 x86_64 ppc64 ppc64le s390x ia64 sparc64 aarch64 arch64 arm64 sun4u sun4v)
+  _intel_machines = %w(i86pc i386 x86_64 amd64 i686)
 
   describe '#_64_bit?' do
     _64_bit_machines.each do |arch|
@@ -33,31 +34,43 @@ describe Chef::Sugar::Architecture do
     end
   end
 
-  describe '#intel?' do
-    it 'returns true when the system is Intel' do
-      node = { 'kernel' => { 'machine' => 'i86pc' } }
-      expect(described_class.intel?(node)).to be true
+  describe '#i386?' do
+    it 'returns true when the system is 32 bit' do
+      node = { 'kernel' => { 'machine' => 'i386' } }
+      expect(described_class.i386?(node)).to be true
     end
 
     _64_bit_machines.each do |arch|
       it "returns false when the system is #{arch}" do
         node = { 'kernel' => { 'machine' => arch } }
+        expect(described_class.i386?(node)).to be false
+      end
+    end
+  end
+
+  describe '#intel?' do
+    _intel_machines.each do |arch|
+      it "returns true when the system is #{arch}" do
+        node = { 'kernel' => { 'machine' => arch } }
+        expect(described_class.intel?(node)).to be true
+      end
+
+      it 'returns false when the system is non Intel' do
+        node = { 'kernel' => { 'machine' => 'sun4u' } }
         expect(described_class.intel?(node)).to be false
       end
     end
   end
 
   describe '#sparc?' do
-    it 'returns true when the system is SPARC' do
+    it 'returns true when the system is SPARC sun4u' do
       node = { 'kernel' => { 'machine' => 'sun4u' } }
       expect(described_class.sparc?(node)).to be true
     end
 
-    _64_bit_machines.each do |arch|
-      it "returns false when the system is #{arch}" do
-        node = { 'kernel' => { 'machine' => arch } }
-        expect(described_class.sparc?(node)).to be false
-      end
+    it 'returns true when the system is SPARC sun4v' do
+      node = { 'kernel' => { 'machine' => 'sun4v' } }
+      expect(described_class.sparc?(node)).to be true
     end
   end
 

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

@@ -77,12 +77,12 @@ describe Chef::Sugar::Platform do
 
   describe '#redhat_enterprise_linux?' do
     it 'returns true when the platform is redhat enterprise linux' do
-      node = { 'platform' => 'enterprise' }
+      node = { 'platform' => 'redhat' }
       expect(described_class.redhat_enterprise_linux?(node)).to be true
     end
 
     it 'returns false when the platform is not redhat enterprise linux' do
-      node = { 'platform' => 'windows' }
+      node = { 'platform' => 'enterprise' }
       expect(described_class.redhat_enterprise_linux?(node)).to be false
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-sugar
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: A collection of helper methods and modules that make working with Chef recipes