octocatalog-diff 1.5.1 → 2.0.0

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 (44) hide show
  1. checksums.yaml +5 -5
  2. data/.version +1 -1
  3. data/README.md +4 -4
  4. data/doc/CHANGELOG.md +49 -0
  5. data/doc/advanced-filter.md +23 -0
  6. data/doc/advanced-ignores.md +10 -0
  7. data/doc/advanced-puppet-master.md +23 -5
  8. data/doc/configuration-puppetdb.md +11 -0
  9. data/doc/dev/api/v1/calls/catalog-diff.md +6 -2
  10. data/doc/dev/api/v1/objects/diff.md +3 -3
  11. data/doc/dev/releasing.md +1 -1
  12. data/doc/limitations.md +9 -9
  13. data/doc/optionsref.md +167 -11
  14. data/doc/requirements.md +6 -2
  15. data/lib/octocatalog-diff/catalog-diff/differ.rb +29 -4
  16. data/lib/octocatalog-diff/catalog-diff/filter.rb +2 -1
  17. data/lib/octocatalog-diff/catalog-diff/filter/compilation_dir.rb +29 -25
  18. data/lib/octocatalog-diff/catalog-diff/filter/single_item_array.rb +44 -0
  19. data/lib/octocatalog-diff/catalog-util/builddir.rb +3 -3
  20. data/lib/octocatalog-diff/catalog-util/command.rb +25 -3
  21. data/lib/octocatalog-diff/catalog-util/fileresources.rb +1 -1
  22. data/lib/octocatalog-diff/catalog.rb +22 -4
  23. data/lib/octocatalog-diff/catalog/computed.rb +2 -1
  24. data/lib/octocatalog-diff/catalog/puppetmaster.rb +43 -5
  25. data/lib/octocatalog-diff/cli.rb +36 -5
  26. data/lib/octocatalog-diff/cli/options.rb +39 -3
  27. data/lib/octocatalog-diff/cli/options/hostname.rb +13 -2
  28. data/lib/octocatalog-diff/cli/options/pe_enc_token_file.rb +1 -1
  29. data/lib/octocatalog-diff/cli/options/puppet_master_api_version.rb +2 -2
  30. data/lib/octocatalog-diff/cli/options/puppet_master_token.rb +20 -0
  31. data/lib/octocatalog-diff/cli/options/puppet_master_token_file.rb +35 -0
  32. data/lib/octocatalog-diff/cli/options/puppet_master_update_catalog.rb +20 -0
  33. data/lib/octocatalog-diff/cli/options/puppet_master_update_facts.rb +20 -0
  34. data/lib/octocatalog-diff/cli/options/puppetdb_package_inventory.rb +18 -0
  35. data/lib/octocatalog-diff/cli/options/puppetdb_token.rb +17 -0
  36. data/lib/octocatalog-diff/cli/options/puppetdb_token_file.rb +21 -0
  37. data/lib/octocatalog-diff/facts/puppetdb.rb +43 -2
  38. data/lib/octocatalog-diff/puppetdb.rb +5 -1
  39. data/lib/octocatalog-diff/util/parallel.rb +20 -16
  40. data/lib/octocatalog-diff/util/util.rb +2 -0
  41. data/scripts/env/env.sh +1 -1
  42. data/scripts/git-extract/git-extract.sh +1 -1
  43. data/scripts/puppet/puppet.sh +1 -1
  44. metadata +37 -30
@@ -27,7 +27,9 @@ module OctocatalogDiff
27
27
  def self.safe_dup(object)
28
28
  object.dup
29
29
  rescue TypeError
30
+ # :nocov:
30
31
  object
32
+ # :nocov:
31
33
  end
32
34
 
33
35
  # Utility Method!
@@ -1,4 +1,4 @@
1
- #!/bin/bash
1
+ #!/usr/bin/env bash
2
2
 
3
3
  # This script echoes back the environment. This is used for spec testing
4
4
  # and possible debugging.
@@ -1,4 +1,4 @@
1
- #!/bin/bash
1
+ #!/usr/bin/env bash
2
2
 
3
3
  # This script is called from lib/octocatalog-diff/catalog-util/git.rb and is used to
4
4
  # archive and extract a certain branch of a git repository into a target directory.
@@ -1,4 +1,4 @@
1
- #!/bin/bash
1
+ #!/usr/bin/env bash
2
2
 
3
3
  # Script to run Puppet. The default implementation here is simply to pass
4
4
  # through the command line arguments (which are likely to be numerous when
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octocatalog-diff
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.1
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - GitHub, Inc.
8
8
  - Kevin Paulisse
9
- autorequire:
9
+ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-11-16 00:00:00.000000000 Z
12
+ date: 2021-01-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: diffy
@@ -53,6 +53,20 @@ dependencies:
53
53
  - - ">="
54
54
  - !ruby/object:Gem::Version
55
55
  version: 0.3.0
56
+ - !ruby/object:Gem::Dependency
57
+ name: parallel
58
+ requirement: !ruby/object:Gem::Requirement
59
+ requirements:
60
+ - - ">="
61
+ - !ruby/object:Gem::Version
62
+ version: 1.12.0
63
+ type: :runtime
64
+ prerelease: false
65
+ version_requirements: !ruby/object:Gem::Requirement
66
+ requirements:
67
+ - - ">="
68
+ - !ruby/object:Gem::Version
69
+ version: 1.12.0
56
70
  - !ruby/object:Gem::Dependency
57
71
  name: rugged
58
72
  requirement: !ruby/object:Gem::Requirement
@@ -87,14 +101,14 @@ dependencies:
87
101
  requirements:
88
102
  - - '='
89
103
  - !ruby/object:Gem::Version
90
- version: 11.2.2
104
+ version: 12.3.1
91
105
  type: :development
