inspec 3.3.14 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57b4ef6616ae9f2ee1a0d715fd3849d91f759242afe31da2e044fd243424c88d
-  data.tar.gz: c2a5e2e09134bd5919cdcf057110ad96de7e35bdf8316d440e0d8809d11ea603
+  metadata.gz: 37da5ceb61c6c34673a723fb6b80b19d0147f921c496923f4343ff19fd3def8f
+  data.tar.gz: 89eb7fc258ed7f4bc0bf1c3470fca66e9a43bd8c80539b2f788f61b7dfef3c58
 SHA512:
-  metadata.gz: b51dad58342d2a68ccec838623278fedc4573576f43618f90a36ba9443415ebb922220b656d0b1a2185f6e699e3d0532bd45ef7cb15ff6996225ed9d7c71d286
-  data.tar.gz: d59f22a869aeabf92638eef956e8b9068a71f636b951b3ddeee8ad1c691d31b264dbafd5384449f0fe7ef6d59742e9814e3b134090a5fb62ec791de449d3742d
+  metadata.gz: c43503aa37e7e56987ea560f2eb14abc2cf16d4cd27724b7d331a0e8bf0671d982fb495a354afefad727a2047f7219b93052a525a9a36fc031caeaa923df8c66
+  data.tar.gz: 0ab645bc7b3312564d93d470f1e4b965a17aca0000e72580df13acab1a58fb322b2a0fee550e946ce19b6121a9ede659bfad367bc9411dafa8b223df0d62e4ad

data/README.md

@@ -46,7 +46,7 @@ inspec exec test.rb -t docker://container_id
 
 ## Installation
 
-InSpec requires Ruby ( >2.2 ).
+InSpec requires Ruby ( >2.3 ).
 
 ### Install as package
 

data/etc/deprecations.json

@@ -2,5 +2,9 @@
   "file_version": "1.0.0",
   "unknown_group_action": "ignore",
   "groups": {
+    "attrs_value_replaces_default": {
+      "action": "ignore",
+      "prefix": "The 'default' option for attributes is being replaced by 'value' - please use it instead."
+    }
   }
 }

data/lib/inspec/objects/attribute.rb

@@ -1,5 +1,7 @@
 # encoding:utf-8
 
+require 'utils/deprecation'
+
 module Inspec
   class Attribute
     attr_accessor :name
@@ -21,8 +23,8 @@ module Inspec
         # output warn message if we are in a exec call
         Inspec::Log.warn(
           "Attribute '#{@name}' does not have a value. "\
-          "Use --attrs to provide a value for '#{@name}' or specify a default  "\
-          "value with `attribute('#{@name}', default: 'somedefault', ...)`.",
+          "Use --attrs to provide a value for '#{@name}' or specify a  "\
+          "value with `attribute('#{@name}', value: 'somevalue', ...)`.",
         ) if Inspec::BaseCLI.inspec_cli_command == :exec
       end
 
@@ -42,8 +44,17 @@ module Inspec
     def initialize(name, options = {})
       @name = name
       @opts = options
-      validate_value_type(default) if @opts.key?(:type) && @opts.key?(:default)
-      @value = nil
+      if @opts.key?(:default)
+        Inspec.deprecate(:attrs_value_replaces_default, "attribute name: '#{name}'")
+        if @opts.key?(:value)
+          Inspec::Log.warn "Attribute #{@name} created using both :default and :value options - ignoring :default"
+          @opts.delete(:default)
+        else
+          @opts[:value] = @opts.delete(:default)
+        end
+      end
+      @value = @opts[:value]
+      validate_value_type(@value) if @opts.key?(:type) && @opts.key?(:value)
     end
 
     def value=(new_value)
@@ -54,7 +65,7 @@ module Inspec
     def value
       if @value.nil?
         validate_required(@value) if @opts[:required] == true
-        @value = default
+        @value = value_or_dummy
       else
         @value
       end
@@ -162,8 +173,8 @@ module Inspec
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-    def default
-      @opts.key?(:default) ? @opts[:default] : DEFAULT_ATTRIBUTE.new(@name)
+    def value_or_dummy
+      @opts.key?(:value) ? @opts[:value] : DEFAULT_ATTRIBUTE.new(@name)
     end
   end
 end

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '3.3.14'
+  VERSION = '3.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 3.3.14
+  version: 3.4.1
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train