Fix up code coverage

Author: Kevin Paulisse

lib/octocatalog-diff/catalog/computed.rb

@@ -165,22 +165,20 @@ def puppet_command
       end
 
       def puppet_command_obj
-        return @puppet_command_obj if @puppet_command_obj
-
-        unless @puppet_binary
-          raise ArgumentError, '"puppet_binary" was not passed to OctocatalogDiff::Catalog::Computed'
+        @puppet_command_obj ||= begin
+          raise ArgumentError, '"puppet_binary" was not passed to OctocatalogDiff::Catalog::Computed' unless @puppet_binary
+
+          command_opts = @opts.merge(
+            node: @node,
+            compilation_dir: @builddir.tempdir,
+            parser: @opts.fetch(:parser, :default),
+            puppet_binary: @puppet_binary,
+            fact_file: @builddir.fact_file,
+            dir: @builddir.tempdir,
+            enc: @builddir.enc
+          )
+          OctocatalogDiff::CatalogUtil::Command.new(command_opts)
         end
-
-        command_opts = @opts.merge(
-          node: @node,
-          compilation_dir: @builddir.tempdir,
-          parser: @opts.fetch(:parser, :default),
-          puppet_binary: @puppet_binary,
-          fact_file: @builddir.fact_file,
-          dir: @builddir.tempdir,
-          enc: @builddir.enc
-        )
-        @puppet_command_obj = OctocatalogDiff::CatalogUtil::Command.new(command_opts)
       end
 
       # Private method: Actually execute puppet

lib/octocatalog-diff/util/puppetversion.rb

@@ -37,7 +37,9 @@ def self.puppet_version(puppet, options = {})
 
         output = script.run(sr_run_opts)
         return Regexp.last_match(1) if output =~ /^([\d\.]+)\s*$/
+        # :nocov:
         raise "Unable to determine Puppet version: #{script.output}"
+        # :nocov:
       end
     end
   end