inspec 1.47.0 → 1.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73d4de764766d6ce02f52597d9cdd3d3c5f962bf
-  data.tar.gz: 0aaec0745ed380804d6bd333711054eab7c505ea
+  metadata.gz: '012308b85533b4379b4dae9b2d6bb956e4716dea'
+  data.tar.gz: a621d9a79814290988494ec07da9bad51057f33b
 SHA512:
-  metadata.gz: 93d630d3408a4c34b13504dbdc6cb07e0de5a672525db739bb7e54eff8d0971b09838ae5c14169362d3a98b58ae27af1feffb0e443733e5e92ce948786494f95
-  data.tar.gz: 49a27fd5dbe847483d31fa7d5ec357c91008596f47042d531c81c290b332b542d7caf90e56a9ae04c572b9d39cc913dda87565ec82a405aeef92e7c3d87df425
+  metadata.gz: 93b4c27033acdb1e4559c48940d0c73b1d94b3b20e109ed6a3b2ecf57908143b8c133717790ff273253aa580d893ee3ecd9a75e1129d9125bbc64f2c7c2d8397
+  data.tar.gz: 8eb7fe1e83c0bba17b5ef763015c83be4952c622e80a80af68a702d829d78bed389864157cdee86352f4ae166213ddc17b4fd5fbd5455719c89c8efc3de77a30

data/CHANGELOG.md

@@ -1,29 +1,47 @@
 # Change Log
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 1.47.0 -->
-## [v1.47.0](https://github.com/chef/inspec/tree/v1.47.0) (2017-12-04)
+<!-- latest_release 1.48.0 -->
+## [v1.48.0](https://github.com/chef/inspec/tree/v1.48.0) (2017-12-07)
 
