inspec 2.2.64 → 2.2.70

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +22 -9
  3. data/README.md +1 -1
  4. data/lib/inspec/base_cli.rb +7 -1
  5. data/lib/inspec/rule.rb +2 -1
  6. data/lib/inspec/version.rb +1 -1
  7. data/lib/resources/service.rb +2 -2
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8ae8178b1be1a7d13be61e1a281b95fed49be3fae45f26aff9eb435113e5c1f2
4
- data.tar.gz: 9c224166b801afc788f73bb01a33cbb86e6189d4e0d1edeaf4ea984774185a5a
3
+ metadata.gz: 6dc6fb470460ab2b0b96771d62cb0daf7c236d69ddb6dd79f213656a55d54e5f
4
+ data.tar.gz: 239448502597b1907e8d35761ca18317ed75462cf0063105a6a770e4949b861d
5
5
  SHA512:
6
- metadata.gz: 7e3fe1c9405ad49d9f06f478b6bfbd954cc2cb7256eff64d8f79ff09319a4bcb50e86d7a020562abec492be7d8423372e4f3ca2317ae84bc73de8b31ed8f8c46
7
- data.tar.gz: 74eea6f7ada2d8b4f0492a450ed7243b7b9b590acd186bdda472e0c436bb7d6ed5cc4bba6f9f2955f6f077760fbd7c1b0a08492a33b340da8bc45b7eb50c9845
6
+ metadata.gz: d173ad69e9b20522dff8a485c50d3e11c429115eea183ce558871f4a826d5c2bbde620798dceb6840ddf017e18eb7f59e5fc1f53ddc020c6c84f3c145abb3e8b
7
+ data.tar.gz: cfc9224a29d43af3dbbc4e5da21c9a64af68cf27a7e1d2cef471506662046080f627055f8217cd34dc368f3ebeca6c49b0a0da569c30e428b40d0c7f32207502
data/CHANGELOG.md CHANGED
@@ -1,22 +1,36 @@
1
1
  # Change Log
2
2
  <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
3
- <!-- latest_release 2.2.64 -->
4
- ## [v2.2.64](https://github.com/inspec/inspec/tree/v2.2.64) (2018-08-17)
3
+ <!-- latest_release 2.2.70 -->
4
+ ## [v2.2.70](https://github.com/inspec/inspec/tree/v2.2.70) (2018-08-23)
5
5
 
6
6
  #### Merged Pull Requests
