inspec 0.27.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46a196f44aef946778a2c1551727b83826eaaede
-  data.tar.gz: b351a6fddd347b9f951818ad3332270f3d399139
+  metadata.gz: 3b2dd34beaa375e165c66d9dfd6b45834464644c
+  data.tar.gz: a7fdabda77839fef8b33c810b96ad8e8abb35133
 SHA512:
-  metadata.gz: 70da720dd36b4df18aca90293777b169ee25df1ebbb679500104e191ecdfa203d2136223e063e37c7ab0b5d5eed44029f65d2331bcd5d3eb825376c9e63f344f
-  data.tar.gz: d09acee41a988495d4bec78a6a02409a89c89e8b527b5b3475ba622d2e6ab0da9751236bf1af7c6059c8e51a9193940b24cab6ef1f86cb66db80a174d5f4b8be
+  metadata.gz: 930e452dd58d92af6a2be666ae6fb820b7363efbb41864b702fdaa0d814d533da662c0c1b284daa5fc9c0bd6d0023eccb925df2f1b23b40130eea640b4c610b5
+  data.tar.gz: a09dbb59b25a8c2c0b09b509e471c0079f10064d9d3f9234fd9163a9acbc333378866789a5f31864fcfdd1623cc64ebce2c129c6fed7c158491ec5e9e51ae42e

data/CHANGELOG.md

@@ -1,7 +1,24 @@
 # Change Log
 
