inspec 0.21.2 → 0.21.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb1998905015712a10ce6ed1acad4b930082e181
-  data.tar.gz: 360a2c3f273d67180ce48bd1d595dc21409bb20f
+  metadata.gz: e6b6f3f9425e2fdd338472f8b5ce2f8a8b9d7f68
+  data.tar.gz: 0fbf58b53e5cd374f8078f3e159655d61bda41e7
 SHA512:
-  metadata.gz: 50f86b7266afda06dc4109bf641129b3213d505f6ee198c807a657d38e32b5a909e044d55c0f1858c0b5332fe963d2df07153b387c0a06ed5b7e012346cd00c4
-  data.tar.gz: 891130c79cb1f3c38412c9dfabe3d646a07e23d4d1821c38067e1c3b1f568c9fcabe9945d297437ca223051566f547765c1d25b62900d19a3dc029ca09307509
+  metadata.gz: 9107c45334fb70cba6cfba959270e698d09482029fda4a596e63f9067e9bccfb58e82e9e4e4555fd77b682eccc08c0d4a35721ff0d220bae97bc58c829b08e16
+  data.tar.gz: 18313760dd162fc7ec7e4876d17e00bb06972f16064e7a3ecc457cbcb01fd2ce70713c3cc707baf201dbd0569a562439748c2de9d54307b47f21619b303489a3

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Change Log
 
