inspec 3.9.3 → 4.1.4.preview

data/lib/resources/shadow.rb

@@ -91,32 +91,27 @@ module Inspec::Resources
     # Next 4 are deprecated methods.  We define them here so we can emit a deprecation message.
     # They are also defined on the Table, above.
     def user(query = nil)
-      warn '[DEPRECATION] The shadow `user` property is deprecated and will be removed' \
-       ' in InSpec 3.0.  Please use `users` instead.'
+      Inspec.deprecate(:properties_shadow, 'The shadow `user` property is deprecated. Please use `users` instead.')
       query.nil? ? where.users : where('user' => query)
     end
 
     def password(query = nil)
-      warn '[DEPRECATION] The shadow `password` property is deprecated and will be removed' \
-       ' in InSpec 3.0.  Please use `passwords` instead.'
+      Inspec.deprecate(:properties_shadow, 'The shadow `password` property is deprecated. Please use `passwords` instead.')
       query.nil? ? where.passwords : where('password' => query)
     end
 
     def last_change(query = nil)
-      warn '[DEPRECATION] The shadow `last_change` property is deprecated and will be removed' \
-       ' in InSpec 3.0.  Please use `last_changes` instead.'
+      Inspec.deprecate(:properties_shadow, 'The shadow `last_change` property is deprecated. Please use `last_changes` instead.')
       query.nil? ? where.last_changes : where('last_change' => query)
     end
 
     def expiry_date(query = nil)
-      warn '[DEPRECATION] The shadow `expiry_date` property is deprecated and will be removed' \
-       ' in InSpec 3.0.  Please use `expiry_dates` instead.'
+      Inspec.deprecate(:properties_shadow, 'The shadow `expiry_date` property is deprecated. Please use `expiry_dates` instead.')
       query.nil? ? where.expiry_dates : where('expiry_date' => query)
     end
 
     def lines
-      warn '[DEPRECATION] The shadow `lines` property is deprecated and will be removed' \
-        ' in InSpec 3.0.'
+      Inspec.deprecate(:properties_shadow, 'The shadow `lines` property is deprecated.')
       shadow_content.to_s.split("\n")
     end
 

data/lib/resources/users.rb

@@ -213,42 +213,38 @@ module Inspec::Resources
 
     # implement 'mindays' method to be compatible with serverspec
     def minimum_days_between_password_change
-      deprecated('minimum_days_between_password_change', "Please use: its('mindays')")
+      Inspec.deprecate(:resource_user_serverspec_compat, 'The user resource `minimum_days_between_password_change` property is deprecated. Please use `mindays`.')
       mindays
     end
 
     # implement 'maxdays' method to be compatible with serverspec
     def maximum_days_between_password_change
-      deprecated('maximum_days_between_password_change', "Please use: its('maxdays')")
+      Inspec.deprecate(:resource_user_serverspec_compat, 'The user resource `maximum_days_between_password_change` property is deprecated. Please use `maxdays`.')
       maxdays
     end
 
     # implements rspec has matcher, to be compatible with serverspec
     # @see: https://github.com/rspec/rspec-expectations/blob/master/lib/rspec/matchers/built_in/has.rb
     def has_uid?(compare_uid)
-      deprecated('has_uid?')
+      Inspec.deprecate(:resource_user_serverspec_compat, 'The user resource `has_uid?` matcher is deprecated.')
       uid == compare_uid
     end
 
     def has_home_directory?(compare_home)
-      deprecated('has_home_directory?', "Please use: its('home')")
+      Inspec.deprecate(:resource_user_serverspec_compat, 'The user resource `has_home_directory?` matcher is deprecated. Please use `its(\'home\')`.')
       home == compare_home
     end
 
     def has_login_shell?(compare_shell)
-      deprecated('has_login_shell?', "Please use: its('shell')")
+      Inspec.deprecate(:resource_user_serverspec_compat, 'The user resource `has_login_shell?` matcher is deprecated. Please use `its(\'shell\')`.')
       shell == compare_shell
     end
 
     def has_authorized_key?(_compare_key)