-## [0.27.0](https://github.com/chef/inspec/tree/0.27.0) (2016-07-10)
-[Full Changelog](https://github.com/chef/inspec/compare/v0.26.0...0.27.0)
+## [0.27.1](https://github.com/chef/inspec/tree/0.27.1) (2016-07-15)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.27.0...0.27.1)
+
+**Fixed bugs:**
+
+- Inconsistent json format caused by inconsistent hash keys [\#827](https://github.com/chef/inspec/issues/827)
+
+**Closed issues:**
+
+- wrong path detection for postgres conf\_dir and conf\_path [\#823](https://github.com/chef/inspec/issues/823)
+
+**Merged pull requests:**
+
+- FIX: file\(hba\_config\_file\) test in documentation [\#830](https://github.com/chef/inspec/pull/830) ([atomic111](https://github.com/atomic111))
+- Fix runner.rb key inconsistency [\#828](https://github.com/chef/inspec/pull/828) ([alexpop](https://github.com/alexpop))
+- FIX \#823 wrong postgres path detection for conf\_dir and conf\_path [\#824](https://github.com/chef/inspec/pull/824) ([atomic111](https://github.com/atomic111))
+
+## [v0.27.0](https://github.com/chef/inspec/tree/v0.27.0) (2016-07-11)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.26.0...v0.27.0)
 
 **Implemented enhancements:**
 

data/docs/resources.rst

@@ -1239,9 +1239,9 @@ The following complete example tests the ``pg_hba.conf`` file in |postgresql| fo
 .. code-block:: bash
 
    describe file(hba_config_file) do
-     its('content') { should match /local\s.*?all\s.*?all\s.*?md5/ }
-     its('content') { should match %r{/host\s.*?all\s.*?all\s.*?127.0.0.1\/32\s.*?md5/} }
-     its('content') { should match %r{/host\s.*?all\s.*?all\s.*?::1\/128\s.*?md5/} }
+     its('content') { should match(%r{local\s.*?all\s.*?all\s.*?md5}) }
+     its('content') { should match(%r{host\s.*?all\s.*?all\s.*?127.0.0.1\/32\s.*?md5}) }
+     its('content') { should match(%r{host\s.*?all\s.*?all\s.*?::1\/128\s.*?md5}) }
    end
 
 exist

data/lib/inspec/runner.rb

@@ -109,7 +109,7 @@ module Inspec
     end
 
     def create_context(options = {})
-      meta = options['metadata']
+      meta = options[:metadata]
       profile_id = nil
       profile_id = meta.params[:name] unless meta.nil?
       Inspec::ProfileContext.new(profile_id, @backend, @conf.merge(options))
@@ -123,7 +123,7 @@ module Inspec
       ctx.load_libraries(libs.map { |x| [x[:content], x[:ref], x[:line]] })
 
       # hand the context to the profile for further evaluation
-      unless (profile = options['profile']).nil?
+      unless (profile = options[:profile]).nil?
         profile.runner_context = ctx
       end
 

data/lib/inspec/version.rb

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

data/lib/resources/cache.rb

@@ -0,0 +1,13 @@
+module Inspec::Resources
+  class Cache < Inspec.resource(1)
+    name 'cache'
+
+    def to_json
+      inspec.backend.to_json
+    end
+
+    def load_json(j)
+      inspec.backend.load_json(j)
+    end
+  end
+end

data/lib/resources/postgres.rb

@@ -24,6 +24,13 @@ module Inspec::Resources
         @conf_dir = '/var/lib/postgres/data'
         @conf_path = File.join @conf_dir, 'postgresql.conf'
 
+      when 'centos', 'redhat'
+        @service = 'postgresql'
+        @version = inspec.command('ls /var/lib/pgsql/').stdout.chomp
+        @data_dir = "/var/lib/pgsql/#{@version}/data"
+        @conf_dir = "/var/lib/pgsql/#{@version}/data"
+        @conf_path = File.join @conf_dir, 'postgresql.conf'
+
       else
         @service = 'postgresql'
         @data_dir = '/var/lib/postgresql'

data/lib/utils/hash_map.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+# author: Dominik Richter
+# author: Christoph Hartmann
+
+class HashMap
+  class << self
+    def [](hash, *keys)
+      return hash if keys.empty? || hash.nil?
+      key = keys.shift
+      if hash.is_a?(Array)
+        map = hash.map { |i| [i, key] }
+      else
+        map = hash[key]
+      end
+      [map, *keys]
+    rescue NoMethodError => _
+      nil
+    end
+  end
+end
+
+class StringMap
+  class << self
+    def [](hash, *keys)
+      return hash if keys.empty? || hash.nil?
+      key = keys.shift
+      if hash.is_a?(Array)
+        map = hash.map { |i| [i, key] }
+      else
+        map = hash[key]
+      end
+      [map, *keys]
+    rescue NoMethodError => _
+      nil
+    end
+  end
+end

data/test/unit/mock/profiles/resource-tiny/inspec.yml

@@ -0,0 +1,10 @@
+name: complete
+title: complete example profile
+maintainer: Chef Software, Inc.
+copyright: Chef Software, Inc.
+copyright_email: support@chef.io
+license: Proprietary, All rights reserved
+summary: Testing stub
+version: 1.0.0
+supports:
+- os-family: linux

data/test/unit/mock/profiles/resource-tiny/libraries/resource.rb

@@ -0,0 +1,3 @@
+class Tiny < Inspec.resource(1)
+  name 'tiny'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.27.1
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -318,6 +318,7 @@ files:
 - lib/resources/bash.rb
 - lib/resources/bond.rb
 - lib/resources/bridge.rb
+- lib/resources/cache.rb
 - lib/resources/command.rb
 - lib/resources/csv.rb
 - lib/resources/directory.rb
@@ -376,6 +377,7 @@ files:
 - lib/utils/filter_array.rb
 - lib/utils/find_files.rb
 - lib/utils/hash.rb
+- lib/utils/hash_map.rb
 - lib/utils/json_log.rb
 - lib/utils/modulator.rb
 - lib/utils/object_traversal.rb
@@ -573,6 +575,8 @@ files:
 - test/unit/mock/profiles/library/inspec.yml
 - test/unit/mock/profiles/library/libraries/gordonlib.rb
 - test/unit/mock/profiles/library/libraries/testlib.rb
+- test/unit/mock/profiles/resource-tiny/inspec.yml
+- test/unit/mock/profiles/resource-tiny/libraries/resource.rb
 - test/unit/mock/profiles/simple-metadata/inspec.yml
 - test/unit/mock/profiles/skippy-profile-os/controls/one.rb
 - test/unit/mock/profiles/skippy-profile-os/inspec.yml
@@ -662,7 +666,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Infrastructure and compliance testing.
@@ -857,6 +861,8 @@ test_files:
 - test/unit/mock/profiles/library/inspec.yml
 - test/unit/mock/profiles/library/libraries/gordonlib.rb
 - test/unit/mock/profiles/library/libraries/testlib.rb
+- test/unit/mock/profiles/resource-tiny/inspec.yml
+- test/unit/mock/profiles/resource-tiny/libraries/resource.rb
 - test/unit/mock/profiles/simple-metadata/inspec.yml
 - test/unit/mock/profiles/skippy-profile-os/controls/one.rb
 - test/unit/mock/profiles/skippy-profile-os/inspec.yml