inspec 2.2.64 → 2.2.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ae8178b1be1a7d13be61e1a281b95fed49be3fae45f26aff9eb435113e5c1f2
-  data.tar.gz: 9c224166b801afc788f73bb01a33cbb86e6189d4e0d1edeaf4ea984774185a5a
+  metadata.gz: 6dc6fb470460ab2b0b96771d62cb0daf7c236d69ddb6dd79f213656a55d54e5f
+  data.tar.gz: 239448502597b1907e8d35761ca18317ed75462cf0063105a6a770e4949b861d
 SHA512:
-  metadata.gz: 7e3fe1c9405ad49d9f06f478b6bfbd954cc2cb7256eff64d8f79ff09319a4bcb50e86d7a020562abec492be7d8423372e4f3ca2317ae84bc73de8b31ed8f8c46
-  data.tar.gz: 74eea6f7ada2d8b4f0492a450ed7243b7b9b590acd186bdda472e0c436bb7d6ed5cc4bba6f9f2955f6f077760fbd7c1b0a08492a33b340da8bc45b7eb50c9845
+  metadata.gz: d173ad69e9b20522dff8a485c50d3e11c429115eea183ce558871f4a826d5c2bbde620798dceb6840ddf017e18eb7f59e5fc1f53ddc020c6c84f3c145abb3e8b
+  data.tar.gz: cfc9224a29d43af3dbbc4e5da21c9a64af68cf27a7e1d2cef471506662046080f627055f8217cd34dc368f3ebeca6c49b0a0da569c30e428b40d0c7f32207502

data/CHANGELOG.md

@@ -1,22 +1,36 @@
 # Change Log
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 2.2.64 -->
-## [v2.2.64](https://github.com/inspec/inspec/tree/v2.2.64) (2018-08-17)
+<!-- latest_release 2.2.70 -->
+## [v2.2.70](https://github.com/inspec/inspec/tree/v2.2.70) (2018-08-23)
 
 #### Merged Pull Requests
-- Dummy PR to bump expeditor version. [#3298](https://github.com/inspec/inspec/pull/3298) ([jquick](https://github.com/jquick))
+- Rebuild InSpec omni bundles [#3327](https://github.com/inspec/inspec/pull/3327) ([jquick](https://github.com/jquick))
 <!-- latest_release -->
 
-<!-- release_rollup since=2.2.61 -->
-### Changes since 2.2.61 release
+<!-- release_rollup since=2.2.64 -->
+### Changes since 2.2.64 release
+
+#### Enhancements
+- Infer `--sudo` when `--sudo-password` is used [#3313](https://github.com/inspec/inspec/pull/3313) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 2.2.68 -->
+
+#### Bug Fixes
+- Fix skip hash being passed instead of boolean value [#3323](https://github.com/inspec/inspec/pull/3323) ([frezbo](https://github.com/frezbo)) <!-- 2.2.67 -->
 
 #### Merged Pull Requests
-- Dummy PR to bump expeditor version. [#3298](https://github.com/inspec/inspec/pull/3298) ([jquick](https://github.com/jquick)) <!-- 2.2.64 -->
-- Allow the jsonAutomate report to be executed from cli [#3285](https://github.com/inspec/inspec/pull/3285) ([jquick](https://github.com/jquick)) <!-- 2.2.63 -->
-- Update `only_if` to allow user specified messages. [#3267](https://github.com/inspec/inspec/pull/3267) ([miah](https://github.com/miah)) <!-- 2.2.62 -->
+- Rebuild InSpec omni bundles [#3327](https://github.com/inspec/inspec/pull/3327) ([jquick](https://github.com/jquick)) <!-- 2.2.70 -->
+- Suppress logs for json-automate reporter [#3324](https://github.com/inspec/inspec/pull/3324) ([jquick](https://github.com/jquick)) <!-- 2.2.66 -->
+- Add cloudlinux under redhat family [#2935](https://github.com/inspec/inspec/pull/2935) ([tarcinil](https://github.com/tarcinil)) <!-- 2.2.65 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v2.2.64](https://github.com/inspec/inspec/tree/v2.2.64) (2018-08-17)
+
+#### Merged Pull Requests
+- Update `only_if` to allow user specified messages. [#3267](https://github.com/inspec/inspec/pull/3267) ([miah](https://github.com/miah))
+- Allow the jsonAutomate report to be executed from cli [#3285](https://github.com/inspec/inspec/pull/3285) ([jquick](https://github.com/jquick))
+- Dummy PR to bump expeditor version. [#3298](https://github.com/inspec/inspec/pull/3298) ([jquick](https://github.com/jquick))
+<!-- latest_stable_release -->
+
 ## [v2.2.61](https://github.com/inspec/inspec/tree/v2.2.61) (2018-08-09)
 
 #### New Resources
@@ -32,7 +46,6 @@
 
 #### Merged Pull Requests
 - Enable inspec archive, check, and json to run as unpriveleged user [#3263](https://github.com/inspec/inspec/pull/3263) ([phiggins](https://github.com/phiggins))
-<!-- latest_stable_release -->
 
 ## [v2.2.55](https://github.com/inspec/inspec/tree/v2.2.55) (2018-08-03)
 

data/README.md

@@ -452,4 +452,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License. 

data/lib/inspec/base_cli.rb

@@ -240,7 +240,7 @@ module Inspec
 
     def suppress_log_output?(opts)
       return false if opts['reporter'].nil?
-      match = %w{json json-min json-rspec junit html yaml documentation progress} & opts['reporter'].keys
+      match = %w{json json-min json-rspec json-automate junit html yaml documentation progress} & opts['reporter'].keys
       unless match.empty?
         match.each do |m|
           # check to see if we are outputting to stdout
@@ -277,6 +277,12 @@ module Inspec
         raise ArgumentError, "Please provide a value for --#{v}. For example: --#{v}=hello."
       end
 
+      # Infer `--sudo` if using `--sudo-password` without `--sudo`
+      if o[:sudo_password] && !o[:sudo]
+        o[:sudo] = true
+        warn 'WARN: `--sudo-password` used without `--sudo`. Adding `--sudo`.'
+      end
+
       # check for compliance settings
       Compliance::API.login(o['compliance']) if o['compliance']
 

data/lib/inspec/rule.rb

@@ -227,7 +227,8 @@ module Inspec
       # all checks that were defined in the destination
       sc = checks(src)
       dst.instance_variable_set(:@__checks, sc) unless sc.empty?
-      sr = skip_status(src)
+      # we need only the value of result not the Hash containing value and message
+      sr = skip_status(src)[:result]
       set_skip_rule(dst, sr) unless sr.nil?
 
       # Save merge history

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '2.2.64'
+  VERSION = '2.2.70'
 end

data/lib/resources/service.rb

@@ -134,9 +134,9 @@ module Inspec::Resources
         else
           SysV.new(inspec, service_ctl || '/usr/sbin/service')
         end
-      elsif %w{redhat fedora centos oracle}.include?(platform)
+      elsif %w{redhat fedora centos oracle cloudlinux}.include?(platform)
         version = os[:release].to_i
-        if (%w{redhat centos oracle}.include?(platform) && version >= 7) || (platform == 'fedora' && version >= 15)
+        if (%w{redhat centos oracle cloudlinux}.include?(platform) && version >= 7) || (platform == 'fedora' && version >= 15)
           Systemd.new(inspec, service_ctl)
         else
           SysV.new(inspec, service_ctl || '/sbin/service')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 2.2.64
+  version: 2.2.70
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train