inspec-core 3.3.14 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d04bc72fe20e2d8fc67e39c6b2764735e0b175b152296913daa56a0d908da94
-  data.tar.gz: dc4c2c50a48330e7721138214a8b1499af493508620b26ebb19a270ca4f3d580
+  metadata.gz: fd93e17059f4e6da1bd640c908688b009b7d851b33ac2c12227045d71a5a25a2
+  data.tar.gz: c4edad3d720f7db313a01f7eded6763de0d0b033d34770322496b4a282894e11
 SHA512:
-  metadata.gz: cc16274a2aac2b4db029d53e52898ed728f16c1a3a7d14e87014e638b23e73f2226a3902887980c651da9759607c28d60bcf0e47b647a149c257a31f17ac9f42
-  data.tar.gz: 27108017d22fad18cba4396286099642f20622320d6d0b27809263da49ddd5f4b72b948e09f1a447de958fed30ca5da955766bf2e5f648cff5d0d7242194a6ca
+  metadata.gz: 40cc89ad2cd53ecb0662985ff9901c953b00bae85e6313ba7bdf28b68b22acc4725cb871256c22107a552f6ea074e7d02e093b0a566cdded0addd0548f4a7314
+  data.tar.gz: 7bb582628c261148e8633bd1e3de49b0c8d7b009873e34458b2669b27af6e93a747b993a67a7acf513f7886e1c5c0d3d97b9e6b023a496d889c3a833a6e9fb90

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-core
 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-core