inspec 2.3.23 → 2.3.24

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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +27 -22
  3. data/lib/inspec/plugin/v2/installer.rb +28 -9
  4. data/lib/inspec/version.rb +1 -1
  5. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bb147670fb50f5098fa9bedd9800c529d2e1d93a56e2b80770089f6713dd99fc
4
- data.tar.gz: c7af0a7c8d4518f20c03ff338ac940ae4a2d70834c3b53d8951a3d16abd4a024
3
+ metadata.gz: 5ce8fa792af59dc9067f95e3b4370d1dcf9d0bb35c7a2a907a127402f214abcc
4
+ data.tar.gz: 0b8057aa2502bb82b4602fb218849c8535405b35ea714efdc161d0429b86f577
5
5
  SHA512:
6
- metadata.gz: d47c6b4fc24e3541723e19ad6656629b82429a3b22530bcd8a1c2fe3a4dcfc876797ea41eafa6eb0f36c778a1d79e07ef6e23735b0d9a8b2fff73d16a14c5ae2
7
- data.tar.gz: 3e996b5ac2419172aeae1d164531d38c6a2dc1564c2ae203793699fb2bf6fefff5646c6ef00e93011af3b6f1e7b43d86fb83c9655aebf9053d451ac26213d70d
6
+ metadata.gz: 5f9be64fca10e8f52df2ffd20b173d86ce4787259f5d9d9eb3e03f95f73b0421be3430fcbdc22cd8f341cf7f0b276ddf21f62aa28697bbd29b2c9178806f89a2
7
+ data.tar.gz: 3f97cd48187588aabe5cefb02afe149b3d7bf547c82109ad58d8951224ff9e46473055de3e5e215247997ab6bf671f380fb271e09f8c633fccada5c38d27dbd3
data/CHANGELOG.md CHANGED
@@ -1,36 +1,42 @@
1
1
  # Change Log
2
2
  <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
3
- <!-- latest_release 2.3.23 -->
4
- ## [v2.3.23](https://github.com/inspec/inspec/tree/v2.3.23) (2018-10-12)
3
+ <!-- latest_release 2.3.24 -->
4
+ ## [v2.3.24](https://github.com/inspec/inspec/tree/v2.3.24) (2018-10-12)
5
5
 
