inspec 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f8721f5a1366ca4d03be5b1cbfe3b8f61ba315f
-  data.tar.gz: 68a9c4ce7b72cde464e322d449ce8775f0afa6a8
+  metadata.gz: a7bd506ba6b5577bc33e6a4421be6891fe2bc664
+  data.tar.gz: dcfde04ac7bc6c6119112d719c2a56a00f324043
 SHA512:
-  metadata.gz: 595a34ad34f066fffe31f2ee6799d5692010521949d6dbe57c3d306f391922e7c4ea295f6504156d94b8b835553930623757a2a97e10ce706ae1340ccc40006f
-  data.tar.gz: d117f5aecbcdce653511e263b1b5c9ae394a354ae38bc5fdb93aa73850d9328d6e7934b3acdb5568e689d0163795134a15aef2e167212920baf6306d6d5e4e24
+  metadata.gz: dca0da99fe77fa5df70d636352b7db12768c566c3eec2d92a16d21c98ab650f642318e681736e9117f005e9322a3cedd9b0a7f28a8aa801ad73d281a4d57567e
+  data.tar.gz: 47cabf8903b98d634bfb158b64eba3e8750d5e24b3fd7cbe2c3d258daece4cf9b32ce257dfa03833c263e5fb6041273e68b630eae48a19d566daf172b33bf678

data/CHANGELOG.md

@@ -1,7 +1,27 @@
 # Change Log
 