92
106
  prerelease: false
93
107
  version_requirements: !ruby/object:Gem::Requirement
94
108
  requirements:
95
109
  - - '='
96
110
  - !ruby/object:Gem::Version
97
- version: 11.2.2
111
+ version: 12.3.1
98
112
  - !ruby/object:Gem::Dependency
99
113
  name: parallel_tests
100
114
  requirement: !ruby/object:Gem::Requirement
@@ -152,47 +166,33 @@ dependencies:
152
166
  - !ruby/object:Gem::Version
153
167
  version: 0.14.1
154
168
  - !ruby/object:Gem::Dependency
155
- name: simplecov-json
169
+ name: simplecov-erb
156
170
  requirement: !ruby/object:Gem::Requirement
157
171
  requirements:
158
- - - ">="
172
+ - - "~>"
159
173
  - !ruby/object:Gem::Version
160
- version: '0'
174
+ version: 0.1.1
161
175
  type: :development
162
176
  prerelease: false
163
177
  version_requirements: !ruby/object:Gem::Requirement
164
178
  requirements:
165
- - - ">="
179
+ - - "~>"
166
180
  - !ruby/object:Gem::Version
167
- version: '0'
181
+ version: 0.1.1
168
182
  - !ruby/object:Gem::Dependency
169
183
  name: puppet
170
184
  requirement: !ruby/object:Gem::Requirement
171
185
  requirements:
172
186
  - - "~>"
173
187
  - !ruby/object:Gem::Version
174
- version: 4.10.8
188
+ version: 5.5.8
175
189
  type: :development
176
190
  prerelease: false
177
191
  version_requirements: !ruby/object:Gem::Requirement
178
192
  requirements:
179
193
  - - "~>"
180
194
  - !ruby/object:Gem::Version
181
- version: 4.10.8
182
- - !ruby/object:Gem::Dependency
183
- name: puppetdb-terminus
184
- requirement: !ruby/object:Gem::Requirement
185
- requirements:
186
- - - '='
187
- - !ruby/object:Gem::Version
188
- version: 3.2.4
189
- type: :development
190
- prerelease: false
191
- version_requirements: !ruby/object:Gem::Requirement
192
- requirements:
193
- - - '='
194
- - !ruby/object:Gem::Version
195
- version: 3.2.4
195
+ version: 5.5.8
196
196
  description: |
197
197
  Octocatalog-Diff assists with Puppet development and testing by enabling the user to
198
198
  compile 2 Puppet catalogs and compare them. It is possible to compare different
@@ -279,6 +279,7 @@ files:
279
279
  - lib/octocatalog-diff/catalog-diff/filter/absent_file.rb
280
280
  - lib/octocatalog-diff/catalog-diff/filter/compilation_dir.rb
281
281
  - lib/octocatalog-diff/catalog-diff/filter/json.rb
282
+ - lib/octocatalog-diff/catalog-diff/filter/single_item_array.rb
282
283
  - lib/octocatalog-diff/catalog-diff/filter/yaml.rb
283
284
  - lib/octocatalog-diff/catalog-util/bootstrap.rb
284
285
  - lib/octocatalog-diff/catalog-util/builddir.rb
@@ -357,12 +358,19 @@ files:
357
358
  - lib/octocatalog-diff/cli/options/puppet_master_ssl_client_cert.rb
358
359
  - lib/octocatalog-diff/cli/options/puppet_master_ssl_client_key.rb
359
360
  - lib/octocatalog-diff/cli/options/puppet_master_timeout.rb
361
+ - lib/octocatalog-diff/cli/options/puppet_master_token.rb
362
+ - lib/octocatalog-diff/cli/options/puppet_master_token_file.rb
363
+ - lib/octocatalog-diff/cli/options/puppet_master_update_catalog.rb
364
+ - lib/octocatalog-diff/cli/options/puppet_master_update_facts.rb
360
365
  - lib/octocatalog-diff/cli/options/puppetdb_api_version.rb
366
+ - lib/octocatalog-diff/cli/options/puppetdb_package_inventory.rb
361
367
  - lib/octocatalog-diff/cli/options/puppetdb_ssl_ca.rb
362
368
  - lib/octocatalog-diff/cli/options/puppetdb_ssl_client_cert.rb
363
369
  - lib/octocatalog-diff/cli/options/puppetdb_ssl_client_key.rb
364
370
  - lib/octocatalog-diff/cli/options/puppetdb_ssl_client_password.rb
365
371
  - lib/octocatalog-diff/cli/options/puppetdb_ssl_client_password_file.rb
372
+ - lib/octocatalog-diff/cli/options/puppetdb_token.rb
373
+ - lib/octocatalog-diff/cli/options/puppetdb_token_file.rb
366
374
  - lib/octocatalog-diff/cli/options/puppetdb_url.rb
367
375
  - lib/octocatalog-diff/cli/options/quiet.rb
368
376
  - lib/octocatalog-diff/cli/options/retry_failed_catalog.rb
@@ -402,7 +410,7 @@ homepage: https://github.com/github/octocatalog-diff
402
410
  licenses:
403
411
  - MIT
404
412
  metadata: {}
405
- post_install_message:
413
+ post_install_message:
406
414
  rdoc_options: []
407
415
  require_paths:
408
416
  - lib
@@ -417,9 +425,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
417
425
  - !ruby/object:Gem::Version
418
426
  version: '0'
419
427
  requirements: []
420
- rubyforge_project:
421
- rubygems_version: 2.5.1
422
- signing_key:
428
+ rubygems_version: 3.0.3
429
+ signing_key:
423
430
  specification_version: 4
424
431
  summary: Compile Puppet catalogs from 2 branches, versions, etc., and compare them.
425
432
  test_files: []