inspec 1.13.0 → 1.14.0

data/lib/resources/ntp_conf.rb

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

data/lib/resources/packages.rb

@@ -50,7 +50,7 @@ module Inspec::Resources
       elsif p.class == Regexp
         p
       else
-        fail 'invalid name argument to packages resource, please use a "string" or /regexp/'
+        raise 'invalid name argument to packages resource, please use a "string" or /regexp/'
       end
     end
 
@@ -64,7 +64,7 @@ module Inspec::Resources
       if os.debian?
         command = "dpkg-query -W -f='${db:Status-Abbrev} ${Package} ${Version}\\n'"
       else
-        fail "packages resource is not yet supported on #{os.name}"
+        raise "packages resource is not yet supported on #{os.name}"
       end
       build_package_list(command)
     end

data/lib/resources/parse_config.rb

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

data/lib/resources/port.rb

@@ -45,7 +45,7 @@ module Inspec::Resources
           .add(:protocols, field: 'protocol', style: :simple)
           .add(:processes, field: 'process', style: :simple)
           .add(:pids,      field: 'pid', style: :simple)
-          .add(:listening?) { |x| x.entries.length > 0 }
+          .add(:listening?) { |x| !x.entries.empty? }
     filter.connect(self, :info)
 
     def to_s
@@ -169,7 +169,7 @@ module Inspec::Resources
       ports = []
 
       # check that lsof is available, otherwise fail
-      fail 'Please ensure `lsof` is available on the machine.' if !inspec.command(@lsof.to_s).exist?
+      raise 'Please ensure `lsof` is available on the machine.' if !inspec.command(@lsof.to_s).exist?
 
       # -F p=pid, c=command, P=protocol name, t=type, n=internet addresses
       # see 'OUTPUT FOR OTHER PROGRAMS' in LSOF(8)

data/lib/resources/postgres_conf.rb

@@ -65,7 +65,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
 

data/lib/resources/security_policy.rb

@@ -117,7 +117,7 @@ module Inspec::Resources
       return skip_resource "Can't read security policy" if cmd.exit_status.to_i != 0
       @content = cmd.stdout
 
-      if @content.empty? && file.size > 0
+      if @content.empty? && !file.empty?
         return skip_resource "Can't read security policy"
       end
       @content

data/lib/resources/ssh_conf.rb

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

data/lib/resources/ssl.rb

@@ -52,7 +52,7 @@ class SSL < Inspec.resource(1)
       elsif inspec.backend.class.to_s == 'Train::Transports::Local::Connection'
         @host = 'localhost'
       else
-        fail 'Cannot determine host for SSL test. Please specify it or use a different target.'
+        raise 'Cannot determine host for SSL test. Please specify it or use a different target.'
       end
     end
     @port = opts[:port] || 443

data/lib/resources/users.rb

@@ -242,7 +242,7 @@ module Inspec::Resources
 
     def has_authorized_key?(_compare_key)
       deprecated('has_authorized_key?')
-      fail NotImplementedError
+      raise NotImplementedError
     end
 
     def deprecated(name, alternative = nil)
@@ -292,7 +292,7 @@ module Inspec::Resources
     #   groups: '',
     # }
     def identity(_username)
-      fail 'user provider must implement the `identity` method'
+      raise 'user provider must implement the `identity` method'
     end
 
     # returns optional information about a user, eg shell
@@ -313,7 +313,7 @@ module Inspec::Resources
 
     # returns an array with users
     def list_users
-      fail 'user provider must implement the `list_users` method'
+      raise 'user provider must implement the `list_users` method'
     end
 
     # retuns all aspects of the user as one hash
@@ -556,7 +556,7 @@ module Inspec::Resources
     def parse_windows_account(username)
       account = username.split('\\')
       name = account.pop
-      domain = account.pop if account.size > 0
+      domain = account.pop if !account.empty?
       [name, domain]
     end
 
@@ -565,7 +565,7 @@ module Inspec::Resources
       name, _domain = parse_windows_account(username)
       return if collect_user_details.nil?
       res = collect_user_details.select { |user| user[:username] == name }
