inspec 4.23.15 → 4.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fb44a09849349d6dd99638cd3f2998f14ae039a12ddb449a97156f40b009ba7
-  data.tar.gz: 755369ab5359e07d1880cc04c8fe58f09c586e75c29b6fc4cfe0f5f10eaabc41
+  metadata.gz: 3aa75ff0854e501df881167882cf8a278e77919188c0474afe40cc97eaec5c9e
+  data.tar.gz: 172732810ba4fc07cb33b83b0bc94800b3034b14c80d8d4dc32de690f47238d4
 SHA512:
-  metadata.gz: fd0706e22b7d957b405d9973167da3e33caa13f4e561cf423799d9105f5e0c373401ecbc24f4c9bcd054638ff5c6d9e12f417c1abaf82dfe39517f929c7206b2
-  data.tar.gz: 39d25bbebf66fee94d2cffad8b0a646e13819c1a680b83d841b0e08865822704069ca206d624fac49d5c358f37740ea7a9791cf9513758722aac6d9ccd68c218
+  metadata.gz: 79f202cba830524e9f896a627a2c5ab13a355d02986ad9448ca21659e2e79f64bc64a5579314fd7165cd561e9bad6f3d4f111224dacd5b00b990e7aa9010dae4
+  data.tar.gz: 84dca7bc01e7e9fd6ef3297a563663b55d25c5d0fd20fd192e5a7700fc257e285836a9d708bed68292d27bbf29602db252ee868eb10ffbcb11425b450c9c7c3f

data/Gemfile

@@ -9,7 +9,16 @@ gem "inspec", path: "."
 # in it in order to package the executable. Hence the odd backwards dependency.
 gem "inspec-bin", path: "./inspec-bin"
 
-gem "ffi", ">= 1.9.14", "!= 1.13.0"
+gem "ffi", ">= 1.9.14", "!= 1.13.0", "!= 1.14.2"
+
+if Gem.ruby_version.to_s.start_with?("2.5")
+  # 16.7.23 required ruby 2.6+
+  gem "chef-utils", "< 16.7.23" # TODO: remove when we drop ruby 2.5
+end
+
+# inspec tests depend text output that changed in the 3.10 release
+# but our runtime dep is still 3.9+
+gem "rspec", ">= 3.10"
 
 group :omnibus do
   gem "rb-readline"
@@ -19,46 +28,23 @@ group :omnibus do
 end
 
 group :test do
-  gem "chefstyle", "~> 1.2.1"
-  gem "minitest", "~> 5.5"
-  gem "minitest-sprint", "~> 1.0"
-  gem "rake", ">= 10"
-  gem "simplecov", ["~> 0.10", "<=0.18.2"]
+  gem "chefstyle", "~> 1.5.7"
   gem "concurrent-ruby", "~> 1.0"
-  gem "nokogiri", "~> 1.9"
+  gem "html-proofer", platforms: :ruby # do not attempt to run proofer on windows
+  gem "json_schemer", ">= 0.2.1", "< 0.2.18"
+  gem "m"
+  gem "minitest-sprint", "~> 1.0"
+  gem "minitest", "~> 5.5"
   gem "mocha", "~> 1.1"
+  gem "nokogiri", "~> 1.9"
+  gem "pry-byebug"
+  gem "pry", "~> 0.10"
+  gem "rake", ">= 10"
   gem "ruby-progressbar", "~> 1.8"
+  gem "simplecov", "~> 0.18"
   gem "webmock", "~> 3.0"
-  gem "m"
-  gem "pry", "~> 0.10"
-  gem "pry-byebug"
-  gem "html-proofer", platforms: :ruby # do not attempt to run proofer on windows
-end
-
-group :integration do
-  gem "berkshelf"
-  gem "test-kitchen"
-  gem "kitchen-vagrant"
-  gem "chef", "< 15"
-  gem "chef-zero", "< 15"
-  gem "kitchen-inspec"
-  gem "kitchen-ec2"
-  gem "kitchen-dokken"
-  gem "git"
-end
-
-# gems for Maintainers.md generation
-group :maintenance do
-  gem "tomlrb"
-
-  # To sync maintainers with github
-  gem "octokit"
-  gem "netrc"
 end
 
 group :deploy do
   gem "inquirer"
 end
