Miscellaneous cleanups

Author: kpaulisse

lib/octocatalog-diff/catalog.rb

@@ -31,6 +31,7 @@ def initialize(options = {})
       @error_message = nil
       @catalog = nil
       @catalog_json = nil
+      @retries = nil
 
       # The compilation directory can be overridden, e.g. when testing
       @override_compilation_dir = options[:compilation_dir]

lib/octocatalog-diff/catalog/computed.rb

@@ -39,7 +39,6 @@ def initialize(options)
         @puppet_binary = options[:puppet_binary]
         @puppet_version = options[:puppet_version]
         @puppet_command = options[:puppet_command]
-        @retries = nil
         @builddir = nil
         @facts_terminus = options.fetch(:facts_terminus, 'yaml')
       end

lib/octocatalog-diff/catalog/json.rb

@@ -14,7 +14,10 @@ class JSON < OctocatalogDiff::Catalog
       # @param :node [String] Node name (if not supplied, will be determined from catalog)
       def initialize(options)
         super
-        raise ArgumentError, "Must supply :json as string in options: #{options[:json].class}" unless options[:json].is_a?(String)
+
+        unless options[:json].is_a?(String)
+          raise ArgumentError, "Must supply :json as string in options: #{options[:json].class}"
+        end
 
         @catalog_json = options.fetch(:json)
         begin

lib/octocatalog-diff/catalog/puppetdb.rb

@@ -17,14 +17,9 @@ class PuppetDB < OctocatalogDiff::Catalog
       def initialize(options)
         super
 
-        raise ArgumentError, 'node must be a non-empty string' unless options[:node].is_a?(String) && options[:node] != ''
-        @node = options[:node]
-        @catalog = nil
-        @error_message = nil
-        @retries = nil
-
-        # Save options
-        @options = options
+        unless @options[:node].is_a?(String) && @options[:node] != ''
+          raise ArgumentError, 'node must be a non-empty string'
+        end
       end
 
       private

lib/octocatalog-diff/catalog/puppetmaster.rb

@@ -34,20 +34,21 @@ class PuppetMaster < OctocatalogDiff::Catalog
       def initialize(options)
         super
 
-        raise ArgumentError, 'node must be a non-empty string' unless options[:node].is_a?(String) && options[:node] != ''
-        unless options[:branch].is_a?(String) && options[:branch] != ''
+        unless @options[:node].is_a?(String) && @options[:node] != ''
+          raise ArgumentError, 'node must be a non-empty string'
+        end
+
+        unless @options[:branch].is_a?(String) && @options[:branch] != ''
           raise ArgumentError, 'Environment must be a non-empty string'
         end
-        unless options[:puppet_master].is_a?(String) && options[:puppet_master] != ''
+
+        unless @options[:puppet_master].is_a?(String) && @options[:puppet_master] != ''
           raise ArgumentError, 'Puppet Master must be a non-empty string'
         end
 
-        @retries = nil
         @timeout = options.fetch(:puppet_master_timeout, options.fetch(:timeout, PUPPET_MASTER_TIMEOUT))
         @retry_failed_catalog = options.fetch(:retry_failed_catalog, 0)
-
-        options[:puppet_master] += ":#{DEFAULT_PUPPET_PORT_NUMBER}" unless options[:puppet_master] =~ /\:\d+$/
-        @options = options
+        @options[:puppet_master] += ":#{DEFAULT_PUPPET_PORT_NUMBER}" unless @options[:puppet_master] =~ /\:\d+$/
       end
 
       private