inspec-core 4.17.15 → 4.17.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b94a47b56f16dbf38f6615e8d875b52b73a33408ce77e50459e9e4e02896ce28
-  data.tar.gz: f25ea6088072f15623ad844358f99e678740cbf569da136145b216571c29c3a0
+  metadata.gz: e9cfd01a9da3acdf34494cfad5f09ce2656ab12bd0bc727322eb8de72c342fa3
+  data.tar.gz: 111c6ea5d24bc14f76b0d9d3b25d92639a2fdcdb14711b2e8045e51b4b5033f4
 SHA512:
-  metadata.gz: edd0ca2b83df5e036fe0269c7ff8e75ab9a68642a265d814808332127ac819ee79743df898d202f02be38010ef17293f2ef8e700892ebeca055731b951370fe9
-  data.tar.gz: 6221337750dd654cb62ef2f0423cceb2ad373c22f4a2eb42a3cb59b57946757d64439eaadfeb0f1f08887f953dbfdc67bd9f82c790b9666663781314d5aa7afa
+  metadata.gz: bd3169c135e2600a54d7282e5e86579043b118530377ecaac4537805eba272ef7f87f64f0ad744812fb04dda6f53326e14687c1e15b5b0fe031379cc6fe1c9fd
+  data.tar.gz: 1c6f45bf5e0372ae8c529f275df59cd336ec180cf118f8d34219f7de0a85b46659c6c084e468963eca38d841c1fc7961bfbebd6496caf557e8a4c217e7732d6c

data/lib/inspec/describe.rb

@@ -17,6 +17,10 @@ module Inspec
       @action.call("describe.one", @checks, nil)
     end
 
+    def method_missing(method_name, *arguments)
+      Inspec::DSL.method_missing_resource(inspec, method_name, *arguments)
+    end
+
     def describe(*args, &block)
       @checks.push(["describe", args, block])
     end

data/lib/inspec/resources/noop.rb

@@ -0,0 +1,9 @@
+module Inspec::Resources
+  class Noop < Inspec.resource(1)
+    name "noop"
+
+    def to_s
+      "No-op"
+    end
+  end
+end

data/lib/inspec/rule.rb

@@ -227,9 +227,7 @@ module Inspec
         msg = "Skipped control due to #{skip_check[:type]} condition."
       end
 
-      # TODO: we use os as the carrier here, but should consider
-      # a separate resource to do skipping
-      resource = rule.os
+      resource = rule.noop
       resource.skip_resource(msg)
       [["describe", [resource], nil]]
     end
@@ -344,14 +342,13 @@ module Inspec
     def with_dsl(block)
       return nil if block.nil?
 
-      if self.class.resource_dsl
-        dsl = self.class.resource_dsl
-        proc do |*args|
-          include dsl
-          instance_exec(*args, &block)
-        end
-      else
-        block
+      dsl = self.class.resource_dsl
+
+      return block unless dsl
+
+      proc do |*args|
+        include dsl
+        instance_exec(*args, &block)
       end
     end
 

data/lib/inspec/version.rb

@@ -1,3 +1,3 @@
 module Inspec
-  VERSION = "4.17.15".freeze
+  VERSION = "4.17.17".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec-core
 version: !ruby/object:Gem::Version
-  version: 4.17.15
+  version: 4.17.17
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train-core
@@ -531,6 +531,7 @@ files:
 - lib/inspec/resources/mysql_session.rb
 - lib/inspec/resources/nginx.rb
 - lib/inspec/resources/nginx_conf.rb
+- lib/inspec/resources/noop.rb
 - lib/inspec/resources/npm.rb
 - lib/inspec/resources/ntp_conf.rb
 - lib/inspec/resources/oneget.rb