-      deprecated('has_authorized_key?')
+      Inspec.deprecate(:resource_user_serverspec_compat, 'The user resource `has_authorized_key?` matcher is deprecated. There is no currently implemented alternative')
       raise NotImplementedError
     end
 
-    def deprecated(name, alternative = nil)
-      warn "[DEPRECATION] #{name} is deprecated. #{alternative}"
-    end
-
     def to_s
       "User #{@username}"
     end

data/lib/resources/wmi.rb

@@ -26,11 +26,10 @@ module Inspec::Resources
 
     def initialize(wmiclass = nil, opts = nil)
       @options = opts || {}
-      # if wmiclass is not a hash, we have to handle deprecation behavior
       if wmiclass.is_a?(Hash)
         @options.merge!(wmiclass)
       else
-        warn '[DEPRECATION] `wmi(\'wmiclass\')` is deprecated.  Please use `wmi({class: \'wmiclass\'})` instead.'
+        Inspec.deprecate(:wmi_non_hash_usage, 'Using `wmi(\'wmisclass\')` is deprecated. Please use`wmi({class: \'wmisclass\'})`')
         @options[:class] = wmiclass
       end
     end

data/lib/utils/deprecation/deprecator.rb

@@ -18,7 +18,7 @@ module Inspec
 
         action = group[:action] || :warn
         action_method = ('handle_' + action.to_s + '_action').to_sym
-        send(action_method, assembled_message, group)
+        send(action_method, group_name.to_sym, assembled_message, group)
       end
 
       private
@@ -76,7 +76,8 @@ module Inspec
         false
       end
 
-      def handle_ignore_action(message, _group)
+      # Unused args needed for unit test deprecation harness
+      def handle_ignore_action(_group_name, message, _group)
         handle_log_action(message, :debug)
       end
 
@@ -91,24 +92,24 @@ module Inspec
         end
       end
 
-      def handle_warn_action(message, _group)
+      def handle_warn_action(_group_name, message, _group)
         handle_log_action(message, :warn)
       end
 
-      def handle_error_action(message, _group)
+      def handle_error_action(_group_name, message, _group)
         handle_log_action(message, :error)
       end
 
-      def handle_fail_control_action(message, group)
+      def handle_fail_control_action(group_name, message, group)
         if called_from_control?
           raise Inspec::Exceptions::ResourceFailed, message
         else
-          handle_warn_action(message, group)
+          handle_warn_action(group_name, message, group)
         end
       end
 
-      def handle_exit_action(message, group)
-        handle_error_action(message, group)
+      def handle_exit_action(group_name, message, group)
+        handle_error_action(group_name, message, group)
         status = group[:exit_status] || :fatal_deprecation
         Inspec::UI.new.exit(status)
       end

data/lib/utils/deprecation/global_method.rb

@@ -1,7 +1,7 @@
 require 'utils/deprecation/deprecator'
 
 module Inspec
-  def self.deprecate(group, msg, opts = {})
+  def self.deprecate(group, msg = '', opts = {})
     config_io = opts.delete(:config_io)
     deprecator = Inspec::Deprecation::Deprecator.new(config_io: config_io)
     deprecator.handle_deprecation(group, msg, opts)

data/lib/utils/parser.rb

@@ -88,7 +88,7 @@ module LinuxMountParser
       # parse options as array
       mount_options[:options] = mount[5].gsub(/\(|\)/, '').split(',')
     else
-      # parse options as serverspec uses it, tbis is deprecated
+      Inspec.deprecate(:mount_parser_serverspec_compat, 'Parsing mount options in this fashion is deprecated')
       mount_options[:options] = {}
       mount[5].gsub(/\(|\)/, '').split(',').each do |option|
         name, val = option.split('=')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 3.9.3
+  version: 4.1.4.preview
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: train-habitat
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: train-aws
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: license-acceptance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -797,14 +819,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: Infrastructure and compliance testing.