Run multiple node diffs in parallel

Author: EdgeJ

lib/octocatalog-diff/cli.rb

@@ -11,6 +11,7 @@
 require_relative 'version'
 
 require 'logger'
+require 'parallel'
 require 'socket'
 
 module OctocatalogDiff
@@ -117,8 +118,12 @@ def self.cli(argv = ARGV, logger = Logger.new(STDERR), opts = {})
 
       # Compile catalogs and do catalog-diff
       node_set = options.delete(:node)
+      node_set = [node_set] unless node_set.is_a?(Array)
+      catalog_diff = nil
       all_diffs = []
-      node_set.each do |node|
+
+      # run multiple node diffs in parallel
+      Parallel.map(node_set, in_threads: 4) do |node|
         options[:node] = node
         catalog_diff = OctocatalogDiff::API::V1.catalog_diff(options.merge(logger: logger))
         diffs = catalog_diff.diffs
@@ -133,7 +138,13 @@ def self.cli(argv = ARGV, logger = Logger.new(STDERR), opts = {})
 
       # Return the resulting diff object if requested (generally for testing) or otherwise return exit code
       return catalog_diff if opts[:INTEGRATION]
-      all_diffs.any? ? EXITCODE_SUCCESS_WITH_DIFFS : EXITCODE_SUCCESS_NO_DIFFS
+
+      all_diffs.each do |diff|
+        next unless diff.any?
+        return EXITCODE_SUCCESS_WITH_DIFFS
+      end
+
+      EXITCODE_SUCCESS_NO_DIFFS
     end
 
     # Parse command line options with 'optparse'. Returns a hash with the parsed arguments.

lib/octocatalog-diff/cli/options/hostname.rb

@@ -9,7 +9,11 @@
 
   def parse(parser, options)
     parser.on('--hostname HOSTNAME', '-n', 'Use PuppetDB facts from last run of hostname') do |hostname|
-      options[:node] = hostname.split(',')
+      options[:node] = if hostname.include?(',')
+        hostname.split(',')
+      else
+        hostname
+      end
     end
   end
 end

octocatalog-diff.gemspec

@@ -27,6 +27,7 @@ EOF
   s.add_runtime_dependency 'diffy', '>= 3.1.0'
   s.add_runtime_dependency 'httparty', '>= 0.11.0'
   s.add_runtime_dependency 'hashdiff', '>= 0.3.0'
+  s.add_runtime_dependency 'parallel', '>= 1.12.0'
   s.add_runtime_dependency 'rugged', '>= 0.25.0b2'
 
   s.add_development_dependency 'rspec', '~> 3.4.0'

spec/octocatalog-diff/tests/cli/options/hostname_spec.rb

@@ -6,7 +6,7 @@
   describe '#opt_hostname' do
     it 'should set options[:node] when hostname is set with short form' do
       result = run_optparse(['-n', 'octonode.rspec'])
-      expect(result.fetch(:node, 'key-not-defined')).to eq(%w[octonode.rspec])
+      expect(result.fetch(:node, 'key-not-defined')).to eq('octonode.rspec')
     end
 
     it 'should set multiple nodes when passed a series of nodes' do