octocatalog-diff 1.5.2 → 2.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (46) hide show
  1. checksums.yaml +5 -5
  2. data/.version +1 -1
  3. data/README.md +4 -4
  4. data/doc/CHANGELOG.md +50 -0
  5. data/doc/advanced-compare-file-text.md +79 -0
  6. data/doc/advanced-environments.md +5 -5
  7. data/doc/advanced-ignores.md +10 -0
  8. data/doc/advanced-puppet-master.md +25 -7
  9. data/doc/configuration-puppet.md +19 -19
  10. data/doc/configuration-puppetdb.md +8 -0
  11. data/doc/configuration.md +31 -31
  12. data/doc/dev/api/v1/calls/catalog-diff.md +6 -2
  13. data/doc/dev/api/v1/objects/diff.md +3 -3
  14. data/doc/dev/integration-tests.md +2 -2
  15. data/doc/dev/releasing.md +41 -41
  16. data/doc/dev/run-from-branch.md +23 -23
  17. data/doc/installation.md +14 -14
  18. data/doc/limitations.md +9 -9
  19. data/doc/optionsref.md +166 -11
  20. data/doc/requirements.md +6 -2
  21. data/lib/octocatalog-diff/catalog-diff/differ.rb +32 -5
  22. data/lib/octocatalog-diff/catalog-diff/filter/compilation_dir.rb +29 -25
  23. data/lib/octocatalog-diff/catalog-util/command.rb +25 -3
  24. data/lib/octocatalog-diff/catalog-util/fileresources.rb +39 -16
  25. data/lib/octocatalog-diff/catalog.rb +22 -4
  26. data/lib/octocatalog-diff/catalog/computed.rb +2 -1
  27. data/lib/octocatalog-diff/catalog/puppetmaster.rb +43 -5
  28. data/lib/octocatalog-diff/cli.rb +38 -6
  29. data/lib/octocatalog-diff/cli/options.rb +36 -1
  30. data/lib/octocatalog-diff/cli/options/compare_file_text.rb +18 -0
  31. data/lib/octocatalog-diff/cli/options/hostname.rb +13 -2
  32. data/lib/octocatalog-diff/cli/options/puppet_master_api_version.rb +2 -2
  33. data/lib/octocatalog-diff/cli/options/puppet_master_token.rb +20 -0
  34. data/lib/octocatalog-diff/cli/options/puppet_master_token_file.rb +35 -0
  35. data/lib/octocatalog-diff/cli/options/puppet_master_update_catalog.rb +20 -0
  36. data/lib/octocatalog-diff/cli/options/puppet_master_update_facts.rb +20 -0
  37. data/lib/octocatalog-diff/cli/options/puppetdb_package_inventory.rb +18 -0
  38. data/lib/octocatalog-diff/cli/options/use_lcs.rb +14 -0
  39. data/lib/octocatalog-diff/facts/json.rb +13 -2
  40. data/lib/octocatalog-diff/facts/puppetdb.rb +43 -2
  41. data/lib/octocatalog-diff/util/parallel.rb +20 -16
  42. data/lib/octocatalog-diff/util/util.rb +2 -0
  43. data/scripts/env/env.sh +1 -1
  44. data/scripts/git-extract/git-extract.sh +1 -1
  45. data/scripts/puppet/puppet.sh +1 -1
  46. metadata +36 -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!
data/scripts/env/env.sh CHANGED
@@ -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.2
4
+ version: 2.1.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-12-19 00:00:00.000000000 Z
12
+ date: 2021-02-18 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
@@ -214,6 +214,7 @@ files:
214
214
  - doc/advanced-catalog-only.md
215
215
  - doc/advanced-catalog-validation.md
216
216
  - doc/advanced-ci.md
217
+ - doc/advanced-compare-file-text.md
217
218
  - doc/advanced-dynamic-ignores.md
218
219
  - doc/advanced-environment-variables.md
219
220
  - doc/advanced-environments.md
@@ -358,7 +359,12 @@ files:
358
359
  - lib/octocatalog-diff/cli/options/puppet_master_ssl_client_cert.rb
359
360
  - lib/octocatalog-diff/cli/options/puppet_master_ssl_client_key.rb
360
361
  - lib/octocatalog-diff/cli/options/puppet_master_timeout.rb
362
+ - lib/octocatalog-diff/cli/options/puppet_master_token.rb
363
+ - lib/octocatalog-diff/cli/options/puppet_master_token_file.rb
364
+ - lib/octocatalog-diff/cli/options/puppet_master_update_catalog.rb
365
+ - lib/octocatalog-diff/cli/options/puppet_master_update_facts.rb
361
366
  - lib/octocatalog-diff/cli/options/puppetdb_api_version.rb
367
+ - lib/octocatalog-diff/cli/options/puppetdb_package_inventory.rb
362
368
  - lib/octocatalog-diff/cli/options/puppetdb_ssl_ca.rb
363
369
  - lib/octocatalog-diff/cli/options/puppetdb_ssl_client_cert.rb
364
370
  - lib/octocatalog-diff/cli/options/puppetdb_ssl_client_key.rb
@@ -375,6 +381,7 @@ files:
375
381
  - lib/octocatalog-diff/cli/options/suppress_absent_file_details.rb
376
382
  - lib/octocatalog-diff/cli/options/to_from_branch.rb
377
383
  - lib/octocatalog-diff/cli/options/truncate_details.rb
384
+ - lib/octocatalog-diff/cli/options/use_lcs.rb
378
385
  - lib/octocatalog-diff/cli/options/validate_references.rb
379
386
  - lib/octocatalog-diff/cli/printer.rb
380
387
  - lib/octocatalog-diff/errors.rb
@@ -405,7 +412,7 @@ homepage: https://github.com/github/octocatalog-diff
405
412
  licenses:
406
413
  - MIT
407
414
  metadata: {}
408
- post_install_message:
415
+ post_install_message:
409
416
  rdoc_options: []
410
417
  require_paths:
411
418
  - lib
@@ -420,9 +427,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
420
427
  - !ruby/object:Gem::Version
421
428
  version: '0'
422
429
  requirements: []
423
- rubyforge_project:
424
- rubygems_version: 2.5.1
425
- signing_key:
430
+ rubygems_version: 3.0.3
431
+ signing_key:
426
432
  specification_version: 4
427
433
  summary: Compile Puppet catalogs from 2 branches, versions, etc., and compare them.
428
434
  test_files: []