7
- - Dummy PR to bump expeditor version. [#3298](https://github.com/inspec/inspec/pull/3298) ([jquick](https://github.com/jquick))
7
+ - Rebuild InSpec omni bundles [#3327](https://github.com/inspec/inspec/pull/3327) ([jquick](https://github.com/jquick))
8
8
  <!-- latest_release -->
9
9
 
10
- <!-- release_rollup since=2.2.61 -->
11
- ### Changes since 2.2.61 release
10
+ <!-- release_rollup since=2.2.64 -->
11
+ ### Changes since 2.2.64 release
12
+
13
+ #### Enhancements
14
+ - Infer `--sudo` when `--sudo-password` is used [#3313](https://github.com/inspec/inspec/pull/3313) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 2.2.68 -->
15
+
16
+ #### Bug Fixes
17
+ - 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 -->
12
18
 
13
19
  #### Merged Pull Requests
14
- - Dummy PR to bump expeditor version. [#3298](https://github.com/inspec/inspec/pull/3298) ([jquick](https://github.com/jquick)) <!-- 2.2.64 -->
15
- - 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 -->
16
- - Update `only_if` to allow user specified messages. [#3267](https://github.com/inspec/inspec/pull/3267) ([miah](https://github.com/miah)) <!-- 2.2.62 -->
20
+ - Rebuild InSpec omni bundles [#3327](https://github.com/inspec/inspec/pull/3327) ([jquick](https://github.com/jquick)) <!-- 2.2.70 -->
21
+ - Suppress logs for json-automate reporter [#3324](https://github.com/inspec/inspec/pull/3324) ([jquick](https://github.com/jquick)) <!-- 2.2.66 -->
22
+ - Add cloudlinux under redhat family [#2935](https://github.com/inspec/inspec/pull/2935) ([tarcinil](https://github.com/tarcinil)) <!-- 2.2.65 -->
17
23
  <!-- release_rollup -->
18
24
 
19
25
  <!-- latest_stable_release -->
26
+ ## [v2.2.64](https://github.com/inspec/inspec/tree/v2.2.64) (2018-08-17)
27
+
28
+ #### Merged Pull Requests
29
+ - Update `only_if` to allow user specified messages. [#3267](https://github.com/inspec/inspec/pull/3267) ([miah](https://github.com/miah))
30
+ - Allow the jsonAutomate report to be executed from cli [#3285](https://github.com/inspec/inspec/pull/3285) ([jquick](https://github.com/jquick))
31
+ - Dummy PR to bump expeditor version. [#3298](https://github.com/inspec/inspec/pull/3298) ([jquick](https://github.com/jquick))
32
+ <!-- latest_stable_release -->
33
+
20
34
  ## [v2.2.61](https://github.com/inspec/inspec/tree/v2.2.61) (2018-08-09)
21
35
 
22
36
  #### New Resources
@@ -32,7 +46,6 @@
32
46
 
33
47
  #### Merged Pull Requests
34
48
  - Enable inspec archive, check, and json to run as unpriveleged user [#3263](https://github.com/inspec/inspec/pull/3263) ([phiggins](https://github.com/phiggins))
35
- <!-- latest_stable_release -->
36
49
 
37
50
  ## [v2.2.55](https://github.com/inspec/inspec/tree/v2.2.55) (2018-08-03)
38
51
 
data/README.md CHANGED
@@ -452,4 +452,4 @@ Unless required by applicable law or agreed to in writing, software
452
452
  distributed under the License is distributed on an "AS IS" BASIS,
453
453
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
454
454
  See the License for the specific language governing permissions and
455
- limitations under the License.
455
+ limitations under the License.
data/lib/inspec/base_cli.rb CHANGED
@@ -240,7 +240,7 @@ module Inspec
240
240
 
241
241
  def suppress_log_output?(opts)
242
242
  return false if opts['reporter'].nil?
243
- match = %w{json json-min json-rspec junit html yaml documentation progress} & opts['reporter'].keys
243
+ match = %w{json json-min json-rspec json-automate junit html yaml documentation progress} & opts['reporter'].keys
244
244
  unless match.empty?
245
245
  match.each do |m|
246
246
  # check to see if we are outputting to stdout
@@ -277,6 +277,12 @@ module Inspec
277
277
  raise ArgumentError, "Please provide a value for --#{v}. For example: --#{v}=hello."
278
278
  end
279
279
 
280
+ # Infer `--sudo` if using `--sudo-password` without `--sudo`
281
+ if o[:sudo_password] && !o[:sudo]
282
+ o[:sudo] = true
283
+ warn 'WARN: `--sudo-password` used without `--sudo`. Adding `--sudo`.'
284
+ end
285
+
280
286
  # check for compliance settings
281
287
  Compliance::API.login(o['compliance']) if o['compliance']
282
288
 
data/lib/inspec/rule.rb CHANGED
@@ -227,7 +227,8 @@ module Inspec
227
227
  # all checks that were defined in the destination
228
228
  sc = checks(src)
229
229
  dst.instance_variable_set(:@__checks, sc) unless sc.empty?
230
- sr = skip_status(src)
230
+ # we need only the value of result not the Hash containing value and message
231
+ sr = skip_status(src)[:result]
231
232
  set_skip_rule(dst, sr) unless sr.nil?
232
233
 
233
234
  # Save merge history
data/lib/inspec/version.rb CHANGED
@@ -4,5 +4,5 @@
4
4
  # author: Christoph Hartmann
5
5
 
6
6
  module Inspec
7
- VERSION = '2.2.64'
7
+ VERSION = '2.2.70'
8
8
  end
data/lib/resources/service.rb CHANGED
@@ -134,9 +134,9 @@ module Inspec::Resources
134
134
  else
135
135
  SysV.new(inspec, service_ctl || '/usr/sbin/service')
136
136
  end
137
- elsif %w{redhat fedora centos oracle}.include?(platform)
137
+ elsif %w{redhat fedora centos oracle cloudlinux}.include?(platform)
138
138
  version = os[:release].to_i
139
- if (%w{redhat centos oracle}.include?(platform) && version >= 7) || (platform == 'fedora' && version >= 15)
139
+ if (%w{redhat centos oracle cloudlinux}.include?(platform) && version >= 7) || (platform == 'fedora' && version >= 15)
140
140
  Systemd.new(inspec, service_ctl)
141
141
  else
142
142
  SysV.new(inspec, service_ctl || '/sbin/service')
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: inspec
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.64
4
+ version: 2.2.70
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dominik Richter
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-08-17 00:00:00.000000000 Z
11
+ date: 2018-08-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: train