inspec 0.19.2 → 0.19.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWU1MWE2NmFhMTQ0ODNhZDc2Zjk1YmM2OWNhNzdjNGRhYzBjMzllNA==
+    Y2RmMzdlYzM1NmRkODlmNDNiZDRjMTg4MTkxZDczOGM4ZWEyMjdmNw==
   data.tar.gz: !binary |-
-    NjI5MGVjN2IzM2U4NDczZjU2NGZmZTQxNDJjNTMzN2M3MDc5YTFjMw==
+    NjFmODBkODVkMTI5MzljNjk1NzI4MGNjNDZkMzc0YTczODExYjYwMA==
 SHA512:
   metadata.gz: !binary |-
-    N2EzZTRjZjA4ZDJkNTliM2MxNTJhNzNmMGVmODZlMzNkZWNmNWY2YmVkMDhi
-    MjBlODgzYzc5Njg3MGVjZmQyZjdjNmU4OGYyMGU2MmRhOGYxM2JlN2FjOGUw
-    Yjc1M2UwMjMwNmQ4N2U4YzRlMWUyOGM3Njc4N2VjYjE5NDgxZDg=
+    YzM5Njc4YTc2NTZjNTk0ZTNlYWVlYWU0ZTU3ZGVlNDU2OTA2NWIxZjA5ZDRi
+    MjVlYWZhNDViZjU4NmIzNDZkNjcwOThkMWZkZGY2NjU4YjI4MzFlMWU1ZjE0
+    MDY0NDZhOGRiODU4YTFmNWExMGYwYzYwZGYxMTI2Nzg0N2U3Y2M=
   data.tar.gz: !binary |-
-    OTZkMDUwZGFmZjUxYmU3ZDlhYzQyNDJjMzQ5Y2I1YzUyZDVmZmZiZWU2NDBi
-    YjZmNzBjMGZiYmUxZTc5NjhhMWE4ZmM5NDZjOTk0YjU5ZDdkZTY0ZTdiOTY4
-    ZTM1ZGY3Y2EzYzM2ZWI1NDQ0NjAxOTJlMjk3OWU0NDNjOTI2ZWM=
+    NGUwMDk1YWFiMmM3ZTNjOGMxY2ZmMjBmYzFmNGIyZWMwYmM4MDNiZWZkYjRm
+    YTIzMDkyNjg0ODk1YzllNjJmNDMxMzdhMTUyZmQxZTYwMWIwNDVlYTJmNTQ0
+    ZWUyNzljYjM1NzMzOWFlOWVmOTU4NWE0N2ZhN2FhNTlkODU0N2E=

data/CHANGELOG.md

@@ -1,7 +1,18 @@
 # Change Log
 
-## [0.19.2](https://github.com/chef/inspec/tree/0.19.2) (2016-04-21)
-[Full Changelog](https://github.com/chef/inspec/compare/v0.19.1...0.19.2)
+## [0.19.3](https://github.com/chef/inspec/tree/0.19.3) (2016-04-22)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.19.2...0.19.3)
+
+**Fixed bugs:**
+
+- fix legacy supports call [\#679](https://github.com/chef/inspec/pull/679) ([arlimus](https://github.com/arlimus))
+
+**Merged pull requests:**
+
+- v0.19.2 [\#675](https://github.com/chef/inspec/pull/675) ([arlimus](https://github.com/arlimus))
+
+## [v0.19.2](https://github.com/chef/inspec/tree/v0.19.2) (2016-04-21)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.19.1...v0.19.2)
 
 **Implemented enhancements:**
 

data/lib/inspec/metadata.rb

@@ -137,26 +137,46 @@ module Inspec
       }
     end
 
+    def self.finalize_supports_elem(elem, logger)
+      case x = elem
+      when Hash then x
+      when Array
+        logger.warn(
+          'Failed to read supports entry that is an array. Please use '\
+          'the `supports: {os-family: xyz}` syntax.',
+        )
+        nil
+      when nil then nil
+      else
+        logger ||= Logger.new(nil)
+        logger.warn(
+          "Do not use deprecated `supports: #{x}` syntax. Instead use:\n"\
+          "supports:\n  - os-family: #{x}\n\n")
+        { :'os-family' => x }
+      end
+    end
+
+    def self.finalize_supports(supports, logger)
+      case x = supports
+      when Hash   then [x]
+      when Array  then x.map { |e| finalize_supports_elem(e, logger) }.compact
+      when nil    then []
+      else
+        logger ||= Logger.new(nil)
+        logger.warn(
+          "Do not use deprecated `supports: #{x}` syntax. Instead use:\n"\
+          "supports:\n  - os-family: #{x}\n\n")
+        [{ :'os-family' => x }]
+      end
+    end
+
     def self.finalize(metadata, profile_id, logger = nil)
       return nil if metadata.nil?
       param = metadata.params || {}
       param['name'] = profile_id.to_s unless profile_id.to_s.empty?
       param['version'] = param['version'].to_s unless param['version'].nil?
       metadata.params = symbolize_keys(param)
-
-      # consolidate supports field with legacy mode
-      metadata.params[:supports] =
-        case x = metadata.params[:supports]
-        when Hash   then [x]
-        when Array  then x
-        when nil    then []
-        else
-          logger ||= Logger.new(nil)
-          logger.warn(
-            "Do not use deprecated `supports: #{x}` syntax. Instead use "\
-            "`supports: {os-family: #{x}}`.")
-          [{ :'os-family' => x }]
-        end
+      metadata.params[:supports] = finalize_supports(metadata.params[:supports], logger)
 
       metadata
     end

data/lib/inspec/version.rb

@@ -3,5 +3,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '0.19.2'.freeze
+  VERSION = '0.19.3'.freeze
 end

data/test/unit/metadata_test.rb

@@ -50,14 +50,20 @@ describe 'metadata with supported operating systems' do
 
     it 'supports legacy simple support style, but warns' do
       # i.e. setting this to something that would fail:
-      logger.expect :warn, nil, [
-        'Do not use deprecated `supports: linux` '\
-        'syntax. Instead use `supports: {os-family: linux}`.']
+      logger.expect :warn, nil, ["Do not use deprecated `supports: linux` syntax. Instead use:\nsupports:\n  - os-family: linux\n\n"]
       m = supports_meta('linux')
       m.supports_transport?(backend).must_equal true
       logger.verify
     end
 
+    it 'supports legacy simple support style, but warns' do
+      # i.e. setting this to something that would fail:
+      logger.expect :warn, nil, ["Do not use deprecated `supports: linux` syntax. Instead use:\nsupports:\n  - os-family: linux\n\n"]
+      m = supports_meta(['linux'])
+      m.supports_transport?(backend).must_equal true
+      logger.verify
+    end
+
     it 'loads a profile which supports os ubuntu' do
       m = supports_meta({ 'os' => 'ubuntu' })
       m.supports_transport?(backend).must_equal true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.19.3
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r-train
@@ -609,7 +609,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Infrastructure and compliance testing.