-#### New Features
-- Enable caching for backend calls [#2309](https://github.com/chef/inspec/pull/2309) ([jquick](https://github.com/jquick))
+#### Merged Pull Requests
+- Fix changelog categories, bump minor version for release [#2381](https://github.com/chef/inspec/pull/2381) ([adamleff](https://github.com/adamleff))
 <!-- latest_release -->
 
-<!-- release_rollup since=1.46.2 -->
-### Changes since 1.46.2 release
+<!-- release_rollup since=1.47.0 -->
+### Changes since 1.47.0 release
 
-#### New Features
-- Enable caching for backend calls [#2309](https://github.com/chef/inspec/pull/2309) ([jquick](https://github.com/jquick)) <!-- 1.47.0 -->
+#### Enhancements
+- Allow crontab resource to read crontab at user specified paths. [#2328](https://github.com/chef/inspec/pull/2328) ([miah](https://github.com/miah)) <!-- 1.47.7 -->
+- Update default cli options to be uniq per command type [#2378](https://github.com/chef/inspec/pull/2378) ([jquick](https://github.com/jquick)) <!-- 1.47.6 -->
+
+#### Bug Fixes
+- Allow `inspec check` to ignore `only_if` [#2250](https://github.com/chef/inspec/pull/2250) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 1.47.2 -->
+- Remove rainbow dependency, fix duplicate rake gem [#2374](https://github.com/chef/inspec/pull/2374) ([adamleff](https://github.com/adamleff)) <!-- 1.47.8 -->
+- Resolve merge issue with json-config vs thor defaults [#2377](https://github.com/chef/inspec/pull/2377) ([jquick](https://github.com/jquick)) <!-- 1.47.5 -->
+- Update rspec cli control summary to not uniq fails/skips [#2362](https://github.com/chef/inspec/pull/2362) ([jquick](https://github.com/jquick)) <!-- 1.47.1 -->
 
 #### Merged Pull Requests
-- docker_image resource: properly handle registries in image strings [#2356](https://github.com/chef/inspec/pull/2356) ([adamleff](https://github.com/adamleff)) <!-- 1.46.5 -->
+- Fix changelog categories, bump minor version for release [#2381](https://github.com/chef/inspec/pull/2381) ([adamleff](https://github.com/adamleff)) <!-- 1.48.0 -->
+- Fix inspec appveyor test with the new local train transport [#2376](https://github.com/chef/inspec/pull/2376) ([jquick](https://github.com/jquick)) <!-- 1.47.4 -->
+- Update command resource to check for mock backend [#2353](https://github.com/chef/inspec/pull/2353) ([jquick](https://github.com/jquick)) <!-- 1.47.3 -->
+<!-- release_rollup -->
+
+<!-- latest_stable_release -->
+## [v1.47.0](https://github.com/chef/inspec/tree/v1.47.0) (2017-12-04)
+
+#### New Features
+- Enable caching for backend calls [#2309](https://github.com/chef/inspec/pull/2309) ([jquick](https://github.com/jquick))
 
 #### Bug Fixes
-- security_policy resource: use PID for filename instead of random [#2368](https://github.com/chef/inspec/pull/2368) ([jquick](https://github.com/jquick)) <!-- 1.46.7 -->
-- key_rsa resource: fix inline shell documentation help, wrong resource name used in examples [#2364](https://github.com/chef/inspec/pull/2364) ([eramoto](https://github.com/eramoto)) <!-- 1.46.6 -->
-- json resource: ensure params is not nil in event of read/parse failure [#2354](https://github.com/chef/inspec/pull/2354) ([adamleff](https://github.com/adamleff)) <!-- 1.46.4 -->
-- Unique export file for security policy resource [#2350](https://github.com/chef/inspec/pull/2350) ([jquick](https://github.com/jquick)) <!-- 1.46.3 -->
-<!-- release_rollup -->
+- Unique export file for security policy resource [#2350](https://github.com/chef/inspec/pull/2350) ([jquick](https://github.com/jquick))
+- json resource: ensure params is not nil in event of read/parse failure [#2354](https://github.com/chef/inspec/pull/2354) ([adamleff](https://github.com/adamleff))
+- key_rsa resource: fix inline shell documentation help, wrong resource name used in examples [#2364](https://github.com/chef/inspec/pull/2364) ([eramoto](https://github.com/eramoto))
+- security_policy resource: use PID for filename instead of random [#2368](https://github.com/chef/inspec/pull/2368) ([jquick](https://github.com/jquick))
 
+#### Merged Pull Requests
+- docker_image resource: properly handle registries in image strings [#2356](https://github.com/chef/inspec/pull/2356) ([adamleff](https://github.com/adamleff))
 <!-- latest_stable_release -->
+
 ## [v1.46.2](https://github.com/chef/inspec/tree/v1.46.2) (2017-11-29)
 
 #### Enhancements
@@ -36,7 +54,6 @@
 - file resource: fix NilClass error when using advanced windows permissions [#2344](https://github.com/chef/inspec/pull/2344) ([TheLonelyGhost](https://github.com/TheLonelyGhost))
 - wmi resource: properly escape quotes in WMI query [#2342](https://github.com/chef/inspec/pull/2342) ([TheLonelyGhost](https://github.com/TheLonelyGhost))
 - Allow skipping/failing resources in FilterTable [#2349](https://github.com/chef/inspec/pull/2349) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
-<!-- latest_stable_release -->
 
 ## [v1.45.13](https://github.com/chef/inspec/tree/v1.45.13) (2017-11-21)
 

data/Gemfile

@@ -12,7 +12,7 @@ gem 'ffi', '>= 1.9.14'
 group :test do
   gem 'bundler', '~> 1.5'
   gem 'minitest', '~> 5.5'
-  gem 'rake', '~> 10'
+  gem 'rake', '>= 10'
   gem 'rubocop', '= 0.49.1'
   gem 'simplecov', '~> 0.10'
   gem 'concurrent-ruby', '~> 0.9'

data/inspec.gemspec

@@ -26,10 +26,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_dependency 'train', '~> 0.30'
+  spec.add_dependency 'train', '~> 0.31', '>= 0.31.1'
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'json', '>= 1.8', '< 3.0'
-  spec.add_dependency 'rainbow', '~> 2'
   spec.add_dependency 'method_source', '~> 0.8'
   spec.add_dependency 'rubyzip', '~> 1.1'
   spec.add_dependency 'rspec', '~> 3'

data/lib/inspec/backend.rb

@@ -40,7 +40,7 @@ module Inspec
     #
     # @param [Hash] config for the transport backend
     # @return [TransportBackend] enriched transport instance
-    def self.create(config)
+    def self.create(config) # rubocop:disable Metrics/AbcSize
       conf = Train.target_config(config)
       name = Train.validate_backend(conf)
       transport = Train.create(name, conf)
@@ -56,12 +56,15 @@ module Inspec
       # Set caching settings. We always want to enable caching for
       # the Mock transport for testing.
       if config[:backend_cache] || config[:backend] == :mock
+        Inspec::Log.debug 'Option backend_cache is enabled'
         connection.enable_cache(:file)
         connection.enable_cache(:command)
       elsif config[:debug_shell]
+        Inspec::Log.debug 'Option backend_cache is disabled'
         connection.disable_cache(:file)
         connection.disable_cache(:command)
       else
+        Inspec::Log.debug 'Option backend_cache is disabled'
         connection.disable_cache(:command)
       end
 

data/lib/inspec/base_cli.rb

@@ -59,18 +59,28 @@ module Inspec
         desc: 'A list of controls to run. Ignore all other tests.'
       option :format, type: :string,
         desc: 'Which formatter to use: cli, progress, documentation, json, json-min, junit'
-      option :color, type: :boolean, default: true,
+      option :color, type: :boolean,
         desc: 'Use colors in output.'
       option :attrs, type: :array,
         desc: 'Load attributes file (experimental)'
       option :cache, type: :string,
         desc: 'Use the given path for caching dependencies. (default: ~/.inspec/cache)'
-      option :create_lockfile, type: :boolean, default: true,
+      option :create_lockfile, type: :boolean,
         desc: 'Write out a lockfile based on this execution (unless one already exists)'
-      option :backend_cache, type: :boolean, default: false,
+      option :backend_cache, type: :boolean,
         desc: 'Allow caching for backend command output.'
     end
 
+    def self.default_options
+      {
+        exec: {
+          'color' => true,
+          'create_lockfile' => true,
+          'backend_cache' => false,
+        },
+      }
+    end
+
     private
 
     # helper method to run tests
@@ -101,8 +111,8 @@ module Inspec
       puts
     end
 
-    def opts
-      o = merged_opts
+    def opts(type = nil)
+      o = merged_opts(type)
 
       # Due to limitations in Thor it is not possible to set an argument to be
       # both optional and its value to be mandatory. E.g. the user supplying
@@ -118,9 +128,18 @@ module Inspec
       o
     end
 
-    def merged_opts
-      # argv overrides json
-      Thor::CoreExt::HashWithIndifferentAccess.new(options_json.merge(options))
+    def merged_opts(type = nil)
+      opts = {}
+
+      # start with default options if we have any
+      opts = BaseCLI.default_options[type] unless type.nil?
+
+      # merge in any options from json-config
+      opts.merge!(options_json)
+
+      # merge in any options defined via thor
+      opts.merge!(options)
+      Thor::CoreExt::HashWithIndifferentAccess.new(opts)
     end
 
     def options_json

data/lib/inspec/cli.rb

@@ -62,6 +62,7 @@ class Inspec::InspecCLI < Inspec::BaseCLI # rubocop:disable Metrics/ClassLength
     o = opts.dup
     o[:ignore_supports] = true # we check for integrity only
     o[:backend] = Inspec::Backend.create(target: 'mock://')
+    o[:check_mode] = true
 
     # run check
     profile = Inspec::Profile.for_target(path, o)
@@ -151,8 +152,8 @@ class Inspec::InspecCLI < Inspec::BaseCLI # rubocop:disable Metrics/ClassLength
   exec_options
   def exec(*targets)
     diagnose
-    configure_logger(opts)
-    o = opts.dup
+    o = opts(:exec).dup
+    configure_logger(o)
 
     # run tests
     run_tests(targets, o)

data/lib/inspec/control_eval_context.rb

@@ -13,7 +13,7 @@ module Inspec
   # as the basic DSL of the control files (describe, control, title,
   # etc).
   #
-  class ControlEvalContext
+  class ControlEvalContext # rubocop:disable Metrics/ClassLength
     # Create the context for controls. This includes all components of the DSL,
     # including matchers and resources.
     #
@@ -47,12 +47,13 @@ module Inspec
 
         attr_accessor :skip_file
 
-        def initialize(backend, conf, dependencies, require_loader)
+        def initialize(backend, conf, dependencies, require_loader, skip_only_if_eval)
           @backend = backend
           @conf = conf
           @dependencies = dependencies
           @require_loader = require_loader
           @skip_file = false
+          @skip_only_if_eval = skip_only_if_eval
         end
 
         define_method :title do |arg|
@@ -70,6 +71,7 @@ module Inspec
         define_method :control do |*args, &block|
           id = args[0]
           opts = args[1] || {}
+          opts[:skip_only_if_eval] = @skip_only_if_eval
           register_control(rule_class.new(id, profile_id, opts, &block))
         end
 
@@ -133,7 +135,10 @@ module Inspec
 
         define_method :only_if do |&block|
           return unless block
-          return if @skip_file == true || block.yield == true
+          return if @skip_file == true
+          return if @skip_only_if_eval == true
+
+          return if block.yield == true
 
           # Apply `set_skip_rule` for other rules in the same file
           profile_context_owner.rules.values.each do |r|

data/lib/inspec/profile.rb

@@ -78,7 +78,7 @@ module Inspec
       for_fetcher(fetcher, opts)
     end
 
-    attr_reader :source_reader, :backend, :runner_context
+    attr_reader :source_reader, :backend, :runner_context, :check_mode
     def_delegator :@source_reader, :tests
     def_delegator :@source_reader, :libraries
     def_delegator :@source_reader, :metadata
@@ -96,6 +96,7 @@ module Inspec
       @attr_values = options[:attributes]
       @tests_collected = false
       @libraries_loaded = false
+      @check_mode = options[:check_mode] || false
       Metadata.finalize(@source_reader.metadata, @profile_id, options)
 
       # if a backend has already been created, clone it so each profile has its own unique backend object

data/lib/inspec/profile_context.rb

@@ -14,7 +14,8 @@ module Inspec
   class ProfileContext # rubocop:disable Metrics/ClassLength
     def self.for_profile(profile, backend, attributes)
       new(profile.name, backend, { 'profile' => profile,
-                                   'attributes' => attributes })
+                                   'attributes' => attributes,
+                                   'check_mode' => profile.check_mode })
     end
 
     attr_reader :attributes, :profile_id, :resource_registry, :backend
@@ -27,6 +28,7 @@ module Inspec
       @profile_id = profile_id
       @backend = backend
       @conf = conf.dup
+      @skip_only_if_eval = @conf['check_mode']
       @rules = {}
       @control_subcontexts = []
       @lib_subcontexts = []
@@ -53,7 +55,7 @@ module Inspec
     def control_eval_context
       @control_eval_context ||= begin
                                   ctx = Inspec::ControlEvalContext.create(self, to_resources_dsl)
-                                  ctx.new(@backend, @conf, dependencies, @require_loader)
+                                  ctx.new(@backend, @conf, dependencies, @require_loader, @skip_only_if_eval)
                                 end
     end
 

data/lib/inspec/rspec_json_formatter.rb

@@ -776,8 +776,8 @@ class InspecRspecCli < InspecRspecJson # rubocop:disable Metrics/ClassLength
           examples[0][:message].to_s
         else
           [
-            !fails.empty? ? "#{fails.uniq.length} failed" : nil,
-            !skips.empty? ? "#{skips.uniq.length} skipped" : nil,
+            !fails.empty? ? "#{fails.length} failed" : nil,
+            !skips.empty? ? "#{skips.length} skipped" : nil,
           ].compact.join(' ')
         end
 

data/lib/inspec/rule.rb

@@ -29,7 +29,7 @@ module Inspec
       @resource_dsl
     end
 
-    def initialize(id, profile_id, _opts, &block)
+    def initialize(id, profile_id, opts, &block)
       @impact = nil
       @title = nil
       @desc = nil
@@ -44,6 +44,7 @@ module Inspec
       @__checks = []
       @__skip_rule = nil
       @__merge_count = 0
+      @__skip_only_if_eval = opts[:skip_only_if_eval]
 
       # evaluate the given definition
       instance_eval(&block) if block_given?
@@ -104,6 +105,8 @@ module Inspec
     # @return [nil]
     def only_if
       return unless block_given?
+      return if @__skip_only_if_eval == true
+
       @__skip_rule ||= !yield
     end
 

data/lib/inspec/version.rb

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

data/lib/resources/command.rb

@@ -45,9 +45,9 @@ module Inspec::Resources
       result.exit_status.to_i
     end
 
-    def exist?
+    def exist? # rubocop:disable Metrics/AbcSize
       # silent for mock resources
-      return false if inspec.os.name.nil?
+      return false if inspec.os.name.nil? || inspec.os.name == 'mock'
 
       if inspec.os.linux?
         res = inspec.backend.run_command("bash -c 'type \"#{@command}\"'")
@@ -56,7 +56,7 @@ module Inspec::Resources
       elsif inspec.os.unix?
         res = inspec.backend.run_command("type \"#{@command}\"")
       else
-        warn "`command(#{@command}).exist?` is not suported on your OS: #{inspec.os[:name]}"
+        warn "`command(#{@command}).exist?` is not supported on your OS: #{inspec.os[:name]}"
         return false
       end
       res.exit_status.to_i == 0

data/lib/resources/crontab.rb

@@ -1,15 +1,14 @@
 # encoding: utf-8
-# author: Adam Leff
 
 require 'utils/parser'
 require 'utils/filter'
 
 module Inspec::Resources
-  class Crontab < Inspec.resource(1)
+  class Crontab < Inspec.resource(1) # rubocop:disable Metrics/ClassLength
     name 'crontab'
     desc 'Use the crontab InSpec audit resource to test the contents of the crontab for a given user which contains information about scheduled tasks owned by that user.'
     example "
-      describe crontab('root') do
+      describe crontab(user: 'root') do
         its('commands') { should include '/path/to/some/script' }
       end
 
@@ -25,51 +24,40 @@ module Inspec::Resources
       describe crontab.where { command =~ /a partial command string/ } do
         its('entries.length') { should cmp 1 }
       end
+
+      describe crontab(path: '/etc/cron.d/some_crontab') do
+        its('commands') { should include '/path/to/some/script' }
+      end
     "
 
     attr_reader :params
 
     include CommentParser
 
-    def initialize(user = nil)
-      @user   = user
+    def initialize(opts = nil)
+      if opts.respond_to?(:fetch)
+        Hash[opts.map { |k, v| [k.to_sym, v] }]
+        @user = opts.fetch(:user, nil)
+        @path = opts.fetch(:path, nil)
+        raise Inspec::Exceptions::ResourceFailed, 'A user or path must be supplied.' if @user.nil? && @path.nil?
+      else
+        @user = opts
+        @path = nil
+      end
+      raise Inspec::Exceptions::ResourceSkipped, 'The `crontab` resource is not supported on your OS.' unless inspec.os.unix?
       @params = read_crontab
-
-      return skip_resource 'The `crontab` resource is not supported on your OS.' unless inspec.os.unix?
     end
 
     def read_crontab
-      inspec.command(crontab_cmd).stdout.lines.map { |l| parse_crontab_line(l) }.compact
+      ct = is_system_crontab? ? inspec.file(@path).content : inspec.command(crontab_cmd).stdout
+      ct.lines.map { |l| parse_crontab_line(l) }.compact
     end
 
     def parse_crontab_line(l)
       data, = parse_comment_line(l, comment_char: '#', standalone_comments: false)
       return nil if data.nil? || data.empty?
 
-      case data
-      when /@hourly .*/
-        { 'minute' => '0', 'hour' => '*', 'day' => '*', 'month' => '*', 'weekday' => '*', 'command' => data.split(/\s+/, 2).at(1) }
-      when /@(midnight|daily) .*/
-        { 'minute' => '0', 'hour' => '0', 'day' => '*', 'month' => '*', 'weekday' => '*', 'command' => data.split(/\s+/, 2).at(1) }
-      when /@weekly .*/
-        { 'minute' => '0', 'hour' => '0', 'day' => '*', 'month' => '*', 'weekday' => '0', 'command' => data.split(/\s+/, 2).at(1) }
-      when /@monthly ./
-        { 'minute' => '0', 'hour' => '0', 'day' => '1', 'month' => '*', 'weekday' => '*', 'command' => data.split(/\s+/, 2).at(1) }
-      when /@(annually|yearly) .*/
-        { 'minute' => '0', 'hour' => '0', 'day' => '1', 'month' => '1', 'weekday' => '*', 'command' => data.split(/\s+/, 2).at(1) }
-      when /@reboot .*/
-        { 'minute' => '-1', 'hour' => '-1', 'day' => '-1', 'month' => '-1', 'weekday' => '-1', 'command' => data.split(/\s+/, 2).at(1) }
-      else
-        elements = data.split(/\s+/, 6)
-        {
-          'minute'  => elements.at(0),
-          'hour'    => elements.at(1),
-          'day'     => elements.at(2),
-          'month'   => elements.at(3),
-          'weekday' => elements.at(4),
-          'command' => elements.at(5),
-        }
-      end
+      is_system_crontab? ? parse_system_crontab(data) : parse_user_crontab(data)
     end
 
     def crontab_cmd
@@ -84,19 +72,98 @@ module Inspec::Resources
           .add(:days,     field: 'day')
           .add(:months,   field: 'month')
           .add(:weekdays, field: 'weekday')
+          .add(:user,     field: 'user')
           .add(:commands, field: 'command')
 
     # rebuild the crontab line from raw content
     filter.add(:content) { |t, _|
       t.entries.map do |e|
-        [e.minute, e.hour, e.day, e.month, e.weekday, e.command].join(' ')
+        [e.minute, e.hour, e.day, e.month, e.weekday, e.user, e.command].compact.join(' ')
       end.join("\n")
     }
 
     filter.connect(self, :params)
 
     def to_s
-      @user.nil? ? 'crontab for current user' : "crontab for user #{@user}"
+      if is_system_crontab?
+        "crontab for path #{@path}"
+      elsif is_user_crontab?
+        "crontab for user #{@user}"
+      else
+        'crontab for current user'
+      end
+    end
+
+    private
+
+    def is_system_crontab?
+      !@path.nil?
+    end
+
+    def is_user_crontab?
+      !@user.nil?
+    end
+
+    def parse_system_crontab(data)
+      case data
+      when /@hourly .*/
+        elements = data.split(/\s+/, 3)
+        { 'minute' => '0', 'hour' => '*', 'day' => '*', 'month' => '*', 'weekday' => '*', 'user' => elements.at(1), 'command' => elements.at(2) }
+      when /@(midnight|daily) .*/
+        elements = data.split(/\s+/, 3)
+        { 'minute' => '0', 'hour' => '0', 'day' => '*', 'month' => '*', 'weekday' => '*', 'user' => elements.at(1), 'command' => elements.at(2) }
+      when /@weekly .*/
+        elements = data.split(/\s+/, 3)
+        { 'minute' => '0', 'hour' => '0', 'day' => '*', 'month' => '*', 'weekday' => '0', 'user' => elements.at(1), 'command' => elements.at(2) }
+      when /@monthly ./
+        elements = data.split(/\s+/, 3)
+        { 'minute' => '0', 'hour' => '0', 'day' => '1', 'month' => '*', 'weekday' => '*', 'user' => elements.at(1), 'command' => elements.at(2) }
+      when /@(annually|yearly) .*/
+        elements = data.split(/\s+/, 3)
+        { 'minute' => '0', 'hour' => '0', 'day' => '1', 'month' => '1', 'weekday' => '*', 'user' => elements.at(1), 'command' => elements.at(2) }
+      when /@reboot .*/
+        elements = data.split(/\s+/, 3)
+        { 'minute' => '-1', 'hour' => '-1', 'day' => '-1', 'month' => '-1', 'weekday' => '-1', 'user' => elements.at(1), 'command' => elements.at(2) }
+      else
+        elements = data.split(/\s+/, 7)
+        {
+          'minute'  => elements.at(0),
+          'hour'    => elements.at(1),
+          'day'     => elements.at(2),
+          'month'   => elements.at(3),
+          'weekday' => elements.at(4),
+          'user'    => elements.at(5),
+          'command' => elements.at(6),
+        }
+      end
+    end
+
+    def parse_user_crontab(data)
+      case data
+      when /@hourly .*/
+        { 'minute' => '0', 'hour' => '*', 'day' => '*', 'month' => '*', 'weekday' => '*', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
+      when /@(midnight|daily) .*/
+        { 'minute' => '0', 'hour' => '0', 'day' => '*', 'month' => '*', 'weekday' => '*', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
+      when /@weekly .*/
+        { 'minute' => '0', 'hour' => '0', 'day' => '*', 'month' => '*', 'weekday' => '0', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
+      when /@monthly ./
+        { 'minute' => '0', 'hour' => '0', 'day' => '1', 'month' => '*', 'weekday' => '*', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
+      when /@(annually|yearly) .*/
+        { 'minute' => '0', 'hour' => '0', 'day' => '1', 'month' => '1', 'weekday' => '*', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
+      when /@reboot .*/
+        { 'minute' => '-1', 'hour' => '-1', 'day' => '-1', 'month' => '-1', 'weekday' => '-1', 'user' => @user, 'command' => data.split(/\s+/, 2).at(1) }
+      else
+        elements = data.split(/\s+/, 6)
+        {
+          'minute'  => elements.at(0),
+          'hour'    => elements.at(1),
+          'day'     => elements.at(2),
+          'month'   => elements.at(3),
+          'weekday' => elements.at(4),
+          'user'    => @user,
+          'command' => elements.at(5),
+        }
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 1.47.0
+  version: 1.48.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.31'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.31.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.31'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.31.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +64,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement