chef-sugar 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f284c42cb57577613febeaaaad0c92dc7da64a9
-  data.tar.gz: ec1b3ba2496d4fb0bf99bbb0003410e21fb00217
+  metadata.gz: e302495d54fd2ab9c684d7f14aa9cbd1a4fec669
+  data.tar.gz: 74531fd32eb4b31afb0dd12f7490c7d2a25526ab
 SHA512:
-  metadata.gz: ca8d21daa32329740d9e051541993eba4fa9fc76d5d01aa4b6dce6825c9184bc60013d663e03273b5379452ee30d3a8c81304e880e4e9a3e1c5dbf92de3e498e
-  data.tar.gz: 08770b8f178afd0d9838f94bfda7e5cc2ffc3361b8090c4f71d500e3c8384ee8639a6ec09c81d4b3ab84238a105b1b053b1a9c864737b8078062e50aaa575b03
+  metadata.gz: 2a68af78673536af03376c879442090b269319b16dc79a0bdd12fa768db20d83fcd14bc151ef794bb44b1b28e1654582c3c484944fac48fb22d615731455b1de
+  data.tar.gz: dec8f58a0fac8e97867673f9122fae92e0cd7ddd9b1386fc099446476c56e597618789f79c2f361521fb2df45f040742c06b16e5d378df671df439e771f2fad8

data/.travis.yml

@@ -1,7 +1,6 @@
 sudo: false
 
 rvm:
-  - 2.0.0
   - 2.1
   - 2.2
 

data/CHANGELOG.md

@@ -2,6 +2,18 @@ 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)
+-------------------
+### 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)
 -------------------
 ### Improvements

data/chef-sugar.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rack', '~> 1.6'
   spec.add_development_dependency 'rake'
 
   spec.add_development_dependency 'chefspec',        '~> 4.2'

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 sun4v sun4u)
+        %w(amd64 x86_64 ppc64 ppc64le s390x ia64 sparc64 aarch64 arch64 arm64 sun4v sun4u s390x)
           .include?(node['kernel']['machine']) || ( node['kernel']['bits'] == '64' )
       end
 
@@ -98,6 +98,27 @@ class Chef
         %w(powerpc)
           .include?(node['kernel']['machine'])
       end
+
+      #
+      # Determine if the current architecture is ARM with Hard Float
+      #
+      # @return [Boolean]
+      #
+      def armhf?(node)
+        # Add more arm variants as needed here
+        %w(armv7l)
+          .include?(node['kernel']['machine'])
+      end
+
+      #
+      # Determine if the current architecture is s390x
+      #
+      # @return [Boolean]
+      #
+      def s390x?(node)
+        %w(s390x)
+          .include?(node['kernel']['machine'])
+      end
     end
 
     module DSL
@@ -124,6 +145,13 @@ class Chef
 
       # @see Chef::Sugar::Architecture#powerpc?
       def powerpc?; Chef::Sugar::Architecture.powerpc?(node); end
+
+      # @see Chef::Sugar::Architecture#arm?
+      def armhf?; Chef::Sugar::Architecture.armhf?(node); end
+
+      # @see Chef::Sugar::Architecture#s390x?
+      def s390x?; Chef::Sugar::Architecture.s390x?(node); end
+
     end
   end
 end

data/lib/chef/sugar/platform.rb

@@ -58,6 +58,10 @@ class Chef
           'raring'   => '13.04',
           'saucy'    => '13.10',
           'trusty'   => '14.04',
+          'utopic'   => '14.10',
+          'vivid'    => '15.04',
+          'wily'     => '15.10',
+          'xenial'   => '16.04',
         },
       }
 

data/lib/chef/sugar/version.rb

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

data/lib/chef/sugar/virtualization.rb

@@ -83,6 +83,14 @@ class Chef
       def openvz?(node)
         node.key?('virtualization') && node['virtualization']['system'] == 'openvz'
       end
+
+      def virtual?(node)
+        openvz?(node) || vmware?(node) || virtualbox?(node) || lxc?(node) || kvm?(node)
+      end
+
+      def physical?(node)
+        !virtual?(node)
+      end
     end
 
     module DSL
@@ -100,6 +108,12 @@ class Chef
 
       # @see Chef::Sugar::Virtualization#openvz?
       def openvz?; Chef::Sugar::Virtualization.openvz?(node); end
+
+      # @see Chef::Sugar::Virtualization#virtual?
+      def virtual?; Chef::Sugar::Virtualization.virtual?(node); end
+      
+      # @see Chef::Sugar::Virtualization#physical?
+      def physical?; Chef::Sugar::Virtualization.physical?(node); end
     end
   end
 end

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

@@ -78,6 +78,14 @@ describe Chef::Sugar::Architecture do
     end
   end
 
+  describe '#armhf?' do
+    it 'returns true when the system is ARM' do
+      node = { 'kernel' => { 'machine' => 'armv7l' } }
+      expect(described_class.intel?(node)).to be false
+      expect(described_class.armhf?(node)).to be true
+    end
+  end
+
   describe '#sparc?' do
     it 'returns true when the system is SPARC sun4u' do
       node = { 'kernel' => { 'machine' => 'sun4u' } }
@@ -103,4 +111,11 @@ describe Chef::Sugar::Architecture do
       expect(described_class.ppc64le?(node)).to be true
     end
   end
+
+  describe '#s390x?' do
+    it 'returns true when the system is s390x' do
+      node = { 'kernel' => { 'machine' => 's390x' } }
+      expect(described_class.s390x?(node)).to be true
+    end
+  end
 end

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

@@ -87,4 +87,32 @@ describe Chef::Sugar::Virtualization do
       expect(described_class.openvz?(node)).to be false
     end
   end
+
+  describe '#virtual?' do
+    it 'returns true when the machine is under a supported virtualization provider' do
+      %w(openvz vmware vbox lxc kvm).each do |host|
+        node = { 'virtualization' => { 'system' => host } }
+        expect(described_class.virtual?(node)).to be true
+      end
+    end
+
+    it 'returns false when the machine is not virtual' do
+      node = {}
+      expect(described_class.virtual?(node)).to be false
+    end
+  end
+
+  describe '#physical?' do
+    it 'returns false when the machine is under a supported virtualization provider' do
+      %w(openvz vmware vbox lxc kvm).each do |host|
+        node = { 'virtualization' => { 'system' => host } }
+        expect(described_class.physical?(node)).to be false
+      end
+    end
+
+    it 'returns true when the machine is not virtual' do
+      node = {}
+      expect(described_class.physical?(node)).to be true
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-sugar
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A collection of helper methods and modules that make working with Chef recipes