inspec 0.21.1 → 0.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a6c7098d367a3d561834016a1bfdd60d23c1253
-  data.tar.gz: da8753876169c48fbe087a1b16e92b13ab6185dd
+  metadata.gz: eb1998905015712a10ce6ed1acad4b930082e181
+  data.tar.gz: 360a2c3f273d67180ce48bd1d595dc21409bb20f
 SHA512:
-  metadata.gz: b8adc2e483a203e77d2b0df1eb4d842570947474ca83e411967563e7f2e958d54f35733bda867586f28a472807e4dc5e851b81d0414e198788980d77a1241807
-  data.tar.gz: ab9eb448c12955d4b2b633113616d90d44f3732b10f1c65e871b07df627fdf7892f3d6b2e67ead38164491c9d37a9f8338b57292a6370b4410387c41221c2149
+  metadata.gz: 50f86b7266afda06dc4109bf641129b3213d505f6ee198c807a657d38e32b5a909e044d55c0f1858c0b5332fe963d2df07153b387c0a06ed5b7e012346cd00c4
+  data.tar.gz: 891130c79cb1f3c38412c9dfabe3d646a07e23d4d1821c38067e1c3b1f568c9fcabe9945d297437ca223051566f547765c1d25b62900d19a3dc029ca09307509

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Change Log
 
-## [0.21.1](https://github.com/chef/inspec/tree/0.21.1) (2016-05-10)
-[Full Changelog](https://github.com/chef/inspec/compare/v0.21.0...0.21.1)
+## [0.21.2](https://github.com/chef/inspec/tree/0.21.2) (2016-05-11)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.21.1...0.21.2)
+
+**Implemented enhancements:**
+
+- Read SELinux labels for processes [\#726](https://github.com/chef/inspec/issues/726)
+- Fix contain\_match, add none\_match [\#736](https://github.com/chef/inspec/pull/736) ([alexpop](https://github.com/alexpop))
+
+**Fixed bugs:**
+
+- Fix contain\\_match, add none\\_match [\#736](https://github.com/chef/inspec/pull/736) ([alexpop](https://github.com/alexpop))
+
+## [v0.21.1](https://github.com/chef/inspec/tree/v0.21.1) (2016-05-10)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.21.0...v0.21.1)
 
 **Fixed bugs:**
 

data/docs/matchers.rst

@@ -10,6 +10,7 @@ Inspec uses matchers to help compare resource values to expectations. The follow
 * `eq`
 * `include`
 * `match`
+* Array matchers: `contain_match`, `all_match`, `none_match`, `contain_duplicates`
 
 
 be
@@ -135,3 +136,66 @@ Check if a string matches a regular expression.
   describe sshd_config do
     its('Ciphers') { should_not match /cbc/ }
   end
+
+
+Array Matchers
+=====================================================
+
+The following matchers are designed to work with arrays:
+
+
+contain_match
+-----------------------------------------------------
+
+Check if an array contains at least one item that matches the regex:
+
+.. code-block:: ruby
+
+  describe ['lemon', 'ginger', 'grapes'] do
+    it { should contain_match /^gin/}
+  end
+  describe port(25) do
+    its('addresses') it { should_not contain_match /0\.0\.0\.0/}
+  end
+
+
+all_match
+-----------------------------------------------------
+
+Check if all items of an array match the regex:
+
+.. code-block:: ruby
+
+  describe ['grapefruit', 'grapes'] do
+    it { should all_match /^grape.+/}
+  end
+
+
+none_match
+-----------------------------------------------------
+
+Check if all items of an array match the regex:
+
+.. code-block:: ruby
+
+  describe ['ginger', 'grapefruit'] do
+    it { should none_match /^sugar$/}
+  end
+  describe port(25) do
+    its('addresses') it { should none_match /^0\.0\.0\.0$/ }
+  end
+
+
+contain_duplicates
+-----------------------------------------------------
+
+Check if an array contains duplicate items:
+
+.. code-block:: ruby
+
+  describe [80, 443, 80] do
+    it { should contain_duplicates }
+  end
+  describe ['ginger', 'grapefruit'] do
+    it { should_not contain_duplicates }
+  end

data/lib/inspec/version.rb

@@ -3,5 +3,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '0.21.1'.freeze
+  VERSION = '0.21.2'.freeze
 end

data/lib/matchers/matchers.rb

@@ -74,26 +74,30 @@ RSpec::Matchers.define :contain_legacy_plus do
   end
 end
 
-# matcher to check that all entries match the regex
+# verifies that all entries match the regex
 RSpec::Matchers.define :all_match do |regex|
   match do |arr|
-    arr.all? { |element| element.match(regex) }
+    Array(arr).all? { |element| element.to_s.match(regex) }
+  end
+end
+
+# verifies that all entries don't match a regex
+RSpec::Matchers.define :none_match do |regex|
+  match do |arr|
+    Array(arr).all? { |element| !element.to_s.match(regex) }
   end
 end
 
 # verifies that no entry in an array contains a value
 RSpec::Matchers.define :contain_match do |regex|
   match do |arr|
-    arr.inject { |result, i|
-      result = i.match(regex)
-      result || i.match(/$/)
-    }
+    Array(arr).one? { |element| element.to_s.match(regex) }
   end
 end
 
 RSpec::Matchers.define :contain_duplicates do
   match do |arr|
-    dup = arr.select { |element| arr.count(element) > 1 }
+    dup = Array(arr).select { |element| arr.count(element) > 1 }
     !dup.uniq.empty?
   end
 end

data/test/integration/default/matcher.rb

@@ -1,9 +1,51 @@
 # encoding: utf-8
 
+# 'all_match' matcher tests
 describe ['ananas', 'apples', 'oranges', 'air', 'alot'] do
-  it { should all_match  /[a]./}
+  it { should all_match /[a]./}
 end
+describe ['ananas', 'apples', 'oranges', 'melons', 'air'] do
+  it { should_not all_match /[a]./}
+end
+describe [true, true, true] do
+  it { should all_match /^true$/}
+end
+
+
+# 'none_match' matcher tests
+describe ['kiwi', 'avocado', 'grapefruit'] do
+  it { should none_match /xyz/}
+end
+describe ['kiwi', 'avocado', 'grapefruit'] do
+  it { should_not none_match /^avo/}
+end
+describe 999 do
+  it { should none_match /^666/}
+end
+
 
-describe ['ananas', 'apples', 'oranges', 'air', 'melons'] do
-  it { should_not all_match  /[a]./}
+# 'contain_match' matcher tests
+describe ['lemon', 'ginger', 'grapes'] do
+  it { should contain_match /^gin/}
+end
+describe ['lemon', 'ginger', 'gra(pes'] do
+  it { should contain_match 'gra\(pe' }
+end
+describe ['lemon', 'ginger', 'grapes'] do
+  it { should_not contain_match /^chocolate/}
+end
+describe 'kiwi' do
+  it { should contain_match /^kiw/}
+end
+
+
+# 'contain_duplicates' matcher tests
+describe ['onion', 'carrot', 'onion'] do
+  it { should contain_duplicates }
+end
+describe ['onion', 'carrot', 'brocoli'] do
+  it { should_not contain_duplicates }
+end
+describe [80, 443] do
+  it { should_not contain_duplicates }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.21.2
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r-train