-## [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)
+## [0.21.3](https://github.com/chef/inspec/tree/0.21.3) (2016-05-12)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.21.2...0.21.3)
+
+**Fixed bugs:**
+
+- Return empty array instead of nil for port methods [\#739](https://github.com/chef/inspec/pull/739) ([alexpop](https://github.com/alexpop))
+
+**Merged pull requests:**
+
+- deprecate array matcher [\#737](https://github.com/chef/inspec/pull/737) ([chris-rock](https://github.com/chris-rock))
+- Escape os\_env command on Windows to handle env variables containing parentheses. [\#735](https://github.com/chef/inspec/pull/735) ([tpcwang](https://github.com/tpcwang))
+
+## [v0.21.2](https://github.com/chef/inspec/tree/v0.21.2) (2016-05-11)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.21.1...v0.21.2)
 
 **Implemented enhancements:**
 

data/docs/matchers.rst

@@ -10,7 +10,6 @@ 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
@@ -136,66 +135,3 @@ 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.2'.freeze
+  VERSION = '0.21.3'.freeze
 end

data/lib/matchers/matchers.rb

@@ -70,34 +70,26 @@ end
 # matcher to check /etc/passwd, /etc/shadow and /etc/group
 RSpec::Matchers.define :contain_legacy_plus do
   match do |file|
+    warn '[DEPRECATION] `contain_legacy_plus` is deprecated and will be removed for InSpec 1.0. Please use `describe file(\'/etc/passwd\') do its(\'content\') { should_not match /^\+:/ } end`'
     file.content =~ /^\+:/
   end
 end
 
-# verifies that all entries match the regex
-RSpec::Matchers.define :all_match do |regex|
-  match do |arr|
-    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|
-    Array(arr).one? { |element| element.to_s.match(regex) }
+    warn '[DEPRECATION] `contain_match` is deprecated and will be removed for InSpec 1.0. See https://github.com/chef/inspec/issues/738 for more details'
+    arr.inject { |result, i|
+      result = i.match(regex)
+      result || i.match(/$/)
+    }
   end
 end
 
 RSpec::Matchers.define :contain_duplicates do
   match do |arr|
-    dup = Array(arr).select { |element| arr.count(element) > 1 }
+    warn '[DEPRECATION] `contain_duplicates` is deprecated and will be removed for InSpec 1.0. See https://github.com/chef/inspec/issues/738 for more details'
+    dup = arr.select { |element| arr.count(element) > 1 }
     !dup.uniq.empty?
   end
 end

data/lib/resources/os_env.rb

@@ -51,7 +51,7 @@ module Inspec::Resources
 
     def value_for(env)
       command = if inspec.os.windows?
-                  "$Env:#{env}"
+                  "${Env:#{env}}"
                 else
                   'env'
                 end

data/lib/resources/port.rb

@@ -59,22 +59,22 @@ module Inspec::Resources
 
     def protocols
       res = info.map { |x| x[:protocol] }.uniq.compact
-      res.size > 0 ? res : nil
+      res.size > 0 ? res : []
     end
 
     def processes
       res = info.map { |x| x[:process] }.uniq.compact
-      res.size > 0 ? res : nil
+      res.size > 0 ? res : []
     end
 
     def addresses
       res = info.map { |x| x[:address] }.uniq.compact
-      res.size > 0 ? res : nil
+      res.size > 0 ? res : []
     end
 
     def pids
       res = info.map { |x| x[:pid] }.uniq.compact
-      res.size > 0 ? res : nil
+      res.size > 0 ? res : []
     end
 
     def to_s

data/test/helper.rb

@@ -142,7 +142,7 @@ class MockLoader
       'secedit /export /cfg win_secpol.cfg' => cmd.call('success'),
       'Remove-Item win_secpol.cfg' => cmd.call('success'),
       'env' => cmd.call('env'),
-      '$Env:PATH'  => cmd.call('$env-PATH'),
+      '${Env:PATH}'  => cmd.call('$env-PATH'),
       # registry key test (winrm 1.6.0, 1.6.1)
       '2790db1e88204a073ed7fd3493f5445e5ce531afd0d2724a0e36c17110c535e6' => cmd.call('reg_schedule'),
       '25a1a38fafc289a646d30f7aa966ce0901c267798f47abf2f9440e27d31a5b7d' => cmd.call('reg_schedule'),

data/test/unit/resources/port_test.rb

@@ -36,7 +36,7 @@ describe 'Inspec::Resources::Port' do
     resource = MockLoader.new(:windows).load_resource('port', 135)
     _(resource.listening?).must_equal true
     _(resource.protocols).must_equal ['tcp']
-    _(resource.processes).must_equal nil
+    _(resource.processes).must_equal []
     _(resource.addresses).must_equal ["::", "192.168.10.157"]
   end
 
@@ -60,10 +60,10 @@ describe 'Inspec::Resources::Port' do
   it 'verify running on undefined' do
     resource = MockLoader.new(:undefined).load_resource('port', 22)
     _(resource.listening?).must_equal false
-    _(resource.protocols).must_equal nil
-    _(resource.pids).must_equal nil
-    _(resource.processes).must_equal nil
-    _(resource.addresses).must_equal nil
+    _(resource.protocols).must_equal []
+    _(resource.pids).must_equal []
+    _(resource.processes).must_equal []
+    _(resource.addresses).must_equal []
   end
 
   it 'verify port and interface on Ubuntu 14.04' do
@@ -78,7 +78,7 @@ describe 'Inspec::Resources::Port' do
   it 'verify not listening port on interface on Ubuntu 14.04' do
     resource = MockLoader.new(:ubuntu1404).load_resource('port', '127.0.0.1', 22)
     _(resource.listening?).must_equal false
-    _(resource.addresses).must_equal nil
+    _(resource.addresses).must_equal []
   end
 
   it 'verify port on Solaris 10' do
@@ -103,7 +103,7 @@ describe 'Inspec::Resources::Port' do
   it 'verify not listening port on hpux' do
     resource = MockLoader.new(:hpux).load_resource('port', 23)
     _(resource.listening?).must_equal false
-    _(resource.protocols).must_equal nil
-    _(resource.addresses).must_equal nil
+    _(resource.protocols).must_equal []
+    _(resource.addresses).must_equal []
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.21.3
 platform: ruby
 authors:
 - Dominik Richter
@@ -411,7 +411,6 @@ files:
 - test/integration/default/json_spec.rb
 - test/integration/default/kernel_module_spec.rb
 - test/integration/default/kernel_parameter_spec.rb
-- test/integration/default/matcher.rb
 - test/integration/default/mount_spec.rb
 - test/integration/default/os_spec.rb
 - test/integration/default/package_spec.rb
@@ -687,7 +686,6 @@ test_files:
 - test/integration/default/json_spec.rb
 - test/integration/default/kernel_module_spec.rb
 - test/integration/default/kernel_parameter_spec.rb
-- test/integration/default/matcher.rb
 - test/integration/default/mount_spec.rb
 - test/integration/default/os_spec.rb
 - test/integration/default/package_spec.rb

data/test/integration/default/matcher.rb

@@ -1,51 +0,0 @@
-# encoding: utf-8
-
-# 'all_match' matcher tests
-describe ['ananas', 'apples', 'oranges', 'air', 'alot'] do
-  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
-
-
-# '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