-
-# add these additional dependencies into Gemfile.local
-eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")

data/inspec.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "inspec/version"
 
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.license       = "Apache-2.0"
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = "~> 2.4"
+  spec.required_ruby_version = ">= 2.5"
 
   # ONLY the aws/azure/gcp files. The rest will come in from inspec-core
   # the gemspec is necessary for appbundler so don't remove it

data/lib/resources/aws/aws_billing_report.rb

@@ -1,9 +1,7 @@
 require "resource_support/aws/aws_singular_resource_mixin"
 require "resource_support/aws/aws_backend_base"
 
-require "resource_support/aws/aws_singular_resource_mixin"
-require "resource_support/aws/aws_backend_base"
-require "aws-sdk-costandusagereportservice.rb"
+require "aws-sdk-costandusagereportservice"
 
 class AwsBillingReport < Inspec.resource(1)
   name "aws_billing_report"

data/lib/resources/aws/aws_ecs_cluster.rb

@@ -37,19 +37,18 @@ class AwsEcsCluster < Inspec.resource(1)
 
   def fetch_from_api
     backend = BackendFactory.create(inspec_runner)
-    begin
-      # Use default cluster if no cluster name is specified
-      params = cluster_name.nil? ? {} : { clusters: [cluster_name] }
-      clusters = backend.describe_clusters(params).clusters
 
-      # Cluster name is unique, we either get back one cluster, or none
-      if clusters.length == 1
-        @exists = true
-        unpack_describe_clusters_response(clusters.first)
-      else
-        @exists = false
-        populate_as_missing
-      end
+    # Use default cluster if no cluster name is specified
+    params = cluster_name.nil? ? {} : { clusters: [cluster_name] }
+    clusters = backend.describe_clusters(params).clusters
+
+    # Cluster name is unique, we either get back one cluster, or none
+    if clusters.length == 1
+      @exists = true
+      unpack_describe_clusters_response(clusters.first)
+    else
+      @exists = false
+      populate_as_missing
     end
   end
 

data/lib/resources/aws/aws_iam_policy.rb

@@ -2,9 +2,9 @@ require "resource_support/aws/aws_singular_resource_mixin"
 require "resource_support/aws/aws_backend_base"
 require "aws-sdk-iam"
 
-require "json"
-require "set"
-require "uri"
+require "json" unless defined?(JSON)
+require "set" unless defined?(Set)
+require "uri" unless defined?(URI)
 
 class AwsIamPolicy < Inspec.resource(1)
   name "aws_iam_policy"

data/lib/resources/aws/aws_security_group.rb

@@ -1,5 +1,5 @@
-require "set"
-require "ipaddr"
+require "set" unless defined?(Set)
+require "ipaddr" unless defined?(IPAddr)
 
 require "resource_support/aws/aws_singular_resource_mixin"
 require "resource_support/aws/aws_backend_base"

data/lib/resources/aws/aws_sqs_queue.rb

@@ -2,7 +2,7 @@ require "resource_support/aws/aws_singular_resource_mixin"
 require "resource_support/aws/aws_backend_base"
 require "aws-sdk-sqs"
 
-require "uri"
+require "uri" unless defined?(URI)
 
 class AwsSqsQueue < Inspec.resource(1)
   name "aws_sqs_queue"

data/lib/resources/azure/azure_virtual_machine_data_disk.rb

@@ -1,5 +1,5 @@
 require "resources/azure/azure_backend"
-require "uri"
+require "uri" unless defined?(URI)
 
 module Inspec::Resources
   class AzureVirtualMachineDataDisk < AzureResourceBase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 4.23.15
+  version: 4.25.1
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.23.15
+        version: 4.25.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.23.15
+        version: 4.25.1
 - !ruby/object:Gem::Dependency
   name: train
   requirement: !ruby/object:Gem::Requirement
@@ -192,16 +192,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Infrastructure and compliance testing.