-## [0.19.0](https://github.com/chef/inspec/tree/0.19.0) (2016-04-17)
-[Full Changelog](https://github.com/chef/inspec/compare/v0.18.0...0.19.0)
+## [0.19.1](https://github.com/chef/inspec/tree/0.19.1) (2016-04-18)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.19.0...0.19.1)
+
+**Implemented enhancements:**
+
+- configure command execution shells to sh/bash/zsh [\#659](https://github.com/chef/inspec/pull/659) ([arlimus](https://github.com/arlimus))
+- be descriptive on shadow.entries [\#657](https://github.com/chef/inspec/pull/657) ([arlimus](https://github.com/arlimus))
+
+**Fixed bugs:**
+
+- bugfix: print cmp expectations [\#656](https://github.com/chef/inspec/pull/656) ([arlimus](https://github.com/arlimus))
+
+**Closed issues:**
+
+- gem install failure on RHEL 7.2 Ruby 2.0 [\#653](https://github.com/chef/inspec/issues/653)
+
+**Merged pull requests:**
+
+- add requirements for gem installation to readme [\#655](https://github.com/chef/inspec/pull/655) ([arlimus](https://github.com/arlimus))
+
+## [v0.19.0](https://github.com/chef/inspec/tree/v0.19.0) (2016-04-17)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.18.0...v0.19.0)
 
 **Implemented enhancements:**
 

data/Gemfile

@@ -2,6 +2,10 @@
 source 'https://rubygems.org'
 gemspec
 
+group :development do
+  gem 'r-train', github: 'chef/train'
+end
+
 # pin dependency for Ruby 1.9.3 since bundler is not
 # detecting that net-ssh 3 does not work with 1.9.3
 if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')

data/README.md

@@ -47,6 +47,22 @@ InSpec requires Ruby ( >1.9 ).
 
 ### Install it via rubygems.org
 
+When installing from source, gem dependencies may require ruby build tools to be installed.
+
+For CentOS/RedHat/Fedora:
+
+```bash
+yum -y install ruby ruby-devel make gcc
+```
+
+For Ubuntu:
+
+```bash
+apt-get -y install ruby ruby-dev gcc make
+```
+
+To install inspec from [rubygems](https://rubygems.org/):
+
 ```bash
 gem install inspec
 ```

data/inspec.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'r-train', '~> 0.10.4'
+  spec.add_dependency 'r-train', '~> 0.10.5'
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'json', '~> 1.8'
   spec.add_dependency 'rainbow', '~> 2'

data/lib/inspec/version.rb

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

data/lib/matchers/matchers.rb

@@ -282,13 +282,13 @@ RSpec::Matchers.define :cmp do |first_expected|
   end
 
   failure_message do |actual|
-    actual = '0' + actual.to_s(8) if octal?(expected)
-    "\nexpected: value #{@operation} #{expected}\n     got: #{actual}\n\n(compared using `cmp` matcher)\n"
+    actual = '0' + actual.to_s(8) if octal?(@expected)
+    "\nexpected: value #{@operation} #{@expected}\n     got: #{actual}\n\n(compared using `cmp` matcher)\n"
   end
 
   failure_message_when_negated do |actual|
-    actual = '0' + actual.to_s(8) if octal?(expected)
-    "\nexpected: value ! #{@operation} #{expected}\n     got: #{actual}\n\n(compared using `cmp` matcher)\n"
+    actual = '0' + actual.to_s(8) if octal?(@expected)
+    "\nexpected: value ! #{@operation} #{@expected}\n     got: #{actual}\n\n(compared using `cmp` matcher)\n"
   end
 end
 

data/lib/resources/command.rb

@@ -4,6 +4,8 @@
 # author: Christoph Hartmann
 # license: All rights reserved
 
+require 'shellwords'
+
 module Inspec::Resources
   class Cmd < Inspec.resource(1)
     name 'command'
@@ -17,14 +19,25 @@ module Inspec::Resources
       end
     "
 
+    SHELLS = {
+      'sh'   => ->(x, path = 'sh')   { path + ' -c ' + Shellwords.escape(x) },
+      'bash' => ->(x, path = 'bash') { path + ' -c ' + Shellwords.escape(x) },
+      'zsh'  => ->(x, path = 'zsh')  { path + ' -c ' + Shellwords.escape(x) },
+    }.freeze
+
     attr_reader :command
 
-    def initialize(cmd)
+    def initialize(cmd, opts = {})
       @command = cmd
+      unless opts.is_a?(Hash)
+        skip_resource "Called #{self} with invalid command options. See the resource help for valid examples."
+        opts = {}
+      end
+      @opts = opts
     end
 
     def result
-      @result ||= inspec.backend.run_command(@command)
+      @result ||= inspec.backend.run_command(wrap_cmd)
     end
 
     def stdout
@@ -59,5 +72,18 @@ module Inspec::Resources
     def to_s
       "Command #{@command}"
     end
+
+    private
+
+    def wrap_cmd
+      shell = @opts[:shell]
+      return @command if shell.nil?
+
+      wrapper = SHELLS[shell]
+      # TODO: fail with an error if the command isn't found
+      return @command if wrapper.nil?
+
+      wrapper.call(@command)
+    end
   end
 end

data/lib/resources/shadow.rb

@@ -67,7 +67,11 @@ module Inspec::Resources
     end
 
     def entries
-      @lines.map { |line| Shadow.new(@path, content: line, filters: @filters) }
+      @lines.map do |line|
+        params = parse_shadow_line(line)
+        Shadow.new(@path, content: line,
+                   filters: "#{@filters} on entry user=#{params['user']}")
+      end
     end
 
     def users(name = nil)

data/test/unit/resources/command_test.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+# author: Christoph Hartmann
+# author: Dominik Richter
+
+require 'helper'
+require 'inspec/resource'
+
+describe Inspec::Resources::Cmd do
+  it 'runs regular commands' do
+    x = rand.to_s
+    load_resource('command', x).method(:wrap_cmd).call
+      .must_equal x
+  end
+
+  it 'runs sh commands' do
+    x = rand.to_s
+    load_resource('command', '$("'+x+'")', {shell: 'sh'})
+    .method(:wrap_cmd).call
+    .must_equal "sh -c \\$\\(\\\"#{x}\\\"\\)"
+  end
+
+  it 'runs bash commands' do
+    x = rand.to_s
+    load_resource('command', '$("'+x+'")', {shell: 'bash'})
+      .method(:wrap_cmd).call
+      .must_equal "bash -c \\$\\(\\\"#{x}\\\"\\)"
+  end
+
+  it 'runs zsh commands' do
+    x = rand.to_s
+    load_resource('command', '$("'+x+'")', {shell: 'zsh'})
+      .method(:wrap_cmd).call
+      .must_equal "zsh -c \\$\\(\\\"#{x}\\\"\\)"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r-train
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.10.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.10.5
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -541,6 +541,7 @@ files:
 - test/unit/resources/auditd_rules_test.rb
 - test/unit/resources/bond_test.rb
 - test/unit/resources/bridge_test.rb
+- test/unit/resources/command_test.rb
 - test/unit/resources/csv_test.rb
 - test/unit/resources/etc_group_test.rb
 - test/unit/resources/file_test.rb
@@ -811,6 +812,7 @@ test_files:
 - test/unit/resources/auditd_rules_test.rb
 - test/unit/resources/bond_test.rb
 - test/unit/resources/bridge_test.rb
+- test/unit/resources/command_test.rb
 - test/unit/resources/csv_test.rb
 - test/unit/resources/etc_group_test.rb
 - test/unit/resources/file_test.rb