puppet 5.0.0 → 6.0.0

data/Rakefile

@@ -19,43 +19,25 @@ rescue LoadError
 end
 
 require 'rake'
+require 'open3'
 
 Dir['tasks/**/*.rake'].each { |t| load t }
 
-begin
-  load File.join(RAKE_ROOT, 'ext', 'packaging', 'packaging.rake')
-rescue LoadError
-end
-
-build_defs_file = 'ext/build_defaults.yaml'
-if File.exist?(build_defs_file)
+if Rake.application.top_level_tasks.grep(/^(pl:|package:)/).any?
   begin
-    require 'yaml'
-    @build_defaults ||= YAML.load_file(build_defs_file)
-  rescue Exception => e
-    STDERR.puts "Unable to load yaml from #{build_defs_file}:"
-    STDERR.puts e
+    require 'packaging'
+    Pkg::Util::RakeUtils.load_packaging_tasks
+  rescue LoadError => e
+    puts "Error loading packaging rake tasks: #{e}"
   end
-  @packaging_url  = @build_defaults['packaging_url']
-  @packaging_repo = @build_defaults['packaging_repo']
-  raise "Could not find packaging url in #{build_defs_file}" if @packaging_url.nil?
-  raise "Could not find packaging repo in #{build_defs_file}" if @packaging_repo.nil?
+end
 
