inspec 0.21.3 → 0.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6b6f3f9425e2fdd338472f8b5ce2f8a8b9d7f68
-  data.tar.gz: 0fbf58b53e5cd374f8078f3e159655d61bda41e7
+  metadata.gz: 6c4b9ddfdd938125e49d0de346cd3ddc680102ec
+  data.tar.gz: 611a23c93ca0a9a88f0bca9c904c8976ea42b34f
 SHA512:
-  metadata.gz: 9107c45334fb70cba6cfba959270e698d09482029fda4a596e63f9067e9bccfb58e82e9e4e4555fd77b682eccc08c0d4a35721ff0d220bae97bc58c829b08e16
-  data.tar.gz: 18313760dd162fc7ec7e4876d17e00bb06972f16064e7a3ecc457cbcb01fd2ce70713c3cc707baf201dbd0569a562439748c2de9d54307b47f21619b303489a3
+  metadata.gz: 9ef13914cdf0244f62ec4e77bf978d4397fd35698394be0d0b1cf4369ea2eaea6b34b9091c7d2467040ede39e2696e8c1bf91031ab7c53c598c953013aff6cb8
+  data.tar.gz: f5decb00ff30769b253d841566798f55a6dc3f8f1582f76d6a712188ddbf9bb25e8e325b8ea7c1296b52b9c7e27e497bdd37c18f2c91e42b6d3e28294349afc3

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [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)
+## [0.21.4](https://github.com/chef/inspec/tree/0.21.4) (2016-05-13)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.21.3...0.21.4)
+
+**Implemented enhancements:**
+
+- use struct for processes list [\#744](https://github.com/chef/inspec/pull/744) ([arlimus](https://github.com/arlimus))
+
+## [v0.21.3](https://github.com/chef/inspec/tree/v0.21.3) (2016-05-11)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.21.2...v0.21.3)
 
 **Fixed bugs:**
 

data/lib/inspec/polyfill.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+# copyright: 2016, Chef Software Inc.
+# author: Dominik Richter
+# author: Christoph Hartmann
+# license: All rights reserved
+
+class Struct
+  unless instance_methods.include? :to_h
+    def to_h
+      Hash[each_pair.to_a]
+    end
+  end
+end

data/lib/inspec/profile.rb

@@ -4,6 +4,7 @@
 # author: Christoph Hartmann
 
 require 'forwardable'
+require 'inspec/polyfill'
 require 'inspec/fetcher'
 require 'inspec/source_reader'
 require 'inspec/metadata'

data/lib/inspec/version.rb

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

data/lib/resources/processes.rb

@@ -26,7 +26,6 @@ module Inspec::Resources
         grep = '(/[^/]*)*'+grep if grep[0] != '/'
         grep = Regexp.new('^' + grep + '(\s|$)')
       end
-
       all_cmds = ps_aux
       @list = all_cmds.find_all do |hm|
         hm[:command] =~ grep
@@ -57,7 +56,12 @@ module Inspec::Resources
       build_process_list(command, regex, os)
     end
 
-    def build_process_list(command, regex, os) # rubocop:disable MethodLength, Metrics/AbcSize
+    Process = Struct.new(:label, :user, :pid,
+                         :cpu, :mem, :vsz,
+                         :rss, :tty, :stat,
+                         :start, :time, :command)
+
+    def build_process_list(command, regex, os)
       cmd = inspec.command(command)
       all = cmd.stdout.split("\n")[1..-1]
       return [] if all.nil?
@@ -66,40 +70,13 @@ module Inspec::Resources
         line.match(regex)
       end.compact
 
-      if os.linux?
-        lines.map do |m|
-          {
-            label: m[1],
-            user: m[2],
-            pid: m[3].to_i,
-            cpu: m[4],
-            mem: m[5],
-            vsz: m[6].to_i,
-            rss: m[7].to_i,
-            tty: m[8],
-            stat: m[9],
-            start: m[10],
-            time: m[11],
-            command: m[12],
-          }
-        end
-      else
-        lines.map do |m|
-          {
-            label: nil,
-            user: m[1],
-            pid: m[2].to_i,
-            cpu: m[3],
-            mem: m[4],
-            vsz: m[5].to_i,
-            rss: m[6].to_i,
-            tty: m[7],
-            stat: m[8],
-            start: m[9],
-            time: m[10],
-            command: m[11],
-          }
-        end
+      lines.map do |m|
+        a = m.to_a[1..-1] # grab all matching groups
+        a.unshift(nil) unless os.linux?
+        a[2] = a[2].to_i
+        a[5] = a[5].to_i
+        a[6] = a[6].to_i
+        Process.new(*a)
       end
     end
   end

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

data/test/unit/resources/processes_test.rb

@@ -13,7 +13,8 @@ describe 'Inspec::Resources::Processes' do
 
   it 'verify processes resource' do
     resource = MockLoader.new(:freebsd10).load_resource('processes', '/bin/bash')
-    _(resource.list).must_equal [{
+    _(resource.list.length).must_equal 1
+    _(resource.list[0].to_h).must_equal({
       label: nil,
       user: 'root',
       pid: 1,
@@ -26,14 +27,13 @@ describe 'Inspec::Resources::Processes' do
       start: '14:15',
       time: '0:00',
       command: '/bin/bash',
-    }]
-
-    _(resource.list.length).must_equal 1
+    })
   end
 
   it 'verify processes resource on linux os' do
     resource = MockLoader.new(:centos6).load_resource('processes', '/sbin/init')
-    _(resource.list).must_equal [{
+    _(resource.list.length).must_equal 1
+    _(resource.list[0].to_h).must_equal({
       label: 'system_u:system_r:kernel_t:s0',
       user: 'root',
       pid: 1,
@@ -46,9 +46,16 @@ describe 'Inspec::Resources::Processes' do
       start: 'May04',
       time: '0:01',
       command: '/sbin/init',
-    }]
+    })
+  end
 
-    _(resource.list.length).must_equal 1
+  it 'access attributes of a process' do
+    resource = MockLoader.new(:centos6).load_resource('processes', '/sbin/init')
+    process = resource.list[0]
+    process.user.must_equal 'root'
+    process[:user].must_equal 'root'
+    process['user'].must_equal 'root'
+    process[1].must_equal 'root'
   end
 
   it 'retrieves the users and states as arrays' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.21.3
+  version: 0.21.4
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r-train
@@ -279,6 +279,7 @@ files:
 - lib/inspec/plugins/fetcher.rb
 - lib/inspec/plugins/resource.rb
 - lib/inspec/plugins/source_reader.rb
+- lib/inspec/polyfill.rb
 - lib/inspec/profile.rb
 - lib/inspec/profile_context.rb
 - lib/inspec/resource.rb
@@ -358,6 +359,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
@@ -549,6 +551,8 @@ files:
 - test/unit/mock/profiles/legacy-empty-metadata/metadata.rb
 - test/unit/mock/profiles/legacy-simple-metadata/metadata.rb
 - test/unit/mock/profiles/legacy-simple-metadata/test/.gitkeep
+- 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
@@ -635,7 +639,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.
@@ -824,6 +828,8 @@ test_files:
 - test/unit/mock/profiles/legacy-empty-metadata/metadata.rb
 - test/unit/mock/profiles/legacy-simple-metadata/metadata.rb
 - test/unit/mock/profiles/legacy-simple-metadata/test/.gitkeep
+- 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