inspec 1.13.0 → 1.14.0

data/lib/inspec/plugins/resource.rb

@@ -38,7 +38,6 @@ module Inspec
     end
 
     def __register(name, obj)
-      # rubocop:disable Lint/NestedMethodDefinition
       cl = Class.new(obj) do
         def initialize(backend, name, *args)
           # attach the backend to this instance

data/lib/inspec/plugins/source_reader.rb

@@ -15,7 +15,7 @@ module Inspec
       #
       # @return [Inspec::Metadata] profile metadata
       def metadata
-        fail "SourceReader #{self} does not implement `metadata()`. This method is required"
+        raise "SourceReader #{self} does not implement `metadata()`. This method is required"
       end
 
       # Retrieve this profile's tests
@@ -26,14 +26,14 @@ module Inspec
       #
       # @return [Hash] Collection with references pointing to test contents
       def tests
-        fail "SourceReader #{self} does not implement `tests()`. This method is required"
+        raise "SourceReader #{self} does not implement `tests()`. This method is required"
       end
 
       # Retrieve this profile's libraries
       #
       # @return [Hash] Collection with references pointing to library contents
       def libraries
-        fail "SourceReader #{self} does not implement `libraries()`. This method is required"
+        raise "SourceReader #{self} does not implement `libraries()`. This method is required"
       end
     end
   end

data/lib/inspec/profile.rb

@@ -57,7 +57,7 @@ module Inspec
 
       reader = Inspec::SourceReader.resolve(rp)
       if reader.nil?