-      res[0] if res.length > 0
+      res[0] if !res.empty?
     end
 
     def list_users

data/lib/resources/xinetd.rb

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

data/lib/utils/command_wrapper.rb

@@ -9,20 +9,20 @@ class CommandWrapper
 
   def self.wrap(cmd, options)
     unless options.is_a?(Hash)
-      fail 'All options for the command wrapper must be provided as a hash. '\
+      raise 'All options for the command wrapper must be provided as a hash. '\
         "You entered: #{options.inspect}. Please consult the documentation."
     end
 
     wrap = options[:wrap]
     if !wrap.nil? && !wrap.is_a?(Proc)
-      fail "Called command wrapper with wrap: #{wrap.inspect}. It must be called with a Proc."
+      raise "Called command wrapper with wrap: #{wrap.inspect}. It must be called with a Proc."
     elsif !wrap.nil?
       return wrap.call(cmd)
     end
 
     shell = options[:shell]
     unless UNIX_SHELLS.include?(shell)
-      fail "Don't know how to wrap commands for shell: #{shell.inspect}."
+      raise "Don't know how to wrap commands for shell: #{shell.inspect}."
     end
 
     path = options[:path] || shell

data/lib/utils/filter.rb

@@ -70,7 +70,7 @@ module FilterTable
     end
 
     def new_entry(*_)
-      fail "#{self.class} must not be used on its own. It must be inherited "\
+      raise "#{self.class} must not be used on its own. It must be inherited "\
            'and the #new_entry method must be implemented. This is an internal '\
            'error and should not happen.'
     end

data/lib/utils/plugin_registry.rb

@@ -39,7 +39,7 @@ class PluginRegistry
     #
     # @return [PluginRegistry] plugin registry for this plugin
     def self.plugin_registry
-      fail "Plugin #{self} does not implement `self.plugin_registry()`. This method is required"
+      raise "Plugin #{self} does not implement `self.plugin_registry()`. This method is required"
     end
 
     # Register a new plugin by name
@@ -47,7 +47,7 @@ class PluginRegistry
     # @param [String] the unique name of this plugin
     # @return [nil] disregard
     def self.name(name)
-      fail "Trying to register #{self} with name == nil" if name.nil?
+      raise "Trying to register #{self} with name == nil" if name.nil?
       @name = name
       plugin_registry.registry[name] = self
     end
@@ -72,7 +72,7 @@ class PluginRegistry
     # @param [String] target to try to resolve
     # @return [Plugin] instance if it can be resolved, nil otherwise
     def self.resolve(_target)
-      fail "Plugin #{self} does not implement `self.resolve(target)`. This method is required"
+      raise "Plugin #{self} does not implement `self.resolve(target)`. This method is required"
     end
 
     # When a plugin's resolve doesn't lead to the final state, it can

data/lib/utils/simpleconfig.rb

@@ -33,7 +33,7 @@ class SimpleConfig
       raw_data = raw_data.tr(options[:line_separator], "\n")
     end
     rest = raw_data
-    rest = parse_rest(rest, options) while rest.length > 0
+    rest = parse_rest(rest, options) until rest.empty?
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -367,7 +367,11 @@ files:
 - examples/kitchen-puppet/test/integration/default/web_spec.rb
 - examples/meta-profile/README.md
 - examples/meta-profile/controls/example.rb
+- examples/meta-profile/inspec.lock
 - examples/meta-profile/inspec.yml
+- examples/meta-profile/vendor/3d473e72d8b70018386a53e0a105e92ccbb4115dc268cadc16ff53d550d2898e.tar.gz
+- examples/meta-profile/vendor/793adcbb91cfc2da0044bb9cbf0863773ae2cf89ce9b8343b4295b137f70897b.tar.gz
+- examples/meta-profile/vendor/e25d521fb1093b4c23b31a7dc8f41b5540236f4a433960b151bc427523662ab6.tar.gz
 - examples/profile-attribute.yml
 - examples/profile-attribute/README.md
 - examples/profile-attribute/controls/example.rb