inspec 1.32.1 → 1.33.1

data/Gemfile

@@ -37,7 +37,6 @@ group :tools do
   gem 'pry', '~> 0.10'
   gem 'rb-readline'
   gem 'license_finder'
-  gem "github_changelog_generator", git: "https://github.com/chef/github-changelog-generator"
 end
 
 # gems for Maintainers.md generation

data/Rakefile

@@ -4,7 +4,6 @@
 require 'bundler'
 require 'bundler/gem_tasks'
 require 'rake/testtask'
-require_relative 'tasks/changelog'
 require_relative 'tasks/maintainers'
 require_relative 'tasks/spdx'
 
@@ -138,19 +137,6 @@ task :version do
   inspec_version
 end
 
-# Update the version of this gem and create an updated
-# changelog. It covers everything short of actually releasing
-# the gem.
-desc 'Bump the version of this gem'
-task :bump_version, [:version] do |_, args|
-  v = args[:version] || ENV['to']
-  fail "You must specify a target version!  rake bump_version to=1.2.3" if v.empty?
-  check_update_requirements
-  inspec_version(v)
-  Rake::Task['changelog'].invoke
-  Rake::Task['docs:cli'].invoke
-end
-
 desc 'Release a new docker image'
 task :release_docker do
   version = Inspec::VERSION

data/docs/matchers.md

@@ -8,6 +8,7 @@ Inspec uses matchers to help compare resource values to expectations.
 The following matchers are available:
 
 * `be`
+* `be_in`
 * `cmp`
 * `eq`
 * `include`
@@ -125,6 +126,16 @@ describe passwd do
 end
 ```
 
+## be_in
+
+Verifies that an item is included in a list.
+
+```ruby
+describe resource do
+  its('item') { should be_in LIST }
+end
+```
+
 ## match
 
 Check if a string matches a regular expression.

data/inspec.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1'
 
-  spec.add_dependency 'train', '>=0.24.0', '<1.0'
+  spec.add_dependency 'train', '~> 0.26'
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'json', '>= 1.8', '< 3.0'
   spec.add_dependency 'rainbow', '~> 2'

data/lib/inspec/version.rb

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

data/lib/matchers/matchers.rb

@@ -222,6 +222,44 @@ RSpec::Matchers.define :contain do |rule|
   end
 end
 
+# `be_in` matcher
+# You can use it in the following cases:
+# - check if an item or array is included in a given array
+# eg:
+# describe nginx do
+#   its('user') { should be_in AUTHORIZED_USER_LIST }
+# end
+# describe nginx do
+#   its('module_list') { should be_in AUTHORIZED_MODULE_LIST }
+# end
+RSpec::Matchers.define :be_in do |list|
+  match do |item|
+    # Handle both single item and array
+    item.is_a?(Array) ? (item - list).empty? : list.include?(item)
+  end
+
+  match_when_negated do |item|
+    # Handle both single item and array
+    item.is_a?(Array) ? (item & list).empty? : !list.include?(item)
+  end
+
+  failure_message do |item|
+    if item.is_a?(Array)
+      "expected `#{item}` to be in the list: `#{list}` \nDiff:\n #{(item - list)}"
+    else
+      "expected `#{item}` to be in the list: `#{list}`"
+    end
+  end
+
+  failure_message_when_negated do |item|
+    if item.is_a?(Array)
+      "expected `#{item}` not to be in the list: `#{list}` \nComm:\n #{(item & list)}"
+    else
+      "expected `#{item}` not to be in the list: `#{list}`"
+    end
+  end
+end
+
 # This matcher implements a compare feature that cannot be covered by the default
 # `eq` matcher
 # You can use it in the following cases:

data/lib/resources/docker_container.rb

@@ -74,11 +74,13 @@ module Inspec::Resources
     end
 
     def repo
-      image.split(':')[0] unless image.nil?
+      return if image_name_from_image.nil?
+      image_name_from_image.split(':')[0]
     end
 
     def tag
-      image.split(':')[1] unless image.nil?
+      return if image_name_from_image.nil?
+      image_name_from_image.split(':')[1]
     end
 
     def to_s
@@ -88,6 +90,16 @@ module Inspec::Resources
 
     private
 
+    def image_name_from_image
+      return if image.nil?
+      # possible image names include:
+      #   alpine
+      #   ubuntu:14.04
+      #   repo.example.com:5000/ubuntu
+      #   repo.example.com:5000/ubuntu:1404
+      image.include?('/') ? image.split('/')[1] : image
+    end
+
     def container_info
       return @info if defined?(@info)
       opts = @opts

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 1.32.1
+  version: 1.33.1
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.24.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.24.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.26'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement