Add multiple node capabilities to --hostname option

Author: EdgeJ

lib/octocatalog-diff/cli.rb

@@ -116,16 +116,24 @@ def self.cli(argv = ARGV, logger = Logger.new(STDERR), opts = {})
       end
 
       # Compile catalogs and do catalog-diff
-      catalog_diff = OctocatalogDiff::API::V1.catalog_diff(options.merge(logger: logger))
-      diffs = catalog_diff.diffs
-
-      # Display diffs
-      printer_obj = OctocatalogDiff::Cli::Printer.new(options, logger)
-      printer_obj.printer(diffs, catalog_diff.from.compilation_dir, catalog_diff.to.compilation_dir)
+      node_set = options.delete(:node)
+      all_diffs = []
+      node_set.each do |node|
+        options[:node] = node
+        catalog_diff = OctocatalogDiff::API::V1.catalog_diff(options.merge(logger: logger))
+        diffs = catalog_diff.diffs
+
+        # Display diffs
+        printer_obj = OctocatalogDiff::Cli::Printer.new(options, logger)
+        printer_obj.printer(diffs, catalog_diff.from.compilation_dir, catalog_diff.to.compilation_dir)
+
+        # Append any diffs for final exit status
+        all_diffs << diffs
+      end
 
       # Return the resulting diff object if requested (generally for testing) or otherwise return exit code
       return catalog_diff if opts[:INTEGRATION]
-      diffs.any? ? EXITCODE_SUCCESS_WITH_DIFFS : EXITCODE_SUCCESS_NO_DIFFS
+      all_diffs.any? ? EXITCODE_SUCCESS_WITH_DIFFS : 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,7 @@
 
   def parse(parser, options)
     parser.on('--hostname HOSTNAME', '-n', 'Use PuppetDB facts from last run of hostname') do |hostname|
-      options[:node] = hostname
+      options[:node] = hostname.split(',')
     end
   end
 end

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

@@ -6,7 +6,12 @@
   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('octonode.rspec')
+      expect(result.fetch(:node, 'key-not-defined')).to eq(%w[octonode.rspec])
+    end
+
+    it 'should set multiple nodes when passed a series of nodes' do
+      result = run_optparse(['-n', 'octonode1.rspec,octonode2.rspec'])
+      expect(result.fetch(:node, 'key-not-defined')).to eq(%w[octonode1.rspec octonode2.rspec])
     end
   end
 end