-        fail("Don't understand inspec profile in #{path}, it " \
+        raise("Don't understand inspec profile in #{path}, it " \
              "doesn't look like a supported profile structure.")
       end
       new(reader, opts)
@@ -108,7 +108,7 @@ module Inspec
       metadata.params[:version]
     end
 
-    def writable? # rubocop:disable Style/TrivialAccessors
+    def writable?
       @writable
     end
 
@@ -397,10 +397,10 @@ module Inspec
       end
 
       name = params[:name] ||
-             fail('Cannot create an archive without a profile name! Please '\
+             raise('Cannot create an archive without a profile name! Please '\
                   'specify the name in metadata or use --output to create the archive.')
       version = params[:version] ||
-                fail('Cannot create an archive without a profile version! Please '\
+                raise('Cannot create an archive without a profile version! Please '\
                      'specify the version in metadata or use --output to create the archive.')
       ext = opts[:zip] ? 'zip' : 'tar.gz'
       slug = name.downcase.strip.tr(' ', '-').gsub(/[^\w-]/, '_')

data/lib/inspec/profile_context.rb

@@ -21,7 +21,7 @@ module Inspec
     attr_accessor :rules
     def initialize(profile_id, backend, conf)
       if backend.nil?
-        fail 'ProfileContext is initiated with a backend == nil. ' \
+        raise 'ProfileContext is initiated with a backend == nil. ' \
              'This is a backend error which must be fixed upstream.'
       end
       @profile_id = profile_id

data/lib/inspec/resource.rb

@@ -39,7 +39,7 @@ module Inspec
                             profile_context.subcontext_by_name(profile_name)
                           end
 
-          fail ProfileNotFound, "Cannot find profile named: #{profile_name}" if inner_context.nil?
+          raise ProfileNotFound, "Cannot find profile named: #{profile_name}" if inner_context.nil?
           inner_context.resource_registry[resource_name]
         end
 
@@ -64,7 +64,7 @@ module Inspec
 
   def self.validate_resource_dsl_version!(version)
     if version != 1
-      fail 'Only resource version 1 is supported!'
+      raise 'Only resource version 1 is supported!'
     end
   end
 end

data/lib/inspec/runner.rb

@@ -166,7 +166,7 @@ module Inspec
                                            backend: @backend,
                                            controls: @controls,
                                            attributes: @conf[:attributes])
-      fail "Could not resolve #{target} to valid input." if profile.nil?
+      raise "Could not resolve #{target} to valid input." if profile.nil?
       @target_profiles << profile if supports_profile?(profile)
     end
 
@@ -174,13 +174,13 @@ module Inspec
       return true if @ignore_supports
 
       if !profile.supports_runtime?
-        fail 'This profile requires InSpec version '\
+        raise 'This profile requires InSpec version '\
              "#{profile.metadata.inspec_requirement}. You are running "\
              "InSpec v#{Inspec::VERSION}.\n"
       end
 
       if !profile.supports_os?
-        fail "This OS/platform (#{@backend.os[:name]}) is not supported by this profile."
+        raise "This OS/platform (#{@backend.os[:name]}) is not supported by this profile."
       end
 
       true
@@ -249,7 +249,7 @@ module Inspec
           # otherwise return all working tests
           return ok_tests
         else
-          fail "A rule was registered with #{method_name.inspect}, "\
+          raise "A rule was registered with #{method_name.inspect}, "\
                "which isn't understood and cannot be processed."
         end
       end

data/lib/inspec/secrets.rb

@@ -10,7 +10,7 @@ module Inspec
 
   def self.secrets(version)
     if version != 1
-      fail 'Only secrets version 1 is supported!'
+      raise 'Only secrets version 1 is supported!'
     end
     Inspec::Plugins::Secret
   end

data/lib/inspec/shell.rb

@@ -79,7 +79,7 @@ module Inspec
       # determine min whitespace that can be removed
       min = nil
       example.lines.each do |line|
-        if line.strip.length > 0 # ignore empty lines
+        if !line.strip.empty? # ignore empty lines
           line_whitespace = line.length - line.lstrip.length
           min = line_whitespace if min.nil? || line_whitespace < min
         end

data/lib/inspec/source_reader.rb

@@ -19,7 +19,7 @@ module Inspec
 
   def self.source_reader(version)
     if version != 1
-      fail 'Only source readers version 1 is supported!'
+      raise 'Only source readers version 1 is supported!'
     end
     Inspec::Plugins::SourceReader
   end

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '1.13.0'.freeze
+  VERSION = '1.14.0'.freeze
 end

data/lib/matchers/matchers.rb

@@ -105,7 +105,7 @@ RSpec::Matchers.define :be_installed do
   end
 
   chain :by do
-    fail "[UNSUPPORTED] Please use the new resources 'gem', 'npm' or 'pip'."
+    raise "[UNSUPPORTED] Please use the new resources 'gem', 'npm' or 'pip'."
   end
 
   chain :with_version do |version|
@@ -121,7 +121,7 @@ RSpec::Matchers.define :be_enabled do
   end
 
   chain :with_level do |_level|
-    fail '[UNSUPPORTED] with level is not supported'
+    raise '[UNSUPPORTED] with level is not supported'
   end
 
   failure_message do |service|
@@ -137,7 +137,7 @@ RSpec::Matchers.define :be_running do
   end
 
   chain :under do |_under|
-    fail '[UNSUPPORTED] under is not supported'
+    raise '[UNSUPPORTED] under is not supported'
   end
 
   failure_message do |service|
@@ -178,7 +178,7 @@ RSpec::Matchers.define :be_reachable do
   end
 
   chain :with do |_attr|
-    fail '[UNSUPPORTED] `with` is not supported in combination with `be_reachable`'
+    raise '[UNSUPPORTED] `with` is not supported in combination with `be_reachable`'
   end
 
   failure_message do |host|
@@ -193,7 +193,7 @@ RSpec::Matchers.define :be_resolvable do
   end
 
   chain :by do |_type|
-    fail "[UNSUPPORTED] `by` is not supported in combination with `be_resolvable`. Please use the following syntax `host('example.com', port: 53, proto: 'udp')`."
+    raise "[UNSUPPORTED] `by` is not supported in combination with `be_resolvable`. Please use the following syntax `host('example.com', port: 53, proto: 'udp')`."
   end
 
   failure_message do |host|
@@ -208,11 +208,11 @@ RSpec::Matchers.define :have_rule do |rule|
   end
 
   chain :with_table do |_table|
-    fail "[UNSUPPORTED] `with_table` is not supported in combination with `have_rule`. Please use the following syntax `iptables(table:'mangle', chain: 'input')`."
+    raise "[UNSUPPORTED] `with_table` is not supported in combination with `have_rule`. Please use the following syntax `iptables(table:'mangle', chain: 'input')`."
   end
 
   chain :with_chain do |_chain|
-    fail "[UNSUPPORTED] `with_table` is not supported in combination with `with_chain`. Please use the following syntax `iptables(table:'mangle', chain: 'input')`."
+    raise "[UNSUPPORTED] `with_table` is not supported in combination with `with_chain`. Please use the following syntax `iptables(table:'mangle', chain: 'input')`."
   end
 end
 

data/lib/resources/apache_conf.rb

@@ -70,7 +70,7 @@ module Inspec::Resources
       end
 
       raw_conf = file.content
-      if raw_conf.empty? && file.size > 0
+      if raw_conf.empty? && !file.empty?
         return skip_resource("Can't read file \"#{@conf_path}\"")
       end
 

data/lib/resources/auditd_conf.rb

@@ -41,7 +41,7 @@ module Inspec::Resources
       end
 
       content = file.content
-      if content.empty? && file.size > 0
+      if content.empty? && !file.empty?
         skip_resource "Can't read file '#{@conf_path}'"
         return @params = {}
       end

data/lib/resources/auditd_rules.rb

@@ -93,7 +93,7 @@ module Inspec::Resources
     # rubocop:disable Style/MethodName
     def LIST_RULES
       return @legacy.LIST_RULES if @legacy
-      fail 'Using legacy auditd_rules LIST_RULES interface with non-legacy audit package. Please use the new syntax.'
+      raise 'Using legacy auditd_rules LIST_RULES interface with non-legacy audit package. Please use the new syntax.'
     end
 
     def status(name = nil)

data/lib/resources/bridge.rb

@@ -115,7 +115,7 @@ module Inspec::Resources
         adapter_collection.push(info) if info[:name].casecmp(bridge_name) == 0
       end
 
-      return nil if bridges.size == 0
+      return nil if bridges.empty?
       warn "[Possible Error] detected multiple bridges interfaces with the name #{bridge_name}" if bridges.size > 1
       bridges[0]
     end

data/lib/resources/etc_group.rb

@@ -107,7 +107,7 @@ module Inspec::Resources
       # iterate over each line and filter comments
       @content.split("\n").each_with_object([]) do |line, lines|
         grp_info = parse_group_line(line)
-        lines.push(grp_info) if !grp_info.nil? && grp_info.size > 0
+        lines.push(grp_info) if !grp_info.nil? && !grp_info.empty?
       end
     end
 
@@ -119,7 +119,7 @@ module Inspec::Resources
       line, _idx_nl = parse_comment_line(line, opts)
       x = line.split(':')
       # abort if we have an empty or comment line
-      return nil if x.size == 0
+      return nil if x.empty?
       # map data
       {
         'name' => x.at(0), # Name of the group.

data/lib/resources/file.rb

@@ -61,7 +61,7 @@ module Inspec::Resources
     end
 
     def contain(*_)
-      fail 'Contain is not supported. Please use standard RSpec matchers.'
+      raise 'Contain is not supported. Please use standard RSpec matchers.'
     end
 
     def readable?(by_usergroup, by_specific_user)
@@ -128,7 +128,7 @@ module Inspec::Resources
     private
 
     def file_permission_granted?(access_type, by_usergroup, by_specific_user)
-      fail '`file_permission_granted?` is not supported on your OS' if @perms_provider.nil?
+      raise '`file_permission_granted?` is not supported on your OS' if @perms_provider.nil?
       if by_specific_user.nil? || by_specific_user.empty?
         @perms_provider.check_file_permission_by_mask(file, access_type, by_usergroup, by_specific_user)
       else
@@ -154,7 +154,7 @@ module Inspec::Resources
       when 'execute'
         'x'
       else
-        fail 'Invalid access_type provided'
+        raise 'Invalid access_type provided'
       end
     end
 
@@ -172,7 +172,7 @@ module Inspec::Resources
       usergroup = usergroup_for(usergroup, specific_user)
       flag = permission_flag(access_type)
       mask = file.unix_mode_mask(usergroup, flag)
-      fail 'Invalid usergroup/owner provided' if mask.nil?
+      raise 'Invalid usergroup/owner provided' if mask.nil?
       (file.mode & mask) != 0
     end
 
@@ -197,7 +197,7 @@ module Inspec::Resources
 
   class WindowsFilePermissions < FilePermissions
     def check_file_permission_by_mask(_file, _access_type, _usergroup, _specific_user)
-      fail '`check_file_permission_by_mask` is not supported on Windows'
+      raise '`check_file_permission_by_mask` is not supported on Windows'
     end
 
     def check_file_permission_by_user(access_type, user, path)
@@ -209,7 +209,7 @@ module Inspec::Resources
                     when 'execute'
                       '@(\'FullControl\', \'Modify\', \'ReadAndExecute\', \'ExecuteFile\')'
                     else
-                      fail 'Invalid access_type provided'
+                      raise 'Invalid access_type provided'
                     end
       cmd = inspec.command("@(@((Get-Acl '#{path}').access | Where-Object {$_.AccessControlType -eq 'Allow' -and $_.IdentityReference -eq '#{user}' }) | Where-Object {($_.FileSystemRights.ToString().Split(',') | % {$_.trim()} | ? {#{access_rule} -contains $_}) -ne $null}) | measure | % { $_.Count }")
       cmd.stdout.chomp == '0' ? false : true

data/lib/resources/groups.rb

@@ -99,18 +99,18 @@ module Inspec::Resources
 
     # verifies if a group exists
     def exists?
-      group_info.entries.size > 0
+      !group_info.entries.empty?
     end
 
     def gid
       gids = group_info.gids
-      if gids.size == 0
+      if gids.empty?
         nil
       # the default case should be one group
       elsif gids.size == 1
         gids.entries[0]
       else
-        fail 'found more than one group with the same name, please use `groups` resource'
+        raise 'found more than one group with the same name, please use `groups` resource'
       end
     end
 
@@ -144,7 +144,7 @@ module Inspec::Resources
     end
 
     def groups
-      fail 'group provider must implement the `groups` method'
+      raise 'group provider must implement the `groups` method'
     end
   end
 

data/lib/resources/grub_conf.rb

@@ -38,11 +38,11 @@ class GrubConfig < Inspec.resource(1) # rubocop:disable Metrics/ClassLength
       @conf_path = path || '/boot/grub/grub.cfg'
       @defaults_path = '/etc/default/grub'
       @version = 'grub2'
-    elsif os[:name] == 'amazon' # rubocop:disable Style/GuardClause
+    elsif os[:name] == 'amazon'
       @conf_path = path || '/etc/grub.conf'
       @version = 'legacy'
     else
-      fail UnknownGrubConfig
+      raise UnknownGrubConfig
     end
   end
 
@@ -145,7 +145,7 @@ class GrubConfig < Inspec.resource(1) # rubocop:disable Metrics/ClassLength
 
     content = file.content
 
-    if content.empty? && file.size > 0
+    if content.empty? && !file.empty?
       skip_resource "Can't read file '#{@conf_path}'"
       return @params = {}
     end

data/lib/resources/host.rb

@@ -60,7 +60,7 @@ module Inspec::Resources
     end
 
     def reachable?(port = nil, proto = nil, timeout = nil)
-      fail "Use `host` resource with host('#{@hostname}', port: #{port}, proto: '#{proto}') parameters." if !port.nil? || !proto.nil? || !timeout.nil?
+      raise "Use `host` resource with host('#{@hostname}', port: #{port}, proto: '#{proto}') parameters." if !port.nil? || !proto.nil? || !timeout.nil?
       ping.nil? ? false : ping
     end
 

data/lib/resources/inetd_conf.rb

@@ -43,7 +43,7 @@ module Inspec::Resources
       end
 
       content = file.content
-      if content.empty? && file.size > 0
+      if content.empty? && !file.empty?
         skip_resource "Can't read file \"#{@conf_path}\""
         return @params = {}
       end

data/lib/resources/interface.rb

@@ -121,7 +121,7 @@ module Inspec::Resources
         adapter_collection.push(info) if info[:name].casecmp(iface) == 0
       end
 
-      return nil if adapters.size == 0
+      return nil if adapters.empty?
       warn "[Possible Error] detected multiple network interfaces with the name #{iface}" if adapters.size > 1
       adapters[0]
     end

data/lib/resources/json.rb

@@ -49,7 +49,7 @@ module Inspec::Resources
         end
 
         # check if file is readable
-        if @file_content.nil? && @file.size > 0
+        if @file_content.nil? && !@file.empty?
           skip_resource "Can't read file \"#{@path}\""
           return @params = {}
         end

data/lib/resources/limits_conf.rb

@@ -35,7 +35,7 @@ module Inspec::Resources
       end
 
       content = file.content
-      if content.empty? && file.size > 0
+      if content.empty? && !file.empty?
         skip_resource "Can't read file \"#{@conf_path}\""
         return @params = {}
       end

data/lib/resources/login_def.rb

@@ -47,7 +47,7 @@ module Inspec::Resources
       end
 
       content = file.content
-      if content.empty? && file.size > 0
+      if content.empty? && !file.empty?
         skip_resource "Can't read file \"#{@conf_path}\""
         return @params = {}
       end

data/lib/resources/mysql_conf.rb

@@ -73,7 +73,7 @@ module Inspec::Resources
         return skip_resource "Can't find file \"#{@conf_path}\""
       end
       raw_conf = read_file(@conf_path)
-      if raw_conf.empty? && inspec.file(@conf_path).size > 0
+      if raw_conf.empty? && !inspec.file(@conf_path).empty?
         return skip_resource("Can't read file \"#{@conf_path}\"")
       end