6
- #### Merged Pull Requests
7
- - Fix plugin issues on omni builds [#3499](https://github.com/inspec/inspec/pull/3499) ([jquick](https://github.com/jquick))
6
+ #### Bug Fixes
7
+ - Fix plugin install issues in different ruby envs [#3505](https://github.com/inspec/inspec/pull/3505) ([jquick](https://github.com/jquick))
8
8
  <!-- latest_release -->
9
9
 
10
- <!-- release_rollup since=2.3.10 -->
11
- ### Changes since 2.3.10 release
10
+ <!-- release_rollup since=2.3.23 -->
11
+ ### Changes since 2.3.23 release
12
+
13
+ #### Bug Fixes
14
+ - Fix plugin install issues in different ruby envs [#3505](https://github.com/inspec/inspec/pull/3505) ([jquick](https://github.com/jquick)) <!-- 2.3.24 -->
15
+ <!-- release_rollup -->
16
+
17
+ <!-- latest_stable_release -->
18
+ ## [v2.3.23](https://github.com/inspec/inspec/tree/v2.3.23) (2018-10-12)
12
19
 
13
20
  #### Enhancements
14
- - Plugins: Filter Plugins During Search and Install [#3458](https://github.com/inspec/inspec/pull/3458) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 2.3.20 -->
21
+ - Plugins: Filter Plugins During Search and Install [#3458](https://github.com/inspec/inspec/pull/3458) ([clintoncwolfe](https://github.com/clintoncwolfe))
15
22
 
16
23
  #### Bug Fixes
17
- - Backport compliance namespace and add testing for A2 audit report. [#3493](https://github.com/inspec/inspec/pull/3493) ([jquick](https://github.com/jquick)) <!-- 2.3.21 -->
18
- - Fix error on empty attributes yaml [#3485](https://github.com/inspec/inspec/pull/3485) ([jquick](https://github.com/jquick)) <!-- 2.3.19 -->
19
- - small fix - update to AlpinePkg Class [#3483](https://github.com/inspec/inspec/pull/3483) ([aaronlippold](https://github.com/aaronlippold)) <!-- 2.3.16 -->
24
+ - small fix - update to AlpinePkg Class [#3483](https://github.com/inspec/inspec/pull/3483) ([aaronlippold](https://github.com/aaronlippold))
25
+ - Fix error on empty attributes yaml [#3485](https://github.com/inspec/inspec/pull/3485) ([jquick](https://github.com/jquick))
26
+ - Backport compliance namespace and add testing for A2 audit report. [#3493](https://github.com/inspec/inspec/pull/3493) ([jquick](https://github.com/jquick))
20
27
 
21
28
  #### Merged Pull Requests
22
- - Fix plugin issues on omni builds [#3499](https://github.com/inspec/inspec/pull/3499) ([jquick](https://github.com/jquick)) <!-- 2.3.23 -->
23
- - Set a static node GUID for travis runs [#3497](https://github.com/inspec/inspec/pull/3497) ([jquick](https://github.com/jquick)) <!-- 2.3.22 -->
24
- - docs: Add version to multiple descriptions doc [#3477](https://github.com/inspec/inspec/pull/3477) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 2.3.18 -->
25
- - Skip running appveyor on docs and examples [#3474](https://github.com/inspec/inspec/pull/3474) ([btm](https://github.com/btm)) <!-- 2.3.17 -->
26
- - Remove &#39;demo&#39; from website. [#3475](https://github.com/inspec/inspec/pull/3475) ([miah](https://github.com/miah)) <!-- 2.3.15 -->
27
- - Enable compression for deb/rpm packages [#3472](https://github.com/inspec/inspec/pull/3472) ([tas50](https://github.com/tas50)) <!-- 2.3.14 -->
28
- - Fix Packages Resource Docs [#3469](https://github.com/inspec/inspec/pull/3469) ([pwelch](https://github.com/pwelch)) <!-- 2.3.13 -->
29
- - Exclude docs and examples from the gem [#3471](https://github.com/inspec/inspec/pull/3471) ([tas50](https://github.com/tas50)) <!-- 2.3.12 -->
30
- - Fix archive with required attributes [#3468](https://github.com/inspec/inspec/pull/3468) ([jquick](https://github.com/jquick)) <!-- 2.3.11 -->
31
- <!-- release_rollup -->
32
-
29
+ - Fix archive with required attributes [#3468](https://github.com/inspec/inspec/pull/3468) ([jquick](https://github.com/jquick))
30
+ - Exclude docs and examples from the gem [#3471](https://github.com/inspec/inspec/pull/3471) ([tas50](https://github.com/tas50))
31
+ - Fix Packages Resource Docs [#3469](https://github.com/inspec/inspec/pull/3469) ([pwelch](https://github.com/pwelch))
32
+ - Enable compression for deb/rpm packages [#3472](https://github.com/inspec/inspec/pull/3472) ([tas50](https://github.com/tas50))
33
+ - Remove &#39;demo&#39; from website. [#3475](https://github.com/inspec/inspec/pull/3475) ([miah](https://github.com/miah))
34
+ - Skip running appveyor on docs and examples [#3474](https://github.com/inspec/inspec/pull/3474) ([btm](https://github.com/btm))
35
+ - docs: Add version to multiple descriptions doc [#3477](https://github.com/inspec/inspec/pull/3477) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
36
+ - Set a static node GUID for travis runs [#3497](https://github.com/inspec/inspec/pull/3497) ([jquick](https://github.com/jquick))
37
+ - Fix plugin issues on omni builds [#3499](https://github.com/inspec/inspec/pull/3499) ([jquick](https://github.com/jquick))
33
38
  <!-- latest_stable_release -->
39
+
34
40
  ## [v2.3.10](https://github.com/inspec/inspec/tree/v2.3.10) (2018-10-04)
35
41
 
36
42
  #### Enhancements
@@ -43,7 +49,6 @@
43
49
 
44
50
  #### Merged Pull Requests
45
51
  - Fix `attribute` with empty hash regression [#3454](https://github.com/inspec/inspec/pull/3454) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
46
- <!-- latest_stable_release -->
47
52
 
48
53
  ## [v2.3.5](https://github.com/inspec/inspec/tree/v2.3.5) (2018-10-01)
49
54
 
data/lib/inspec/plugin/v2/installer.rb CHANGED
@@ -390,25 +390,44 @@ module Inspec::Plugin::V2
390
390
  # Utilities
391
391
  #===================================================================#
392
392
 
393
- # This class alows us to build a Vendor set with the gems that are
393
+ # This class alows us to build a Resolver set with the gems that are
394
394
  # already included either with Ruby or with the InSpec install
395
- class InstalledVendorSet < Gem::Resolver::VendorSet
395
+ #
396
+ # This code is heavily based on:
397
+ # https://github.com/hashicorp/vagrant/blob/master/lib/vagrant/bundler.rb#L400
398
+ # https://github.com/hashicorp/vagrant/blob/master/lib/vagrant/bundler.rb#L565
399
+ class InstalledVendorSet < Gem::Resolver::Set
396
400
  def initialize
397
401
  super
402
+ @remote = false
403
+ @specs = []
398
404
 
405
+ # Grab any pre loaded gems
399
406
  Gem::Specification.find_all do |spec|
400
- @specs[spec.name] = spec
401
- @directories[spec] = spec.gem_dir
407
+ @specs << spec
402
408
  end
403
409
 
410
+ # find all gem specification directories
411
+ directories = [Gem::Specification.default_specifications_dir]
404
412
  if !defined?(::Bundler)
405
- directories = Gem::Specification.dirs.find_all do |path|
413
+ # add in any others that do not start with the user directory
414
+ directories += Gem::Specification.dirs.find_all do |path|
406
415
  !path.start_with?(Gem.user_dir)
407
416
  end
408
- Gem::Specification.each_spec(directories) do |spec|
409
- @specs[spec.name] = spec
410
- @directories[spec] = spec.gem_dir
411
- end
417
+ end
418
+
419
+ # add them all to the specs array
420
+ Gem::Specification.each_spec(directories) do |spec|
421
+ @specs << spec
422
+ end
423
+
424
+ # resolver expects one of each spec so uniq here.
425
+ @specs.uniq!
426
+ end
427
+
428
+ def find_all(req)
429
+ @specs.select { |spec| req.match?(spec) }.map do |spec|
430
+ Gem::Resolver::InstalledSpecification.new(self, spec)
412
431
  end
413
432
  end
414
433
  end
data/lib/inspec/version.rb CHANGED
@@ -4,5 +4,5 @@
4
4
  # author: Christoph Hartmann
5
5
 
6
6
  module Inspec
7
- VERSION = '2.3.23'
7
+ VERSION = '2.3.24'
8
8
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: inspec
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.23
4
+ version: 2.3.24
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dominik Richter