-  namespace :package do
-    desc "Bootstrap packaging automation, e.g. clone into packaging repo"
-    task :bootstrap do
-      if File.exist?("ext/#{@packaging_repo}")
-        puts "It looks like you already have ext/#{@packaging_repo}. If you don't like it, blow it away with package:implode."
-      else
-        cd 'ext' do
-          %x{git clone #{@packaging_url}}
-        end
-      end
-    end
-    desc "Remove all cloned packaging automation"
-    task :implode do
-      rm_rf "ext/#{@packaging_repo}"
-    end
+namespace :package do
+  task :bootstrap do
+    puts 'Bootstrap is no longer needed, using packaging-as-a-gem'
+  end
+  task :implode do
+    puts 'Implode is no longer needed, using packaging-as-a-gem'
   end
 end
 
@@ -64,6 +46,7 @@ task :default do
 end
 
 task :spec do
+  ENV["LOG_SPEC_ORDER"] = "true"
   sh %{rspec #{ENV['TEST'] || ENV['TESTS'] || 'spec'}}
 end
 
@@ -105,9 +88,37 @@ task(:commits) do
   end
 end
 
-begin
-  spec = Gem::Specification.find_by_name 'gettext-setup'
-  load "#{spec.gem_dir}/lib/tasks/gettext.rake"
-  GettextSetup.initialize(File.absolute_path('locales', File.dirname(__FILE__)))
-rescue LoadError
+desc "verify that changed files are clean of Ruby warnings"
+task(:warnings) do
+  # This rake task looks at all files modified in this branch. This is
+  # accomplished by using the TRAVIS_COMMIT_RANGE environment variable, which
+  # is present in travis CI and populated with the range of commits the PR
+  # contains. If not available, this falls back to `master..HEAD` as a next
+  # best bet as `master` is unlikely to ever be absent.
+  commit_range = ENV['TRAVIS_COMMIT_RANGE'].nil? ? 'master...HEAD' : ENV['TRAVIS_COMMIT_RANGE']
+  ruby_files_ok = true
+  puts "Checking modified files #{commit_range}"
+  %x{git diff --diff-filter=ACM --name-only #{commit_range}}.each_line do |modified_file|
+    modified_file.chomp!
+    next unless File.extname(modified_file) == '.rb'
+    puts modified_file
+
+    stdout, stderr, _ = Open3.capture3("ruby -wc \"#{modified_file}\"")
+    unless stderr.empty?
+      ruby_files_ok = false
+      puts stderr
+    end
+    puts stdout
+  end
+  raise "One or more ruby files contain warnings." unless ruby_files_ok
+end
+
+if Rake.application.top_level_tasks.grep(/^gettext:/).any?
+  begin
+    spec = Gem::Specification.find_by_name 'gettext-setup'
+    load "#{spec.gem_dir}/lib/tasks/gettext.rake"
+    GettextSetup.initialize(File.absolute_path('locales', File.dirname(__FILE__)))
+  rescue LoadError
+    abort("Run `bundle install --with documentation` to install the `gettext-setup` gem.")
+  end
 end

data/conf/auth.conf

@@ -7,7 +7,7 @@
 # otherwise, the general rules may "steal" requests that should be
 # governed by the specific rules.
 #
-# See https://docs.puppetlabs.com/puppet/latest/reference/config_file_auth.html
+# See https://puppet.com/docs/puppet/latest/config_file_auth.html
 # for a more complete description of auth.conf's behavior.
 #
 # Supported syntax:
@@ -64,7 +64,7 @@
 # file access in auth.conf by controlling the /file_metadata(s)/<mount point>,
 # /file_content(s)/<mount point>, and /static_file_content/<file> paths. See the
 # Puppet Server documentation at
-# https://docs.puppet.com/puppetserver/latest/config_file_auth.html.
+# https://puppet.com/docs/puppetserver/latest/config_file_auth.html.
 #
 # If you are not using Puppet Server, or are using Puppet Server but with the
 # "jruby-puppet.use-legacy-auth-conf" setting set to "true", you could set the
@@ -100,6 +100,11 @@ path ~ ^/puppet/v3/report/([^/]+)$
 method save
 allow $1
 
+# allow all nodes to update their own facts
+path ~ ^/puppet/v3/facts/([^/]+)$
+method save
+allow $1
+
 # Allow all nodes to access all file services; this is necessary for
 # pluginsync, file serving from modules, and file serving from custom
 # mount points (see fileserver.conf). Note that the `/file` prefix matches

data/conf/environment.conf

@@ -1,6 +1,6 @@
 # Each environment can have an environment.conf file. Its settings will only
 # affect its own environment. See docs for more info:
-# https://docs.puppetlabs.com/puppet/latest/reference/config_file_environment.html
+# https://puppet.com/docs/puppet/latest/config_file_environment.html
 
 # Any unspecified settings use default values; some of those defaults are based
 # on puppet.conf settings.

data/conf/fileserver.conf

@@ -34,4 +34,4 @@
 #
 # For details and an example, see the auth.conf file. If you're using Puppet
 # Server, see the Puppet Server documentation at
-# https://docs.puppet.com/puppetserver/latest/config_file_auth.html.
+# https://puppet.com/docs/puppetserver/latest/config_file_auth.html.

data/conf/puppet.conf

@@ -1,6 +1,6 @@
 # This file can be used to override the default puppet settings.
 # See the following links for more details on what settings are available:
-# - https://docs.puppetlabs.com/puppet/latest/reference/config_important_settings.html
-# - https://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html
-# - https://docs.puppetlabs.com/puppet/latest/reference/config_file_main.html
-# - https://docs.puppetlabs.com/puppet/latest/reference/configuration.html
+# - https://puppet.com/docs/puppet/latest/config_important_settings.html
+# - https://puppet.com/docs/puppet/latest/config_about_settings.html
+# - https://puppet.com/docs/puppet/latest/config_file_main.html
+# - https://puppet.com/docs/puppet/latest/configuration.html

data/ext/README.environment

@@ -5,4 +5,4 @@ modules that are installed globally (normally in /etc/puppetlabs/code/modules) f
 puppet master.
 
 For more information see
-https://docs.puppet.com/puppet/latest/reference/environments.html
+https://puppet.com/docs/puppet/latest/environments_about.html

data/ext/build_defaults.yaml

@@ -1,6 +1,4 @@
 ---
-packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
-packaging_repo: 'packaging'
 packager: 'puppetlabs'
 gpg_key: '7F438280EF8D349F'
 

data/ext/cert_inspector

@@ -97,7 +97,7 @@ class X509Collector
         next unless public_key_info = extract_public_key_info(path, meaning)
         public_key, priority, name = public_key_info
         pem = public_key.to_s
-        existing_priority, existing_name, existing_public_key = key_data[pem]
+        existing_priority, _, _ = key_data[pem]
         next if existing_priority and existing_priority < priority
         key_data[pem] = priority, name, public_key
       rescue
@@ -106,7 +106,7 @@ class X509Collector
     end
     name_to_key_hash = {}
     key_data.each do |pem, data|
-      priority, name, public_key = data
+      _, name, public_key = data
       if name_to_key_hash[name]
         suffix_num = 2
         while name_to_key_hash[name + " (#{suffix_num})"]

data/ext/debian/copyright

@@ -7,13 +7,13 @@ Maintainer:
  Nigel Kersten <nigel@explanatorygap.net>,
  Stig Sandbeck Mathisen <ssm@debian.org>
 Source: git://github.com/puppetlabs/puppet.git,
- https://docs.puppetlabs.com/puppet/latest/reference/install_pre.html
+ https://puppet.com/docs/puppet/latest/install_pre.html
 
 Copyright: 2005-2015 Puppet Labs
 License: Apache 2.0
 
 Files: debian/*
-Copyright: 
+Copyright:
  Andrew Pollock <apollock@debian.org>,
  Jamie Wilkinson <jaq@debian.org>,
  Matthew Palmer <mpalmer@debian.org>,
@@ -61,16 +61,6 @@ Files: lib/puppet/external/event-loop/*
 Copyright: Daniel Brockman
 License: GPL-2+
 
-Files: lib/puppet/external/nagios/parser.rb
-Copyright: Minero Aoki
-License: other
- This program is free software.
- You can distribute/modify this program under the same terms of ruby.
- .
- As a special exception, when this code is copied by Racc
- into a Racc output file, you may use that output file
- without restriction.
-
 Files: lib/puppet/network/http_server/mongrel.rb
 Copyright: Manuel Holtgrewe, Luke Kanies
 License: MIT
@@ -94,18 +84,6 @@ License: MIT
  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-Files: lib/puppet/provider/augeas/augeas.rb, lib/puppet/type/augeas.rb
-Copyright: Red Hat Inc.
-License: GPL-2+
-
-Files: lib/puppet/provider/mcx/mcxcontent.rb
-Copyright: Jeff McCune <jeff@northstarlabs.net>
-License: GPL-2+
-
-Files: lib/puppet/type/mcx.rb, spec/unit/type/mcx.rb
-Copyright: Jeffrey J McCune.
-License: GPL-2+
-
 Files: lib/puppet/provider/nameservice/directoryservice.rb
 Copyright: Jeff McCune
 License: GPL-2

data/ext/debian/puppetmaster.README.debian

@@ -11,7 +11,7 @@ To run Passenger with Apache, install the puppetmaster-passenger package. It
 automatically sets up an apache2 virtual host that runs puppetmaster under
 Passenger.
 
-For more information, see https://docs.puppetlabs.com/guides/passenger.html.
+For more information, see https://puppet.com/docs/puppet/latest/passenger.html.
 For information about the Puppet-designed Puppet Server, which deprecates
 the Passenger/Apache stack, see
-https://docs.puppetlabs.com/puppetserver/latest/.
+https://puppet.com/docs/puppetserver/latest/.

data/ext/envpuppet

@@ -48,7 +48,7 @@ will taint the development version
 
 The following enviornment variables configure the behavior of envpuppet
 
-    ENVPUPPET_BASEDIR=${HOME}/src 
+    ENVPUPPET_BASEDIR="${HOME}/src"
       the base directory where puppet, facter, etc...  live.
 
     ENVPUPPET_BLEEDING=true   Enables bleeding edge prototypes like

data/ext/gentoo/init.d/puppetmaster

@@ -36,7 +36,7 @@ start() {
     ebegin "Starting puppetmaster"
     start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetmasterd \
         -- ${options}
-    eend $? "Failed to start puppetmaster"
+    eend "$?" "Failed to start puppetmaster"
 }
 
 stop() {
@@ -44,8 +44,8 @@ stop() {
     start-stop-daemon --stop --quiet \
         --pidfile ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
     local ret=$?
-    eend ${ret} "Failed to stop puppetmaster"
-    rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
-    return ${ret}
+    eend "${ret}" "Failed to stop puppetmaster"
+    rm -f "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
+    return "${ret}"
 }
 

data/ext/hiera/hiera.yaml

@@ -4,7 +4,7 @@ defaults:
   # The default value for "datadir" is "data" under the same directory as the hiera.yaml
   # file (this file)
   # When specifying a datadir, make sure the directory exists.
-  # See https://docs.puppet.com/puppet/latest/environments.html for further details on environments.
+  # See https://puppet.com/docs/puppet/latest/environments_about.html for further details on environments.
   # datadir: data
   # data_hash: yaml_data
 hierarchy:

data/ext/ips/puppet-agent

@@ -2,16 +2,16 @@
 
 . /lib/svc/share/smf_include.sh
 
-[[ -z "${SMF_FMRI}" ]] && exit $SMF_EXIT_ERR
+[[ -z "${SMF_FMRI}" ]] && exit "$SMF_EXIT_ERR"
 
 typeset -r CONF_FILE=/etc/puppet/puppet.conf
-[[ ! -f "${CONF_FILE}" ]] && exit $SMF_EXIT_ERR_CONFIG
+[[ ! -f "${CONF_FILE}" ]] && exit "$SMF_EXIT_ERR_CONFIG"
 
 typeset -r PUPPET=/usr/bin/puppet
 
 case "$1" in
 start)
-  exec $PUPPET agent
+  exec "$PUPPET" agent
   ;;
 
 stop)
@@ -23,22 +23,22 @@ stop)
   # continues until all processes are killed.
   # svcs -p <fmri> lists all processes in the contract.
   # http://bnsmb.de/solaris/My_Little_SMF_FAQ.html
-  ctid=`svcprop -p restarter/contract $SMF_FMRI`
+  ctid=`svcprop -p restarter/contract "$SMF_FMRI"`
   if [ -n "$ctid" ]; then
-    smf_kill_contract $ctid TERM 1 5
+    smf_kill_contract "$ctid" TERM 1 5
     ret=$?
-    [ $ret -eq 1 ] && exit $SMF_EXIT_ERR_FATAL
+    [ "$ret" -eq 1 ] && exit "$SMF_EXIT_ERR_FATAL"
 
-    if [ $ret -eq 2 ] ; then
-      smf_kill_contract $ctid KILL 1
-      [ $? -ne 0 ] && exit $SMF_EXIT_ERR_FATAL
+    if [ "$ret" -eq 2 ] ; then
+      smf_kill_contract "$ctid" KILL 1
+      [ $? -ne 0 ] && exit "$SMF_EXIT_ERR_FATAL"
     fi
   fi
   ;;
 *)
   echo "Usage: $0 {start|stop}";
-  exit $SMF_EXIT_ERR_FATAL
+  exit "$SMF_EXIT_ERR_FATAL"
   ;;
 esac
-exit $SMF_EXIT_OK
+exit "$SMF_EXIT_OK"
 

data/ext/ips/puppet-master

@@ -2,15 +2,15 @@
 
 . /lib/svc/share/smf_include.sh
 
-[[ -z "${SMF_FMRI}" ]] && exit $SMF_EXIT_ERR
+[[ -z "${SMF_FMRI}" ]] && exit "$SMF_EXIT_ERR"
 
 typeset -r CONF_FILE=/etc/puppet/puppet.conf
-[[ ! -f ${CONF_FILE} ]] && exit $SMF_EXIT_ERR_CONFIG
+[[ ! -f "${CONF_FILE}" ]] && exit "$SMF_EXIT_ERR_CONFIG"
 typeset -r PUPPET=/usr/bin/puppet
 
 case "$1" in
 start)
-  exec $PUPPET master --daemonize
+  exec "$PUPPET" master --daemonize
   ;;
 
 stop)
@@ -23,22 +23,22 @@ stop)
   # svcs -p <fmri> lists all processes in the contract.
   # http://bnsmb.de/solaris/My_Little_SMF_FAQ.html
 
-  ctid=`svcprop -p restarter/contract $SMF_FMRI`
+  ctid=`svcprop -p restarter/contract "$SMF_FMRI"`
   if [ -n "$ctid" ]; then
-    smf_kill_contract $ctid TERM 1 5
+    smf_kill_contract "$ctid" TERM 1 5
     ret=$?
-    [ $ret -eq 1 ] && exit $SMF_EXIT_ERR_FATAL
+    [ "$ret" -eq 1 ] && exit "$SMF_EXIT_ERR_FATAL"
 
-    if [ $ret -eq 2 ] ; then
-      smf_kill_contract $ctid KILL 1
-      [ $? -ne 0 ] && exit $SMF_EXIT_ERR_FATAL
+    if [ "$ret" -eq 2 ] ; then
+      smf_kill_contract "$ctid" KILL 1
+      [ $? -ne 0 ] && exit "$SMF_EXIT_ERR_FATAL"
     fi
   fi
   ;;
 *)
   echo "Usage: $0 {start|stop}";
-  exit $SMF_EXIT_ERR_FATAL
+  exit "$SMF_EXIT_ERR_FATAL"
   ;;
 esac
-exit $SMF_EXIT_OK
+exit "$SMF_EXIT_OK"
 

data/ext/project_data.yaml

@@ -14,15 +14,17 @@ gem_test_files: 'spec/**/*'
 gem_executables: 'puppet'
 gem_default_executables: 'puppet'
 gem_forge_project: 'puppet'
-gem_required_ruby_version: '>= 1.9.3'
+gem_required_ruby_version: '>= 2.3.0'
 gem_required_rubygems_version: '> 1.3.1'
 gem_runtime_dependencies:
-  facter: ['> 2.0', '< 4']
+  facter: ['> 2.0.1', '< 4']
   hiera: ['>= 3.2.1', '< 4']
-  # PUP-7115 - return to a gem dependency in Puppet 5
-  # semantic_puppet: ['>= 0.1.3', '< 2']
-  gettext-setup: ['>= 0.10', '< 1']
+  semantic_puppet: '~> 1.0'
+  fast_gettext: '~> 1.1.2'
   locale: '~> 2.1'
+  multi_json: '~> 1.10'
+  httpclient: '~> 2.8'
+  puppet-resource_api: '~>1.5'
 gem_rdoc_options:
   - --title
   - "Puppet - Configuration Management"
@@ -35,8 +37,7 @@ gem_platform_dependencies:
       CFPropertyList: '~> 2.2'
   x86-mingw32:
     gem_runtime_dependencies:
-      # Pinning versions that require native extensions
-      ffi: '~> 1.9.6'
+      ffi: '~> 1.9.25'
       # win32-xxxx gems are pinned due to PUP-6445
       win32-dir: '= 0.4.9'
       win32-process: '= 0.7.5'
@@ -46,7 +47,7 @@ gem_platform_dependencies:
       minitar: '~> 0.6.1'
   x64-mingw32:
     gem_runtime_dependencies:
-      ffi: '~> 1.9.6'
+      ffi: '~> 1.9.25'
       # win32-xxxx gems are pinned due to PUP-6445
       win32-dir: '= 0.4.9'
       win32-process: '= 0.7.5'

data/ext/puppet-test

@@ -23,7 +23,7 @@
 # parameter, so you can specify '--server <servername>' as an argument.
 #
 # See the configuration file documentation at
-# http://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html
+# https://puppet.com/docs/puppet/latest/config_about_settings.html
 # for the full list of acceptable parameters. A commented list of all
 # configuration $options can also be generated by running puppetd with
 # '--genconfig'.
@@ -195,10 +195,11 @@ class Suite
 
         $options[:repeat].times do |i|
             @count = i
+            escaped_doc = doc.gsub(/%/, '%%')
             if forked?
-                msg = doc + " in PID %s" % Process.pid
+                msg = escaped_doc + " in PID %{process_id} in %%{seconds} seconds" % { process_id: Process.pid }
             else
-                msg = doc
+                msg = escaped_doc + " in %{seconds} seconds"
             end
             Puppet::Util.benchmark(:notice, msg) do
                 begin
@@ -381,7 +382,6 @@ $args = {}
 $options = {:repeat => 1, :fork => 0, :pause => false, :nodes => []}
 
 begin
-    explicit_waitforcert = false
     result.each { |opt,arg|
         case opt
             # First check to see if the argument is a valid setting;
@@ -396,7 +396,7 @@ begin
             when "--fork"
                 begin
                     $options[:fork] = Integer(arg)
-                rescue => detail
+                rescue
                     $stderr.puts "The argument to 'fork' must be an integer"
                     exit(14)
                 end

data/ext/redhat/client.init

@@ -16,9 +16,9 @@
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
 lockfile=/var/lock/subsys/puppet
 piddir=/var/run/puppetlabs
-pidfile=${piddir}/agent.pid
+pidfile="${piddir}/agent.pid"
 puppetd=/opt/puppetlabs/puppet/bin/puppet
-pid=$(cat $pidfile 2> /dev/null)
+pid=$(cat "$pidfile" 2> /dev/null)
 RETVAL=0
 
 PUPPET_OPTS="agent "

data/ext/redhat/logrotate

@@ -15,7 +15,7 @@
   nocreate
   sharedscripts
   postrotate
-   ([ -x /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1) ||
+   ([ -x /etc/init.d/puppet ] && /etc/init.d/puppet rotate > /dev/null 2>&1) ||
     ([ -x /usr/bin/systemctl ] && /usr/bin/systemctl kill -s USR2 puppet.service > /dev/null 2>&1) || true
   endscript
 }

data/ext/redhat/puppet.spec.erb

@@ -104,10 +104,6 @@ The server can also function as a certificate authority and file server.
 
 
 %build
-for f in external/nagios.rb relationship.rb; do
-  sed -i -e '1d' lib/puppet/$f
-done
-
 find examples/ -type f | xargs --no-run-if-empty chmod a-x
 
 %install

data/ext/regexp_nodes/regexp_nodes.rb

@@ -2,24 +2,24 @@
 
 # = Synopsis
 # This is an external node classifier script, after
-# https://docs.puppetlabs.com/guides/external_nodes.html
+# https://puppet.com/docs/puppet/latest/lang_write_functions_in_puppet.html
 #
 # = Usage
 # regexp_nodes.rb <host>
 #
 # = Description
 # This classifier implements filesystem autoloading: It looks through classes,
-# parameters, and environment subdirectories, looping through each file it 
-# finds.  Each file's contents are a regexp-per-line which, if they match the 
-# hostname passed to the program as ARGV[0], sets a class, parameter value 
+# parameters, and environment subdirectories, looping through each file it
+# finds.  Each file's contents are a regexp-per-line which, if they match the
+# hostname passed to the program as ARGV[0], sets a class, parameter value
 # or environment named the same thing as the file itself. At the end, the
-# resultant data structure is returned back to the puppet master process as 
+# resultant data structure is returned back to the puppet master process as
 # yaml.
 #
 # = Caveats
 # Since the files are read in directory order, multiple matches for a given
 # hostname in the parameters/ and environment/ subdirectories will return the
-# last-read value.  (Multiple classes/ matches don't cause a problem; the 
+# last-read value.  (Multiple classes/ matches don't cause a problem; the
 # class is either incuded or it isn't)
 #
 # Unmatched hostnames in any of the environment/ files will cause 'production'
@@ -28,10 +28,10 @@
 #
 # = Examples
 # Based on the example files in the classes/ and parameters/ subdirectories
-# in the distribution, classes/database will set the 'database' class for 
-# hosts matching %r{db\d{2}} (that is, 'db' followed by two digits) or with 
-# 'mysql' anywhere in the hostname.  Similarly, hosts beginning with 'www' or 
-# 'web' or the hostname 'leterel' (my workstation) will be assigned the 
+# in the distribution, classes/database will set the 'database' class for
+# hosts matching %r{db\d{2}} (that is, 'db' followed by two digits) or with
+# 'mysql' anywhere in the hostname.  Similarly, hosts beginning with 'www' or
+# 'web' or the hostname 'leterel' (my workstation) will be assigned the
 # 'webserver' class.
 #
 # Under parameters/ there is one subdirectory 'service' which
@@ -42,7 +42,7 @@
 #
 # In the environment/ subdirectory, any hosts matching '^dev-' and a single
 # production host which serves as 'canary in the coal mine' will be put into
-# the development environment 
+# the development environment
 #
 # = Author
 # Eric Sorenson <eric@explosive.net>
@@ -89,7 +89,6 @@ class ExternalNode
   # parameters
   def initialize(hostname, classdir = 'classes/', parameterdir = 'parameters/', environmentdir = 'environment/')
     # instance variables that contain the lists of classes and parameters
-    @hostname
     @classes = Set.new
     @parameters = Hash.new("unknown")  # sets a default value of "unknown"
     @environment = "production"
@@ -134,13 +133,13 @@ class ExternalNode
     patternlist = []
 
     begin
-      open(filepath).each { |l|
+      open(filepath).each do |l|
         l.chomp!
 
         next if l =~ /^$/
         next if l =~ /^#/
 
-		if l =~ /^\s*(\S+)/
+        if l =~ /^\s*(\S+)/
           m = Regexp.last_match
           log("found a non-comment line, transforming [#{l}] into [#{m[1]}]")
           l.gsub!(l,m[1])
@@ -151,7 +150,7 @@ class ExternalNode
         pattern = %r{#{l}}
         patternlist <<  pattern
         log("appending [#{pattern}] to patternlist for [#{filepath}]")
-      }
+      end
     rescue StandardError
       log("Problem reading #{filepath}: #{$!}",:err)
       exit(1)
@@ -187,7 +186,7 @@ class ExternalNode
     end
   end
 
-  # match_environment is similar to match_classes but it overwrites 
+  # match_environment is similar to match_classes but it overwrites
   # any previously set value (usually just the default, 'production')
   # with a match
   def match_environment(fullpath)