Skip to content

Commit 69be75a

Browse files
committed
octo-diff dep rugged fails; fix regression class for no octo-diff
1 parent 46b017d commit 69be75a

File tree

2 files changed

+28
-24
lines changed

2 files changed

+28
-24
lines changed
Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,33 @@
1-
# temporarily supress warning messages for octocatalog-diff redefining puppet constants and then reactivate
2-
$VERBOSE = nil
3-
require 'octocatalog-diff'
4-
$VERBOSE = false
1+
begin
2+
# temporarily supress warning messages for octocatalog-diff redefining puppet constants and then reactivate
3+
$VERBOSE = nil
4+
require 'octocatalog-diff'
5+
$VERBOSE = false
56

6-
# executes smoke and regression tests on catalogs
7-
class RegressionCheck
8-
# smoke testing
9-
def self.smoke(interface_nodes, octoconfig)
10-
options = config(octoconfig)
11-
nodes = options.key?(:node) ? [options[:node]] : interface_nodes
12-
nodes.each do |node|
13-
options[:node] = node
14-
OctocatalogDiff::API::V1.catalog(options)
7+
# executes smoke and regression tests on catalogs
8+
class RegressionCheck
9+
# smoke testing
10+
def self.smoke(interface_nodes, octoconfig)
11+
options = config(octoconfig)
12+
nodes = options.key?(:node) ? [options[:node]] : interface_nodes
13+
nodes.each do |node|
14+
options[:node] = node
15+
OctocatalogDiff::API::V1.catalog(options)
16+
end
1517
end
16-
end
1718

18-
# regression testing
19-
# def self.regression(nodes, octoconfig)
20-
# options = RegressionCheck.config(octoconfig)
21-
# nodes.each { |node| stuff }
22-
# end
19+
# regression testing
20+
# def self.regression(nodes, octoconfig)
21+
# options = RegressionCheck.config(octoconfig)
22+
# nodes.each { |node| stuff }
23+
# end
2324

24-
# config file loading
25-
def self.config(octoconfig)
26-
private_class_method :method
27-
OctocatalogDiff::API::V1.config(filename: octoconfig)
25+
# config file loading
26+
def self.config(octoconfig)
27+
private_class_method :method
28+
OctocatalogDiff::API::V1.config(filename: octoconfig)
29+
end
2830
end
31+
rescue LoadError
32+
# octocatalog-diff not installed
2933
end

puppet-check.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
1717
spec.add_dependency 'reek', '~> 6.0'
1818
spec.add_dependency 'rubocop', '~> 1.0'
1919
spec.add_dependency 'rubocop-performance', '~> 1.0'
20-
spec.add_development_dependency 'octocatalog-diff', '~> 2.0'
20+
# spec.add_development_dependency 'octocatalog-diff', '~> 2.0'
2121
spec.add_development_dependency 'rake', '~> 13.0'
2222
spec.add_development_dependency 'rspec', '~> 3.0'
2323
end

0 commit comments

Comments
 (0)