diff options
422 files changed, 3029 insertions, 3029 deletions
@@ -1,5 +1,5 @@ 0.25.0 - Fixed #2280 - Detailed exit codes fix + Fixed #2280 - Detailed exit codes fix Fixed #198 - Puppet man pages added @@ -25,7 +25,7 @@ 0.24.8 Fixed #2077 - ralsh user broken on OSX - + Fixed #2004 - ssh_authorized_key fails if no target is defined Fixed #1629 - incorrect permissions on ssh_authorized_keys created files @@ -44,9 +44,9 @@ Fixed #1871 - Sensitive information leaked in log reports - Fixed #1956 - Cleaned up variable names to be more sane, clarified error messages + Fixed #1956 - Cleaned up variable names to be more sane, clarified error messages and fixed incorrect use of 'value' variable rather than 'member'. - + Fixed #1831 - Added sprintf function Fixed #1830 - Added regsubst function @@ -55,7 +55,7 @@ Fixing #1948 and #1953 - augeas ins bug: wrong number of arguments (1 for 3) - Fixing #944 - changing error message from warning to info - connection recycled + Fixing #944 - changing error message from warning to info - connection recycled Fixed #961 - puppetd creating too many/not closing TCP connections @@ -70,7 +70,7 @@ Fixed #1884 - Exported resources are marked as unexported when collected on the exporting host Fixed #1922 - Functions squash all arguments into a single hash - + Fixed #1538 - Yumrepo sets permissions wrongly on files in /etc/yum.repos.d Fixed #1936 - Added /* */ support to the vim file @@ -78,7 +78,7 @@ Fixed #1541 - nagios objects write files to clientbucket on every change Fixed #1542 - cannot purge nagios objects - + Fixing #1912 - gid still works with no 'should' value fixing ralsh issues Fixing the Rakefile to use 'git format-patch' @@ -93,8 +93,8 @@ Updated Red Hat spec file 0.24.7 - Fixed #1920 - Shadow password corruption - + Fixed #1920 - Shadow password corruption + 0.24.7 Fixed #1804 - Added VDev and MultiVDev properties to the ZPool type @@ -156,14 +156,14 @@ Fixed #1711 - fileserver test fails due to incorrect mocking - Fixed #1751 - Mac OS X DirectoryService nameservice provider support for - plist output and password hash fil - - Fixed #1752 - Add an optional argument to Puppet::Util.execute to determine + Fixed #1751 - Mac OS X DirectoryService nameservice provider support for + plist output and password hash fil + + Fixed #1752 - Add an optional argument to Puppet::Util.execute to determine whether stderr and stdout are combined in the output - + Added versionable feature to the RPM provider - + Fixed #1668 - puppetca can't clean unsigned certs Moved RRD feature from util/metric.rb to feature/base.rb @@ -200,7 +200,7 @@ Updated Red Hat spec file for 0.24.6 - Removed conf/debian directory - Debian packaging information + Removed conf/debian directory - Debian packaging information now maintained downstream Added augeas type @@ -211,7 +211,7 @@ Added multiline comment support 0.24.6 - Adding support to the user type for: profiles, auths, project, + Adding support to the user type for: profiles, auths, project, key/value pairs (extension to Solaris RBAC support added in 0.24.6) @@ -223,21 +223,21 @@ Fixed #1655 - Provider::Confine::Variable tests are broken - Fixed #1646 - service puppet status does not work as non-root + Fixed #1646 - service puppet status does not work as non-root on redhat system Fixed #1649 - Updated OSX package cleanup - + Fixed #1647 - puppetdoc -r providers now working again Fixed #1639 - uninitialized constant Puppet::Type::User::ProviderUseradd - Fixed #1637 - With an inexistant (global) templatedir, modules + Fixed #1637 - With an inexistant (global) templatedir, modules can't access their templates Fixed #1202 - Collection attribute matching doesn't parse arrays - Fixed #1473 - Puppetd stops with error after puppetmasterd + Fixed #1473 - Puppetd stops with error after puppetmasterd is unavailable Fixed #1354 - yum provider problems with RHEL 3 @@ -249,21 +249,21 @@ Fixing #947 - pluginsync no longer fails poorly when no plugins exist Fixed #981 - Removed 'Adding aliases' info message - + Fixing #1089 - Log messages are now tagged with the log level, making it easier to match messages in the 'tagmail' report. - + Fixing #1098 - Multiline strings now correctly increment the line count Fixing #1614 - Environments no longer have to be listed out - Fixed #1628 - Changed node search to use certname rather than Facter + Fixed #1628 - Changed node search to use certname rather than Facter hostname - - Fixed #1613 - The client environment will be substituted when looking + + Fixed #1613 - The client environment will be substituted when looking up settings. - Updated puppet binary documentation + Updated puppet binary documentation Feature #1624 - Added RBAC roles to solaris user provider @@ -292,13 +292,13 @@ Fixed #791 - You should now be able to create and find a user/group in one transaction. Fixed #1610 - Raise "Filebucketed" messages to Notice priority - + FIxed #1530 - ssh_authorized_keys provider does not crash anymore on SSH type 1 keys Added a number of confines to package providers - Fixed #1609 - Added confines for the Gentoo, FreeBSD and - SMF (Solaris) service providers + Fixed #1609 - Added confines for the Gentoo, FreeBSD and + SMF (Solaris) service providers Fixed #1608 - Added ubuntu to defaultfor for apt provider @@ -306,14 +306,14 @@ provider Fixed #1045 - Multiple metaparams all get added to resources. - - Fixed #1472 -- defined, exported resources in the current compile + + Fixed #1472 -- defined, exported resources in the current compile now get expanded correctly. Fixed #1595 - Internally, Property#retrieve is no longer called when no 'should' value is available for a resource. - Fixed #1588 - Fixed puppetca --clean --all + Fixed #1588 - Fixed puppetca --clean --all Fixed #1584 - Added support for appended variables @@ -324,7 +324,7 @@ Fixed #1579 and #1580 - errors in the Puppet RPM spec file Fixed #1572 -- file purging now fails if remote sources do not exist. - + Fixed #1521 -- ldap user and password are now used with the default connection. Fixed issues with file descriptors leaking into subprocesses @@ -338,7 +338,7 @@ Adjusted hpuxuseradd user provider to confine to HP-UX and fixed HP-UX user provider path regression Fixed debug messages in package type - thanks to Todd Zullinger for this fix - + Fixed #1566 - changed password property of the user type Fixed debug messages in package type @@ -362,10 +362,10 @@ Fixed #1526 - Fixed leak in template Fixed #1506 - Removed storeconfig duplicate indexes - + Fixed #1457 - case insensitive match for error - - Fixed #1488 - Moved individual functions out of functions.rb into + + Fixed #1488 - Moved individual functions out of functions.rb into lib/puppet/parser/functions directory. New functions should be create in this directory. Fixed #1508 - Added HP-UX package provider @@ -377,7 +377,7 @@ Add the -P/--ping option to puppetrun, fixes #1501 Fixed #1394 - Added stored configuration clearing script to /ext - + Fixed #1442 - replaced use of Facter for report titling with certname Fixed $1456 - add proxy configuration capability to yum repo @@ -390,7 +390,7 @@ Expose all puppet variables as instance member variables of the template wrapper. This helps resolve redmine #1427, by providing a safe mechanism to access variables. - + * Implement Puppet::Parser::Scope#to_hash, which returns a hash containing all the variable bindings in the current and, optionally, parent scope. * Use that to set instance member variables into Puppet::Parser::Templatewrapper @@ -403,17 +403,17 @@ interpolation, not both, to avoid issues where a #{} interpolated value contains a % character. - Feature #1476: Allow specification of --bindir --sbindir --sitelibdir --mandir --destdir + Feature #1476: Allow specification of --bindir --sbindir --sitelibdir --mandir --destdir in installation - + Added feature #1241 : Improve performance of group lookups - Fixed bug #1448: Puppet CA incorrectly writes out all certs to inventory .txt on each + Fixed bug #1448: Puppet CA incorrectly writes out all certs to inventory .txt on each certificate signing - Fixing puppetlast to make it work with 0.24.5 / 0.25. Made puppetlast work on 0.24.5 + Fixing puppetlast to make it work with 0.24.5 / 0.25. Made puppetlast work on 0.24.5 by using the YAML indirector - + 0.24.5 You can now select the encoding format when transferring the catalog, with 'yaml' still being the default but 'marshal' being an option. @@ -433,12 +433,12 @@ Updated /spec/unit/rails.rb test - Fix #1426 - services on redhat are restarted again and status is + Fix #1426 - services on redhat are restarted again and status is called from the Red Hat provider Fixed #1414 - Return code from waitpid now right shifted 8 bits - Fixed #174 - a native type type for managing ssh authorized_keys + Fixed #174 - a native type type for managing ssh authorized_keys files is available. Further moves from the examples directory and ext directory @@ -448,14 +448,14 @@ Moved debian to conf and updated examples directory Fixed #1368 - updated Red Hat init scripts - + Added message referencing ReductiveLabs build library Fixed #1396 - Added sha1 function from DavidS to core - + Fixed #1399 - the ldap user provider now knows it can manage passwords. - + Fixed #1272 - if you provide a group name as the gid to an ldap user, the name will be converted to a gid. Note that this only looks up ldap groups, at this point; if you want to set an ldap @@ -468,7 +468,7 @@ Fixed 1240 - puppet will function more like puppetd if graphing or reporting are enabled. - + Fixed #1231 - Exceptions during initialization should now be clearer. Fixed #1006 - puppetrun --class works again. I added the class @@ -484,9 +484,9 @@ Fixed #1367 - Updated Rakefile for new daily builds Fixed #1370 - removed test/util/loadedfile.rb tests - + Fixed #1221 - aliases to titles now work for resources. - + Fixed #1012 - templates in the templatedir are preferred to module templates. Fixed #707 - special '@reboot'-style cron jobs work again. @@ -495,14 +495,14 @@ Fixed #1369 - the init service provider now supports HP-UX. - Removed support for the 'node_name' setting in LDAP and external node + Removed support for the 'node_name' setting in LDAP and external node lookups. Also removed support for 'default' nodes in external nodes. LDAP nodes now use the certificate name, the short name, and 'default', but external nodes just use the certificate name and any custom terminus types will use just the certificate name. - + Fixing #1168 (for 0.24.x) -- automatically downcasing the fqdn. Also requiring that passed in certnames be downcased; the setting system isn't currently flexible enough to automatically downcase @@ -520,7 +520,7 @@ The Master handler previously provided the support for the :node_name setting, and that functionality has now been moved into the Node class. At the same time, the names to search through have been - changed somewhat: Previously, the certificate name and the + changed somewhat: Previously, the certificate name and the hostname were both used for searching, but now, the cert name is always searched first (unless node_name == facter), but only the Facter hostname, domain, and fqdn are used otherwise. We no @@ -530,28 +530,28 @@ Adding support for settings within the existing Facter provider confines. - Moving all confine code out of the Provider class, and fixing #1197. - Created a Confiner module for the Provider class methods, enhanced - the interface between it and the Confine class to make sure binary + Moving all confine code out of the Provider class, and fixing #1197. + Created a Confiner module for the Provider class methods, enhanced + the interface between it and the Confine class to make sure binary paths are searched for fresh each time. Modified the 'factpath' setting to automatically configure Facter to load facts there if a new enough version of Facter is used. - Crontab provider: fix a parse error when a line begins with a space + Crontab provider: fix a parse error when a line begins with a space character (fixes #1216) - Instead of deleting the init scripts (with --del) we should simply - disable it with chkconfig service off, and respectfully do the same + Instead of deleting the init scripts (with --del) we should simply + disable it with chkconfig service off, and respectfully do the same for enable => true; - + Added ldap providers for users and groups. Added support for the --all option to puppetca --clean. If puppetca --clean --all is issued then all client certificates are removed. - + Resources now return the 'should' value for properties from the [] accessor method (they previously threw an exception when this method was used with properties). This shouldn't have any @@ -617,7 +617,7 @@ that it can cause corruption, especially in file serving (but it's client-side corruption). - Applying patch by Ryan McBride to fix OpenBSD package + Applying patch by Ryan McBride to fix OpenBSD package matching. The actual problem was caused by the fix to #1001. Found all instances of methods where split() is used without @@ -867,7 +867,7 @@ the bootproto (#762). You now must specify an environment and you are required to specify - the valid environments for your site. (#911) + the valid environments for your site. (#911) Certificates now always specify a subjectAltName, but it defaults to '*', meaning that it doesn't require DNS names to match. You @@ -998,7 +998,7 @@ exactly the feature asked for, but I could not find a way to directly copy ActiveRecord's concept of an environment. - External node sources can now return undefined classes (#687). + External node sources can now return undefined classes (#687). Puppet clients now have http proxy support (#701). @@ -1051,7 +1051,7 @@ Only ONE node source can be used -- you can use LDAP, code, or an external node program, but not more than one. - + LDAP node support has two changes: First, the "ldapattrs" attribute is now used for setting the attributes to retrieve from the server (in addition to required attriutes), and second, all retrieved attributes @@ -1066,8 +1066,8 @@ handle that on its own. Reworked the database schema used to store configurations with the - storeconfigs option. - + storeconfigs option. + Replaced the obsolete RRD ruby library with the maintained RubyRRDtool library (which requires rrdtool2) (#659). @@ -1140,7 +1140,7 @@ fail on cycles. Added a 'dynamicfacts' configuration option; any facts in that - comma-separated list will be ignored when comparing facts to + comma-separated list will be ignored when comparing facts to see if they have changed and thus whether a recompile is necessary. Renamed some poorly named internal variables: @@ -1312,7 +1312,7 @@ Fixing a bug related to link recursion that caused link directories to always be considered out of sync. - The bind address for puppetmasterd can now be specified with + The bind address for puppetmasterd can now be specified with --bindaddress. Added (probably experimental) mongrel support. At this point you're @@ -1492,7 +1492,7 @@ Correctly handling spaces in file sources. Moved documentation into svn tree. - + 0.18.0 Added support for a "default" node. @@ -1690,7 +1690,7 @@ 0.9.4 Small fix to wrap the StatusServer class in the checks for required classes. - + 0.9.3 Fixed some significant bugs in cron job management. @@ -3,8 +3,8 @@ Puppet - Automating Configuration Management. Copyright (C) 2005 Reductive Labs Reductive Labs can be contacted at: info@reductivelabs.com This program and entire repository is free software; you can -redistribute it and/or modify it under the terms of the GNU -General Public License as published by the Free Software +redistribute it and/or modify it under the terms of the GNU +General Public License as published by the Free Software Foundation; either version 2 of the License, or any later version. This program is distributed in the hope that it will be useful, @@ -1,4 +1,4 @@ -Documentation (and detailed install instructions) can be found +Documentation (and detailed install instructions) can be found online at http://reductivelabs.com/trac/puppet/wiki/DocumentationStart . Generally, you need the following things installed: diff --git a/README.rst b/README.rst index d1f266bea..7e34d0d2a 100644 --- a/README.rst +++ b/README.rst @@ -1,11 +1,11 @@ Puppet ====== -Puppet, an automated administrative engine for your Linux and Unix systems, performs -administrative tasks (such as adding users, installing packages, and updating server +Puppet, an automated administrative engine for your Linux and Unix systems, performs +administrative tasks (such as adding users, installing packages, and updating server configurations) based on a centralized specification. -Documentation (and detailed install instructions) can be found +Documentation (and detailed install instructions) can be found online at the `Puppet Wiki`_. Installation @@ -32,7 +32,7 @@ Generally, you need the following things installed: the library. * Facter => 1.1.1 - You can get this from your package management system or the `Facter site`_ + You can get this from your package management system or the `Facter site`_ .. _Puppet Wiki: http://reductivelabs.com/trac/puppet/wiki/DocumentationStart .. _Facter site: http://reductivelabs.com/projects/facter @@ -54,7 +54,7 @@ end task :tracdocs do require 'puppet' require 'puppet/util/reference' - Puppet::Util::Reference.references.each do |ref| + Puppet::Util::Reference.references.each do |ref| sh "puppetdoc -m trac -r #{ref.to_s}" end end @@ -65,7 +65,7 @@ task :spec do require 'spec/rake/spectask' # require 'rcov' Spec::Rake::SpecTask.new do |t| - t.spec_opts = ['--format','s', '--loadby','mtime'] + t.spec_opts = ['--format','s', '--loadby','mtime'] t.spec_files = FileList['spec/**/*.rb'] end end @@ -83,9 +83,9 @@ task :ci_prep do require 'ci/reporter/rake/rspec' require 'ci/reporter/rake/test_unit' ENV['CI_REPORTS'] = 'results' - rescue LoadError + rescue LoadError puts 'Missing ci_reporter gem. You must have the ci_reporter gem installed to run the CI spec tests' - end + end end desc "Run the CI RSpec tests" @@ -104,7 +104,7 @@ task :mail_patches do raise "Could not get branch from 'git status'" end branch = $1 - + unless branch =~ %r{^([^\/]+)/([^\/]+)/([^\/]+)$} raise "Branch name does not follow <type>/<parent>/<name> model; cannot autodetect parent branch" end @@ -136,9 +136,9 @@ task :changelog do mkdir(CHANGELOG_DIR) unless File.directory?(CHANGELOG_DIR) change_body=`git log --pretty=format:'%aD%n%an <%ae>%n%s%n'` File.open(File.join(CHANGELOG_DIR, "CHANGELOG.git"), 'w') do |f| - f << change_body + f << change_body end - + # Changelog commit `git add #{CHANGELOG_DIR}/CHANGELOG.git` `git commit -m "Update CHANGELOG.git"` diff --git a/bin/filebucket b/bin/filebucket index 911bd2ec7..201fd1c1c 100755 --- a/bin/filebucket +++ b/bin/filebucket @@ -45,7 +45,7 @@ # /etc/passwd: 429b225650b912a2ee067b0a4cf1e949 # $ filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949 # $ -# +# # = Options # # Note that any configuration parameter that's valid in the configuration file @@ -98,4 +98,4 @@ require 'puppet/application' require 'puppet/application/filebucket' # launch the filebucket -Puppet::Application[:filebucket].run
\ No newline at end of file +Puppet::Application[:filebucket].run diff --git a/bin/puppetdoc b/bin/puppetdoc index 87e711056..09d0966cd 100755 --- a/bin/puppetdoc +++ b/bin/puppetdoc @@ -8,7 +8,7 @@ # # = Usage # -# puppetdoc [-a|--all] [-h|--help] [-o|--outputdir <rdoc outputdir>] [-m|--mode <text|pdf|trac|rdoc>] +# puppetdoc [-a|--all] [-h|--help] [-o|--outputdir <rdoc outputdir>] [-m|--mode <text|pdf|trac|rdoc>] # [-r|--reference <[type]|configuration|..>] [manifest-file] # # = Description @@ -19,7 +19,7 @@ # available on the Reductive Labs web site. # # In 'rdoc' mode, this command generates an html RDoc hierarchy describing the manifests that -# are in 'manifestdir' and 'modulepath' configuration directives. +# are in 'manifestdir' and 'modulepath' configuration directives. # The generated documentation directory is doc by default but can be changed with the 'outputdir' option. # # If the command is started with 'manifest-file' command-line arguments, puppetdoc generate a single @@ -64,7 +64,7 @@ # = Example # # This example uses ``ralsh`` to return Puppet configuration for the user ``luke``:: -# +# # $ ralsh user luke # user { 'luke': # home => '/home/luke', diff --git a/conf/auth.conf b/conf/auth.conf index 60d99f272..431e4b205 100644 --- a/conf/auth.conf +++ b/conf/auth.conf @@ -1,11 +1,11 @@ # This is an example auth.conf file, it mimics the puppetmasterd defaults -# +# # The ACL are checked in order of appearance in this file. -# +# # Supported syntax: -# This file supports two different syntax depending on how +# This file supports two different syntax depending on how # you want to express the ACL. -# +# # Path syntax (the one used below): # --------------------------------- # path /path/to/resource @@ -14,35 +14,35 @@ # [auth[enthicated] {yes|no|on|off|any}] # allow [host|ip|*] # deny [host|ip] -# +# # The path is matched as a prefix. That is /file match at # the same time /file_metadat and /file_content. -# +# # Regex syntax: # ------------- # This one is differenciated from the path one by a '~' -# +# # path ~ regex # [environment envlist] # [method methodlist] # [auth[enthicated] {yes|no|on|off|any}] # allow [host|ip|*] # deny [host|ip] -# +# # The regex syntax is the same as ruby ones. -# +# # Ex: # path ~ .pp$ # will match every resource ending in .pp (manifests files for instance) -# +# # path ~ ^/path/to/resource # is essentially equivalent to path /path/to/resource -# +# # environment:: restrict an ACL to a specific set of environments # method:: restrict an ACL to a specific set of methods # auth:: restrict an ACL to an authenticated or unauthenticated request # the default when unspecified is to restrict the ACL to authenticated requests -# (ie exactly as if auth yes was present). +# (ie exactly as if auth yes was present). # ### Authenticated ACL - those applies only when the client diff --git a/conf/osx/createpackage.sh b/conf/osx/createpackage.sh index 32cbebfc5..75b5bb012 100755 --- a/conf/osx/createpackage.sh +++ b/conf/osx/createpackage.sh @@ -7,13 +7,13 @@ # Last Updated: 2008-07-31 # # Copyright 2008 Google Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,7 +30,7 @@ PREFLIGHT="preflight" function find_installer() { - # we walk up three directories to make this executable from the root, + # we walk up three directories to make this executable from the root, # root/conf or root/conf/osx if [ -f "./${INSTALLRB}" ]; then installer="$(pwd)/${INSTALLRB}" @@ -63,7 +63,7 @@ function prepare_package() { # to look at for package creation and substitue the version strings out. # Major/Minor versions can only be integers, so we have "0" and "245" for # puppet version 0.24.5 - # Note too that for 10.5 compatibility this Info.plist *must* be set to + # Note too that for 10.5 compatibility this Info.plist *must* be set to # follow symlinks. VER1=$(echo ${puppet_version} | awk -F "." '{print $1}') VER2=$(echo ${puppet_version} | awk -F "." '{print $2}') @@ -74,12 +74,12 @@ function prepare_package() { sed -i '' "s/{SHORTVERSION}/${puppet_version}/g" "${pkgtemp}/${PROTO_PLIST}" sed -i '' "s/{MAJORVERSION}/${major_version}/g" "${pkgtemp}/${PROTO_PLIST}" sed -i '' "s/{MINORVERSION}/${minor_version}/g" "${pkgtemp}/${PROTO_PLIST}" - + # We need to create a preflight script to remove traces of previous # puppet installs due to limitations in Apple's pkg format. mkdir "${pkgtemp}/scripts" cp "${puppet_root}/conf/osx/${PREFLIGHT}" "${pkgtemp}/scripts" - + # substitute in the sitelibdir specified above on the assumption that this # is where any previous puppet install exists that should be cleaned out. sed -i '' "s|{SITELIBDIR}|${SITELIBDIR}|g" "${pkgtemp}/scripts/${PREFLIGHT}" @@ -123,44 +123,44 @@ function main() { fi find_installer - + if [ ! "${installer}" ]; then echo "Unable to find ${INSTALLRB}" cleanup_and_exit 1 fi find_puppet_root - + if [ ! "${puppet_root}" ]; then echo "Unable to find puppet repository root." cleanup_and_exit 1 fi - + pkgroot=$(mktemp -d -t puppetpkg) - + if [ ! "${pkgroot}" ]; then echo "Unable to create temporary package root." cleanup_and_exit 1 fi - + pkgtemp=$(mktemp -d -t puppettmp) - + if [ ! "${pkgtemp}" ]; then echo "Unable to create temporary package root." cleanup_and_exit 1 fi - + install_puppet get_puppet_version - + if [ ! "${puppet_version}" ]; then echo "Unable to retrieve puppet version" cleanup_and_exit 1 fi - + prepare_package create_package - + cleanup_and_exit 0 } diff --git a/conf/redhat/server.init b/conf/redhat/server.init index 48c8e4ed5..34e0c3fc7 100644 --- a/conf/redhat/server.init +++ b/conf/redhat/server.init @@ -26,7 +26,7 @@ PUPPETMASTER_OPTS="" if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then PUPPETMASTER_OPTS="$PUPPETMASTER_OPTS --servertype=mongrel" elif [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -eq 1 ]; then - PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}" + PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}" fi [ -n "$PUPPETMASTER_LOG" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --logdest=${PUPPETMASTER_LOG}" PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \ @@ -67,7 +67,7 @@ stop() { if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do echo -en "\nPort: ${PUPPETMASTER_PORTS[$i]}" - killproc -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster + killproc -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster ret=$?; [ $ret != 0 ] && RETVAL=$ret done else @@ -93,9 +93,9 @@ puppetmaster_status() { if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do echo -en "Port ${PUPPETMASTER_PORTS[$i]}: " - status -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster + status -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster ret=$?; [ $ret != 0 ] && RETVAL=$ret - done + done else status $PUPPETMASTER RETVAL=$? diff --git a/conf/redhat/server.sysconfig b/conf/redhat/server.sysconfig index befb40fee..1e3997b61 100644 --- a/conf/redhat/server.sysconfig +++ b/conf/redhat/server.sysconfig @@ -5,20 +5,20 @@ # Specify syslog to send log messages to the system log. #PUPPETMASTER_LOG=syslog -# You may specify an alternate port or an array of ports on which +# You may specify an alternate port or an array of ports on which # puppetmaster should listen. Default is: 8140 # If you specify more than one port, the puppetmaster ist automatically # started with the servertype set to mongrel. This might be interesting # if you'd like to run your puppetmaster in a loadbalanced cluster. -# Please note: this won't setup nor start any loadbalancer. +# Please note: this won't setup nor start any loadbalancer. # If you'd like to run puppetmaster with mongrel as servertype but only # on one (specified) port, you have to add --servertype=mongrel to # PUPPETMASTER_EXTRA_OPTS. -# Default: Empty (Puppetmaster isn't started with mongrel, nor on a +# Default: Empty (Puppetmaster isn't started with mongrel, nor on a # specific port) # # Please note: Due to reduced options in the rc-functions lib in RHEL/Centos -# versions prior to 5, this feature won't work. Fedora versions >= 8 are +# versions prior to 5, this feature won't work. Fedora versions >= 8 are # known to work. #PUPPETMASTER_PORTS="" # Puppetmaster on a different port, run with standard webrick servertype diff --git a/conf/solaris/smf/puppetd.xml b/conf/solaris/smf/puppetd.xml index 4b62bac6d..84ee0087d 100644 --- a/conf/solaris/smf/puppetd.xml +++ b/conf/solaris/smf/puppetd.xml @@ -20,7 +20,7 @@ type='path'> <service_fmri value='file:///etc/puppet/puppet.conf'/> </dependency> - + <dependency name='loopback' grouping='require_all' restart_on='error' diff --git a/conf/solaris/smf/puppetmasterd.xml b/conf/solaris/smf/puppetmasterd.xml index b7190eff0..e7b0113bd 100644 --- a/conf/solaris/smf/puppetmasterd.xml +++ b/conf/solaris/smf/puppetmasterd.xml @@ -20,7 +20,7 @@ type='path'> <service_fmri value='file:///etc/puppet/puppet.conf'/> </dependency> - + <dependency name='loopback' grouping='require_all' restart_on='error' diff --git a/conf/suse/client.init b/conf/suse/client.init index d168e8cb4..b81869b55 100644 --- a/conf/suse/client.init +++ b/conf/suse/client.init @@ -14,7 +14,7 @@ ### BEGIN INIT INFO # Provides: puppet # Required-Start: $local_fs $network $syslog -# Should-Start: +# Should-Start: # Required-Stop: # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 diff --git a/conf/suse/puppet.spec b/conf/suse/puppet.spec index b7f7d6162..9d317f849 100644 --- a/conf/suse/puppet.spec +++ b/conf/suse/puppet.spec @@ -22,9 +22,9 @@ BuildArchitectures: noarch BuildRequires: ruby >= 1.8.6 %description -Puppet lets you centrally manage every important aspect of your system using a -cross-platform specification language that manages all the separate elements -normally aggregated in different files, like users, cron jobs, and hosts, +Puppet lets you centrally manage every important aspect of your system using a +cross-platform specification language that manages all the separate elements +normally aggregated in different files, like users, cron jobs, and hosts, along with obviously discrete elements like packages, services, and files. %package server @@ -132,13 +132,13 @@ fi * Sat Feb 16 2008 James Turnbull <james@lovedthanlost.net> - 0.24.1-1 - Fixed puppet configuation file references to match single puppet.conf file - Update versions for 0.24.1 release - + * Tue Aug 3 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-3 - Replaced puppet-bin.patch with %build section from David's spec * Tue Aug 1 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-2 - Added supprot for enabling services in SuSE - + * Tue Aug 1 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-1 - New version and support for SuSE @@ -150,7 +150,7 @@ fi * Mon Jun 19 2006 David Lutterkort <dlutter@redhat.com> - 0.18.0-1 - Patch config for LSB compliance (lsb-config.patch) -- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl +- Changed config moves /var/puppet to /var/lib/puppet, /etc/puppet/ssl to /var/lib/puppet, /etc/puppet/clases.txt to /var/lib/puppet/classes.txt, /etc/puppet/localconfig.yaml to /var/lib/puppet/localconfig.yaml @@ -173,7 +173,7 @@ fi - Rebuilt for new version * Wed Mar 22 2006 David Lutterkort <dlutter@redhat.com> - 0.15.1-1 -- Patch0: Run puppetmaster as root; running as puppet is not ready +- Patch0: Run puppetmaster as root; running as puppet is not ready for primetime * Mon Mar 13 2006 David Lutterkort <dlutter@redhat.com> - 0.15.0-1 @@ -188,7 +188,7 @@ fi allocate the puppet uid/gid dynamically * Sun Feb 19 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-4 -- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed +- Use fedora-usermgmt to create puppet user/group. Use uid/gid 24. Fixed problem with listing fileserver.conf and puppetmaster.conf twice * Wed Feb 8 2006 David Lutterkort <dlutter@redhat.com> - 0.13.0-3 @@ -213,7 +213,7 @@ problem with listing fileserver.conf and puppetmaster.conf twice - Added basic fileserver.conf * Wed Jan 11 2006 David Lutterkort <dlutter@redhat.com> - 0.10.1-1 -- Updated. Moved installation of library files to sitelibdir. Pulled +- Updated. Moved installation of library files to sitelibdir. Pulled initscripts into separate files. Folded tools rpm into server * Thu Nov 24 2005 Duane Griffin <d.griffin@psenterprise.com> diff --git a/conf/suse/server.init b/conf/suse/server.init index 36a310784..2649af506 100644 --- a/conf/suse/server.init +++ b/conf/suse/server.init @@ -12,7 +12,7 @@ ### BEGIN INIT INFO # Provides: puppetmaster # Required-Start: $local_fs $network $syslog -# Should-Start: +# Should-Start: # Required-Stop: # Default-Start: 3 4 5 # Default-Stop: 0 1 2 6 diff --git a/examples/mac_dscl.pp b/examples/mac_dscl.pp index ff59f9d8d..d04f97d58 100755 --- a/examples/mac_dscl.pp +++ b/examples/mac_dscl.pp @@ -7,7 +7,7 @@ User { provider => "directoryservice" } Group { provider => "directoryservice" } user { - "testgone": + "testgone": ensure => absent, uid => 550; "testhere": @@ -25,4 +25,4 @@ group { ensure => present, gid => 551; -}
\ No newline at end of file +} diff --git a/examples/mac_dscl_revert.pp b/examples/mac_dscl_revert.pp index c9bd2b541..7c348b33b 100755 --- a/examples/mac_dscl_revert.pp +++ b/examples/mac_dscl_revert.pp @@ -7,7 +7,7 @@ User { provider => "directoryservice" } Group { provider => "directoryservice" } user { - "testgone": + "testgone": ensure => absent, uid => 550; "testhere": diff --git a/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb b/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb index 9dfa3f54c..d7ad7d22e 100644 --- a/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb +++ b/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb @@ -1,6 +1,6 @@ # Copyright (C) David Schmitt <david@schmitt.edv-bus.at> # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -12,7 +12,7 @@ # 3. Neither the name of the Author nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/examples/modules/sample-module/manifests/init.pp b/examples/modules/sample-module/manifests/init.pp index 1af8dff1f..1b7df032a 100644 --- a/examples/modules/sample-module/manifests/init.pp +++ b/examples/modules/sample-module/manifests/init.pp @@ -1,12 +1,12 @@ # Jeff McCune <jeff.mccune@northstarlabs.net> -# +# # Demonstration of a custom parser function and erb template within # a module, working in concert. class sample-module { $fqdn_to_dn = hostname_to_dn($domain) $sample_template = template("sample-module/sample.erb") - + notice("hostname_to_dn module function returned: [$fqdn_to_dn]") info("sample.erb looks like:\n$sample_template") } diff --git a/examples/relationships b/examples/relationships index 795788947..e361dc852 100644 --- a/examples/relationships +++ b/examples/relationships @@ -28,7 +28,7 @@ define sleeper { files { } -sleeper { +sleeper { require => files["yay"], schedule => true } diff --git a/ext/autotest/config b/ext/autotest/config index d37c1b2c6..88c37b2d2 100644 --- a/ext/autotest/config +++ b/ext/autotest/config @@ -5,7 +5,7 @@ require 'autotest/redgreen' require 'autotest/timestamp' Autotest.send(:alias_method, :real_find_files, :find_files) -Autotest.send(:define_method, :find_files) do |*args| +Autotest.send(:define_method, :find_files) do |*args| real_find_files.reject do |k, v| if (ENV['AUTOTEST'] and !ENV['AUTOTEST'].empty?) !Regexp.new(ENV['AUTOTEST']).match(k) @@ -15,19 +15,19 @@ end module Autotest::Growl - def self.growl title, msg, img, pri=0, sticky="" - system "growlnotify -n autotest --image #{img} -p #{pri} -m #{msg.inspect} #{title} #{sticky}" + def self.growl title, msg, img, pri=0, sticky="" + system "growlnotify -n autotest --image #{img} -p #{pri} -m #{msg.inspect} #{title} #{sticky}" end Autotest.add_hook :ran_command do |at| - image_root = "~/.autotest_images" + image_root = "~/.autotest_images" results = [at.results].flatten.join("\n") output = results.slice(/(\d+)\stests,\s(\d+)\sassertions,\s(\d+)\sfailures,\s(\d+)\serrors/) if output if $~[3].to_i > 0 || $~[4].to_i > 0 growl "FAIL", "#{output}", "#{image_root}/fail.png", 2 else - growl "Pass", "#{output}", "#{image_root}/pass.png" + growl "Pass", "#{output}", "#{image_root}/pass.png" end end @@ -36,7 +36,7 @@ module Autotest::Growl if $~[2].to_i > 0 || $~[4].to_i > 0 growl "FAIL", "#{output}", "#{image_root}/fail.png", 2 else - growl "Pass", "#{output}", "#{image_root}/pass.png" + growl "Pass", "#{output}", "#{image_root}/pass.png" end end end diff --git a/ext/dbfix.sql b/ext/dbfix.sql index 960369117..3720289b9 100644 --- a/ext/dbfix.sql +++ b/ext/dbfix.sql @@ -1,5 +1,5 @@ -- MySQL DB consistency check/fix --- +-- -- Usage: -- cat dbfix.sql | mysql -u user -p puppet -- @@ -13,11 +13,11 @@ FROM resources AS bad_rows FROM resources GROUP BY title,restype,host_id HAVING count(*) > 1 - ) AS good_rows - ON - good_rows.title = bad_rows.title AND - good_rows.restype = bad_rows.restype AND - good_rows.host_id = bad_rows.host_id AND + ) AS good_rows + ON + good_rows.title = bad_rows.title AND + good_rows.restype = bad_rows.restype AND + good_rows.host_id = bad_rows.host_id AND good_rows.max_id <> bad_rows.id; -- Remove duplicate param_values, and keep the latest one @@ -28,17 +28,17 @@ FROM param_values AS bad_rows FROM param_values GROUP BY value,param_name_id,resource_id HAVING count(*) > 1 - ) AS good_rows - ON - good_rows.value = bad_rows.value AND - good_rows.param_name_id = bad_rows.param_name_id AND - good_rows.resource_id = bad_rows.resource_id AND + ) AS good_rows + ON + good_rows.value = bad_rows.value AND + good_rows.param_name_id = bad_rows.param_name_id AND + good_rows.resource_id = bad_rows.resource_id AND good_rows.max_id <> bad_rows.id; -- rewrite param_values that points to duplicated param_names -- to point to the highest param_name id. -UPDATE - param_values v +UPDATE + param_values v INNER JOIN param_names n ON n.id = v.param_name_id @@ -60,8 +60,8 @@ FROM param_names AS bad_rows FROM param_names GROUP BY name HAVING count(*) > 1 - ) AS good_rows - ON + ) AS good_rows + ON good_rows.name = bad_rows.name AND good_rows.max_id <> bad_rows.id; @@ -73,16 +73,16 @@ FROM resource_tags AS bad_rows FROM resource_tags GROUP BY resource_id,puppet_tag_id HAVING count(*) > 1 - ) AS good_rows - ON + ) AS good_rows + ON good_rows.resource_id = bad_rows.resource_id AND good_rows.puppet_tag_id = bad_rows.puppet_tag_id AND good_rows.max_id <> bad_rows.id; -- rewrite resource_tags that points to duplicated puppet_tags -- to point to the highest puppet_tags id. -UPDATE - resource_tags v +UPDATE + resource_tags v INNER JOIN puppet_tags n ON n.id = v.puppet_tag_id @@ -104,8 +104,8 @@ FROM puppet_tags AS bad_rows FROM puppet_tags GROUP BY name HAVING count(*) > 1 - ) AS good_rows - ON + ) AS good_rows + ON good_rows.name = bad_rows.name AND good_rows.max_id <> bad_rows.id; diff --git a/ext/emacs/puppet-mode.el b/ext/emacs/puppet-mode.el index 27f4c701a..31249a593 100644 --- a/ext/emacs/puppet-mode.el +++ b/ext/emacs/puppet-mode.el @@ -1,6 +1,6 @@ ;;; ;;; puppet-mode.el -;;; +;;; ;;; Author: lutter ;;; Author: Russ Allbery <rra@stanford.edu> ;;; @@ -152,23 +152,23 @@ of the initial include plus puppet-include-indent." ;; Indent the line to the same indentation as the first ;; element in that array. That is, this... ;; - ;; exec { + ;; exec { ;; "add_puppetmaster_mongrel_startup_links": ;; command => "string1", - ;; creates => [ "string2", "string3", - ;; "string4", "string5", + ;; creates => [ "string2", "string3", + ;; "string4", "string5", ;; "string6", "string7", ;; "string3" ], ;; refreshonly => true, ;; } - ;; + ;; ;; ...should instead look like this: ;; - ;; exec { + ;; exec { ;; "add_puppetmaster_mongrel_startup_links": ;; command => "string1", - ;; creates => [ "string2", "string3", - ;; "string4", "string5", + ;; creates => [ "string2", "string3", + ;; "string4", "string5", ;; "string6", "string7", ;; "string8" ], ;; refreshonly => true, @@ -216,12 +216,12 @@ of the initial include plus puppet-include-indent." ;; if there is more than one block opened and closed on the same ;; line but it's still unbalanced; hopefully people don't do that. ((looking-at "^.*{[^\n}]*$") - (setq cur-indent (+ (current-indentation) puppet-indent-level)) + (setq cur-indent (+ (current-indentation) puppet-indent-level)) (setq not-indented nil)) ;; Indent by one level if the line ends with an open paren. ((looking-at "^.*\(\\s-*$") - (setq cur-indent (+ (current-indentation) puppet-indent-level)) + (setq cur-indent (+ (current-indentation) puppet-indent-level)) (setq not-indented nil)) ;; Semicolon ends a block for a resource when multiple resources diff --git a/ext/puppet-test b/ext/puppet-test index bf6c2de39..dbbde40c6 100755 --- a/ext/puppet-test +++ b/ext/puppet-test @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# == Synopsis +# == Synopsis # # Test individual client performance. Can compile configurations, describe # files, or retrieve files. @@ -309,7 +309,7 @@ Suite.new :rails, "Rails Interactions" do Puppet::Rails.init @facts = Facter.to_hash - if num = ENV["RESOURCECOUNT"] + if num = ENV["RESOURCECOUNT"] @resources = Integer(num) else @resources = 10 diff --git a/ext/puppetlisten/puppetlisten.rb b/ext/puppetlisten/puppetlisten.rb index 23c2c4942..23e9f65d5 100755 --- a/ext/puppetlisten/puppetlisten.rb +++ b/ext/puppetlisten/puppetlisten.rb @@ -46,7 +46,7 @@ File.open(Puppet[:authconfig]).each do |line| end # be a daemon -sock = TCPServer.new(port) +sock = TCPServer.new(port) ssls = OpenSSL::SSL::SSLServer.new(sock, ctx) loop do diff --git a/ext/rack/README b/ext/rack/README index 33f958e36..63b8fde7a 100644 --- a/ext/rack/README +++ b/ext/rack/README @@ -2,7 +2,7 @@ PUPPETMASTER AS A RACK APPLICATION ================================== -puppetmaster can now be hosted as a standard Rack application. A proper +puppetmaster can now be hosted as a standard Rack application. A proper config.ru is provided for this. For more details about rack, see http://rack.rubyforge.org/ . @@ -17,14 +17,14 @@ to work. WEBrick ------- -WEBrick is currently not supported as a Rack host. You'll be better off +WEBrick is currently not supported as a Rack host. You'll be better off just running puppetmasterd directly. Mongrel ------- -If you like Mongrel, and want to replicate wiki:UsingMongrel, you could +If you like Mongrel, and want to replicate wiki:UsingMongrel, you could probably start your backend mongrels this way: cd ext/rack @@ -48,7 +48,7 @@ Requirements: Apache 2.x SSL Module loaded -Apache configuration snippet is in files/apache2.conf. You need to +Apache configuration snippet is in files/apache2.conf. You need to edit it to reflect your servername. Required puppet.conf settings: @@ -60,8 +60,8 @@ To set up most of the boring stuff, you can use this command: puppet --verbose --modulepath ./ext ext/rack/manifest.pp Or use manifest.pp as a starting point for your own module. -Note: Passenger will not let applications run as root or the Apache user, -instead an implicit setuid will be done, to the user whom owns +Note: Passenger will not let applications run as root or the Apache user, +instead an implicit setuid will be done, to the user whom owns config.ru. Therefore, config.ru shall be owned by the puppet user. diff --git a/ext/rack/manifest.pp b/ext/rack/manifest.pp index 5145e05c8..7df07c0c8 100644 --- a/ext/rack/manifest.pp +++ b/ext/rack/manifest.pp @@ -30,7 +30,7 @@ package { ["rack", "passenger"]: service { "apache2": } -case $lsbdistid { +case $lsbdistid { "Debian": { package { ["apache2-mpm-worker", "apache2-threaded-dev", "apache2"]: ensure => installed, diff --git a/ext/vim/syntax/puppet.vim b/ext/vim/syntax/puppet.vim index ba9ac92e9..a60a77bfd 100644 --- a/ext/vim/syntax/puppet.vim +++ b/ext/vim/syntax/puppet.vim @@ -2,9 +2,9 @@ " Filename: puppet.vim " Language: puppet configuration file " Maintainer: Luke Kanies <luke@madstop.com> -" URL: -" Last Change: -" Version: +" URL: +" Last Change: +" Version: " " Copied from the cfengine, ruby, and perl syntax files diff --git a/install.rb b/install.rb index 662cd0678..5353bea1b 100755 --- a/install.rb +++ b/install.rb @@ -51,10 +51,10 @@ begin if $haverdoc rst2man = %x{which rst2man.py} $haveman = true - else + else $haveman = false end -rescue +rescue puts "Missing rst2man; skipping man page creation" $haveman = false end @@ -233,19 +233,19 @@ def prepare_installation Config::CONFIG['bindir'] = "/usr/bin" Config::CONFIG['sbindir'] = "/usr/sbin" end - + if not InstallOptions.bindir.nil? bindir = InstallOptions.bindir else bindir = Config::CONFIG['bindir'] end - + if not InstallOptions.sbindir.nil? sbindir = InstallOptions.sbindir else sbindir = Config::CONFIG['sbindir'] end - + if not InstallOptions.sitelibdir.nil? sitelibdir = InstallOptions.sitelibdir else @@ -259,11 +259,11 @@ def prepare_installation end end end - + if not InstallOptions.mandir.nil? mandir = InstallOptions.mandir else - mandir = Config::CONFIG['mandir'] + mandir = Config::CONFIG['mandir'] end # To be deprecated once people move over to using --destdir option @@ -342,13 +342,13 @@ def build_man(bins) File.unlink("./puppet.conf.rst") # Create binary man pages - bins.each do |bin| + bins.each do |bin| b = bin.gsub( "bin/", "") %x{#{bin} --help > ./#{b}.rst} %x{#{rst2man} ./#{b}.rst ./man/man8/#{b}.8} File.unlink("./#{b}.rst") end - rescue SystemCallError + rescue SystemCallError $stderr.puts "Couldn't build man pages: " + $! $stderr.puts "Continuing with install..." end @@ -388,7 +388,7 @@ def install_binfile(from, op_file, target) break end end - + fail "Cannot find a temporary directory" unless tmp_dir tmp_file = File.join(tmp_dir, '_tmp') ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']) diff --git a/lib/puppet.rb b/lib/puppet.rb index 6e7aa2318..f448f89f7 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -59,7 +59,7 @@ module Puppet # I keep wanting to use Puppet.error # XXX this isn't actually working right now alias :error :err - + # The feature collection @features = Puppet::Util::Feature.new('puppet/feature') diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb index 88ad9d493..e7240f773 100644 --- a/lib/puppet/application.rb +++ b/lib/puppet/application.rb @@ -14,14 +14,14 @@ require 'optparse' # The executable uses the application object like this: # Puppet::Application[:example].run # -# +# # Puppet::Application.new(:example) do -# +# # preinit do # # perform some pre initialization # @all = false # end -# +# # # dispatch is called to know to what command to call # dispatch do # ARGV.shift @@ -30,15 +30,15 @@ require 'optparse' # option("--arg ARGUMENT") do |v| # @args << v # end -# +# # option("--debug", "-d") do |v| # @debug = v # end -# +# # option("--all", "-a:) do |v| # @all = v # end -# +# # unknown do |opt,arg| # # last chance to manage an option # ... @@ -49,11 +49,11 @@ require 'optparse' # command(:read) do # # read action # end -# +# # command(:write) do # # writeaction # end -# +# # end # # === Preinit @@ -62,7 +62,7 @@ require 'optparse' # # === Options # Puppet::Application uses +OptionParser+ to manage the application options. -# Options are defined with the +option+ method to which are passed various +# Options are defined with the +option+ method to which are passed various # arguments, including the long option, the short option, a description... # Refer to +OptionParser+ documentation for the exact format. # * If the option method is given a block, this one will be called whenever @@ -142,7 +142,7 @@ class Puppet::Application end end - # used to declare accessor in a more natural way in the + # used to declare accessor in a more natural way in the # various applications def attr_accessor(*args) args.each do |arg| @@ -186,7 +186,7 @@ class Puppet::Application # initialize default application behaviour def init_default - setup do + setup do default_setup end diff --git a/lib/puppet/application/pi.rb b/lib/puppet/application/pi.rb index 3ac6081e1..67fffdc1b 100644 --- a/lib/puppet/application/pi.rb +++ b/lib/puppet/application/pi.rb @@ -161,7 +161,7 @@ class TypeDoc a.to_s <=> b.to_s }.each { |prov| puts "\n- **%s**" % prov - puts @format.wrap(type.provider(prov).doc, + puts @format.wrap(type.provider(prov).doc, :indent => 4, :scrub => true) } end diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb index 17b07d98e..4799d5571 100644 --- a/lib/puppet/application/puppetd.rb +++ b/lib/puppet/application/puppetd.rb @@ -164,7 +164,7 @@ Puppet::Application.new(:puppetd) do # to clients. In the meantime, we just disable CRL checking if # the CRL file doesn't exist unless File::exist?(Puppet[:cacrl]) - Puppet[:cacrl] = 'false' + Puppet[:cacrl] = 'false' end handlers = nil @@ -199,7 +199,7 @@ Puppet::Application.new(:puppetd) do args[:Server] = Puppet[:server] if options[:fqdn] args[:FQDN] = options[:fqdn] - Puppet[:certname] = options[:fqdn] + Puppet[:certname] = options[:fqdn] end if options[:centrallogs] diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb index 7db9972dd..8ec0b0055 100644 --- a/lib/puppet/configurer.rb +++ b/lib/puppet/configurer.rb @@ -58,7 +58,7 @@ class Puppet::Configurer end end end - + # Just so we can specify that we are "the" instance. def initialize Puppet.settings.use(:main, :ssl, :puppetd) @@ -124,7 +124,7 @@ class Puppet::Configurer return catalog end - # The code that actually runs the catalog. + # The code that actually runs the catalog. # This just passes any options on to the catalog, # which accepts :tags and :ignoreschedules. def run(options = {}) diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb index 5f811d897..16b1f80d2 100755 --- a/lib/puppet/daemon.rb +++ b/lib/puppet/daemon.rb @@ -17,7 +17,7 @@ class Puppet::Daemon Process.detach(pid) exit(0) end - + create_pidfile() # Get rid of console logging diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 538d31c96..3d0ad4bb8 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -39,7 +39,7 @@ module Puppet logopts = ["$vardir/log", "The Puppet log directory."] end setdefaults(:main, :logdir => logopts) - + # This name hackery is necessary so that the rundir is set reasonably during # unit tests. if Process.uid == 0 and %w{puppetd puppetmasterd}.include?(self.name) @@ -60,7 +60,7 @@ module Puppet this directory can be removed without causing harm (although it might result in spurious service restarts)." }, - :rundir => { + :rundir => { :default => rundir, :mode => 01777, :desc => "Where Puppet PID files are kept." @@ -192,7 +192,7 @@ module Puppet end Puppet.setdefaults(:main, - # We have to downcase the fqdn, because the current ssl stuff (as oppsed to in master) doesn't have good facilities for + # We have to downcase the fqdn, because the current ssl stuff (as oppsed to in master) doesn't have good facilities for # manipulating naming. :certname => {:default => fqdn.downcase, :desc => "The name to use when handling certificates. Defaults to the fully qualified domain name.", @@ -320,13 +320,13 @@ module Puppet autosigns any key request, and is a very bad idea), false (which never autosigns any key request), and the path to a file, which uses that configuration file to determine which keys to sign."}, - :ca_days => ["", "How long a certificate should be valid. + :ca_days => ["", "How long a certificate should be valid. This parameter is deprecated, use ca_ttl instead"], - :ca_ttl => ["5y", "The default TTL for new certificates; valid values - must be an integer, optionally followed by one of the units - 'y' (years of 365 days), 'd' (days), 'h' (hours), or + :ca_ttl => ["5y", "The default TTL for new certificates; valid values + must be an integer, optionally followed by one of the units + 'y' (years of 365 days), 'd' (days), 'h' (hours), or 's' (seconds). The unit defaults to seconds. If this parameter - is set, ca_days is ignored. Examples are '3600' (one hour) + is set, ca_days is ignored. Examples are '3600' (one hour) and '1825d', which is the same as '5y' (5 years) "], :ca_md => ["md5", "The type of hash used in certificates."], :req_bits => [2048, "The bit length of the certificates."], @@ -382,11 +382,11 @@ module Puppet }, :masterport => [8140, "Which port puppetmasterd listens on."], :parseonly => [false, "Just check the syntax of the manifests."], - :node_name => ["cert", "How the puppetmaster determines the client's identity - and sets the 'hostname', 'fqdn' and 'domain' facts for use in the manifest, - in particular for determining which 'node' statement applies to the client. - Possible values are 'cert' (use the subject's CN in the client's - certificate) and 'facter' (use the hostname that the client + :node_name => ["cert", "How the puppetmaster determines the client's identity + and sets the 'hostname', 'fqdn' and 'domain' facts for use in the manifest, + in particular for determining which 'node' statement applies to the client. + Possible values are 'cert' (use the subject's CN in the client's + certificate) and 'facter' (use the hostname that the client reported in its facts)"], :bucketdir => { :default => "$vardir/bucket", @@ -642,7 +642,7 @@ module Puppet :typecheck => [true, "Whether to validate types during parsing."], :paramcheck => [true, "Whether to validate parameters during parsing."] ) - + setdefaults(:main, :casesensitive => [false, "Whether matching in case statements and selectors diff --git a/lib/puppet/dsl.rb b/lib/puppet/dsl.rb index 714b350f8..ca01a9c42 100644 --- a/lib/puppet/dsl.rb +++ b/lib/puppet/dsl.rb @@ -1,5 +1,5 @@ # Just quick mess-around to see what a DSL would look like. -# +# # This is what the executable could look like: ##!/usr/bin/env ruby # @@ -28,22 +28,22 @@ # # require 'puppet' # require 'puppet/dsl' -# +# # include Puppet::DSL # init() -# +# # aspect :webserver do # file "/tmp/testone", :content => "yaytest" -# +# # exec "testing", :command => "/bin/echo this is a test" # end -# +# # aspect :other, :inherits => :webserver do # file "/tmp/testone", :mode => "755" # end -# +# # acquire :other -# +# # apply require 'puppet' diff --git a/lib/puppet/external/dot.rb b/lib/puppet/external/dot.rb index fcd5c6a85..b0d542891 100644 --- a/lib/puppet/external/dot.rb +++ b/lib/puppet/external/dot.rb @@ -1,5 +1,5 @@ # rdot.rb -# +# # # This is a modified version of dot.rb from Dave Thomas's rdoc project. I [Horst Duchene] # renamed it to rdot.rb to avoid collision with an installed rdoc/dot. @@ -7,19 +7,19 @@ # It also supports undirected edges. module DOT - + # These glogal vars are used to make nice graph source. $tab = ' ' $tab2 = $tab * 2 - + # if we don't like 4 spaces, we can change it any time def change_tab (t) $tab = t $tab2 = t * 2 end - + # options for node declaration NODE_OPTS = [ @@ -56,7 +56,7 @@ module DOT 'bgcolor', 'rank' ] - + # options for edge declaration EDGE_OPTS = [ @@ -96,7 +96,7 @@ module DOT # maintained for backward compatibility or rdot internal 'id' ] - + # options for graph declaration GRAPH_OPTS = [ @@ -111,7 +111,7 @@ module DOT 'rank', 'rankdir', 'ranksep', 'ratio', 'size' ] - + # a root class for any element in dot notation class DOTSimpleElement @@ -126,7 +126,7 @@ module DOT @name end end - + # an element that has options ( node, edge, or graph ) class DOTElement < DOTSimpleElement @@ -159,8 +159,8 @@ module DOT #end end - - + + # This is used when we build nodes that have shape=record # ports don't have options :) @@ -177,7 +177,7 @@ module DOT ( @name && @name != "" ? "<#{@name}>" : "" ) + "#{@label}" end end - + # node element class DOTNode < DOTElement @@ -300,7 +300,7 @@ module DOT @from = params['from'] ? params['from'] : nil @to = params['to'] ? params['to'] : nil end - + def edge_link '--' end @@ -315,7 +315,7 @@ module DOT end end # class DOTEdge - + class DOTDirectedEdge < DOTEdge def edge_link diff --git a/lib/puppet/external/event-loop/better-definers.rb b/lib/puppet/external/event-loop/better-definers.rb index 09e33fdb5..5d6175fe9 100644 --- a/lib/puppet/external/event-loop/better-definers.rb +++ b/lib/puppet/external/event-loop/better-definers.rb @@ -172,7 +172,7 @@ class Module def define_methods (*names, &body) names.each { |name| define_method(name, &body) } end - + def define_private_methods (*names, &body) define_methods(*names, &body) names.each { |name| private name } @@ -280,7 +280,7 @@ if __FILE__ == $0 assert_equal @y.baz, 321 assert_equal @y.quux, 654 end - + def test_define_soft_aliases @X.define_method(:foo) { 123 } @X.define_method(:baz) { 321 } diff --git a/lib/puppet/external/lock.rb b/lib/puppet/external/lock.rb index 5213f5657..785ecd637 100644 --- a/lib/puppet/external/lock.rb +++ b/lib/puppet/external/lock.rb @@ -36,7 +36,7 @@ class File flush flock(LOCK_UN) end - + # Get a shared (i.e., read) lock on the file, and yield to the block. # If the lock is not available, wait for it without blocking other ruby # threads. diff --git a/lib/puppet/external/nagios/base.rb b/lib/puppet/external/nagios/base.rb index 6a0c1831c..5185c92f7 100755 --- a/lib/puppet/external/nagios/base.rb +++ b/lib/puppet/external/nagios/base.rb @@ -231,9 +231,9 @@ class Nagios::Base # This is probably a bad idea. def name=(value) - unless self.class.namevar.to_s == "name" - send(self.class.namevar.to_s + "=", value) - end + unless self.class.namevar.to_s == "name" + send(self.class.namevar.to_s + "=", value) + end end def namevar diff --git a/lib/puppet/external/nagios/parser.rb b/lib/puppet/external/nagios/parser.rb index d8a8bceea..498b0884e 100644 --- a/lib/puppet/external/nagios/parser.rb +++ b/lib/puppet/external/nagios/parser.rb @@ -402,7 +402,7 @@ module Racc toks.each {|t| out.print ' ', racc_token2str(t) } end out.puts " --> #{racc_token2str(sim)}" - + racc_print_stacks tstack, vstack @racc_debug_out.puts end diff --git a/lib/puppet/file_serving/base.rb b/lib/puppet/file_serving/base.rb index d1fa9dfd2..c82bb1992 100644 --- a/lib/puppet/file_serving/base.rb +++ b/lib/puppet/file_serving/base.rb @@ -48,7 +48,7 @@ class Puppet::FileServing::Base def links=(value) value = value.to_sym value = :manage if value == :ignore - raise(ArgumentError, ":links can only be set to :manage or :follow") unless [:manage, :follow].include?(value) + raise(ArgumentError, ":links can only be set to :manage or :follow") unless [:manage, :follow].include?(value) @links = value end diff --git a/lib/puppet/file_serving/configuration/parser.rb b/lib/puppet/file_serving/configuration/parser.rb index 50368fdaf..eef2d7852 100644 --- a/lib/puppet/file_serving/configuration/parser.rb +++ b/lib/puppet/file_serving/configuration/parser.rb @@ -55,7 +55,7 @@ class Puppet::FileServing::Configuration::Parser < Puppet::Util::LoadedFile # Allow a given pattern access to a mount. def allow(mount, value) - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] x = value.split(/\s*,\s*/).each { |val| begin mount.info "allowing %s access" % val @@ -69,7 +69,7 @@ class Puppet::FileServing::Configuration::Parser < Puppet::Util::LoadedFile # Deny a given pattern access to a mount. def deny(mount, value) - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] x = value.split(/\s*,\s*/).each { |val| begin mount.info "denying %s access" % val diff --git a/lib/puppet/file_serving/content.rb b/lib/puppet/file_serving/content.rb index c1ecff749..9fc1d08b3 100644 --- a/lib/puppet/file_serving/content.rb +++ b/lib/puppet/file_serving/content.rb @@ -36,7 +36,7 @@ class Puppet::FileServing::Content < Puppet::FileServing::Base def content unless defined?(@content) and @content # This stat can raise an exception, too. - raise(ArgumentError, "Cannot read the contents of links unless following links") if stat().ftype == "symlink" + raise(ArgumentError, "Cannot read the contents of links unless following links") if stat().ftype == "symlink" @content = ::File.read(full_path()) end diff --git a/lib/puppet/file_serving/fileset.rb b/lib/puppet/file_serving/fileset.rb index a6a4b62a1..50e4e1e80 100644 --- a/lib/puppet/file_serving/fileset.rb +++ b/lib/puppet/file_serving/fileset.rb @@ -111,14 +111,14 @@ class Puppet::FileServing::Fileset elsif request.options.include?(param.to_s) value = request.options[param.to_s] end - next if value.nil? + next if value.nil? value = true if value == "true" value = false if value == "false" value = Integer(value) if value.is_a?(String) and value =~ /^\d+$/ send(param.to_s + "=", value) end end - + private # Pull the recursion logic into one place. It's moderately hairy, and this diff --git a/lib/puppet/file_serving/mount.rb b/lib/puppet/file_serving/mount.rb index 5b74ad218..5ab6d8688 100644 --- a/lib/puppet/file_serving/mount.rb +++ b/lib/puppet/file_serving/mount.rb @@ -15,7 +15,7 @@ class Puppet::FileServing::Mount < Puppet::Network::AuthStore include Puppet::Util::Logging attr_reader :name - + # Determine the environment to use, if any. def environment(node_name) if node_name and node = Puppet::Node.find(node_name) diff --git a/lib/puppet/file_serving/mount/file.rb b/lib/puppet/file_serving/mount/file.rb index 15e343c57..9053ee18c 100644 --- a/lib/puppet/file_serving/mount/file.rb +++ b/lib/puppet/file_serving/mount/file.rb @@ -79,7 +79,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount # Create a map for a specific node. def clientmap(node) { - "h" => node.sub(/\..*$/, ""), + "h" => node.sub(/\..*$/, ""), "H" => node, "d" => node.sub(/[^.]+\./, "") # domain name } @@ -101,7 +101,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount path.gsub(/%(.)/) do |v| key = $1 - if key == "%" + if key == "%" "%" else map[key] || v diff --git a/lib/puppet/indirector/catalog/active_record.rb b/lib/puppet/indirector/catalog/active_record.rb index 66348f9a4..e3b56ece6 100644 --- a/lib/puppet/indirector/catalog/active_record.rb +++ b/lib/puppet/indirector/catalog/active_record.rb @@ -12,7 +12,7 @@ class Puppet::Resource::Catalog::ActiveRecord < Puppet::Indirector::ActiveRecord return nil unless host = ar_model.find_by_name(request.key) catalog = Puppet::Resource::Catalog.new(host.name) - + host.resources.each do |resource| catalog.add_resource resource.to_transportable end diff --git a/lib/puppet/indirector/exec.rb b/lib/puppet/indirector/exec.rb index 5b51142c3..022ec5324 100644 --- a/lib/puppet/indirector/exec.rb +++ b/lib/puppet/indirector/exec.rb @@ -42,7 +42,7 @@ class Puppet::Indirector::Exec < Puppet::Indirector::Terminus Puppet.err "Failed to find %s via exec: %s" % [name, detail] return nil end - + if output =~ /\A\s*\Z/ # all whitespace Puppet.debug "Empty response for %s from exec %s terminus" % [name, self.name] return nil diff --git a/lib/puppet/indirector/facts/active_record.rb b/lib/puppet/indirector/facts/active_record.rb index 9478c3df2..a2d3e7758 100644 --- a/lib/puppet/indirector/facts/active_record.rb +++ b/lib/puppet/indirector/facts/active_record.rb @@ -28,7 +28,7 @@ class Puppet::Node::Facts::ActiveRecord < Puppet::Indirector::ActiveRecord facts = request.instance host = ar_model.find_by_name(facts.name) || ar_model.create(:name => facts.name) - + host.merge_facts(facts.values) host.save diff --git a/lib/puppet/indirector/indirection.rb b/lib/puppet/indirector/indirection.rb index 0623446d1..f16a9b5dc 100644 --- a/lib/puppet/indirector/indirection.rb +++ b/lib/puppet/indirector/indirection.rb @@ -23,14 +23,14 @@ class Puppet::Indirector::Indirection def self.instances @@indirections.collect { |i| i.name } end - + # Find an indirected model by name. This is provided so that Terminus classes # can specifically hook up with the indirections they are associated with. def self.model(name) return nil unless match = @@indirections.find { |i| i.name == name } match.model end - + attr_accessor :name, :model # Create and return our cache terminus. @@ -126,7 +126,7 @@ class Puppet::Indirector::Indirection unless terminus_name ||= terminus_class raise Puppet::DevError, "No terminus specified for %s; cannot redirect" % self.name end - + return termini[terminus_name] ||= make_terminus(terminus_name) end diff --git a/lib/puppet/indirector/node/ldap.rb b/lib/puppet/indirector/node/ldap.rb index ab5d47b1c..4600a0dd5 100644 --- a/lib/puppet/indirector/node/ldap.rb +++ b/lib/puppet/indirector/node/ldap.rb @@ -9,7 +9,7 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap # The attributes that Puppet class information is stored in. def class_attributes - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] x = Puppet[:ldapclassattrs].split(/\s*,\s*/) end diff --git a/lib/puppet/indirector/queue.rb b/lib/puppet/indirector/queue.rb index 91e431795..cd0e0c833 100644 --- a/lib/puppet/indirector/queue.rb +++ b/lib/puppet/indirector/queue.rb @@ -10,7 +10,7 @@ require 'yaml' # and specifies a default queue type of <tt>:stomp</tt>, appropriate for use with a variety of message brokers. # # It's up to the queue client type to instantiate itself correctly based on Puppet configuration information. -# +# # A single queue client is maintained for the abstract terminus, meaning that you can only use one type # of queue client, one message broker solution, etc., with the indirection mechanism. # diff --git a/lib/puppet/indirector/report/processor.rb b/lib/puppet/indirector/report/processor.rb index 135f1649d..9daf14641 100644 --- a/lib/puppet/indirector/report/processor.rb +++ b/lib/puppet/indirector/report/processor.rb @@ -45,7 +45,7 @@ class Puppet::Transaction::Report::Processor < Puppet::Indirector::Code # Handle the parsing of the reports attribute. def reports - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] x = Puppet[:reports].gsub(/(^\s+)|(\s+$)/, '').split(/\s*,\s*/) end end diff --git a/lib/puppet/indirector/rest.rb b/lib/puppet/indirector/rest.rb index c3d689e93..6903f9a0d 100644 --- a/lib/puppet/indirector/rest.rb +++ b/lib/puppet/indirector/rest.rb @@ -6,7 +6,7 @@ require 'puppet/network/http/api/v1' # Access objects via REST class Puppet::Indirector::REST < Puppet::Indirector::Terminus - include Puppet::Network::HTTP::API::V1 + include Puppet::Network::HTTP::API::V1 class << self attr_reader :server_setting, :port_setting @@ -58,7 +58,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus def headers {"Accept" => model.supported_formats.join(", ")} end - + def network(request) Puppet::Network::HttpPool.http_instance(request.server || self.class.server, request.port || self.class.port) end @@ -66,19 +66,19 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus def find(request) deserialize network(request).get(indirection2uri(request), headers) end - + def search(request) unless result = deserialize(network(request).get(indirection2uri(request), headers), true) return [] end return result end - + def destroy(request) raise ArgumentError, "DELETE does not accept options" unless request.options.empty? deserialize network(request).delete(indirection2uri(request), headers) end - + def save(request) raise ArgumentError, "PUT does not accept options" unless request.options.empty? deserialize network(request).put(indirection2uri(request), request.instance.render, headers) diff --git a/lib/puppet/indirector/ssl_file.rb b/lib/puppet/indirector/ssl_file.rb index de7163700..67202699d 100644 --- a/lib/puppet/indirector/ssl_file.rb +++ b/lib/puppet/indirector/ssl_file.rb @@ -54,7 +54,7 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus # Use a setting to determine our path. def path(name) - if ca?(name) and ca_location + if ca?(name) and ca_location ca_location elsif collection_directory File.join(collection_directory, name.to_s + ".pem") diff --git a/lib/puppet/indirector/terminus.rb b/lib/puppet/indirector/terminus.rb index 22c56a4d2..4d1d58f87 100644 --- a/lib/puppet/indirector/terminus.rb +++ b/lib/puppet/indirector/terminus.rb @@ -111,7 +111,7 @@ class Puppet::Indirector::Terminus # Return all terminus classes for a given indirection. def terminus_classes(indirection_name) setup_instance_loading indirection_name - + # Load them all. instance_loader(indirection_name).loadall @@ -137,15 +137,15 @@ class Puppet::Indirector::Terminus raise Puppet::DevError, "Cannot create instances of abstract terminus types" end end - + def model self.class.model end - + def name self.class.name end - + def terminus_type self.class.terminus_type end diff --git a/lib/puppet/indirector/yaml.rb b/lib/puppet/indirector/yaml.rb index 5b53a7628..782112ebd 100644 --- a/lib/puppet/indirector/yaml.rb +++ b/lib/puppet/indirector/yaml.rb @@ -52,7 +52,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus def path(name) File.join(base, self.class.indirection_name.to_s, name.to_s + ".yaml") end - + # Do a glob on the yaml directory, loading each file found def search(request) Dir.glob(File.join(base, self.class.indirection_name.to_s, request.key)).collect { |f| YAML.load_file(f) } diff --git a/lib/puppet/metatype/manager.rb b/lib/puppet/metatype/manager.rb index 773f30b1b..865a7c296 100644 --- a/lib/puppet/metatype/manager.rb +++ b/lib/puppet/metatype/manager.rb @@ -19,7 +19,7 @@ module Manager @types.each do |name, type| # Only consider types that have names #if ! type.parameters.empty? or ! type.validproperties.empty? - yield type + yield type #end end end @@ -94,14 +94,14 @@ module Manager klass end - + # Remove an existing defined type. Largely used for testing. def rmtype(name) # Then create the class. klass = rmclass(name, :hash => @types ) - + if respond_to?("new" + name.to_s) metaclass.send(:remove_method, "new" + name.to_s) end diff --git a/lib/puppet/module.rb b/lib/puppet/module.rb index 30c2512f3..701e4b258 100644 --- a/lib/puppet/module.rb +++ b/lib/puppet/module.rb @@ -29,7 +29,7 @@ class Puppet::Module end end end - + # Return an array of paths by splitting the +modulepath+ config # parameter. Only consider paths that are absolute and existing # directories diff --git a/lib/puppet/network/authconfig.rb b/lib/puppet/network/authconfig.rb index 41f8f1c3e..0922393a2 100644 --- a/lib/puppet/network/authconfig.rb +++ b/lib/puppet/network/authconfig.rb @@ -16,7 +16,7 @@ module Puppet [:allow, :deny].each do |method| define_method(method) do |*args| @rights.send(method, *args) - end + end end # Here we add a little bit of semantics. They can set auth on a whole @@ -77,7 +77,7 @@ module Puppet else return end - else + else Puppet.notice "%s and %s" % [@configtimeout, @configstatted] end end diff --git a/lib/puppet/network/client/dipper.rb b/lib/puppet/network/client/dipper.rb index 0ec7087e5..8616d4f73 100644 --- a/lib/puppet/network/client/dipper.rb +++ b/lib/puppet/network/client/dipper.rb @@ -2,7 +2,7 @@ class Puppet::Network::Client::Dipper < Puppet::Network::Client @handler = Puppet::Network::Handler.handler(:filebucket) @drivername = :Bucket - + attr_accessor :name # Create our bucket client diff --git a/lib/puppet/network/format_handler.rb b/lib/puppet/network/format_handler.rb index e03432858..0a7e9dcad 100644 --- a/lib/puppet/network/format_handler.rb +++ b/lib/puppet/network/format_handler.rb @@ -96,7 +96,7 @@ module Puppet::Network::FormatHandler end def supported_formats - result = format_handler.formats.collect { |f| format_handler.format(f) }.find_all { |f| f.supported?(self) }.collect { |f| f.name }.sort do |a, b| + result = format_handler.formats.collect { |f| format_handler.format(f) }.find_all { |f| f.supported?(self) }.collect { |f| f.name }.sort do |a, b| # It's an inverse sort -- higher weight formats go first. format_handler.format(b).weight <=> format_handler.format(a).weight end diff --git a/lib/puppet/network/handler/filebucket.rb b/lib/puppet/network/handler/filebucket.rb index 38ef7f3f2..4973886f7 100755 --- a/lib/puppet/network/handler/filebucket.rb +++ b/lib/puppet/network/handler/filebucket.rb @@ -129,7 +129,7 @@ class Puppet::Network::Handler # :nodoc: File.open(bfile) { |of| contents = of.read } - + if client return Base64.encode64(contents) else diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb index 50e2614aa..6bc6d9d4a 100755 --- a/lib/puppet/network/handler/fileserver.rb +++ b/lib/puppet/network/handler/fileserver.rb @@ -53,7 +53,7 @@ class Puppet::Network::Handler mount = Mount.new(MODULES) mount.allow("*") @mounts[MODULES] = mount - + Puppet.debug "No file server configuration file; autocreating #{PLUGINS} mount with default permissions" mount = PluginMount.new(PLUGINS) mount.allow("*") @@ -145,7 +145,7 @@ class Puppet::Network::Handler desc.collect { |sub| sub.join("\t") }.join("\n") end - + def local? self.local end @@ -349,14 +349,14 @@ class Puppet::Network::Handler mount.allow("*") newmounts[MODULES] = mount end - + unless newmounts[PLUGINS] Puppet.debug "No #{PLUGINS} mount given; autocreating with default permissions" mount = PluginMount.new(PLUGINS) mount.allow("*") newmounts[PLUGINS] = mount end - + unless newmounts[PLUGINS].valid? Puppet.debug "No path given for #{PLUGINS} mount; creating a special PluginMount" # We end up here if the user has specified access rules for @@ -372,7 +372,7 @@ class Puppet::Network::Handler ) newmounts[PLUGINS] = mount end - + # Verify each of the mounts are valid. # We let the check raise an error, so that it can raise an error # pointing to the specific problem. @@ -433,7 +433,7 @@ class Puppet::Network::Handler # Create a map for a specific client. def clientmap(client) { - "h" => client.sub(/\..*$/, ""), + "h" => client.sub(/\..*$/, ""), "H" => client, "d" => client.sub(/[^.]+\./, "") # domain name } @@ -454,7 +454,7 @@ class Puppet::Network::Handler end path.gsub(/%(.)/) do |v| key = $1 - if key == "%" + if key == "%" "%" else map[key] || v @@ -698,7 +698,7 @@ class Puppet::Network::Handler # A special mount class specifically for the plugins mount -- just # has some magic to effectively do a union mount of the 'plugins' # directory of all modules. - # + # class PluginMount < Mount def path(client) '' @@ -719,7 +719,7 @@ class Puppet::Network::Handler def mod_file_path(mod, relpath, client = nil) File.join(mod, PLUGINS, relpath) end - + def file_path(relpath, client = nil) return nil unless mod = valid_modules(client).find { |m| m.plugin(relpath) } mod.plugin(relpath) @@ -746,7 +746,7 @@ class Puppet::Network::Handler def valid_modules(client) Puppet::Node::Environment.new.modules.find_all { |mod| mod.exist? } end - + def add_to_filetree(f, filetree) first, rest = f.split(File::SEPARATOR, 2) end diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb index 0d36c1e88..e21e1e6e3 100644 --- a/lib/puppet/network/handler/master.rb +++ b/lib/puppet/network/handler/master.rb @@ -74,7 +74,7 @@ class Puppet::Network::Handler end end - # + # def decode_facts(facts) if @local # we don't need to do anything, since we should already diff --git a/lib/puppet/network/handler/report.rb b/lib/puppet/network/handler/report.rb index b92b77ea5..8cfd8d83d 100755 --- a/lib/puppet/network/handler/report.rb +++ b/lib/puppet/network/handler/report.rb @@ -79,7 +79,7 @@ class Puppet::Network::Handler # Handle the parsing of the reports attribute. def reports - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] x = Puppet[:reports].gsub(/(^\s+)|(\s+$)/, '').split(/\s*,\s*/) end end diff --git a/lib/puppet/network/handler/resource.rb b/lib/puppet/network/handler/resource.rb index 54391c3de..6f8d3df0a 100755 --- a/lib/puppet/network/handler/resource.rb +++ b/lib/puppet/network/handler/resource.rb @@ -7,7 +7,7 @@ class Puppet::Network::Handler desc "An interface for interacting with client-based resources that can be used for querying or managing remote machines without using Puppet's central server tools. - + The ``describe`` and ``list`` methods return TransBuckets containing TransObject instances (``describe`` returns a single TransBucket), and the ``apply`` method accepts a TransBucket of TransObjects and @@ -44,7 +44,7 @@ class Puppet::Network::Handler # And then apply the catalog. This way we're reusing all # the code in there. It should probably just be separated out, though. transaction = catalog.apply - + # And then clean up catalog.clear(true) @@ -173,14 +173,14 @@ class Puppet::Network::Handler end # Deal with ignore parameters. - def handleignore(children, path, ignore) - ignore.each { |ignore| + def handleignore(children, path, ignore) + ignore.each { |ignore| Dir.glob(File.join(path,ignore), File::FNM_DOTMATCH) { |match| children.delete(File.basename(match)) - } + } } return children - end + end def to_s "resource" diff --git a/lib/puppet/network/http.rb b/lib/puppet/network/http.rb index 844af909f..ee6b70422 100644 --- a/lib/puppet/network/http.rb +++ b/lib/puppet/network/http.rb @@ -7,7 +7,7 @@ module Puppet::Network::HTTP when :mongrel raise ArgumentError, "Mongrel is not installed on this platform" unless Puppet.features.mongrel? require 'puppet/network/http/mongrel' - return Puppet::Network::HTTP::Mongrel + return Puppet::Network::HTTP::Mongrel else raise ArgumentError, "Unknown HTTP server name [#{kind}]" end diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb index 679bb8dcd..9528d39a6 100644 --- a/lib/puppet/network/http/handler.rb +++ b/lib/puppet/network/http/handler.rb @@ -165,7 +165,7 @@ module Puppet::Network::HTTP::Handler def path(request) raise NotImplementedError - end + end def request_key(request) raise NotImplementedError diff --git a/lib/puppet/network/http/mongrel.rb b/lib/puppet/network/http/mongrel.rb index 356402545..6c39bb37f 100644 --- a/lib/puppet/network/http/mongrel.rb +++ b/lib/puppet/network/http/mongrel.rb @@ -6,7 +6,7 @@ class Puppet::Network::HTTP::Mongrel def initialize(args = {}) @listening = false end - + def listen(args = {}) raise ArgumentError, ":protocols must be specified." if !args[:protocols] or args[:protocols].empty? raise ArgumentError, ":address must be specified." unless args[:address] @@ -15,26 +15,26 @@ class Puppet::Network::HTTP::Mongrel @protocols = args[:protocols] @xmlrpc_handlers = args[:xmlrpc_handlers] - @server = Mongrel::HttpServer.new(args[:address], args[:port]) + @server = Mongrel::HttpServer.new(args[:address], args[:port]) setup_handlers @listening = true @server.run end - + def unlisten raise "Mongrel server is not listening" unless listening? @server.stop @server = nil @listening = false end - + def listening? @listening end - + private - + def setup_handlers # Register our REST support at / klass = class_for_protocol(:rest) @@ -49,7 +49,7 @@ class Puppet::Network::HTTP::Mongrel def setup_xmlrpc_handlers @server.register('/RPC2', Puppet::Network::HTTPServer::Mongrel.new(@xmlrpc_handlers)) end - + def class_for_protocol(protocol) return Puppet::Network::HTTP::MongrelREST if protocol.to_sym == :rest raise ArgumentError, "Unknown protocol [#{protocol}]." diff --git a/lib/puppet/network/http/mongrel/rest.rb b/lib/puppet/network/http/mongrel/rest.rb index fe3f51d35..369d4c6c4 100644 --- a/lib/puppet/network/http/mongrel/rest.rb +++ b/lib/puppet/network/http/mongrel/rest.rb @@ -30,7 +30,7 @@ class Puppet::Network::HTTP::MongrelREST < Mongrel::HttpHandler # what path was requested? def path(request) - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] #x = '/' + request.params[Mongrel::Const::REQUEST_PATH] request.params[Mongrel::Const::REQUEST_PATH] end diff --git a/lib/puppet/network/http/webrick.rb b/lib/puppet/network/http/webrick.rb index 46735c0f5..a60a22ba1 100644 --- a/lib/puppet/network/http/webrick.rb +++ b/lib/puppet/network/http/webrick.rb @@ -12,19 +12,19 @@ class Puppet::Network::HTTP::WEBrick @listening = false @mutex = Mutex.new end - + def self.class_for_protocol(protocol) return Puppet::Network::HTTP::WEBrickREST if protocol.to_sym == :rest raise "Unknown protocol [#{protocol}]." end - + def listen(args = {}) raise ArgumentError, ":protocols must be specified." if !args[:protocols] or args[:protocols].empty? raise ArgumentError, ":address must be specified." unless args[:address] raise ArgumentError, ":port must be specified." unless args[:port] - + @protocols = args[:protocols] - @xmlrpc_handlers = args[:xmlrpc_handlers] + @xmlrpc_handlers = args[:xmlrpc_handlers] arguments = {:BindAddress => args[:address], :Port => args[:port]} arguments.merge!(setup_logger) @@ -35,12 +35,12 @@ class Puppet::Network::HTTP::WEBrick setup_handlers @mutex.synchronize do - raise "WEBrick server is already listening" if @listening + raise "WEBrick server is already listening" if @listening @listening = true @thread = Thread.new { @server.start } end end - + def unlisten @mutex.synchronize do raise "WEBrick server is not listening" unless @listening @@ -50,7 +50,7 @@ class Puppet::Network::HTTP::WEBrick @listening = false end end - + def listening? @mutex.synchronize do @listening @@ -110,7 +110,7 @@ class Puppet::Network::HTTP::WEBrick end private - + def setup_handlers # Set up the new-style protocols. klass = self.class.class_for_protocol(:rest) diff --git a/lib/puppet/network/http_pool.rb b/lib/puppet/network/http_pool.rb index 9430457bb..b1206f7f9 100644 --- a/lib/puppet/network/http_pool.rb +++ b/lib/puppet/network/http_pool.rb @@ -10,7 +10,7 @@ module Puppet::Network::HttpPool include Puppet::Util::Cacher private - + cached_attr(:http_cache) { Hash.new } end diff --git a/lib/puppet/network/http_server/mongrel.rb b/lib/puppet/network/http_server/mongrel.rb index 382b4dc58..a10a42928 100644 --- a/lib/puppet/network/http_server/mongrel.rb +++ b/lib/puppet/network/http_server/mongrel.rb @@ -3,7 +3,7 @@ # Author: Manuel Holtgrewe <purestorm at ggnore.net> # # Copyright (c) 2006 Manuel Holtgrewe, 2007 Luke Kanies -# +# # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the # "Software"), to deal in the Software without restriction, including @@ -11,10 +11,10 @@ # distribute, sublicense, and/or sell copies of the Software, and to # permit persons to whom the Software is furnished to do so, subject to # the following conditions: -# +# # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -113,7 +113,7 @@ module Puppet::Network end end end - + private def client_info(request) @@ -144,7 +144,7 @@ module Puppet::Network def parse_content_type(str) a, *b = str.split(";") return a.strip, *b - end + end end end diff --git a/lib/puppet/network/http_server/webrick.rb b/lib/puppet/network/http_server/webrick.rb index 0e835d057..a863d3a20 100644 --- a/lib/puppet/network/http_server/webrick.rb +++ b/lib/puppet/network/http_server/webrick.rb @@ -18,7 +18,7 @@ module Puppet include Puppet::SSLCertificates::Support # Read the CA cert and CRL and populate an OpenSSL::X509::Store - # with them, with flags appropriate for checking client + # with them, with flags appropriate for checking client # certificates for revocation def x509store if Puppet[:cacrl] == 'false' diff --git a/lib/puppet/network/rest_authorization.rb b/lib/puppet/network/rest_authorization.rb index 1294a3dd1..5dd4fb5e6 100644 --- a/lib/puppet/network/rest_authorization.rb +++ b/lib/puppet/network/rest_authorization.rb @@ -16,7 +16,7 @@ module Puppet::Network @authconfig end - # Verify that our client has access. + # Verify that our client has access. def check_authorization(request) authconfig.allowed?(request) end diff --git a/lib/puppet/network/rights.rb b/lib/puppet/network/rights.rb index 14b171081..e8267c927 100755 --- a/lib/puppet/network/rights.rb +++ b/lib/puppet/network/rights.rb @@ -42,7 +42,7 @@ class Rights res = :nomatch right = @rights.find do |acl| found = false - # an acl can return :dunno, which means "I'm not qualified to answer your question, + # an acl can return :dunno, which means "I'm not qualified to answer your question, # please ask someone else". This is used when for instance an acl matches, but not for the # current rest method, where we might think some other acl might be more specific. if match = acl.match?(name) diff --git a/lib/puppet/network/server.rb b/lib/puppet/network/server.rb index 701be54ca..f21254be9 100644 --- a/lib/puppet/network/server.rb +++ b/lib/puppet/network/server.rb @@ -83,7 +83,7 @@ class Puppet::Network::Server @routes[name.to_sym] = true end end - + # Unregister Indirector handlers. def unregister(*indirections) raise "Cannot unregister indirections while server is listening." if listening? @@ -92,7 +92,7 @@ class Puppet::Network::Server indirections.flatten.each do |i| raise(ArgumentError, "Indirection [%s] is unknown." % i) unless @routes[i.to_sym] end - + indirections.flatten.each do |i| @routes.delete(i.to_sym) end @@ -106,7 +106,7 @@ class Puppet::Network::Server @xmlrpc_routes[name.to_sym] = true end end - + # Unregister xmlrpc handlers. def unregister_xmlrpc(*namespaces) raise "Cannot unregister xmlrpc handlers while server is listening." if listening? @@ -115,7 +115,7 @@ class Puppet::Network::Server namespaces.flatten.each do |i| raise(ArgumentError, "XMLRPC handler '%s' is unknown." % i) unless @xmlrpc_routes[i.to_sym] end - + namespaces.flatten.each do |i| @xmlrpc_routes.delete(i.to_sym) end @@ -124,19 +124,19 @@ class Puppet::Network::Server def listening? @listening end - + def listen raise "Cannot listen -- already listening." if listening? @listening = true http_server.listen(:address => address, :port => port, :handlers => @routes.keys, :xmlrpc_handlers => @xmlrpc_routes.keys, :protocols => protocols) end - + def unlisten raise "Cannot unlisten -- not currently listening." unless listening? - http_server.unlisten + http_server.unlisten @listening = false end - + def http_server_class http_server_class_by_type(@server_type) end @@ -152,11 +152,11 @@ class Puppet::Network::Server end private - + def http_server @http_server ||= http_server_class.new end - + def http_server_class_by_type(kind) Puppet::Network::HTTP.server_class_by_type(kind) end diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb index 678ab6c00..ee2c008eb 100644 --- a/lib/puppet/network/xmlrpc/client.rb +++ b/lib/puppet/network/xmlrpc/client.rb @@ -82,7 +82,7 @@ module Puppet::Network if detail.message.include?(str) Puppet.warning "Certificate validation failed; consider using the certname configuration option" end - end + end raise XMLRPCClientError, "Certificates were not trusted: %s" % detail end @@ -90,7 +90,7 @@ module Puppet::Network if detail.message.to_s =~ /^Wrong size\. Was \d+, should be \d+$/ Puppet.warning "XMLRPC returned wrong size. Retrying." return :retry - end + end Puppet.err "Could not call %s.%s: %s" % [namespace, method, detail.inspect] error = XMLRPCClientError.new(detail.to_s) error.set_backtrace detail.backtrace @@ -107,7 +107,7 @@ module Puppet::Network if detail.message.include?(str) Puppet.warning "Certificate validation failed; consider using the certname configuration option" end - end + end raise XMLRPCClientError, "Certificates were not trusted: %s" % detail end @@ -185,7 +185,7 @@ module Puppet::Network ) @http = Puppet::Network::HttpPool.http_instance(@host, @port) end - + # Get rid of our existing connection, replacing it with a new one. # This should only happen if we lose our connection somehow (e.g., an EPIPE) # or we've just downloaded certs and we need to create new http instances @@ -197,7 +197,7 @@ module Puppet::Network @http = nil self.http # force a new one end - + def start begin @http.start unless @http.started? diff --git a/lib/puppet/network/xmlrpc/webrick_servlet.rb b/lib/puppet/network/xmlrpc/webrick_servlet.rb index 9a46ffb7c..ec64c1c60 100644 --- a/lib/puppet/network/xmlrpc/webrick_servlet.rb +++ b/lib/puppet/network/xmlrpc/webrick_servlet.rb @@ -42,7 +42,7 @@ module Puppet::Network::XMLRPC # we need to pass a ClientRequest object to process() so we can do # authorization. It's the only way to stay thread-safe. def service(request, response) - if @valid_ip + if @valid_ip raise WEBrick::HTTPStatus::Forbidden unless @valid_ip.any? { |ip| request.peeraddr[3] =~ ip } end @@ -51,9 +51,9 @@ module Puppet::Network::XMLRPC "unsupported method `#{request.request_method}'." end - if parse_content_type(request['Content-type']).first != "text/xml" + if parse_content_type(request['Content-type']).first != "text/xml" raise WEBrick::HTTPStatus::BadRequest - end + end length = (request['Content-length'] || 0).to_i @@ -66,14 +66,14 @@ module Puppet::Network::XMLRPC end resp = process(data, client_request(request)) - if resp.nil? or resp.size <= 0 + if resp.nil? or resp.size <= 0 raise WEBrick::HTTPStatus::InternalServerError end response.status = 200 response['Content-Length'] = resp.size response['Content-Type'] = "text/xml; charset=utf-8" - response.body = resp + response.body = resp end private @@ -97,7 +97,7 @@ module Puppet::Network::XMLRPC if cert = request.client_cert nameary = cert.subject.to_a.find { |ary| ary[0] == "CN" - } + } if nameary.nil? Puppet.warning "Could not retrieve server name from cert" diff --git a/lib/puppet/parameter.rb b/lib/puppet/parameter.rb index ae152de56..c594ed5f4 100644 --- a/lib/puppet/parameter.rb +++ b/lib/puppet/parameter.rb @@ -64,7 +64,7 @@ class Puppet::Parameter end private - + # A standard way of converting all of our values, so we're always # comparing apples to apples. def convert(value) @@ -130,7 +130,7 @@ class Puppet::Parameter if value = @strings.find { |v| v.match?(test_value) } return value end - + # Then look for a regex match @regexes.find { |v| v.match?(test_value) } end @@ -158,7 +158,7 @@ class Puppet::Parameter # * <tt>:event</tt>: The event that should be returned when this value is set. # * <tt>:call</tt>: When to call any associated block. The default value # is ``instead``, which means to call the value instead of calling the - # provider. You can also specify ``before`` or ``after``, which will + # provider. You can also specify ``before`` or ``after``, which will # call both the block and the provider, according to the order you specify # (the ``first`` refers to when the block is called, not the provider). def newvalue(name, options = {}, &block) diff --git a/lib/puppet/parser/ast/astarray.rb b/lib/puppet/parser/ast/astarray.rb index 8f09aa922..9b59d196a 100644 --- a/lib/puppet/parser/ast/astarray.rb +++ b/lib/puppet/parser/ast/astarray.rb @@ -19,7 +19,7 @@ class Puppet::Parser::AST # Make a new array, so we don't have to deal with the details of # flattening and such items = [] - + # First clean out any AST::ASTArrays @children.each { |child| if child.instance_of?(AST::ASTArray) diff --git a/lib/puppet/parser/ast/boolean_operator.rb b/lib/puppet/parser/ast/boolean_operator.rb index c3b5c7d41..160e0e69e 100644 --- a/lib/puppet/parser/ast/boolean_operator.rb +++ b/lib/puppet/parser/ast/boolean_operator.rb @@ -16,7 +16,7 @@ class Puppet::Parser::AST def evaluate(scope) # evaluate the first operand, should return a boolean value lval = @lval.safeevaluate(scope) - + # return result # lazy evaluate right operand case @operator @@ -27,8 +27,8 @@ class Puppet::Parser::AST else # false and false == false false end - when "or"; - if Puppet::Parser::Scope.true?(lval) + when "or"; + if Puppet::Parser::Scope.true?(lval) true else rval = @rval.safeevaluate(scope) diff --git a/lib/puppet/parser/ast/casestatement.rb b/lib/puppet/parser/ast/casestatement.rb index 73fbdcf1e..072747932 100644 --- a/lib/puppet/parser/ast/casestatement.rb +++ b/lib/puppet/parser/ast/casestatement.rb @@ -17,7 +17,7 @@ class Puppet::Parser::AST retvalue = nil found = false - + # Iterate across the options looking for a match. default = nil @options.each { |option| diff --git a/lib/puppet/parser/ast/collexpr.rb b/lib/puppet/parser/ast/collexpr.rb index 6ade58b7e..85bca583f 100644 --- a/lib/puppet/parser/ast/collexpr.rb +++ b/lib/puppet/parser/ast/collexpr.rb @@ -67,7 +67,7 @@ class CollExpr < AST::Branch else str = "(%s) %s (%s)" % [str1, oper, str2] end - + return str, code end diff --git a/lib/puppet/parser/ast/comparison_operator.rb b/lib/puppet/parser/ast/comparison_operator.rb index 3af86efea..0d2f8b16d 100644 --- a/lib/puppet/parser/ast/comparison_operator.rb +++ b/lib/puppet/parser/ast/comparison_operator.rb @@ -21,7 +21,7 @@ class Puppet::Parser::AST # convert to number if operands are number lval = Puppet::Parser::Scope.number?(lval) || lval rval = Puppet::Parser::Scope.number?(rval) || rval - + # return result unless @operator == '!=' lval.send(@operator,rval) diff --git a/lib/puppet/parser/ast/resource_defaults.rb b/lib/puppet/parser/ast/resource_defaults.rb index ed83d3573..3fde7ade2 100644 --- a/lib/puppet/parser/ast/resource_defaults.rb +++ b/lib/puppet/parser/ast/resource_defaults.rb @@ -2,7 +2,7 @@ require 'puppet/parser/ast/branch' class Puppet::Parser::AST # A statement syntactically similar to an ResourceDef, but uses a - # capitalized object type and cannot have a name. + # capitalized object type and cannot have a name. class ResourceDefaults < AST::Branch attr_accessor :type, :params diff --git a/lib/puppet/parser/ast/resource_override.rb b/lib/puppet/parser/ast/resource_override.rb index f8cf3a81e..5eac50982 100644 --- a/lib/puppet/parser/ast/resource_override.rb +++ b/lib/puppet/parser/ast/resource_override.rb @@ -34,7 +34,7 @@ class Puppet::Parser::AST # Now we just create a normal resource, but we call a very different # method on the scope. resource = [resource] unless resource.is_a?(Array) - + resource = resource.collect do |r| res = Puppet::Parser::Resource.new( :type => r.type, diff --git a/lib/puppet/parser/ast/resource_reference.rb b/lib/puppet/parser/ast/resource_reference.rb index e5e2dce99..5a521494f 100644 --- a/lib/puppet/parser/ast/resource_reference.rb +++ b/lib/puppet/parser/ast/resource_reference.rb @@ -25,7 +25,7 @@ class Puppet::Parser::AST def evaluate(scope) title = @title.safeevaluate(scope) title = [title] unless title.is_a?(Array) - + if @type.to_s.downcase == "class" resource_type = "class" title = title.collect { |t| qualified_class(scope, t) } diff --git a/lib/puppet/parser/ast/selector.rb b/lib/puppet/parser/ast/selector.rb index 399d405a3..ecad163d4 100644 --- a/lib/puppet/parser/ast/selector.rb +++ b/lib/puppet/parser/ast/selector.rb @@ -17,9 +17,9 @@ class Puppet::Parser::AST # Get our parameter. paramvalue = @param.safeevaluate(scope) - + sensitive = Puppet[:casesensitive] - + if ! sensitive and paramvalue.respond_to?(:downcase) paramvalue = paramvalue.downcase end diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb index 0434e9b48..a0e629a5b 100644 --- a/lib/puppet/parser/functions.rb +++ b/lib/puppet/parser/functions.rb @@ -120,7 +120,7 @@ module Functions return false end end - + # Runs a newfunction to create a function for each of the log levels Puppet::Util::Log.levels.each do |level| diff --git a/lib/puppet/parser/functions/fqdn_rand.rb b/lib/puppet/parser/functions/fqdn_rand.rb index 2ae46de82..3741d2d32 100644 --- a/lib/puppet/parser/functions/fqdn_rand.rb +++ b/lib/puppet/parser/functions/fqdn_rand.rb @@ -1,6 +1,6 @@ -Puppet::Parser::Functions::newfunction(:fqdn_rand, :type => :rvalue, :doc => - "Generates random numbers based on the node's fqdn. The first argument - sets the range. The second argument specifies a number to add to the +Puppet::Parser::Functions::newfunction(:fqdn_rand, :type => :rvalue, :doc => + "Generates random numbers based on the node's fqdn. The first argument + sets the range. The second argument specifies a number to add to the seed and is optional.") do |args| require 'md5' max = args[0] diff --git a/lib/puppet/parser/functions/inline_template.rb b/lib/puppet/parser/functions/inline_template.rb index 289740873..b9547cac7 100644 --- a/lib/puppet/parser/functions/inline_template.rb +++ b/lib/puppet/parser/functions/inline_template.rb @@ -1,7 +1,7 @@ -Puppet::Parser::Functions::newfunction(:inline_template, :type => :rvalue, :doc => - "Evaluate a template string and return its value. See `the templating docs - </trac/puppet/wiki/PuppetTemplating>`_ for more information. Note that - if multiple template strings are specified, their output is all concatenated +Puppet::Parser::Functions::newfunction(:inline_template, :type => :rvalue, :doc => + "Evaluate a template string and return its value. See `the templating docs + </trac/puppet/wiki/PuppetTemplating>`_ for more information. Note that + if multiple template strings are specified, their output is all concatenated and returned as the output of the function.") do |vals| require 'erb' diff --git a/lib/puppet/parser/functions/regsubst.rb b/lib/puppet/parser/functions/regsubst.rb index 8a1a244ab..e6b98eb2c 100644 --- a/lib/puppet/parser/functions/regsubst.rb +++ b/lib/puppet/parser/functions/regsubst.rb @@ -1,7 +1,7 @@ module Puppet::Parser::Functions newfunction(:regsubst, :type => :rvalue, :doc => " - Perform regexp replacement on a string. + Perform regexp replacement on a string. - **Parameters** (in order): @@ -19,7 +19,7 @@ module Puppet::Parser::Functions - **G** Global replacement; all occurrences of the regexp in the string will be replaced. Without this, only the first occurrence will be replaced. :lang: Optional. How to handle multibyte characters. A single-character string with the following values: - + - **N** None - **E** EUC - **S** SJIS diff --git a/lib/puppet/parser/functions/template.rb b/lib/puppet/parser/functions/template.rb index 2eaace1d7..0a4cfc7aa 100644 --- a/lib/puppet/parser/functions/template.rb +++ b/lib/puppet/parser/functions/template.rb @@ -1,7 +1,7 @@ -Puppet::Parser::Functions::newfunction(:template, :type => :rvalue, :doc => - "Evaluate a template and return its value. See `the templating docs - </trac/puppet/wiki/PuppetTemplating>`_ for more information. Note that - if multiple templates are specified, their output is all concatenated +Puppet::Parser::Functions::newfunction(:template, :type => :rvalue, :doc => + "Evaluate a template and return its value. See `the templating docs + </trac/puppet/wiki/PuppetTemplating>`_ for more information. Note that + if multiple templates are specified, their output is all concatenated and returned as the output of the function.") do |vals| require 'erb' diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra index 9da2999df..d7828d71a 100644 --- a/lib/puppet/parser/grammar.ra +++ b/lib/puppet/parser/grammar.ra @@ -471,10 +471,10 @@ else: # nothing # Unlike yacc/bison, it seems racc # gives tons of shift/reduce warnings # with the following syntax: -# +# # expression: ... # | expression arithop expressio { ... } -# +# # arithop: PLUS | MINUS | DIVIDE | TIMES ... # # So I had to develop the expression by adding one rule @@ -525,10 +525,10 @@ expression: rvalue } | expression AND expression { result = ast AST::BooleanOperator, :operator => val[1], :lval => val[0], :rval => val[2] -} +} | expression OR expression { result = ast AST::BooleanOperator, :operator => val[1], :lval => val[0], :rval => val[2] -} +} | LPAREN expression RPAREN { result = val[1] } @@ -578,9 +578,9 @@ selector: selectlhand QMARK svalues { } svalues: selectval - | LBRACE sintvalues endcomma RBRACE { + | LBRACE sintvalues endcomma RBRACE { @lexer.commentpop - result = val[1] + result = val[1] } sintvalues: selectval @@ -670,7 +670,7 @@ classname: NAME # Multiple hostnames, as used for node names. These are all literal # strings, not AST objects. -hostnames: hostname +hostnames: hostname | hostnames COMMA hostname { result = val[0] result = [result] unless result.is_a?(Array) diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb index c728b54a2..2e8924090 100644 --- a/lib/puppet/parser/interpreter.rb +++ b/lib/puppet/parser/interpreter.rb @@ -36,7 +36,7 @@ class Puppet::Parser::Interpreter # create our interpreter def initialize # The class won't always be defined during testing. - if Puppet[:storeconfigs] + if Puppet[:storeconfigs] if Puppet.features.rails? Puppet::Rails.init else diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb index a7b87e6d1..8bbcb84fb 100644 --- a/lib/puppet/parser/lexer.rb +++ b/lib/puppet/parser/lexer.rb @@ -281,11 +281,11 @@ class Puppet::Parser::Lexer # I tried optimizing based on the first char, but it had # a slightly negative affect and was a good bit more complicated. TOKENS.regex_tokens.each do |token| - next unless match_length = @scanner.match?(token.regex) - + next unless match_length = @scanner.match?(token.regex) + # We've found a longer match if match_length > length - value = @scanner.scan(token.regex) + value = @scanner.scan(token.regex) length = value.length matched_token = token end diff --git a/lib/puppet/parser/parser_support.rb b/lib/puppet/parser/parser_support.rb index 3a6853f27..1d81e6099 100644 --- a/lib/puppet/parser/parser_support.rb +++ b/lib/puppet/parser/parser_support.rb @@ -476,7 +476,7 @@ class Puppet::Parser::Parser private def check_and_add_to_watched_files(filename) - unless @files.include?(filename) + unless @files.include?(filename) @files[filename] = Puppet::Util::LoadedFile.new(filename) return true else diff --git a/lib/puppet/parser/resource.rb b/lib/puppet/parser/resource.rb index 17bf7867a..32ea4573c 100644 --- a/lib/puppet/parser/resource.rb +++ b/lib/puppet/parser/resource.rb @@ -285,7 +285,7 @@ class Puppet::Parser::Resource def to_ral to_resource.to_ral end - + private # Add default values from our definition. @@ -360,7 +360,7 @@ class Puppet::Parser::Resource def paramcheck(param) param = param.to_s # Now make sure it's a valid argument to our class. These checks - # are organized in order of commonhood -- most types, it's a valid + # are organized in order of commonhood -- most types, it's a valid # argument and paramcheck is enabled. if @ref.typeclass.validattr?(param) true diff --git a/lib/puppet/parser/resource/param.rb b/lib/puppet/parser/resource/param.rb index 0662ce953..f44d5a6e9 100644 --- a/lib/puppet/parser/resource/param.rb +++ b/lib/puppet/parser/resource/param.rb @@ -20,7 +20,7 @@ class Puppet::Parser::Resource::Param def line_to_i return line ? Integer(line) : nil end - + def to_s "%s => %s" % [self.name, self.value] end diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb index b1f480ca6..0a182fe1d 100644 --- a/lib/puppet/parser/scope.rb +++ b/lib/puppet/parser/scope.rb @@ -49,7 +49,7 @@ class Puppet::Parser::Scope unless value.is_a?(Fixnum) or value.is_a?(Bignum) or value.is_a?(Float) or value.is_a?(String) return nil end - + if value.is_a?(String) if value =~ /^-?\d+(:?\.\d+|(:?\.\d+)?e\d+)$/ return value.to_f @@ -198,7 +198,7 @@ class Puppet::Parser::Scope else return @symtable[name] end - elsif self.parent + elsif self.parent return parent.lookupvar(name, usestring) elsif usestring return "" @@ -215,12 +215,12 @@ class Puppet::Parser::Scope target = parent.to_hash(recursive) end target ||= Hash.new - @symtable.keys.each { |name| + @symtable.keys.each { |name| value = @symtable[name] if value == :undef then target.delete(name) else - target[name] = value + target[name] = value end } return target @@ -301,7 +301,7 @@ class Puppet::Parser::Scope end raise error end - + unless append @symtable[name] = value else # append case @@ -322,7 +322,7 @@ class Puppet::Parser::Scope ss = StringScanner.new(string) out = "" while not ss.eos? - if ss.scan(/^\$\{((\w*::)*\w+)\}|^\$((\w*::)*\w+)/) + if ss.scan(/^\$\{((\w*::)*\w+)\}|^\$((\w*::)*\w+)/) # If it matches the backslash, then just retun the dollar sign. if ss.matched == '\\$' out << '$' @@ -357,7 +357,7 @@ class Puppet::Parser::Scope out << '$' elsif ss.scan(/^\\\n/) # an escaped carriage return next - else + else tmp = ss.scan(/[^\\$]+/) # Puppet.debug("Got other: pos:%d; m:%s" % [ss.pos, tmp]) unless tmp diff --git a/lib/puppet/parser/templatewrapper.rb b/lib/puppet/parser/templatewrapper.rb index 97b454569..b2eb3c422 100644 --- a/lib/puppet/parser/templatewrapper.rb +++ b/lib/puppet/parser/templatewrapper.rb @@ -91,7 +91,7 @@ class Puppet::Parser::TemplateWrapper # current object, making it possible to access them without conflict # to the regular methods. benchmark(:debug, "Bound template variables for #{template_source}") do - scope.to_hash.each { |name, value| + scope.to_hash.each { |name, value| if name.kind_of?(String) realname = name.gsub(/[^\w]/, "_") else diff --git a/lib/puppet/property.rb b/lib/puppet/property.rb index a144f28d0..487028ed2 100644 --- a/lib/puppet/property.rb +++ b/lib/puppet/property.rb @@ -76,7 +76,7 @@ class Puppet::Property < Puppet::Parameter # * <tt>:event</tt>: The event that should be returned when this value is set. # * <tt>:call</tt>: When to call any associated block. The default value # is ``instead``, which means to call the value instead of calling the - # provider. You can also specify ``before`` or ``after``, which will + # provider. You can also specify ``before`` or ``after``, which will # call both the block and the provider, according to the order you specify # (the ``first`` refers to when the block is called, not the provider). def self.newvalue(name, options = {}, &block) @@ -152,7 +152,7 @@ class Puppet::Property < Puppet::Parameter # Figure out which event to return. def event(name, event = nil) if value_event = self.class.value_option(name, :event) - return value_event + return value_event end if event and event.is_a?(Symbol) @@ -176,7 +176,7 @@ class Puppet::Property < Puppet::Parameter return event end - + attr_reader :shadow # initialize our property @@ -294,7 +294,7 @@ class Puppet::Property < Puppet::Parameter call = self.class.value_option(name, :call) || :none if call == :instead - event, tmp = call_valuemethod(name, value) + event, tmp = call_valuemethod(name, value) elsif call == :none if @resource.provider call_provider(value) diff --git a/lib/puppet/provider.rb b/lib/puppet/provider.rb index ce195c086..1f13538af 100644 --- a/lib/puppet/provider.rb +++ b/lib/puppet/provider.rb @@ -31,7 +31,7 @@ class Puppet::Provider # LAK 2007-05-09: Keep the model stuff around for backward compatibility attr_reader :model attr_accessor :resource - + def self.command(name) name = symbolize(name) @@ -123,7 +123,7 @@ class Puppet::Provider # will catch it, if so. return execute(cmd) end - + # And then define an instance method that just calls the class method. # We need both, so both instances and classes can easily run the commands. unless method_defined? name diff --git a/lib/puppet/provider/computer/computer.rb b/lib/puppet/provider/computer/computer.rb index f3e526105..73f2d2b89 100644 --- a/lib/puppet/provider/computer/computer.rb +++ b/lib/puppet/provider/computer/computer.rb @@ -5,10 +5,10 @@ Puppet::Type.type(:computer).provide :directoryservice, :parent => Puppet::Provi Note that these are distinctly different kinds of objects to 'hosts', as they require a MAC address and can have all sorts of policy attached to them. - + This provider only manages Computer objects in the local directory service domain, not in remote directories. - + If you wish to manage /etc/hosts on Mac OS X, then simply use the host type as per other platforms. @@ -16,7 +16,7 @@ Puppet::Type.type(:computer).provide :directoryservice, :parent => Puppet::Provi confine :operatingsystem => :darwin defaultfor :operatingsystem => :darwin - + # hurray for abstraction. The nameservice directoryservice provider can # handle everything we need. super. end diff --git a/lib/puppet/provider/confine/variable.rb b/lib/puppet/provider/confine/variable.rb index 9bef69412..8067ae954 100644 --- a/lib/puppet/provider/confine/variable.rb +++ b/lib/puppet/provider/confine/variable.rb @@ -57,6 +57,6 @@ class Puppet::Provider::Confine::Variable < Puppet::Provider::Confine end def test_value - setting? ? Puppet.settings[name] : facter_value + setting? ? Puppet.settings[name] : facter_value end end diff --git a/lib/puppet/provider/cron/crontab.rb b/lib/puppet/provider/cron/crontab.rb index d0f139cab..c05dacb47 100755 --- a/lib/puppet/provider/cron/crontab.rb +++ b/lib/puppet/provider/cron/crontab.rb @@ -126,7 +126,7 @@ Puppet::Type.type(:cron).provide(:crontab, next if (record[field] == resource.value(field)) #Puppet.info "Did not match %s: %s vs %s" % # [field, resource.value(field).inspect, record[field].inspect] - matched = false + matched = false break end return resource if matched @@ -145,7 +145,7 @@ Puppet::Type.type(:cron).provide(:crontab, if record[:name] name = record[:name] record[:skip] = true - + # Start collecting env values envs = [] end @@ -185,7 +185,7 @@ Puppet::Type.type(:cron).provide(:crontab, # on my machine). This is my attempt to fix it so the TZ lines don't # multiply. if text =~ /(^TZ=.+\n)/ - tz = $1 + tz = $1 text.sub!(tz, '') text = tz + text end diff --git a/lib/puppet/provider/group/directoryservice.rb b/lib/puppet/provider/group/directoryservice.rb index 63c100a58..d02273476 100644 --- a/lib/puppet/provider/group/directoryservice.rb +++ b/lib/puppet/provider/group/directoryservice.rb @@ -18,7 +18,7 @@ Puppet::Type.type(:group).provide :directoryservice, :parent => Puppet::Provider desc "Group management using DirectoryService on OS X. " - + commands :dscl => "/usr/bin/dscl" confine :operatingsystem => :darwin defaultfor :operatingsystem => :darwin diff --git a/lib/puppet/provider/group/ldap.rb b/lib/puppet/provider/group/ldap.rb index 94d61f5fb..6d5f663ed 100644 --- a/lib/puppet/provider/group/ldap.rb +++ b/lib/puppet/provider/group/ldap.rb @@ -7,7 +7,7 @@ Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do ldap-related settings, including ``ldapbase``. You will also almost definitely need settings for ``ldapuser`` and ``ldappassword``, so that your clients can write to ldap. - + Note that this provider will automatically generate a GID for you if you do not specify one, but it is a potentially expensive operation, as it iterates across all existing groups to pick the appropriate next one. @@ -24,7 +24,7 @@ Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do # Find the next gid after the current largest gid. provider = self - manager.generates(:gidNumber).with do + manager.generates(:gidNumber).with do largest = 500 if existing = provider.manager.search existing.each do |hash| diff --git a/lib/puppet/provider/host/parsed.rb b/lib/puppet/provider/host/parsed.rb index dfa60cc70..e6381384e 100644 --- a/lib/puppet/provider/host/parsed.rb +++ b/lib/puppet/provider/host/parsed.rb @@ -14,8 +14,8 @@ Puppet::Type.type(:host).provide(:parsed, ) do confine :exists => hosts - text_line :comment, :match => /^#/ - text_line :blank, :match => /^\s*$/ + text_line :comment, :match => /^#/ + text_line :blank, :match => /^\s*$/ record_line :parsed, :fields => %w{ip name alias}, :optional => %w{alias}, diff --git a/lib/puppet/provider/ldap.rb b/lib/puppet/provider/ldap.rb index 970ac5202..be6683891 100644 --- a/lib/puppet/provider/ldap.rb +++ b/lib/puppet/provider/ldap.rb @@ -97,7 +97,7 @@ class Puppet::Provider::Ldap < Puppet::Provider result end - # Make a duplicate, so that we have a copy for comparison + # Make a duplicate, so that we have a copy for comparison # at the end. @ldap_properties = @property_hash.dup end diff --git a/lib/puppet/provider/macauthorization/macauthorization.rb b/lib/puppet/provider/macauthorization/macauthorization.rb index 759540cc0..58f12b94c 100644 --- a/lib/puppet/provider/macauthorization/macauthorization.rb +++ b/lib/puppet/provider/macauthorization/macauthorization.rb @@ -11,47 +11,47 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe commands :security => "/usr/bin/security" commands :sw_vers => "/usr/bin/sw_vers" - + confine :operatingsystem => :darwin - + # This should be confined based on macosx_productversion once - # http://projects.reductivelabs.com/issues/show/1796 + # http://projects.reductivelabs.com/issues/show/1796 # is resolved. if FileTest.exists?("/usr/bin/sw_vers") product_version = sw_vers "-productVersion" - + confine :true => if /^10.5/.match(product_version) or /^10.6/.match(product_version) true end end - + defaultfor :operatingsystem => :darwin - + AuthDB = "/etc/authorization" - + @rights = {} @rules = {} @parsed_auth_db = {} @comment = "" # Not implemented yet. Is there any real need to? - + # This map exists due to the use of hyphens and reserved words in # the authorization schema. PuppetToNativeAttributeMap = { :allow_root => "allow-root", - :authenticate_user => "authenticate-user", + :authenticate_user => "authenticate-user", :auth_class => "class", :k_of_n => "k-of-n", :session_owner => "session-owner", } - + class << self attr_accessor :parsed_auth_db attr_accessor :rights attr_accessor :rules attr_accessor :comments # Not implemented yet. - + def prefetch(resources) self.populate_rules_rights end - + def instances if self.parsed_auth_db == {} self.prefetch(nil) @@ -60,7 +60,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe new(:name => k) end end - + def populate_rules_rights auth_plist = Plist::parse_xml(AuthDB) if not auth_plist @@ -71,21 +71,21 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe self.parsed_auth_db = self.rights.dup self.parsed_auth_db.merge!(self.rules.dup) end - + end - + # standard required provider instance methods - + def initialize(resource) if self.class.parsed_auth_db == {} self.class.prefetch(resource) end super end - - + + def create - # we just fill the @property_hash in here and let the flush method + # we just fill the @property_hash in here and let the flush method # deal with it rather than repeating code. new_values = {} validprops = Puppet::Type.type(resource.class.name).validproperties @@ -109,7 +109,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe raise Puppet::Error.new("Must specify auth_type when destroying.") end end - + def exists? if self.class.parsed_auth_db.has_key?(resource[:name]) return true @@ -117,8 +117,8 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe return false end end - - + + def flush # deletion happens in the destroy methods if resource[:ensure] != :absent @@ -133,14 +133,14 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe @property_hash.clear end end - - + + # utility methods below - + def destroy_right security "authorizationdb", :remove, resource[:name] end - + def destroy_rule authdb = Plist::parse_xml(AuthDB) authdb_rules = authdb["rules"].dup @@ -153,13 +153,13 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe end end end - + def flush_right - # first we re-read the right just to make sure we're in sync for - # values that weren't specified in the manifest. As we're supplying - # the whole plist when specifying the right it seems safest to be + # first we re-read the right just to make sure we're in sync for + # values that weren't specified in the manifest. As we're supplying + # the whole plist when specifying the right it seems safest to be # paranoid given the low cost of quering the db once more. - cmds = [] + cmds = [] cmds << :security << "authorizationdb" << "read" << resource[:name] output = execute(cmds, :combine => false) current_values = Plist::parse_xml(output) @@ -168,12 +168,12 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe end specified_values = convert_plist_to_native_attributes(@property_hash) - # take the current values, merge the specified values to obtain a + # take the current values, merge the specified values to obtain a # complete description of the new values. new_values = current_values.merge(specified_values) set_right(resource[:name], new_values) end - + def flush_rule authdb = Plist::parse_xml(AuthDB) authdb_rules = authdb["rules"].dup @@ -185,7 +185,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe new_values = current_values.merge(specified_values) set_rule(resource[:name], new_values) end - + def set_right(name, values) # Both creates and modifies rights as it simply overwrites them. # The security binary only allows for writes using stdin, so we @@ -194,7 +194,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe tmp = Tempfile.new('puppet_macauthorization') begin Plist::Emit.save_plist(values, tmp.path) - cmds = [] + cmds = [] cmds << :security << "authorizationdb" << "write" << name output = execute(cmds, :combine => false, :stdinfile => tmp.path.to_s) @@ -205,11 +205,11 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe tmp.unlink end end - + def set_rule(name, values) - # Both creates and modifies rules as it overwrites the entry in the - # rules dictionary. Unfortunately the security binary doesn't - # support modifying rules at all so we have to twiddle the whole + # Both creates and modifies rules as it overwrites the entry in the + # rules dictionary. Unfortunately the security binary doesn't + # support modifying rules at all so we have to twiddle the whole # plist... :( See Apple Bug #6386000 values = convert_plist_to_native_attributes(values) authdb = Plist::parse_xml(AuthDB) @@ -221,11 +221,11 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe raise Puppet::Error.new("Error writing to: #{AuthDB}") end end - + def convert_plist_to_native_attributes(propertylist) # This mainly converts the keys from the puppet attributes to the - # 'native' ones, but also enforces that the keys are all Strings - # rather than Symbols so that any merges of the resultant Hash are + # 'native' ones, but also enforces that the keys are all Strings + # rather than Symbols so that any merges of the resultant Hash are # sane. newplist = {} propertylist.each_pair do |key, value| @@ -241,13 +241,13 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe end newplist end - + def retrieve_value(resource_name, attribute) - + if not self.class.parsed_auth_db.has_key?(resource_name) raise Puppet::Error.new("Cannot find #{resource_name} in auth db") end - + if PuppetToNativeAttributeMap.has_key?(attribute) native_attribute = PuppetToNativeAttributeMap[attribute] else @@ -270,13 +270,13 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe return "" # so ralsh doesn't display it. end end - - + + # property methods below # # We define them all dynamically apart from auth_type which is a special # case due to not being in the actual authorization db schema. - + properties = [ :allow_root, :authenticate_user, :auth_class, :comment, :group, :k_of_n, :mechanisms, :rule, :session_owner, :shared, :timeout, :tries ] @@ -290,7 +290,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe @property_hash[field] = value end end - + def auth_type if resource.should(:auth_type) != nil return resource.should(:auth_type) @@ -307,9 +307,9 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe raise Puppet::Error.new("auth_type required for new resources.") end end - + def auth_type=(value) @property_hash[:auth_type] = value end - + end diff --git a/lib/puppet/provider/mailalias/aliases.rb b/lib/puppet/provider/mailalias/aliases.rb index f9217123e..f880ccea1 100755 --- a/lib/puppet/provider/mailalias/aliases.rb +++ b/lib/puppet/provider/mailalias/aliases.rb @@ -10,7 +10,7 @@ Puppet::Type.type(:mailalias).provide(:aliases, record_line :aliases, :fields => %w{name recipient}, :separator => /\s*:\s*/, :block_eval => :instance do def post_parse(record) - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] # It's not sufficient to assign to an existing hash. recipient = record[:recipient].split(/\s*,\s*/).collect { |d| d.gsub(/^['"]|['"]$/, '') } record[:recipient] = recipient diff --git a/lib/puppet/provider/mcx/mcxcontent.rb b/lib/puppet/provider/mcx/mcxcontent.rb index b899aa108..002bb0dae 100644 --- a/lib/puppet/provider/mcx/mcxcontent.rb +++ b/lib/puppet/provider/mcx/mcxcontent.rb @@ -2,8 +2,8 @@ # Copyright (C) 2008 Jeffrey J McCune. # This program and entire repository is free software; you can -# redistribute it and/or modify it under the terms of the GNU -# General Public License as published by the Free Software +# redistribute it and/or modify it under the terms of the GNU +# General Public License as published by the Free Software # Foundation; either version 2 of the License, or any later version. # This program is distributed in the hope that it will be useful, @@ -66,7 +66,7 @@ Puppet::Type.type(:mcx).provide :mcxcontent, :parent => Puppet::Provider do content = mcxexport(ds_type, ds_name) if content.empty? Puppet.debug "/#{TypeMap[ds_type]}/#{ds_name} has no MCX data." - else + else # This node has MCX data. rsrc = self.new(:name => "/#{TypeMap[ds_type]}/#{ds_name}", :ds_type => ds_type, diff --git a/lib/puppet/provider/mount/netinfo.rb b/lib/puppet/provider/mount/netinfo.rb index 2cb125776..1cc6c4476 100644 --- a/lib/puppet/provider/mount/netinfo.rb +++ b/lib/puppet/provider/mount/netinfo.rb @@ -9,21 +9,21 @@ require 'puppet/provider/mount' # not to work currently." # commands :nireport => "nireport", :niutil => "niutil" # commands :mountcmd => "mount", :umount => "umount", :df => "df" -# +# # options :device, :key => "name" # options :name, :key => "dir" # options :dump, :key => "dump_freq" # options :pass, :key => "passno" # options :fstype, :key => "vfstype" # options :options, :key => "opts" -# +# # defaultfor :operatingsystem => :darwin -# +# # def initialize(resource) # warning "The NetInfo mount provider is highly experimental. Use at your own risk." # super # end -# +# # def mount # cmd = [] # if opts = @resource.should(:options) diff --git a/lib/puppet/provider/nameservice.rb b/lib/puppet/provider/nameservice.rb index 31572cc47..d7c54c1fc 100644 --- a/lib/puppet/provider/nameservice.rb +++ b/lib/puppet/provider/nameservice.rb @@ -128,7 +128,7 @@ class Puppet::Provider::NameService < Puppet::Provider @ops[property.name] || ("-" + property.name) end end - + # Autogenerate a value. Mostly used for uid/gid, but also used heavily # with netinfo, because netinfo is stupid. def autogen(field) @@ -159,7 +159,7 @@ class Puppet::Provider::NameService < Puppet::Provider else raise Puppet::DevError, "Invalid resource name %s" % resource end - + # Make sure we don't use the same value multiple times if defined? @@prevauto @@prevauto += 1 @@ -244,7 +244,7 @@ class Puppet::Provider::NameService < Puppet::Provider @objectinfo = nil end end - + # Now convert our Etc struct into a hash. if @objectinfo return info2hash(@objectinfo) diff --git a/lib/puppet/provider/nameservice/directoryservice.rb b/lib/puppet/provider/nameservice/directoryservice.rb index cd1e442d5..be0c2972c 100644 --- a/lib/puppet/provider/nameservice/directoryservice.rb +++ b/lib/puppet/provider/nameservice/directoryservice.rb @@ -30,7 +30,7 @@ class DirectoryService < Puppet::Provider::NameService attr_writer :macosx_version_major end - + # JJM 2007-07-24: Not yet sure what initvars() does. I saw it in netinfo.rb # I do know, however, that it makes methods "work" =) # e.g. addcmd isn't available if this method call isn't present. @@ -39,7 +39,7 @@ class DirectoryService < Puppet::Provider::NameService # of methods. If I put initvars after commands, confine and defaultfor, # then getinfo is called from the parent class, not this class. initvars() - + commands :dscl => "/usr/bin/dscl" commands :dseditgroup => "/usr/sbin/dseditgroup" commands :sw_vers => "/usr/bin/sw_vers" @@ -80,27 +80,27 @@ class DirectoryService < Puppet::Provider::NameService :ip_address => 'IPAddress', :members => 'GroupMembership', } - + @@password_hash_dir = "/var/db/shadow/hash" - + def self.instances # JJM Class method that provides an array of instance objects of this # type. # JJM: Properties are dependent on the Puppet::Type we're managine. type_property_array = [:name] + @resource_type.validproperties - + # Create a new instance of this Puppet::Type for each object present # on the system. list_all_present.collect do |name_string| self.new(single_report(name_string, *type_property_array)) end end - + def self.get_ds_path # JJM: 2007-07-24 This method dynamically returns the DS path we're concerned with. # For example, if we're working with an user type, this will be /Users # with a group type, this will be /Groups. - # @ds_path is an attribute of the class itself. + # @ds_path is an attribute of the class itself. if defined? @ds_path return @ds_path end @@ -110,7 +110,7 @@ class DirectoryService < Puppet::Provider::NameService # Puppet::Type this class object is providing for. return @resource_type.name.to_s.capitalize + "s" end - + def self.get_macosx_version_major if defined? @macosx_version_major return @macosx_version_major @@ -140,7 +140,7 @@ class DirectoryService < Puppet::Provider::NameService end return dscl_output.split("\n") end - + def self.parse_dscl_url_data(dscl_output) # we need to construct a Hash from the dscl -url output to match # that returned by the dscl -plist output for 10.5+ clients. @@ -150,7 +150,7 @@ class DirectoryService < Puppet::Provider::NameService # b) if a line ends in a colon and the next line does start with # a space, then the second line is a value of the first. # c) (implied by (b)) keys don't start with spaces. - + dscl_plist = {} dscl_output.split("\n").inject([]) do |array, line| if line =~ /^\s+/ # it's a value @@ -180,11 +180,11 @@ class DirectoryService < Puppet::Provider::NameService end return dscl_plist end - + def self.parse_dscl_plist_data(dscl_output) return Plist.parse_xml(dscl_output) end - + def self.generate_attribute_hash(input_hash, *type_properties) attribute_hash = {} input_hash.keys().each do |key| @@ -208,37 +208,37 @@ class DirectoryService < Puppet::Provider::NameService end attribute_hash[@@ds_to_ns_attribute_map[ds_attribute]] = ds_value end - + # NBK: need to read the existing password here as it's not actually # stored in the user record. It is stored at a path that involves the - # UUID of the user record for non-Mobile local acccounts. + # UUID of the user record for non-Mobile local acccounts. # Mobile Accounts are out of scope for this provider for now if @resource_type.validproperties.include?(:password) attribute_hash[:password] = self.get_password(attribute_hash[:guid]) end return attribute_hash end - + def self.single_report(resource_name, *type_properties) # JJM 2007-07-24: # Given a the name of an object and a list of properties of that # object, return all property values in a hash. - # + # # This class method returns nil if the object doesn't exist # Otherwise, it returns a hash of the object properties. - + all_present_str_array = list_all_present() - + # NBK: shortcut the process if the resource is missing return nil unless all_present_str_array.include? resource_name - + dscl_vector = get_exec_preamble("-read", resource_name) begin dscl_output = execute(dscl_vector) rescue Puppet::ExecutionFailure => detail raise Puppet::Error, "Could not get report. command execution failed." end - + # Two code paths is ugly, but until we can drop 10.4 support we don't # have a lot of choice. Ultimately this should all be done using Ruby # to access the DirectoryService APIs directly, but that's simply not @@ -249,10 +249,10 @@ class DirectoryService < Puppet::Provider::NameService when "10.5", "10.6" dscl_plist = self.parse_dscl_plist_data(dscl_output) end - + return self.generate_attribute_hash(dscl_plist, *type_properties) end - + def self.get_exec_preamble(ds_action, resource_name = nil) # JJM 2007-07-24 # DSCL commands are often repetitive and contain the same positional @@ -285,7 +285,7 @@ class DirectoryService < Puppet::Provider::NameService # e.g. 'dscl / -create /Users/mccune' return command_vector end - + def self.set_password(resource_name, guid, password_hash) password_hash_file = "#{@@password_hash_dir}/#{guid}" begin @@ -293,7 +293,7 @@ class DirectoryService < Puppet::Provider::NameService rescue Errno::EACCES => detail raise Puppet::Error, "Could not write to password hash file: #{detail}" end - + # NBK: For shadow hashes, the user AuthenticationAuthority must contain a value of # ";ShadowHash;". The LKDC in 10.5 makes this more interesting though as it # will dynamically generate ;Kerberosv5;;username@LKDC:SHA1 attributes if @@ -302,12 +302,12 @@ class DirectoryService < Puppet::Provider::NameService # use other custom AuthenticationAuthority attributes without stomping on them. # # There is a potential problem here in that we're only doing this when setting - # the password, and the attribute could get modified at other times while the + # the password, and the attribute could get modified at other times while the # hash doesn't change and so this doesn't get called at all... but # without switching all the other attributes to merge instead of create I can't # see a simple enough solution for this that doesn't modify the user record # every single time. This should be a rather rare edge case. (famous last words) - + dscl_vector = self.get_exec_preamble("-merge", resource_name) dscl_vector << "AuthenticationAuthority" << ";ShadowHash;" begin @@ -316,7 +316,7 @@ class DirectoryService < Puppet::Provider::NameService raise Puppet::Error, "Could not set AuthenticationAuthority." end end - + def self.get_password(guid) password_hash = nil password_hash_file = "#{@@password_hash_dir}/#{guid}" @@ -352,9 +352,9 @@ class DirectoryService < Puppet::Provider::NameService next end end - end + end end - + def password=(passphrase) exec_arg_vector = self.class.get_exec_preamble("-read", @resource.name) exec_arg_vector << @@ns_to_ds_attribute_map[:guid] @@ -370,11 +370,11 @@ class DirectoryService < Puppet::Provider::NameService raise Puppet::Error, "Could not set %s on %s[%s]: %s" % [param, @resource.class.name, @resource.name, detail] end end - + # NBK: we override @parent.set as we need to execute a series of commands # to deal with array values, rather than the single command nameservice.rb # expects to be returned by modifycmd. Thus we don't bother defining modifycmd. - + def set(param, value) self.class.validate(param, value) current_members = @property_value_cache_hash[:members] @@ -385,7 +385,7 @@ class DirectoryService < Puppet::Provider::NameService if @resource[:auth_membership] and not current_members.nil? remove_unwanted_members(current_members, value) end - + # if they're not a member, make them one. add_members(current_members, value) else @@ -402,7 +402,7 @@ class DirectoryService < Puppet::Provider::NameService end end end - + # NBK: we override @parent.create as we need to execute a series of commands # to create objects with dscl, rather than the single command nameservice.rb # expects to be returned by addcmd. Thus we don't bother defining addcmd. @@ -411,7 +411,7 @@ class DirectoryService < Puppet::Provider::NameService info "already exists" return nil end - + # NBK: First we create the object with a known guid so we can set the contents # of the password hash if required # Shelling out sucks, but for a single use case it doesn't seem worth @@ -419,7 +419,7 @@ class DirectoryService < Puppet::Provider::NameService # This should be revisited if Puppet starts managing UUIDs for other platform # user records. guid = %x{/usr/bin/uuidgen}.chomp - + exec_arg_vector = self.class.get_exec_preamble("-create", @resource[:name]) exec_arg_vector << @@ns_to_ds_attribute_map[:guid] << guid begin @@ -428,11 +428,11 @@ class DirectoryService < Puppet::Provider::NameService raise Puppet::Error, "Could not set GeneratedUID for %s %s: %s" % [@resource.class.name, @resource.name, detail] end - + if value = @resource.should(:password) and value != "" self.class.set_password(@resource[:name], guid, value) end - + # Now we create all the standard properties Puppet::Type.type(@resource.class.name).validproperties.each do |property| next if property == :ensure @@ -454,7 +454,7 @@ class DirectoryService < Puppet::Provider::NameService end end end - + def remove_unwanted_members(current_members, new_members) current_members.each do |member| if not new_members.include?(member) @@ -467,7 +467,7 @@ class DirectoryService < Puppet::Provider::NameService end end end - + def add_members(current_members, new_members) new_members.each do |new_member| if current_members.nil? or not current_members.include?(new_member) @@ -480,20 +480,20 @@ class DirectoryService < Puppet::Provider::NameService end end end - + def deletecmd # JJM: Like addcmd, only called when deleting the object itself # Note, this isn't used to delete properties of the object, # at least that's how I understand it... self.class.get_exec_preamble("-delete", @resource[:name]) end - + def getinfo(refresh = false) - # JJM 2007-07-24: + # JJM 2007-07-24: # Override the getinfo method, which is also defined in nameservice.rb # This method returns and sets @infohash, which looks like: # (NetInfo provider, user type...) - # @infohash = {:comment=>"Jeff McCune", :home=>"/Users/mccune", + # @infohash = {:comment=>"Jeff McCune", :home=>"/Users/mccune", # :shell=>"/bin/zsh", :password=>"********", :uid=>502, :gid=>502, # :name=>"mccune"} # @@ -502,24 +502,24 @@ class DirectoryService < Puppet::Provider::NameService if refresh or (! defined?(@property_value_cache_hash) or ! @property_value_cache_hash) # JJM 2007-07-24: OK, there's a bit of magic that's about to # happen... Let's see how strong my grip has become... =) - # + # # self is a provider instance of some Puppet::Type, like # Puppet::Type::User::ProviderDirectoryservice for the case of the # user type and this provider. - # + # # self.class looks like "user provider directoryservice", if that # helps you ... - # + # # self.class.resource_type is a reference to the Puppet::Type class, # probably Puppet::Type::User or Puppet::Type::Group, etc... - # + # # self.class.resource_type.validproperties is a class method, # returning an Array of the valid properties of that specific # Puppet::Type. - # + # # So... something like [:comment, :home, :password, :shell, :uid, # :groups, :ensure, :gid] - # + # # Ultimately, we add :name to the list, delete :ensure from the # list, then report on the remaining list. Pretty whacky, ehh? type_properties = [:name] + self.class.resource_type.validproperties diff --git a/lib/puppet/provider/nameservice/netinfo.rb b/lib/puppet/provider/nameservice/netinfo.rb index 8de141068..ec79f1980 100644 --- a/lib/puppet/provider/nameservice/netinfo.rb +++ b/lib/puppet/provider/nameservice/netinfo.rb @@ -46,14 +46,14 @@ class NetInfo < Puppet::Provider::NameService noautogen end end - + def self.instances warnonce "The NetInfo provider is deprecated; use directoryservice instead" report(@resource_type.validproperties).collect do |hash| self.new(hash) end end - + # Convert a NetInfo line into a hash of data. def self.line2hash(line, params) values = line.split(/\t/) @@ -69,20 +69,20 @@ class NetInfo < Puppet::Provider::NameService end hash end - + # What field the value is stored under. def self.netinfokey(name) name = symbolize(name) self.option(name, :key) || name end - + # Retrieve the data, yo. # FIXME This should retrieve as much information as possible, # rather than retrieving it one at a time. def self.report(*params) dir = self.netinfodir() cmd = [command(:nireport), "/", "/%s" % dir] - + params.flatten! # We require the name in order to know if we match. There's no @@ -111,7 +111,7 @@ class NetInfo < Puppet::Provider::NameService line2hash(line, params) } end - + # How to add an object. def addcmd creatorcmd("-create") @@ -128,7 +128,7 @@ class NetInfo < Puppet::Provider::NameService def deletecmd creatorcmd("-destroy") end - + def destroy delete() end @@ -203,7 +203,7 @@ class NetInfo < Puppet::Provider::NameService def netinfokey(name) self.class.netinfokey(name) end - + # Get a report for a single resource, not the whole table def single_report(*properties) warnonce "The NetInfo provider is deprecated; use directoryservice instead" diff --git a/lib/puppet/provider/package/appdmg.rb b/lib/puppet/provider/package/appdmg.rb index 4b9730c1c..5d64effac 100644 --- a/lib/puppet/provider/package/appdmg.rb +++ b/lib/puppet/provider/package/appdmg.rb @@ -7,7 +7,7 @@ # and are easier to manage. # # Note: the 'apple' Provider checks for the package name -# in /L/Receipts. Since we possibly install multiple apps's from +# in /L/Receipts. Since we possibly install multiple apps's from # a single source, we treat the source .app.dmg file as the package name. # As a result, we store installed .app.dmg file names # in /var/db/.puppet_appdmg_installed_<name> @@ -37,7 +37,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag new(:name => name, :provider => :appdmg, :ensure => :installed) end end - + def self.installapp(source, name, orig_source) appname = File.basename(source); ditto "--rsrc", source, "/Applications/#{appname}" @@ -64,7 +64,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag cached_source = source end end - + begin open(cached_source) do |dmg| xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-mountrandom", "/tmp", dmg.path diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb index ee645242e..7bbbcfe03 100755 --- a/lib/puppet/provider/package/apt.rb +++ b/lib/puppet/provider/package/apt.rb @@ -69,7 +69,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do end cmd << :install << str - + aptget(*cmd) end @@ -93,7 +93,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do self.info("Preseeding %s to debconf-set-selections" % response) preseed response - else + else self.info "No responsefile specified or non existant, not preseeding anything" end end diff --git a/lib/puppet/provider/package/aptrpm.rb b/lib/puppet/provider/package/aptrpm.rb index 9b3e7f015..0471fb915 100644 --- a/lib/puppet/provider/package/aptrpm.rb +++ b/lib/puppet/provider/package/aptrpm.rb @@ -36,7 +36,7 @@ Puppet::Type.type(:package).provide :aptrpm, :parent => :rpm, :source => :rpm do cmd = %w{-q -y} cmd << 'install' << str - + aptget(*cmd) end diff --git a/lib/puppet/provider/package/dpkg.rb b/lib/puppet/provider/package/dpkg.rb index 67d31a592..a4c398282 100755 --- a/lib/puppet/provider/package/dpkg.rb +++ b/lib/puppet/provider/package/dpkg.rb @@ -8,7 +8,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package commands :dpkg => "/usr/bin/dpkg" commands :dpkg_deb => "/usr/bin/dpkg-deb" commands :dpkgquery => "/usr/bin/dpkg-query" - + def self.instances packages = [] @@ -62,7 +62,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package unless file = @resource[:source] raise ArgumentError, "You cannot install dpkg packages without a source" end - + args = [] if @resource[:configfiles] == :keep diff --git a/lib/puppet/provider/package/fink.rb b/lib/puppet/provider/package/fink.rb index 1a779f083..5d9e86313 100755 --- a/lib/puppet/provider/package/fink.rb +++ b/lib/puppet/provider/package/fink.rb @@ -3,7 +3,7 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do include Puppet::Util::Package desc "Package management via ``fink``." - + commands :fink => "/sw/bin/fink" commands :aptget => "/sw/bin/apt-get" commands :aptcache => "/sw/bin/apt-cache" @@ -40,7 +40,7 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do keep = "" cmd << :install << str - + finkcmd(cmd) end @@ -64,7 +64,7 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do self.info("Preseeding %s to debconf-set-selections" % response) preseed response - else + else self.info "No responsefile specified or non existant, not preseeding anything" end end diff --git a/lib/puppet/provider/package/freebsd.rb b/lib/puppet/provider/package/freebsd.rb index 18df015fd..f4ca35466 100755 --- a/lib/puppet/provider/package/freebsd.rb +++ b/lib/puppet/provider/package/freebsd.rb @@ -8,7 +8,7 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do commands :pkginfo => "/usr/sbin/pkg_info", :pkgadd => "/usr/sbin/pkg_add", :pkgdelete => "/usr/sbin/pkg_delete" - + confine :operatingsystem => :freebsd def self.listcmd diff --git a/lib/puppet/provider/package/gem.rb b/lib/puppet/provider/package/gem.rb index 2f1aebcb3..56350fd36 100755 --- a/lib/puppet/provider/package/gem.rb +++ b/lib/puppet/provider/package/gem.rb @@ -90,7 +90,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d command << uri.path when 'puppet' # we don't support puppet:// URLs (yet) - raise Puppet::Error.new("puppet:// URLs are not supported as gem sources") + raise Puppet::Error.new("puppet:// URLs are not supported as gem sources") else # interpret it as a gem repository command << "--source" << "#{source}" << resource[:name] diff --git a/lib/puppet/provider/package/hpux.rb b/lib/puppet/provider/package/hpux.rb index 202fa24c9..0c4fb36f0 100644 --- a/lib/puppet/provider/package/hpux.rb +++ b/lib/puppet/provider/package/hpux.rb @@ -13,19 +13,19 @@ Puppet::Type.type(:package).provide :hpux, :parent => Puppet::Provider::Package confine :operatingsystem => "hp-ux" defaultfor :operatingsystem => "hp-ux" - + def self.instances # TODO: This is very hard on HP-UX! [] end - + # source and name are required def install raise ArgumentError, "source must be provided to install HP-UX packages" unless resource[:source] args = standard_args + ["-s", resource[:source], resource[:name]] swinstall(*args) end - + def query begin swlist resource[:name] @@ -34,12 +34,12 @@ Puppet::Type.type(:package).provide :hpux, :parent => Puppet::Provider::Package {:ensure => :absent} end end - + def uninstall args = standard_args + [resource[:name]] swremove(*args) end - + def standard_args return ["-x", "mount_all_filesystems=false"] end diff --git a/lib/puppet/provider/package/pkgdmg.rb b/lib/puppet/provider/package/pkgdmg.rb index 3b32fcb6a..8f11a0aa3 100644 --- a/lib/puppet/provider/package/pkgdmg.rb +++ b/lib/puppet/provider/package/pkgdmg.rb @@ -30,7 +30,7 @@ require 'facter/util/plist' Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Package do desc "Package management based on Apple's Installer.app and DiskUtility.app. This package works by checking the contents of a DMG image for Apple pkg or mpkg files. Any number of pkg or mpkg files may exist in the root directory of the DMG file system. Sub directories are not checked for packages. See `the wiki docs </trac/puppet/wiki/DmgPackages>` for more detail." - + confine :exists => "/Library/Receipts" commands :installer => "/usr/sbin/installer" commands :hdiutil => "/usr/bin/hdiutil" @@ -65,7 +65,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag t.print "source: '#{orig_source}'\n" end end - + def self.installpkgdmg(source, name) unless source =~ /\.dmg$/i raise Puppet::Error.new("Mac OS X PKG DMG's must specificy a source string ending in .dmg") @@ -82,7 +82,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag cached_source = source end end - + begin File.open(cached_source) do |dmg| xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", dmg.path diff --git a/lib/puppet/provider/package/ports.rb b/lib/puppet/provider/package/ports.rb index 96ef3f042..21696721e 100755 --- a/lib/puppet/provider/package/ports.rb +++ b/lib/puppet/provider/package/ports.rb @@ -53,7 +53,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre name, version = $1, $2 - if match == "=" or match == ">" + if match == "=" or match == ">" # we're up to date or more recent return version end diff --git a/lib/puppet/provider/package/rpm.rb b/lib/puppet/provider/package/rpm.rb index 09f78bf72..a9da43fac 100755 --- a/lib/puppet/provider/package/rpm.rb +++ b/lib/puppet/provider/package/rpm.rb @@ -49,12 +49,12 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr end # Find the fully versioned package name and the version alone. Returns - # a hash with entries :instance => fully versioned package name, and + # a hash with entries :instance => fully versioned package name, and # :ensure => version-release def query #NOTE: Prior to a fix for issue 1243, this method potentially returned a cached value #IF YOU CALL THIS METHOD, IT WILL CALL RPM - #Use get(:property) to check if cached values are available + #Use get(:property) to check if cached values are available cmd = ["-q", @resource[:name], "--nosignature", "--nodigest", "--qf", "#{NEVRAFORMAT}\n"] begin @@ -62,7 +62,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr rescue Puppet::ExecutionFailure return nil end - + # FIXME: We could actually be getting back multiple packages # for multilib @property_hash.update(self.class.nevra_to_hash(output)) @@ -75,7 +75,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr unless source = @resource[:source] @resource.fail "RPMs must specify a package source" end - + cmd = [command(:rpm), "-q", "--qf", "#{NEVRAFORMAT}\n", "-p", "#{@resource[:source]}"] h = self.class.nevra_to_hash(execfail(cmd, Puppet::Error)) return h[:ensure] @@ -86,7 +86,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr unless source = @resource[:source] @resource.fail "RPMs must specify a package source" end - # RPM gets pissy if you try to install an already + # RPM gets pissy if you try to install an already # installed package if @resource.should(:ensure) == @property_hash[:ensure] or @resource.should(:ensure) == :latest && @property_hash[:ensure] == latest diff --git a/lib/puppet/provider/package/sun.rb b/lib/puppet/provider/package/sun.rb index d916eb78c..f72738e2f 100755 --- a/lib/puppet/provider/package/sun.rb +++ b/lib/puppet/provider/package/sun.rb @@ -121,7 +121,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d raise Puppet::Error, "Sun packages must specify a package source" end cmd = [] - + if @resource[:adminfile] cmd << "-a" << @resource[:adminfile] end diff --git a/lib/puppet/provider/package/yum.rb b/lib/puppet/provider/package/yum.rb index 581a446ea..6fdff6997 100755 --- a/lib/puppet/provider/package/yum.rb +++ b/lib/puppet/provider/package/yum.rb @@ -4,7 +4,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do has_feature :versionable commands :yum => "yum", :rpm => "rpm", :python => "python" - + YUMHELPER = File::join(File::dirname(__FILE__), "yumhelper.py") attr_accessor :latest_info @@ -100,7 +100,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do # Install in yum can be used for update, too self.install end - + def purge yum "-y", :erase, @resource[:name] end diff --git a/lib/puppet/provider/package/yumhelper.py b/lib/puppet/provider/package/yumhelper.py index 7d73cdd23..e7b5fe13d 100644 --- a/lib/puppet/provider/package/yumhelper.py +++ b/lib/puppet/provider/package/yumhelper.py @@ -64,7 +64,7 @@ def shell_out(): return WEXITSTATUS(rc) else: # Exit code is None (0), no updates waiting so don't both parsing output - return 0 + return 0 # Yum prints a line of hyphens (old versions) or a blank line between # headers and package data, so skip everything before them diff --git a/lib/puppet/provider/selmodule/semodule.rb b/lib/puppet/provider/selmodule/semodule.rb index 498136691..2b65c0d4a 100644 --- a/lib/puppet/provider/selmodule/semodule.rb +++ b/lib/puppet/provider/selmodule/semodule.rb @@ -45,7 +45,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do end return :false end - + def syncversion= (dosync) begin execoutput("#{command(:semodule)} --upgrade #{selmod_name_to_filename}") @@ -115,13 +115,13 @@ Puppet::Type.type(:selmodule).provide(:semodule) do # At last! the version - v = selmod_readnext(mod) + v = selmod_readnext(mod) self.debug "file version #{v}" return v end - def selmodversion_loaded + def selmodversion_loaded lines = () begin execpipe("#{command(:semodule)} --list") do |output| diff --git a/lib/puppet/provider/service/daemontools.rb b/lib/puppet/provider/service/daemontools.rb index 67520da06..63666e149 100644 --- a/lib/puppet/provider/service/daemontools.rb +++ b/lib/puppet/provider/service/daemontools.rb @@ -11,7 +11,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do * /etc/service * /var/lib/svscan - The daemon directory should be placed in a directory that can be + The daemon directory should be placed in a directory that can be by default in: * /var/lib/service @@ -43,7 +43,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do class << self attr_writer :defpath - + # Determine the daemon path. def defpath unless defined?(@defpath) and @defpath @@ -111,10 +111,10 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do def daemon File.join(resource[:path], resource[:name]) end - + def status begin - output = svstat self.service + output = svstat self.service if output =~ /:\s+up \(/ return :running end diff --git a/lib/puppet/provider/service/freebsd.rb b/lib/puppet/provider/service/freebsd.rb index 356feeee4..baf5e5a11 100644 --- a/lib/puppet/provider/service/freebsd.rb +++ b/lib/puppet/provider/service/freebsd.rb @@ -5,7 +5,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do Uses ``rc.conf.d`` for service enabling and disabling. " - + confine :operatingsystem => [:freebsd, :netbsd, :openbsd] defaultfor :operatingsystem => :freebsd @@ -15,7 +15,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do def self.defpath superclass.defpath end - + # remove service file from rc.conf.d to disable it def disable rcfile = File.join(@@rcconf_dir, @model[:name]) @@ -23,7 +23,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do File.delete(rcfile) end end - + # if the service file exists in rc.conf.d then it's already enabled def enabled? rcfile = File.join(@@rcconf_dir, @model[:name]) @@ -33,7 +33,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do return :false end - + # enable service by creating a service file under rc.conf.d with the # proper contents def enable @@ -43,7 +43,7 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do rcfile = File.join(@@rcconf_dir, @model[:name]) open(rcfile, 'w') { |f| f << "%s_enable=\"YES\"\n" % @model[:name] } end - + # Override stop/start commands to use one<cmd>'s and the avoid race condition # where provider trys to stop/start the service before it is enabled def startcmd diff --git a/lib/puppet/provider/service/gentoo.rb b/lib/puppet/provider/service/gentoo.rb index bf9c3a173..ed643119d 100644 --- a/lib/puppet/provider/service/gentoo.rb +++ b/lib/puppet/provider/service/gentoo.rb @@ -38,7 +38,7 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do return :false unless line # If it's enabled then it will print output showing service | runlevel - if output =~ /^\s*#{@resource[:name]}\s*\|\s*(boot|default)/ + if output =~ /^\s*#{@resource[:name]}\s*\|\s*(boot|default)/ return :true else return :false diff --git a/lib/puppet/provider/service/init.rb b/lib/puppet/provider/service/init.rb index f70b12c42..1bf11fbba 100755 --- a/lib/puppet/provider/service/init.rb +++ b/lib/puppet/provider/service/init.rb @@ -29,21 +29,21 @@ Puppet::Type.type(:service).provide :init, :parent => :base do # List all services of this type. def self.instances self.defpath = [self.defpath] unless self.defpath.is_a? Array - + instances = [] - + self.defpath.each do |path| unless FileTest.directory?(path) Puppet.debug "Service path %s does not exist" % path next end - + check = [:ensure] - + if public_method_defined? :enabled? check << :enable end - + Dir.entries(path).each do |name| fullpath = File.join(path, name) next if name =~ /^\./ diff --git a/lib/puppet/provider/service/launchd.rb b/lib/puppet/provider/service/launchd.rb index ee0dac6a5..16fc55bba 100644 --- a/lib/puppet/provider/service/launchd.rb +++ b/lib/puppet/provider/service/launchd.rb @@ -2,29 +2,29 @@ require 'facter/util/plist' Puppet::Type.type(:service).provide :launchd, :parent => :base do desc "launchd service management framework. - + This provider manages launchd jobs, the default service framework for Mac OS X, that has also been open sourced by Apple for possible use on other platforms. - + See: * http://developer.apple.com/macosx/launchd.html * http://launchd.macosforge.org/ - + This provider reads plists out of the following directories: * /System/Library/LaunchDaemons * /System/Library/LaunchAgents * /Library/LaunchDaemons * /Library/LaunchAgents - + and builds up a list of services based upon each plists \"Label\" entry. - + This provider supports: * ensure => running/stopped, * enable => true/false * status * restart - + Here is how the Puppet states correspond to launchd states: * stopped => job unloaded * started => job loaded @@ -37,12 +37,12 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do " commands :launchctl => "/bin/launchctl" - + defaultfor :operatingsystem => :darwin confine :operatingsystem => :darwin - + has_feature :enableable - + Launchd_Paths = ["/Library/LaunchAgents", "/Library/LaunchDaemons", "/System/Library/LaunchAgents", @@ -129,7 +129,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do job_path, job_plist = plist_from_label(resource[:name]) did_enable_job = false cmds = [] - cmds << :launchctl << :load + cmds << :launchctl << :load if self.enabled? == :false # launchctl won't load disabled jobs cmds << "-w" did_enable_job = true @@ -143,7 +143,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do # As load -w clears the Disabled flag, we need to add it in after if did_enable_job and resource[:enable] == :false self.disable - end + end end @@ -151,7 +151,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do job_path, job_plist = plist_from_label(resource[:name]) did_disable_job = false cmds = [] - cmds << :launchctl << :unload + cmds << :launchctl << :unload if self.enabled? == :true # keepalive jobs can't be stopped without disabling cmds << "-w" did_disable_job = true diff --git a/lib/puppet/provider/service/redhat.rb b/lib/puppet/provider/service/redhat.rb index aec49a583..63a545dd9 100755 --- a/lib/puppet/provider/service/redhat.rb +++ b/lib/puppet/provider/service/redhat.rb @@ -8,7 +8,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do " commands :chkconfig => "/sbin/chkconfig", :service => "/sbin/service" - + defaultfor :operatingsystem => [:redhat, :fedora, :suse, :centos, :sles, :oel, :ovm] def self.defpath @@ -51,7 +51,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init do [self.name, detail] end end - + def restart if @resource[:hasrestart] == :true service(@resource[:name], "restart") diff --git a/lib/puppet/provider/service/runit.rb b/lib/puppet/provider/service/runit.rb index 0deeb0f22..45713b270 100644 --- a/lib/puppet/provider/service/runit.rb +++ b/lib/puppet/provider/service/runit.rb @@ -11,7 +11,7 @@ Puppet::Type.type(:service).provide :runit, :parent => :daemontools do * /var/service * /etc/service - The daemon directory should be placed in a directory that can be + The daemon directory should be placed in a directory that can be by default in: * /etc/sv diff --git a/lib/puppet/provider/sshkey/parsed.rb b/lib/puppet/provider/sshkey/parsed.rb index 57cfb5b67..0dc791bff 100755 --- a/lib/puppet/provider/sshkey/parsed.rb +++ b/lib/puppet/provider/sshkey/parsed.rb @@ -28,7 +28,7 @@ Puppet::Type.type(:sshkey).provide(:parsed, :pre_gen => proc { |hash| if hash[:alias] names = [hash[:name], hash[:alias]].flatten - + hash[:name] = [hash[:name], hash[:alias]].flatten.join(",") hash.delete(:alias) end diff --git a/lib/puppet/provider/user/directoryservice.rb b/lib/puppet/provider/user/directoryservice.rb index 706840822..63e3a35e1 100644 --- a/lib/puppet/provider/user/directoryservice.rb +++ b/lib/puppet/provider/user/directoryservice.rb @@ -20,15 +20,15 @@ Puppet::Type.type(:user).provide :directoryservice, :parent => Puppet::Provider: commands :dscl => "/usr/bin/dscl" confine :operatingsystem => :darwin defaultfor :operatingsystem => :darwin - + # JJM: DirectoryService can manage passwords. # This needs to be a special option to dscl though (-passwd) has_feature :manages_passwords - + # JJM: comment matches up with the /etc/passwd concept of an user options :comment, :key => "realname" options :password, :key => "passwd" - + autogen_defaults :home => "/var/empty", :shell => "/usr/bin/false" verify :gid, "GID must be an integer" do |value| @@ -38,11 +38,11 @@ Puppet::Type.type(:user).provide :directoryservice, :parent => Puppet::Provider: verify :uid, "UID must be an integer" do |value| value.is_a? Integer end - + def autogen_comment return @resource[:name].capitalize end - + # The list of all groups the user is a member of. Different # user mgmt systems will need to override this method. # JJM: FIXME: Override this method... @@ -57,7 +57,7 @@ Puppet::Type.type(:user).provide :directoryservice, :parent => Puppet::Provider: # next unless members # next if members =~ /NoValue/ # members = members.split(",") - # + # # if members.include? user # groups << name # end @@ -80,12 +80,12 @@ Puppet::Type.type(:user).provide :directoryservice, :parent => Puppet::Provider: # end # # Get just the groups we need to modify # diff = groups - (@is || []) - # + # # data = {} # open("| #{command(:nireport)} / /groups name users") do |file| # file.each do |line| # name, members = line.split(/\s+/) - # + # # if members.nil? or members =~ /NoValue/ # data[name] = [] # else @@ -94,7 +94,7 @@ Puppet::Type.type(:user).provide :directoryservice, :parent => Puppet::Provider: # end # end # end - # + # # user = @resource[:name] # data.each do |name, members| # if members.include? user and groups.include? name @@ -112,6 +112,6 @@ Puppet::Type.type(:user).provide :directoryservice, :parent => Puppet::Provider: # end # end end - - + + end diff --git a/lib/puppet/provider/user/hpux.rb b/lib/puppet/provider/user/hpux.rb index 76549ec69..db8dd194e 100644 --- a/lib/puppet/provider/user/hpux.rb +++ b/lib/puppet/provider/user/hpux.rb @@ -3,7 +3,7 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do defaultfor :operatingsystem => "hp-ux" confine :operatingsystem => "hp-ux" - + commands :modify => "/usr/sam/lbin/usermod.sam", :delete => "/usr/sam/lbin/userdel.sam", :add => "/usr/sbin/useradd" options :comment, :method => :gecos options :groups, :flag => "-G" diff --git a/lib/puppet/provider/user/ldap.rb b/lib/puppet/provider/user/ldap.rb index 2e200a88e..4ac18030a 100644 --- a/lib/puppet/provider/user/ldap.rb +++ b/lib/puppet/provider/user/ldap.rb @@ -6,7 +6,7 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do including ``ldapbase``. You will also almost definitely need settings for ``ldapuser`` and ``ldappassword``, so that your clients can write to ldap. - + Note that this provider will automatically generate a UID for you if you do not specify one, but it is a potentially expensive operation, as it iterates across all existing users to pick the appropriate next @@ -33,7 +33,7 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do # Find the next uid after the current largest uid. provider = self - manager.generates(:uidNumber).with do + manager.generates(:uidNumber).with do largest = 500 if existing = provider.manager.search existing.each do |hash| diff --git a/lib/puppet/provider/user/netinfo.rb b/lib/puppet/provider/user/netinfo.rb index 22fb95056..9ec7c89ab 100644 --- a/lib/puppet/provider/user/netinfo.rb +++ b/lib/puppet/provider/user/netinfo.rb @@ -39,7 +39,7 @@ Puppet::Type.type(:user).provide :netinfo, :parent => Puppet::Provider::NameServ # user mgmt systems will need to override this method. def groups warnonce "The NetInfo provider is deprecated; use directoryservice instead" - + groups = [] user = @resource[:name] @@ -64,7 +64,7 @@ Puppet::Type.type(:user).provide :netinfo, :parent => Puppet::Provider::NameServ # of the groups and add us to them. def groups=(groups) warnonce "The NetInfo provider is deprecated; use directoryservice instead" - + case groups when Fixnum groups = [groups.to_s] diff --git a/lib/puppet/provider/zone/solaris.rb b/lib/puppet/provider/zone/solaris.rb index 9d6e24338..778b9e0a1 100644 --- a/lib/puppet/provider/zone/solaris.rb +++ b/lib/puppet/provider/zone/solaris.rb @@ -27,7 +27,7 @@ Puppet::Type.type(:zone).provide(:solaris) do end def self.instances - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] x = adm(:list, "-cp").split("\n").collect do |line| new(line2hash(line)) end diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index 1a240e206..fc8eacd68 100644 --- a/lib/puppet/rails.rb +++ b/lib/puppet/rails.rb @@ -31,13 +31,13 @@ module Puppet::Rails puts detail.backtrace end raise Puppet::Error, "Could not connect to database: %s" % detail - end + end end # The arguments for initializing the database connection. def self.database_arguments adapter = Puppet[:dbadapter] - + args = {:adapter => adapter, :log_level => Puppet[:rails_loglevel]} case adapter @@ -48,7 +48,7 @@ module Puppet::Rails args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].empty? args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].empty? args[:database] = Puppet[:dbname] - + socket = Puppet[:dbsocket] args[:socket] = socket unless socket.empty? else @@ -93,7 +93,7 @@ module Puppet::Rails unless ActiveRecord::Base.connection.tables.include?("resources") raise Puppet::Error, "Database has problems, can't migrate." - end + end Puppet.notice "Migrating" @@ -122,9 +122,9 @@ module Puppet::Rails puts detail.backtrace end raise Puppet::Error, "Could not connect to database: %s" % detail - end + end - ActiveRecord::Base.connection.tables.each do |t| + ActiveRecord::Base.connection.tables.each do |t| ActiveRecord::Base.connection.drop_table t end end diff --git a/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb b/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb index d1035b0db..138f9f151 100644 --- a/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb +++ b/lib/puppet/rails/database/001_add_created_at_to_all_tables.rb @@ -2,16 +2,16 @@ class AddCreatedAtToAllTables < ActiveRecord::Migration def self.up ActiveRecord::Base.connection.tables.each do |t| unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at") - add_column t.to_s, :created_at, :datetime - end - end + add_column t.to_s, :created_at, :datetime + end + end end def self.down ActiveRecord::Base.connection.tables.each do |t| unless ActiveRecord::Base.connection.columns(t).collect {|c| c.name}.include?("created_at") remove_column t.to_s, :created_at - end - end + end + end end end diff --git a/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb b/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb index 3873a13e2..050ca7f43 100644 --- a/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb +++ b/lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb @@ -4,7 +4,7 @@ class RemoveDuplicatedIndexOnAllTables < ActiveRecord::Migration if ActiveRecord::Base.connection.indexes(t).collect {|c| c.columns}.include?("id") remove_index t.to_s, :id end - end + end end def self.down @@ -12,6 +12,6 @@ class RemoveDuplicatedIndexOnAllTables < ActiveRecord::Migration unless ActiveRecord::Base.connection.indexes(t).collect {|c| c.columns}.include?("id") add_index t.to_s, :id, :integer => true end - end + end end end diff --git a/lib/puppet/rails/database/003_add_environment_to_host.rb b/lib/puppet/rails/database/003_add_environment_to_host.rb index 3ed10e946..4ab2fbc63 100644 --- a/lib/puppet/rails/database/003_add_environment_to_host.rb +++ b/lib/puppet/rails/database/003_add_environment_to_host.rb @@ -4,7 +4,7 @@ class AddEnvironmentToHost < ActiveRecord::Migration add_column :hosts, :environment, :string end end - + def self.down if ActiveRecord::Base.connection.columns(:hosts).collect {|c| c.name}.include?("environment") remove_column :hosts, :environment diff --git a/lib/puppet/rails/database/schema.rb b/lib/puppet/rails/database/schema.rb index 246bec482..d8fcbb418 100644 --- a/lib/puppet/rails/database/schema.rb +++ b/lib/puppet/rails/database/schema.rb @@ -27,7 +27,7 @@ class Puppet::Rails::Schema add_index :resources, [:title, :restype] end - create_table :source_files do |t| + create_table :source_files do |t| t.column :filename, :string t.column :path, :string t.column :updated_at, :datetime @@ -44,7 +44,7 @@ class Puppet::Rails::Schema add_index :resource_tags, :resource_id, :integer => true add_index :resource_tags, :puppet_tag_id, :integer => true - create_table :puppet_tags do |t| + create_table :puppet_tags do |t| t.column :name, :string t.column :updated_at, :datetime t.column :created_at, :datetime @@ -66,20 +66,20 @@ class Puppet::Rails::Schema add_index :hosts, :source_file_id, :integer => true add_index :hosts, :name - create_table :fact_names do |t| + create_table :fact_names do |t| t.column :name, :string, :null => false t.column :updated_at, :datetime t.column :created_at, :datetime end add_index :fact_names, :name - create_table :fact_values do |t| + create_table :fact_values do |t| t.column :value, :text, :null => false t.column :fact_name_id, :integer, :null => false t.column :host_id, :integer, :null => false t.column :updated_at, :datetime t.column :created_at, :datetime - end + end add_index :fact_values, :fact_name_id, :integer => true add_index :fact_values, :host_id, :integer => true @@ -93,14 +93,14 @@ class Puppet::Rails::Schema end add_index :param_values, :param_name_id, :integer => true add_index :param_values, :resource_id, :integer => true - - create_table :param_names do |t| + + create_table :param_names do |t| t.column :name, :string, :null => false t.column :updated_at, :datetime t.column :created_at, :datetime end add_index :param_names, :name - end + end end ensure $stdout.close diff --git a/lib/puppet/rails/fact_value.rb b/lib/puppet/rails/fact_value.rb index b53591d7e..e4cc6dd3c 100644 --- a/lib/puppet/rails/fact_value.rb +++ b/lib/puppet/rails/fact_value.rb @@ -4,7 +4,7 @@ class Puppet::Rails::FactValue < ActiveRecord::Base def to_label "#{self.fact_name.name}" - end + end end # $Id: fact_value.rb 1952 2006-12-19 05:47:57Z luke $ diff --git a/lib/puppet/rails/host.rb b/lib/puppet/rails/host.rb index 1ddc01244..14ad5e6aa 100644 --- a/lib/puppet/rails/host.rb +++ b/lib/puppet/rails/host.rb @@ -84,13 +84,13 @@ class Puppet::Rails::Host < ActiveRecord::Base # Return the value of a fact. def fact(name) if fv = self.fact_values.find(:all, :include => :fact_name, - :conditions => "fact_names.name = '#{name}'") + :conditions => "fact_names.name = '#{name}'") return fv else return nil end end - + # returns a hash of fact_names.name => [ fact_values ] for this host. # Note that 'fact_values' is actually a list of the value instances, not # just actual values. @@ -102,7 +102,7 @@ class Puppet::Rails::Host < ActiveRecord::Base hash end end - + # This is *very* similar to the merge_parameters method # of Puppet::Rails::Resource. @@ -208,7 +208,7 @@ class Puppet::Rails::Host < ActiveRecord::Base end end - # Turn a parser resource into a Rails resource. + # Turn a parser resource into a Rails resource. def build_rails_resource_from_parser_resource(resource) db_resource = nil accumulate_benchmark("Added resources", :initialization) { diff --git a/lib/puppet/rails/param_name.rb b/lib/puppet/rails/param_name.rb index b4eb1df05..69e2fb6e2 100644 --- a/lib/puppet/rails/param_name.rb +++ b/lib/puppet/rails/param_name.rb @@ -4,7 +4,7 @@ require 'puppet/util/rails/cache_accumulator' class Puppet::Rails::ParamName < ActiveRecord::Base include Puppet::Util::CollectionMerger - has_many :param_values, :dependent => :destroy + has_many :param_values, :dependent => :destroy include Puppet::Util::CacheAccumulator accumulates :name diff --git a/lib/puppet/rails/param_value.rb b/lib/puppet/rails/param_value.rb index 46d7fc1fb..21415ef4b 100644 --- a/lib/puppet/rails/param_value.rb +++ b/lib/puppet/rails/param_value.rb @@ -67,7 +67,7 @@ class Puppet::Rails::ParamValue < ActiveRecord::Base end params end - + def to_s "%s => %s" % [self.name, self.value] end diff --git a/lib/puppet/rails/resource.rb b/lib/puppet/rails/resource.rb index 758df64b1..12d321143 100644 --- a/lib/puppet/rails/resource.rb +++ b/lib/puppet/rails/resource.rb @@ -150,7 +150,7 @@ class Puppet::Rails::Resource < ActiveRecord::Base end end end - + # Make sure the tag list is correct. def merge_tags(resource) in_db = [] diff --git a/lib/puppet/rails/resource_tag.rb b/lib/puppet/rails/resource_tag.rb index 57649b959..8aeec0ee8 100644 --- a/lib/puppet/rails/resource_tag.rb +++ b/lib/puppet/rails/resource_tag.rb @@ -4,7 +4,7 @@ class Puppet::Rails::ResourceTag < ActiveRecord::Base def to_label "#{self.puppet_tag.name}" - end + end # returns an array of hash containing tags of resource def self.find_all_tags_from_resource(db_resource) diff --git a/lib/puppet/rails/source_file.rb b/lib/puppet/rails/source_file.rb index 3ccf87ac6..de95f755a 100644 --- a/lib/puppet/rails/source_file.rb +++ b/lib/puppet/rails/source_file.rb @@ -4,5 +4,5 @@ class Puppet::Rails::SourceFile < ActiveRecord::Base def to_label "#{self.filename}" - end + end end diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb index 6c40c86ba..60cbb8639 100644 --- a/lib/puppet/reference/configuration.rb +++ b/lib/puppet/reference/configuration.rb @@ -53,20 +53,20 @@ the parameters below, but not all of the arguments make sense for every executab I have tried to be as thorough as possible in the descriptions of the arguments, so it should be obvious whether an argument is appropriate or not. -These parameters can be supplied to the executables either as command-line +These parameters can be supplied to the executables either as command-line options or in the configuration file. For instance, the command-line invocation below would set the configuration directory to ``/private/puppet``:: - + $ puppetd --confdir=/private/puppet - + Note that boolean options are turned on and off with a slightly different syntax on the command line:: $ puppetd --storeconfigs - + $ puppetd --no-storeconfigs -The invocations above will enable and disable, respectively, the storage of +The invocations above will enable and disable, respectively, the storage of the client configuration. Configuration Files @@ -95,7 +95,7 @@ The file follows INI-style formatting. Here is an example of a very simple [main] confdir = /private/puppet storeconfigs = true - + Note that boolean parameters must be explicitly specified as `true` or `false` as seen above. @@ -112,13 +112,13 @@ will print a template configuration to standard output, which can be redirected to a file like so:: $ puppetd --genconfig > /etc/puppet/puppet.conf - + Note that this invocation will replace the contents of any pre-existing `puppet.conf` file, so make a backup of your present config if it contains valuable information. Like the `--genconfig` argument, the executables also accept a `--genmanifest` -argument, which will generate a manifest that can be used to manage all of +argument, which will generate a manifest that can be used to manage all of Puppet's directories and files and prints it to standard output. This can likewise be redirected to a file:: @@ -128,16 +128,16 @@ Puppet can also create user and group accounts for itself (one `puppet` group and one `puppet` user) if it is invoked as `root` with the `--mkusers` argument:: $ puppetd --mkusers - + Signals ------- -The ``puppetd`` and ``puppetmasterd`` executables catch some signals for special -handling. Both daemons catch (``SIGHUP``), which forces the server to restart -tself. Predictably, interrupt and terminate (``SIGINT`` and ``SIGTERM``) will shut +The ``puppetd`` and ``puppetmasterd`` executables catch some signals for special +handling. Both daemons catch (``SIGHUP``), which forces the server to restart +tself. Predictably, interrupt and terminate (``SIGINT`` and ``SIGTERM``) will shut down the server, whether it be an instance of ``puppetd`` or ``puppetmasterd``. -Sending the ``SIGUSR1`` signal to an instance of ``puppetd`` will cause it to -immediately begin a new configuration transaction with the server. This +Sending the ``SIGUSR1`` signal to an instance of ``puppetd`` will cause it to +immediately begin a new configuration transaction with the server. This signal has no effect on ``puppetmasterd``. Configuration Parameter Reference diff --git a/lib/puppet/reference/function.rb b/lib/puppet/reference/function.rb index 5c62c88d5..0dc2f7967 100644 --- a/lib/puppet/reference/function.rb +++ b/lib/puppet/reference/function.rb @@ -6,7 +6,7 @@ There are two types of functions in Puppet: Statements and rvalues. Statements stand on their own and do not return arguments; they are used for performing stand-alone work like importing. Rvalues return values and can only be used in a statement requiring a value, such as an assignment or a case -statement. +statement. Here are the functions available in Puppet: diff --git a/lib/puppet/reference/metaparameter.rb b/lib/puppet/reference/metaparameter.rb index 45e5ea4e6..2d24a4209 100644 --- a/lib/puppet/reference/metaparameter.rb +++ b/lib/puppet/reference/metaparameter.rb @@ -6,7 +6,7 @@ metaparameter = Puppet::Util::Reference.newreference :metaparameter, :doc => "Al next if type.name == :puppet next if type.name == :component types[type.name] = type - } + } str = %{ Metaparameters @@ -23,7 +23,7 @@ Available Metaparameters params = [] Puppet::Type.eachmetaparam { |param| params << param - } + } params.sort { |a,b| a.to_s <=> b.to_s @@ -37,12 +37,12 @@ Available Metaparameters #puts "</dd>" #puts "" - } + } rescue => detail puts detail.backtrace puts "incorrect metaparams: %s" % detail exit(1) end - - str + + str end diff --git a/lib/puppet/reference/providers.rb b/lib/puppet/reference/providers.rb index f9f83a0fc..d425d803e 100644 --- a/lib/puppet/reference/providers.rb +++ b/lib/puppet/reference/providers.rb @@ -80,7 +80,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider end end notes << details - + count += 1 end diff --git a/lib/puppet/reference/type.rb b/lib/puppet/reference/type.rb index c80b17b0a..6f8d480c6 100644 --- a/lib/puppet/reference/type.rb +++ b/lib/puppet/reference/type.rb @@ -17,7 +17,7 @@ Resource Types This is the parameter that gets assigned when a string is provided before the colon in a type declaration. In general, only developers will need to worry about which parameter is the ``namevar``. - + In the following code:: file { "/etc/passwd": diff --git a/lib/puppet/relationship.rb b/lib/puppet/relationship.rb index 984dffeeb..97c84ac0e 100644 --- a/lib/puppet/relationship.rb +++ b/lib/puppet/relationship.rb @@ -13,7 +13,7 @@ class Puppet::Relationship attr_accessor :source, :target, :callback attr_reader :event - + def event=(event) if event != :NONE and ! callback raise ArgumentError, "You must pass a callback for non-NONE events" @@ -31,9 +31,9 @@ class Puppet::Relationship end end end - + # Does the passed event match our event? This is where the meaning - # of :NONE comes from. + # of :NONE comes from. def match?(event) if self.event.nil? or event == :NONE or self.event == :NONE return false @@ -50,7 +50,7 @@ class Puppet::Relationship result[:event] = event if event result end - + def ref "%s => %s" % [source, target] end diff --git a/lib/puppet/reports/rrdgraph.rb b/lib/puppet/reports/rrdgraph.rb index 5889750dd..0c1cbf202 100644 --- a/lib/puppet/reports/rrdgraph.rb +++ b/lib/puppet/reports/rrdgraph.rb @@ -3,21 +3,21 @@ Puppet::Reports.register_report(:rrdgraph) do must have the Ruby RRDtool library installed to use this report, which you can get from `the RubyRRDTool RubyForge page`_. This package may also be available as ``ruby-rrd`` or ``rrdtool-ruby`` in your distribution's package - management system. The library and/or package will both require the binary + management system. The library and/or package will both require the binary ``rrdtool`` package from your distribution to be installed. .. _the RubyRRDTool RubyForge page: http://rubyforge.org/projects/rubyrrdtool/ - + This report will create, manage, and graph RRD database files for each of the metrics generated during transactions, and it will create a few simple html files to display the reporting host's graphs. At this point, it will not create a common index file to display links to all hosts. - + All RRD files and graphs get created in the ``rrddir`` directory. If you want to serve these publicly, you should be able to just alias that directory in a web server. - + If you really know what you're doing, you can tune the ``rrdinterval``, which defaults to the ``runinterval``." diff --git a/lib/puppet/reports/store.rb b/lib/puppet/reports/store.rb index 0c7f8cea9..720e78cea 100644 --- a/lib/puppet/reports/store.rb +++ b/lib/puppet/reports/store.rb @@ -5,7 +5,7 @@ Puppet::Reports.register_report(:store) do desc "Store the yaml report on disk. Each host sends its report as a YAML dump and this just stores the file on disk, in the ``reportdir`` directory. - + These files collect quickly -- one every half hour -- so it is a good idea to perform some maintenance on them if you use this report (it's the only default report)." diff --git a/lib/puppet/reports/tagmail.rb b/lib/puppet/reports/tagmail.rb index 963cc0c19..4fdaa5137 100644 --- a/lib/puppet/reports/tagmail.rb +++ b/lib/puppet/reports/tagmail.rb @@ -8,12 +8,12 @@ Puppet::Reports.register_report(:tagmail) do based on the tags in the log messages. See the `UsingTags tag documentation`:trac: for more information on tags. - + To use this report, you must create a ``tagmail.conf`` (in the location specified by ``tagmap``). This is a simple file that maps tags to email addresses: Any log messages in the report that match the specified tags will be sent to the specified email addresses. - + Tags must be comma-separated, and they can be negated so that messages only match when they do not have that tag. The tags are separated from the email addresses by a colon, and the email addresses should also @@ -29,9 +29,9 @@ Puppet::Reports.register_report(:tagmail) do This will send all messages to ``me@domain.com``, and all messages from webservers that are not also from mailservers to ``httpadmins@domain.com``. - If you are using anti-spam controls, such as grey-listing, on your mail - server you should whitelist the sending email (controlled by ``reportform`` - configuration option) to ensure your email is not discarded as spam. + If you are using anti-spam controls, such as grey-listing, on your mail + server you should whitelist the sending email (controlled by ``reportform`` + configuration option) to ensure your email is not discarded as spam. " @@ -65,10 +65,10 @@ Puppet::Reports.register_report(:tagmail) do reports << [emails, messages.collect { |m| m.to_report }.join("\n")] end end - + return reports end - + # Load the config file def parse(text) taglists = [] @@ -114,13 +114,13 @@ Puppet::Reports.register_report(:tagmail) do end taglists = parse(File.read(Puppet[:tagmap])) - + # Now find any appropriately tagged messages. reports = match(taglists) send(reports) end - + # Send the email reports. def send(reports) pid = fork do @@ -136,7 +136,7 @@ Puppet::Reports.register_report(:tagmail) do p.puts "Date: " + Time.now.rfc2822 p.puts p.puts messages - end + end end end rescue => detail diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb index c885c8d78..eb42ff690 100644 --- a/lib/puppet/resource/catalog.rb +++ b/lib/puppet/resource/catalog.rb @@ -92,7 +92,7 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph # Create an alias for a resource. def alias(resource, name) - #set $1 + #set $1 resource.ref =~ /^(.+)\[/ newref = "%s[%s]" % [$1 || resource.class.name, name] @@ -148,7 +148,7 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph end yield transaction if block_given? - + transaction.send_report if host_config and (Puppet[:report] or Puppet[:summarize]) return transaction @@ -162,7 +162,7 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph def applying? @applying end - + def clear(remove_resources = true) super() # We have to do this so that the resources clean themselves up. @@ -271,7 +271,7 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph make_default_resources @resource_table.values.each { |resource| resource.finish } - + write_graph(:resources) end @@ -304,13 +304,13 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph # First create the default scheduling objects Puppet::Type.type(:schedule).mkdefaultschedules.each { |res| add_resource(res) unless resource(res.ref) } - + # And filebuckets if bucket = Puppet::Type.type(:filebucket).mkdefaultbucket add_resource(bucket) unless resource(bucket.ref) end end - + # Create a graph of all of the relationships in our catalog. def relationship_graph unless defined? @relationship_graph and @relationship_graph @@ -320,7 +320,7 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph # spitting out the messages. If this is not set, # then we get into an infinite loop. @relationship_graph = Puppet::SimpleGraph.new - + # First create the dependency graph self.vertices.each do |vertex| @relationship_graph.add_vertex vertex @@ -328,7 +328,7 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph @relationship_graph.add_edge(edge) end end - + # Lastly, add in any autorequires @relationship_graph.vertices.each do |vertex| vertex.autorequire(self).each do |edge| @@ -343,7 +343,7 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph end end @relationship_graph.write_graph(:relationships) if host_config? - + # Then splice in the container information @relationship_graph.splice!(self, Puppet::Type::Component) @@ -432,7 +432,7 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph # Verify that the given resource isn't defined elsewhere. def fail_unless_unique(resource) - # Short-curcuit the common case, + # Short-curcuit the common case, return unless existing_resource = @resource_table[resource.ref] # If we've gotten this far, it's a real conflict diff --git a/lib/puppet/resource/reference.rb b/lib/puppet/resource/reference.rb index b08f2a380..c205f1038 100644 --- a/lib/puppet/resource/reference.rb +++ b/lib/puppet/resource/reference.rb @@ -37,7 +37,7 @@ class Puppet::Resource::Reference # Don't override whatever was done by setting the title. self.type ||= argtype end - + @builtin_type = nil end @@ -63,7 +63,7 @@ class Puppet::Resource::Reference if value.nil? or value.to_s.downcase == "component" @type = "Class" else - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] x = @type = value.to_s.split("::").collect { |s| s.capitalize }.join("::") end end diff --git a/lib/puppet/simple_graph.rb b/lib/puppet/simple_graph.rb index 5d6f72943..34db59e5c 100644 --- a/lib/puppet/simple_graph.rb +++ b/lib/puppet/simple_graph.rb @@ -117,7 +117,7 @@ class Puppet::SimpleGraph def dependents(resource) tree_from_vertex(resource).keys end - + # Which resources depend upon the given resource. def dependencies(resource) # Cache the reversal graph, because it's somewhat expensive @@ -142,7 +142,7 @@ class Puppet::SimpleGraph l = tree.keys.find_all { |c| adjacent(c, :direction => direction).empty? } return l end - + # Collect all of the edges that the passed events match. Returns # an array of edges. def matching_edges(events, base = nil) @@ -284,7 +284,7 @@ class Puppet::SimpleGraph def remove_edge!(edge) @vertices[edge.source].remove_edge(:out, edge) @vertices[edge.target].remove_edge(:in, edge) - + @edges.delete(edge) nil end @@ -302,9 +302,9 @@ class Puppet::SimpleGraph def setup_vertex(vertex) @vertices[vertex] = VertexWrapper.new(vertex) end - + public - + # # For some reason, unconnected vertices do not show up in # # this graph. # def to_jpg(path, name) @@ -313,11 +313,11 @@ class Puppet::SimpleGraph # induced_subgraph(gv).write_to_graphic_file('jpg', name) # end # end - + # Take container information from another graph and use it # to replace any container vertices with their respective leaves. # This creates direct relationships where there were previously - # indirect relationships through the containers. + # indirect relationships through the containers. def splice!(other, type) # We have to get the container list via a topological sort on the # configuration graph, because otherwise containers that contain @@ -335,7 +335,7 @@ class Puppet::SimpleGraph remove_vertex!(container) next end - + # First create new edges for each of the :in edges [:in, :out].each do |dir| edges = adjacent(container, :direction => dir, :type => :edges) @@ -386,7 +386,7 @@ class Puppet::SimpleGraph walk(start, direction) do |parent, child| predecessor[child] = parent end - predecessor + predecessor end # LAK:FIXME This is just a paste of the GRATR code with slight modifications. @@ -419,7 +419,7 @@ class Puppet::SimpleGraph end graph end - + # Output the dot format as a string def to_dot (params={}) to_dot_graph(params).to_s; end @@ -435,9 +435,9 @@ class Puppet::SimpleGraph def write_to_graphic_file (fmt='png', dotfile='graph') src = dotfile + '.dot' dot = dotfile + '.' + fmt - + File.open(src, 'w') {|f| f << self.to_dot << "\n"} - + system( "dot -T#{fmt} #{src} -o #{dot}" ) dot end diff --git a/lib/puppet/ssl/certificate_authority/interface.rb b/lib/puppet/ssl/certificate_authority/interface.rb index b355e21f0..e4552950c 100644 --- a/lib/puppet/ssl/certificate_authority/interface.rb +++ b/lib/puppet/ssl/certificate_authority/interface.rb @@ -1,6 +1,6 @@ # This class is basically a hidden class that knows how to act # on the CA. It's only used by the 'puppetca' executable, and its -# job is to provide a CLI-like interface to the CA class. +# job is to provide a CLI-like interface to the CA class. class Puppet::SSL::CertificateAuthority::Interface INTERFACE_METHODS = [:destroy, :list, :revoke, :generate, :sign, :print, :verify] diff --git a/lib/puppet/ssl/certificate_factory.rb b/lib/puppet/ssl/certificate_factory.rb index 41155fd41..73b8a54c3 100644 --- a/lib/puppet/ssl/certificate_factory.rb +++ b/lib/puppet/ssl/certificate_factory.rb @@ -12,7 +12,7 @@ class Puppet::SSL::CertificateFactory } attr_reader :name, :cert_type, :csr, :issuer, :serial - + def initialize(cert_type, csr, issuer, serial) @cert_type, @csr, @issuer, @serial = cert_type, csr, issuer, serial @@ -77,7 +77,7 @@ class Puppet::SSL::CertificateFactory @extensions << @ef.create_extension("authorityKeyIdentifier", "keyid:always,issuer:always") if @cert_type == :ca end - # TTL for new certificates in seconds. If config param :ca_ttl is set, + # TTL for new certificates in seconds. If config param :ca_ttl is set, # use that, otherwise use :ca_days for backwards compatibility def ttl ttl = Puppet.settings[:ca_ttl] diff --git a/lib/puppet/ssl/host.rb b/lib/puppet/ssl/host.rb index acd27edb6..29b947eea 100644 --- a/lib/puppet/ssl/host.rb +++ b/lib/puppet/ssl/host.rb @@ -253,7 +253,7 @@ class Puppet::SSL::Host if time < 1 puts "Exiting; no certificate found and waitforcert is disabled" - exit(1) + exit(1) end while true do diff --git a/lib/puppet/sslcertificates/ca.rb b/lib/puppet/sslcertificates/ca.rb index 2a16a32ba..b0bcdb612 100644 --- a/lib/puppet/sslcertificates/ca.rb +++ b/lib/puppet/sslcertificates/ca.rb @@ -31,7 +31,7 @@ class Puppet::SSLCertificates::CA [file, detail] end end - + end end @@ -39,7 +39,7 @@ class Puppet::SSLCertificates::CA File.join(Puppet[:csrdir], [hostname.downcase, "pem"].join(".")) end - # this stores signed certs in a directory unrelated to + # this stores signed certs in a directory unrelated to # normal client certs def host2certfile(hostname) File.join(Puppet[:signeddir], [hostname.downcase, "pem"].join(".")) @@ -142,15 +142,15 @@ class Puppet::SSLCertificates::CA } end - # List signed certificates. This returns a list of hostnames, not actual - # files -- the names can be converted to full paths with host2csrfile. - def list_signed - return Dir.entries(Puppet[:signeddir]).find_all { |file| - file =~ /\.pem$/ - }.collect { |file| - file.sub(/\.pem$/, '') - } - end + # List signed certificates. This returns a list of hostnames, not actual + # files -- the names can be converted to full paths with host2csrfile. + def list_signed + return Dir.entries(Puppet[:signeddir]).find_all { |file| + file =~ /\.pem$/ + }.collect { |file| + file.sub(/\.pem$/, '') + } + end # Create the root certificate. def mkrootcert @@ -207,7 +207,7 @@ class Puppet::SSLCertificates::CA @crl.add_revoked(revoked) store_crl end - + # Take the Puppet config and store it locally. def setconfig(hash) @config = {} @@ -306,7 +306,7 @@ class Puppet::SSLCertificates::CA end end - # TTL for new certificates in seconds. If config param :ca_ttl is set, + # TTL for new certificates in seconds. If config param :ca_ttl is set, # use that, otherwise use :ca_days for backwards compatibility def ttl days = @config[:ca_days] @@ -337,7 +337,7 @@ class Puppet::SSLCertificates::CA end end end - + private def init_crl if FileTest.exists?(@config[:cacrl]) @@ -355,7 +355,7 @@ class Puppet::SSLCertificates::CA @crl end end - + def store_crl # Increment the crlNumber e = @crl.extensions.find { |e| e.oid == 'crlNumber' } diff --git a/lib/puppet/sslcertificates/certificate.rb b/lib/puppet/sslcertificates/certificate.rb index f348cdcb8..191f553b0 100644 --- a/lib/puppet/sslcertificates/certificate.rb +++ b/lib/puppet/sslcertificates/certificate.rb @@ -98,9 +98,9 @@ class Puppet::SSLCertificates::Certificate @encrypt = hash[:encrypt] || false @replace = hash[:replace] || false @issuer = hash[:issuer] || nil - + if hash.include?(:type) - case hash[:type] + case hash[:type] when :ca, :client, :server; @type = hash[:type] else raise "Invalid Cert type %s" % hash[:type] @@ -168,7 +168,7 @@ class Puppet::SSLCertificates::Certificate # case p # when 0; Puppet.info "key info: ." # BN_generate_prime # when 1; Puppet.info "key info: +" # BN_generate_prime -# when 2; Puppet.info "key info: *" # searching good prime, +# when 2; Puppet.info "key info: *" # searching good prime, # # n = #of try, # # but also data from BN_generate_prime # when 3; Puppet.info "key info: \n" # found good prime, n==0 - p, n==1 - q, diff --git a/lib/puppet/sslcertificates/inventory.rb b/lib/puppet/sslcertificates/inventory.rb index 295c416cb..b86ee0b90 100644 --- a/lib/puppet/sslcertificates/inventory.rb +++ b/lib/puppet/sslcertificates/inventory.rb @@ -4,7 +4,7 @@ module Puppet::SSLCertificates module Inventory # Add CERT to the inventory of issued certs in '$cadir/inventory.txt' - # If no inventory exists yet, build an inventory and list all the + # If no inventory exists yet, build an inventory and list all the # certificates that have been signed so far def self.add(cert) inited = false @@ -30,8 +30,8 @@ module Puppet::SSLCertificates def self.format(cert) iso = '%Y-%m-%dT%H:%M:%S%Z' - return "0x%04x %s %s %s" % [cert.serial, - cert.not_before.strftime(iso), + return "0x%04x %s %s %s" % [cert.serial, + cert.not_before.strftime(iso), cert.not_after.strftime(iso), cert.subject] end diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb index dd8689447..f09ca804b 100644 --- a/lib/puppet/transaction.rb +++ b/lib/puppet/transaction.rb @@ -16,7 +16,7 @@ class Transaction # The list of events generated in this transaction. attr_reader :events - + include Puppet::Util # Add some additional times for reporting @@ -35,7 +35,7 @@ class Transaction if resource.purging? and resource.deleting? if deps = relationship_graph.dependents(resource) and ! deps.empty? and deps.detect { |d| ! d.deleting? } resource.warning "%s still depend%s on me -- not purging" % - [deps.collect { |r| r.ref }.join(","), deps.length > 1 ? "":"s"] + [deps.collect { |r| r.ref }.join(","), deps.length > 1 ? "":"s"] return false end end @@ -91,7 +91,7 @@ class Transaction if resource.respond_to?(:flush) resource.flush end - + # And set a trigger for refreshing this resource if it's a # self-refresher if resource.self_refresh? and ! resource.deleting? @@ -149,7 +149,7 @@ class Transaction change.property.resource }.uniq end - + # Do any necessary cleanup. If we don't get rid of the graphs, the # contained resources might never get cleaned up. def cleanup @@ -162,7 +162,7 @@ class Transaction # child resource. def make_parent_child_relationship(resource, children) depthfirst = resource.depthfirst? - + children.each do |gen_child| if depthfirst edge = [gen_child, resource] @@ -190,15 +190,15 @@ class Transaction def eval_generate(resource) generate_additional_resources(resource, :eval_generate) end - + # Evaluate a single resource. def eval_resource(resource) events = [] - + if resource.is_a?(Puppet::Type::Component) raise Puppet::DevError, "Got a component to evaluate" end - + if skip?(resource) @resourcemetrics[:skipped] += 1 else @@ -230,13 +230,13 @@ class Transaction events = [] @resourcemetrics[:scheduled] += 1 - + changecount = @changes.length - + # We need to generate first regardless, because the recursive # actions sometimes change how the top resource is applied. children = eval_generate(resource) - + if ! children.empty? and resource.depthfirst? children.each do |child| # The child will never be skipped when the parent isn't @@ -278,7 +278,7 @@ class Transaction # Start logging. Puppet::Util::Log.newdestination(@report) - + prepare() begin @@ -333,10 +333,10 @@ class Transaction skip = true end end - + return skip end - + # A general method for recursively generating new resources from a # resource. def generate_additional_resources(resource, method) @@ -481,7 +481,7 @@ class Transaction end end end - + # Prepare to evaluate the resources in a transaction. def prepare # Now add any dynamically generated resources @@ -490,7 +490,7 @@ class Transaction # Then prefetch. It's important that we generate and then prefetch, # so that any generated resources also get prefetched. prefetch() - + # This will throw an error if there are cycles in the graph. @sorted_resources = relationship_graph.topsort end @@ -498,7 +498,7 @@ class Transaction def relationship_graph catalog.relationship_graph end - + # Send off the transaction report. def send_report begin @@ -515,7 +515,7 @@ class Transaction if Puppet[:summarize] puts report.summary end - + if Puppet[:report] begin report.save() @@ -550,7 +550,7 @@ class Transaction # this still could get hairy; what if file contents changed, # but a chmod failed? how would i handle that error? dern end - + # FIXME This won't work right now. relationship_graph.matching_edges(events).each do |edge| @targets[edge.target] << edge @@ -565,7 +565,7 @@ class Transaction events }.flatten.reject { |e| e.nil? } end - + # Is the resource currently scheduled? def scheduled?(resource) self.ignoreschedules or resource.scheduled? @@ -582,7 +582,7 @@ class Transaction end @targets[edge.target] << edge end - + # Should this resource be skipped? def skip?(resource) skip = false @@ -597,7 +597,7 @@ class Transaction end return true end - + # The tags we should be checking. def tags unless defined? @tags @@ -608,7 +608,7 @@ class Transaction @tags = tags.split(/\s*,\s*/) end end - + @tags end @@ -616,13 +616,13 @@ class Transaction tags = [tags] unless tags.is_a?(Array) @tags = tags end - + # Is this resource tagged appropriately? def missing_tags?(resource) return false if self.ignore_tags? or tags.empty? return true unless resource.tagged?(tags) end - + # Are there any edges that target this resource? def targeted?(resource) # The default value is a new array so we have to test the length of it. @@ -665,7 +665,7 @@ class Transaction [callback, subs.length] end resource.notice message - + # At this point, just log failures, don't try to react # to them in any way. begin diff --git a/lib/puppet/transaction/change.rb b/lib/puppet/transaction/change.rb index 42c3a174f..b710ee08d 100644 --- a/lib/puppet/transaction/change.rb +++ b/lib/puppet/transaction/change.rb @@ -5,7 +5,7 @@ require 'puppet/transaction/event' # including calling 'sync' on the properties and producing events. class Puppet::Transaction::Change attr_accessor :is, :should, :path, :property, :changed, :proxy - + # Switch the goals of the property, thus running the change in reverse. def backward @is, @should = @should, @is @@ -14,7 +14,7 @@ class Puppet::Transaction::Change @property.info "Reversing %s" % self return self.go end - + def changed? self.changed end @@ -28,7 +28,7 @@ class Puppet::Transaction::Change name = @property.event(should) end - + Puppet::Transaction::Event.new(name, self.resource) end @@ -61,7 +61,7 @@ class Puppet::Transaction::Change else events = [events] end - + return events.collect { |name| @report = @property.log(@property.change_to_s(@is, @should)) event(name) @@ -71,12 +71,12 @@ class Puppet::Transaction::Change def forward return self.go end - + # Is our property noop? This is used for generating special events. def noop? return @property.noop end - + # The resource that generated this change. This is used for handling events, # and the proxy resource is used for generated resources, since we can't # send an event to a resource we don't have a direct relationship. If we diff --git a/lib/puppet/transaction/event.rb b/lib/puppet/transaction/event.rb index f1a48b382..54c092e65 100644 --- a/lib/puppet/transaction/event.rb +++ b/lib/puppet/transaction/event.rb @@ -8,7 +8,7 @@ require 'puppet/util/errors' class Puppet::Transaction::Event include Puppet::Util::MethodHelper include Puppet::Util::Errors - + attr_reader :name, :source def initialize(name, source) diff --git a/lib/puppet/transportable.rb b/lib/puppet/transportable.rb index 052f6bab1..85a75d453 100644 --- a/lib/puppet/transportable.rb +++ b/lib/puppet/transportable.rb @@ -66,7 +66,7 @@ module Puppet end def to_manifest - "%s { '%s':\n%s\n}" % + "%s { '%s':\n%s\n}" % [self.type.to_s, self.name, @params.collect { |p, v| if v.is_a? Array @@ -209,7 +209,7 @@ module Puppet end end end - + begin delver.call(self) catalog.finalize @@ -218,7 +218,7 @@ module Puppet catalog.clear if (clear_on_failure) raise end - + return catalog end diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb index 320f82f0c..d30033870 100644 --- a/lib/puppet/type.rb +++ b/lib/puppet/type.rb @@ -149,7 +149,7 @@ class Type return ens end - + # Deal with any options passed into parameters. def self.handle_param_options(name, options) # If it's a boolean parameter, create a method to test the value easily @@ -201,7 +201,7 @@ class Type if options[:required_features] param.required_features = options[:required_features] end - + handle_param_options(name, options) param.metaparam = true @@ -239,7 +239,7 @@ class Type :array => @parameters, :hash => @paramhash ) - + handle_param_options(name, options) # Grr. @@ -278,7 +278,7 @@ class Type "Options must be a hash, not %s" % options.inspect end - if @validproperties.include?(name) + if @validproperties.include?(name) raise Puppet::DevError, "Class %s already has a property named %s" % [self.name, name] end @@ -390,7 +390,7 @@ class Type return name end end - + # Are we deleting this resource? def deleting? obj = @parameters[:ensure] and obj.should == :absent @@ -405,7 +405,7 @@ class Type end return false end - + # abstract accessing parameters and properties, and normalize # access to always be symbols, not strings # This returns a value, not an object. It returns the 'is' @@ -575,7 +575,7 @@ class Type # Convert our object to a hash. This just includes properties. def to_hash rethash = {} - + @parameters.each do |name, obj| rethash[name] = obj.value end @@ -669,7 +669,7 @@ class Type return false end end - + def depthfirst? self.class.depthfirst? end @@ -746,14 +746,14 @@ class Type # it's really only used for testing def insync?(is) insync = true - + if property = @parameters[:ensure] unless is.include? property raise Puppet::DevError, "The is value is not in the is array for '%s'" % [property.name] end - ensureis = is[property] + ensureis = is[property] if property.insync?(ensureis) and property.should == :absent return true end @@ -779,12 +779,12 @@ class Type #self.debug("%s sync status is %s" % [self,insync]) return insync end - + # retrieve the current value of all contained properties def retrieve return currentpropvalues end - + # Get a hash of the current properties. Returns a hash with # the actual property instance as the key and the current value # as the, um, value. @@ -821,7 +821,7 @@ class Type def noop noop? end - + # Retrieve the changes associated with all of the properties. def propertychanges(currentvalues) # If we are changing the existence of the object, then none of @@ -1073,7 +1073,7 @@ class Type newmetaparam(:noop) do desc "Boolean flag indicating whether work should actually be done." - + newvalues(:true, :false) munge do |value| case value @@ -1165,8 +1165,8 @@ class Type munge do |loglevel| val = super(loglevel) if val == :verbose - val = :info - end + val = :info + end val end end @@ -1174,7 +1174,7 @@ class Type newmetaparam(:alias) do desc "Creates an alias for the object. Puppet uses this internally when you provide a symbolic name:: - + file { sshdconfig: path => $operatingsystem ? { solaris => \"/usr/local/etc/ssh/sshd_config\", @@ -1207,7 +1207,7 @@ class Type should be affecting the same file. See the `LanguageTutorial language tutorial`:trac: for more information. - + " munge do |aliases| @@ -1239,7 +1239,7 @@ class Type Tags are currently useful for things like applying a subset of a host's configuration:: - + puppetd --test --tags mytag This way, when you're testing a configuration you can run just the @@ -1253,18 +1253,18 @@ class Type end end end - + class RelationshipMetaparam < Puppet::Parameter class << self attr_accessor :direction, :events, :callback, :subclasses end - + @subclasses = [] - + def self.inherited(sub) @subclasses << sub end - + def munge(references) references = [references] unless references.is_a?(Array) references.collect do |ref| @@ -1284,7 +1284,7 @@ class Type end end end - + # Create edges from each of our relationships. :in # relationships are specified by the event-receivers, and :out # relationships are specified by the event generator. This @@ -1296,7 +1296,7 @@ class Type def to_edges @value.collect do |reference| reference.catalog = resource.catalog - + # Either of the two retrieval attempts could have returned # nil. unless related_resource = reference.resolve @@ -1325,12 +1325,12 @@ class Type subargs = nil self.debug("requires %s" % [related_resource.ref]) end - + rel = Puppet::Relationship.new(source, target, subargs) end end end - + def self.relationship_params RelationshipMetaparam.subclasses end @@ -1345,7 +1345,7 @@ class Type desc "One or more objects that this object depends on. This is used purely for guaranteeing that changes to required objects happen before the dependent object. For instance:: - + # Create the destination directory before you copy things down file { \"/usr/local/scripts\": ensure => directory @@ -1371,7 +1371,7 @@ class Type any parent directories that are being managed; it will automatically realize that the parent directory should be created before the script is pulled down. - + Currently, exec resources will autorequire their CWD (if it is specified) plus any fully qualified paths that appear in the command. For instance, if you had an ``exec`` command that ran @@ -1386,7 +1386,7 @@ class Type desc "One or more objects that this object depends on. Changes in the subscribed to objects result in the dependent objects being refreshed (e.g., a service will get restarted). For instance:: - + class nagios { file { \"/etc/nagios/nagios.conf\": source => \"puppet://server/module/nagios.conf\", @@ -1418,11 +1418,11 @@ class Type command => "/usr/bin/make", cwd => "/var/nagios/configuration" } - + This will make sure all of the files are up to date before the make command is run.} end - + newmetaparam(:notify, :parent => RelationshipMetaparam, :attributes => {:direction => :out, :events => :ALL_EVENTS, :callback => :refresh}) do desc %{This parameter is the opposite of **subscribe** -- it sends events to the specified object:: @@ -1435,7 +1435,7 @@ class Type service { sshd: ensure => running } - + This will restart the sshd service if the sshd config file changes.} end @@ -1768,7 +1768,7 @@ class Type attr_writer :noop include Enumerable - + # class methods dealing with Type management public @@ -1838,7 +1838,7 @@ class Type # The catalog that this resource is stored in. attr_accessor :catalog - + # create a log at specified level def log(msg) Puppet::Util::Log.create( @@ -1985,7 +1985,7 @@ class Type def ref "%s[%s]" % [self.class.name.to_s.capitalize, self.title] end - + def self_refresh? self.class.self_refresh end diff --git a/lib/puppet/type/component.rb b/lib/puppet/type/component.rb index 724e2985a..5fed1760e 100644 --- a/lib/puppet/type/component.rb +++ b/lib/puppet/type/component.rb @@ -34,7 +34,7 @@ Puppet::Type.newtype(:component) do catalog.alias(self, ref) end end - + # Component paths are special because they function as containers. def pathbuilder if reference.type == "Class" diff --git a/lib/puppet/type/computer.rb b/lib/puppet/type/computer.rb index 0888325a8..ba394f57b 100644 --- a/lib/puppet/type/computer.rb +++ b/lib/puppet/type/computer.rb @@ -1,5 +1,5 @@ Puppet::Type.newtype(:computer) do - + @doc = "Computer object management using DirectoryService on OS X. @@ -15,12 +15,12 @@ Puppet::Type.newtype(:computer) do This type primarily exists to create localhost Computer objects that MCX policy can then be attached to." - + # ensurable - + # We autorequire the computer object in case it is being managed at the # file level by Puppet. - + autorequire(:file) do if self[:name] "/var/db/dslocal/nodes/Default/computers/#{self[:name]}.plist" @@ -28,7 +28,7 @@ Puppet::Type.newtype(:computer) do nil end end - + newproperty(:ensure, :parent => Puppet::Property::Ensure) do desc "Control the existences of this computer record. Set this attribute to ``present`` to ensure the computer record exists. Set it to ``absent`` @@ -41,22 +41,22 @@ Puppet::Type.newtype(:computer) do provider.delete end end - + newparam(:name) do desc "The authoritative 'short' name of the computer record." isnamevar end - + newparam(:realname) do desc "The 'long' name of the computer record." end - + newproperty(:en_address) do desc "The MAC address of the primary network interface. Must match en0." end - + newproperty(:ip_address) do desc "The IP Address of the Computer object." end - + end diff --git a/lib/puppet/type/cron.rb b/lib/puppet/type/cron.rb index c46a7c83b..dcc363254 100755 --- a/lib/puppet/type/cron.rb +++ b/lib/puppet/type/cron.rb @@ -3,20 +3,20 @@ require 'facter' require 'puppet/util/filetype' Puppet::Type.newtype(:cron) do - @doc = "Installs and manages cron jobs. All fields except the command + @doc = "Installs and manages cron jobs. All fields except the command and the user are optional, although specifying no periodic fields would result in the command being executed every minute. While the name of the cron job is not part of the actual job, it is used by Puppet to store and retrieve it. - + If you specify a cron job that matches an existing job in every way except name, then the jobs will be considered equivalent and the new name will be permanently associated with that job. Once this association is made and synced to disk, you can then manage the job normally (e.g., change the schedule of the job). - + Example:: - + cron { logrotate: command => \"/usr/sbin/logrotate\", user => root, @@ -89,7 +89,7 @@ Puppet::Type.newtype(:cron) do # or the first three letters of the word. def alphacheck(value, ary) tmp = value.downcase - + # If they specified a shortened version of the name, then see # if we can lengthen it (e.g., mon => monday). if tmp.length == 3 @@ -211,16 +211,16 @@ Puppet::Type.newtype(:cron) do best to always provide a fully qualified command. The user's profile is not sourced when the command is run, so if the user's environment is desired it should be sourced manually. - + All cron parameters support ``absent`` as a value; this will remove any existing values for that field." - def retrieve + def retrieve return_value = super if return_value && return_value.is_a?(Array) return_value = return_value[0] end - + return return_value end @@ -302,7 +302,7 @@ Puppet::Type.newtype(:cron) do job. If you already have cron jobs with environment settings, then Puppet will keep those settings in the same place in the file, but will not associate them with a specific job. - + Settings should be specified exactly as they should appear in the crontab, e.g., ``PATH=/bin:/usr/bin:/usr/sbin``." @@ -322,7 +322,7 @@ Puppet::Type.newtype(:cron) do end def is_to_s(newvalue) - if newvalue + if newvalue if newvalue.is_a?(Array) newvalue.join(",") else @@ -363,7 +363,7 @@ Puppet::Type.newtype(:cron) do desc "The user to run the command as. This user must be allowed to run cron jobs, which is not currently checked by Puppet. - + The user defaults to whomever Puppet is running as." defaultto { Etc.getpwuid(Process.uid).name || "root" } diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb index a211f8572..730417cda 100755 --- a/lib/puppet/type/exec.rb +++ b/lib/puppet/type/exec.rb @@ -46,7 +46,7 @@ module Puppet Note that if an ``exec`` receives an event from another resource, it will get executed again (or execute the command specified in ``refresh``, if there is one). - + There is a strong tendency to use ``exec`` to do whatever work Puppet can't already do; while this is obviously acceptable (and unavoidable) in the short term, it is highly recommended to migrate work from ``exec`` @@ -114,8 +114,8 @@ module Puppet end if log = @resource[:logoutput] - case log - when :true + case log + when :true log = @resource[:loglevel] when :on_failure if status.exitstatus.to_s != self.should.to_s @@ -200,7 +200,7 @@ module Puppet if dir.is_a?(Array) dir = dir[0] end - + dir end end @@ -249,13 +249,13 @@ module Puppet end end end - + newparam(:timeout) do desc "The maximum time the command should take. If the command takes longer than the timeout, the command is considered to have failed and will be stopped. Use any negative number to disable the timeout. The time is specified in seconds." - + munge do |value| value = value.shift if value.is_a?(Array) if value.is_a?(String) @@ -267,7 +267,7 @@ module Puppet value end end - + defaultto 300 end @@ -276,7 +276,7 @@ module Puppet refresh mechanism for when a dependent object is changed. It only makes sense to use this option when this command depends on some other object; it is useful for triggering an action:: - + # Pull down the main aliases file file { \"/etc/aliases\": source => \"puppet://server/module/aliases\" @@ -288,7 +288,7 @@ module Puppet subscribe => File[\"/etc/aliases\"], refreshonly => true } - + Note that only ``subscribe`` and ``notify`` can trigger actions, not ``require``, so it only makes sense to use ``refreshonly`` with ``subscribe`` or ``notify``." @@ -306,7 +306,7 @@ module Puppet end end - newcheck(:creates) do + newcheck(:creates) do desc "A file that this command creates. If this parameter is provided, then the command will only be run if the specified file does not exist:: @@ -316,10 +316,10 @@ module Puppet creates => \"/var/tmp/myfile\", path => [\"/usr/bin\", \"/usr/sbin\"] } - + " - # FIXME if they try to set this and fail, then we should probably + # FIXME if they try to set this and fail, then we should probably # fail the entire exec, right? validate do |files| files = [files] unless files.is_a? Array @@ -343,7 +343,7 @@ module Puppet newcheck(:unless) do desc "If this parameter is set, then this ``exec`` will run unless the command returns 0. For example:: - + exec { \"/bin/echo root >> /usr/lib/cron/cron.allow\": path => \"/usr/bin:/usr/sbin:/bin\", unless => \"grep root /usr/lib/cron/cron.allow 2>/dev/null\" @@ -380,7 +380,7 @@ module Puppet newcheck(:onlyif) do desc "If this parameter is set, then this ``exec`` will only run if the command returns 0. For example:: - + exec { \"logrotate\": path => \"/usr/bin:/usr/sbin:/bin\", onlyif => \"test `du /var/log/messages | cut -f1` -gt 100000\" diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb index 1d50de5ed..721b5a1fa 100644 --- a/lib/puppet/type/file.rb +++ b/lib/puppet/type/file.rb @@ -17,7 +17,7 @@ module Puppet retrieving entire files from remote servers. As Puppet matures, it expected that the ``file`` resource will be used less and less to manage content, and instead native resources will be used to do so. - + If you find that you are often copying files in from a central location, rather than using native resources, please contact Reductive Labs and we can hopefully work with you to develop a @@ -33,7 +33,7 @@ module Puppet end end - # convert the current path in an index into the collection and the last + # convert the current path in an index into the collection and the last # path name. The aim is to use less storage for all common paths in a hierarchy munge do |value| path, name = File.split(value) @@ -58,11 +58,11 @@ module Puppet the same directory with that value as the extension of the backup. Setting ``backup => false`` disables all backups of the file in question. - + Puppet automatically creates a local filebucket named ``puppet`` and defaults to backing up there. To use a server-based filebucket, you must specify one in your configuration:: - + filebucket { main: server => puppet } @@ -88,7 +88,7 @@ module Puppet " defaultto { "puppet" } - + munge do |value| # I don't really know how this is happening. value = value.shift if value.is_a?(Array) @@ -228,7 +228,7 @@ module Puppet this will destroy data. Only use this option for generated files unless you really know what you are doing. This option only makes sense when recursively managing directories. - + Note that when using ``purge`` with ``source``, Puppet will purge any files that are not on the remote system." @@ -249,7 +249,7 @@ module Puppet newvalues(:first, :all) end - + attr_accessor :bucket # Autorequire any parent directories. @@ -277,7 +277,7 @@ module Puppet end end end - + CREATORS = [:content, :source, :target] validate do @@ -300,7 +300,7 @@ module Puppet self.warning "Possible error: recurselimit is set but not recurse, no recursion will happen" end end - + def self.[](path) return nil unless path super(path.gsub(/\/+/, '/').sub(/\/$/, '')) @@ -381,7 +381,7 @@ module Puppet end super end - + # Create any children via recursion or whatever. def eval_generate return [] unless self.recurse? @@ -499,7 +499,7 @@ module Puppet return false end end - + def initialize(hash) # Used for caching clients @clients = {} @@ -508,7 +508,7 @@ module Puppet # Get rid of any duplicate slashes, and remove any trailing slashes. @title = @title.gsub(/\/+/, "/") - + @title.sub!(/\/$/, "") unless @title == "/" @stat = nil @@ -521,7 +521,7 @@ module Puppet child[:ensure] = :absent end end - + # Create a new file or directory object as a child to the current # object. def newchild(path) @@ -567,7 +567,7 @@ module Puppet return [self.ref] end end - + # Should we be purging? def purge? @parameters.include?(:purge) and (self[:purge] == :true or self[:purge] == "true") @@ -715,7 +715,7 @@ module Puppet self.fail "Could not back up; will not replace" unless handlebackup unless should.to_s == "link" - return if s.ftype.to_s == should.to_s + return if s.ftype.to_s == should.to_s end case s.ftype diff --git a/lib/puppet/type/file/checksum.rb b/lib/puppet/type/file/checksum.rb index 54d1c463b..23a3e5adc 100755 --- a/lib/puppet/type/file/checksum.rb +++ b/lib/puppet/type/file/checksum.rb @@ -12,11 +12,11 @@ Puppet::Type.type(:file).newproperty(:checksum) do specify that a file's checksum should be monitored and then subscribe to the file from another object and receive events to signify checksum changes, for instance. - + There are a number of checksum types available including MD5 hashing (and - an md5lite variation that only hashes the first 500 characters of the + an md5lite variation that only hashes the first 500 characters of the file. - + The default checksum parameter, if checksums are enabled, is md5." @event = :file_changed @@ -74,7 +74,7 @@ Puppet::Type.type(:file).newproperty(:checksum) do type = :mtime if type == :timestamp type = :ctime if type == :time - unless state = @resource.cached(:checksums) + unless state = @resource.cached(:checksums) self.debug "Initializing checksum hash" state = {} @resource.cache(:checksums, state) @@ -174,7 +174,7 @@ Puppet::Type.type(:file).newproperty(:checksum) do # not existing yet return nil unless @resource.property(:source) end - + # If the sums are different, then return an event. if self.updatesum(currentvalue) return :file_changed @@ -193,7 +193,7 @@ Puppet::Type.type(:file).newproperty(:checksum) do return true end end - + # Even though they can specify multiple checksums, the insync? # mechanism can really only test against one, so we'll just retrieve # the first specified sum type. @@ -220,7 +220,7 @@ Puppet::Type.type(:file).newproperty(:checksum) do # out of sync. We don't want to generate an event the first # time we get a sum. self.updatesum(currentvalue) unless cache(checktype()) - + # @resource.debug "checksum state is %s" % self.is return currentvalue end diff --git a/lib/puppet/type/file/content.rb b/lib/puppet/type/file/content.rb index f48e601fb..f30833bd0 100755 --- a/lib/puppet/type/file/content.rb +++ b/lib/puppet/type/file/content.rb @@ -21,7 +21,7 @@ module Puppet content => $str } } - + This attribute is especially useful when used with `PuppetTemplating templating`:trac:." @@ -64,7 +64,7 @@ module Puppet end return nil end - + def content self.should || (s = resource.parameter(:source) and s.content) end @@ -120,7 +120,7 @@ module Puppet # Just write our content out to disk. def sync return_event = @resource.stat ? :file_changed : :file_created - + # We're safe not testing for the 'source' if there's no 'should' # because we wouldn't have gotten this far if there weren't at least # one valid value somewhere. diff --git a/lib/puppet/type/file/ensure.rb b/lib/puppet/type/file/ensure.rb index 4ec35ceb0..f4236b4fc 100755 --- a/lib/puppet/type/file/ensure.rb +++ b/lib/puppet/type/file/ensure.rb @@ -9,14 +9,14 @@ module Puppet Anything other than those values will be considered to be a symlink. For instance, the following text creates a link:: - + # Useful on solaris file { \"/etc/inetd.conf\": ensure => \"/etc/inet/inetd.conf\" } - + You can make relative links:: - + # Useful on solaris file { \"/etc/inetd.conf\": ensure => \"inet/inetd.conf\" diff --git a/lib/puppet/type/file/owner.rb b/lib/puppet/type/file/owner.rb index e4339f05b..15a34a696 100755 --- a/lib/puppet/type/file/owner.rb +++ b/lib/puppet/type/file/owner.rb @@ -89,13 +89,13 @@ module Puppet end end end - + unless stat = @resource.stat(false) return :absent end currentvalue = stat.uid - + # On OS X, files that are owned by -2 get returned as really # large UIDs instead of negative ones. This isn't a Ruby bug, # it's an OS X bug, since it shows up in perl, too. diff --git a/lib/puppet/type/file/source.rb b/lib/puppet/type/file/source.rb index f7c0fa4fc..39d9a20df 100755 --- a/lib/puppet/type/file/source.rb +++ b/lib/puppet/type/file/source.rb @@ -33,15 +33,15 @@ module Puppet will use the local filesystem. This makes it easy to use the same configuration in both local and centralized forms. - Currently, only the ``puppet`` scheme is supported for source - URL's. Puppet will connect to the file server running on - ``server`` to retrieve the contents of the file. If the - ``server`` part is empty, the behavior of the command-line + Currently, only the ``puppet`` scheme is supported for source + URL's. Puppet will connect to the file server running on + ``server`` to retrieve the contents of the file. If the + ``server`` part is empty, the behavior of the command-line interpreter (``puppet``) and the client demon (``puppetd``) differs slightly: ``puppet`` will look such a file up on the module path - on the local host, whereas ``puppetd`` will connect to the + on the local host, whereas ``puppetd`` will connect to the puppet server that it received the manifest from. - + See the `FileServingConfiguration fileserver configuration documentation`:trac: for information on how to configure and use file services within Puppet. @@ -56,9 +56,9 @@ module Puppet \"/nfs/files/file\" ] } - + This will use the first found file as the source. - + You cannot currently copy links using this mechanism; set ``links`` to ``follow`` if any remote sources are links. " @@ -77,12 +77,12 @@ module Puppet end end end - + munge do |sources| sources = [sources] unless sources.is_a?(Array) sources.collect { |source| source.sub(/\/$/, '') } end - + def change_to_s(currentvalue, newvalue) # newvalue = "{md5}" + @metadata.checksum if @resource.property(:ensure).retrieve == :absent @@ -91,7 +91,7 @@ module Puppet return "replacing from source %s with contents %s" % [metadata.source, metadata.checksum] end end - + def checksum if metadata metadata.checksum @@ -167,7 +167,7 @@ module Puppet checks = (pinparams + [:ensure]) checks.delete(:checksum) - + resource[:check] = checks resource[:checksum] = :md5 unless resource.property(:checksum) end diff --git a/lib/puppet/type/file/target.rb b/lib/puppet/type/file/target.rb index 73787c7e9..fe547e498 100644 --- a/lib/puppet/type/file/target.rb +++ b/lib/puppet/type/file/target.rb @@ -55,7 +55,7 @@ module Puppet if [:nochange, :notlink].include?(self.should) or @resource.recurse? return true elsif ! @resource.replace? and File.exists?(@resource[:path]) - return true + return true else return super(currentvalue) end diff --git a/lib/puppet/type/file/type.rb b/lib/puppet/type/file/type.rb index 1835078a1..19816a20a 100755 --- a/lib/puppet/type/file/type.rb +++ b/lib/puppet/type/file/type.rb @@ -6,7 +6,7 @@ module Puppet #munge do |value| # raise Puppet::Error, ":type is read-only" #end - + def retrieve currentvalue = :absent if stat = @resource.stat(false) diff --git a/lib/puppet/type/filebucket.rb b/lib/puppet/type/filebucket.rb index 03970aee8..6e8e38adc 100755 --- a/lib/puppet/type/filebucket.rb +++ b/lib/puppet/type/filebucket.rb @@ -9,16 +9,16 @@ module Puppet can later be used to retrieve the file if restoration becomes necessary. A filebucket does not do any work itself; instead, it can be specified as the value of *backup* in a **file** object. - + Currently, filebuckets are only useful for manual retrieval of accidentally removed files (e.g., you look in the log for the md5 sum and retrieve the file with that sum from the filebucket), but when transactions are fully supported filebuckets will be used to undo transactions. - + You will normally want to define a single filebucket for your whole network and then use that as the default backup location:: - + # Define the bucket filebucket { main: server => puppet } @@ -74,7 +74,7 @@ module Puppet def mkbucket if self[:server] begin - @bucket = Puppet::Network::Client.client(:Dipper).new( + @bucket = Puppet::Network::Client.client(:Dipper).new( :Server => self[:server], :Port => self[:port] ) diff --git a/lib/puppet/type/group.rb b/lib/puppet/type/group.rb index e3507ad5c..3ce60995e 100755 --- a/lib/puppet/type/group.rb +++ b/lib/puppet/type/group.rb @@ -5,13 +5,13 @@ require 'facter' module Puppet newtype(:group) do @doc = "Manage groups. On most platforms this can only create groups. - Group membership must be managed on individual users. - + Group membership must be managed on individual users. + On some platforms such as OS X, group membership is managed as an - attribute of the group, not the user record. Providers must have + attribute of the group, not the user record. Providers must have the feature 'manages_members' to manage the 'members' property of a group record." - + feature :manages_members, "For directories where membership is an attribute of groups not users." @@ -67,18 +67,18 @@ module Puppet return gid end end - + newproperty(:members, :array_matching => :all, :required_features => :manages_members) do desc "The members of the group. For directory services where group membership is stored in the group objects, not the users." - + def change_to_s(currentvalue, newvalue) currentvalue = currentvalue.join(",") if currentvalue != :absent newvalue = newvalue.join(",") super(currentvalue, newvalue) end end - + newparam(:auth_membership) do desc "whether the provider is authoritative for group membership." defaultto true @@ -95,7 +95,7 @@ module Puppet newparam(:allowdupe, :boolean => true) do desc "Whether to allow duplicate GIDs. This option does not work on FreeBSD (contract to the ``pw`` man page)." - + newvalues(:true, :false) defaultto false diff --git a/lib/puppet/type/host.rb b/lib/puppet/type/host.rb index 763841fd8..6f6ea9480 100755 --- a/lib/puppet/type/host.rb +++ b/lib/puppet/type/host.rb @@ -7,7 +7,7 @@ module Puppet validate do |value| unless value =~ /((([0-9a-fA-F]+:){7}[0-9a-fA-F]+)|(([0-9a-fA-F]+:)*[0-9a-fA-F]+)?::(([0-9a-fA-F]+:)*[0-9a-fA-F]+)?)|((25[0-5]|2[0-4][\d]|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3})/ - raise Puppet::Error, "Invalid IP address" + raise Puppet::Error, "Invalid IP address" end end @@ -23,7 +23,7 @@ module Puppet def insync?(is) is == @should end - + def is_to_s(currentvalue = @is) currentvalue = [currentvalue] unless currentvalue.is_a? Array currentvalue.join(" ") @@ -87,13 +87,13 @@ module Puppet isnamevar validate do |value| - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] - x = value.split('.').each do |hostpart| + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + x = value.split('.').each do |hostpart| unless hostpart =~ /^([\d\w]+|[\d\w][\d\w\-]+[\d\w])$/ raise Puppet::Error, "Invalid host name" end end - end + end end @doc = "Installs and manages host entries. For most systems, these diff --git a/lib/puppet/type/k5login.rb b/lib/puppet/type/k5login.rb index d22be11b7..20c03241f 100644 --- a/lib/puppet/type/k5login.rb +++ b/lib/puppet/type/k5login.rb @@ -3,7 +3,7 @@ # Plug-in type for handling k5login files Puppet::Type.newtype(:k5login) do - @doc = "Manage the .k5login file for a user. Specify the full path to + @doc = "Manage the .k5login file for a user. Specify the full path to the .k5login file as the name and an array of principals as the property principals." @@ -33,7 +33,7 @@ Puppet::Type.newtype(:k5login) do end provide(:k5login) do - desc "The k5login provider is the only provider for the k5login + desc "The k5login provider is the only provider for the k5login type." # Does this file exist? diff --git a/lib/puppet/type/macauthorization.rb b/lib/puppet/type/macauthorization.rb index 800d58d1c..3399cf3e2 100644 --- a/lib/puppet/type/macauthorization.rb +++ b/lib/puppet/type/macauthorization.rb @@ -1,15 +1,15 @@ Puppet::Type.newtype(:macauthorization) do - + @doc = "Manage the Mac OS X authorization database. See: http://developer.apple.com/documentation/Security/Conceptual/Security_Overview/Security_Services/chapter_4_section_5.html for more information." - + ensurable - + autorequire(:file) do ["/etc/authorization"] end - + def munge_boolean(value) case value when true, "true", :true @@ -20,122 +20,122 @@ Puppet::Type.newtype(:macauthorization) do raise Puppet::Error("munge_boolean only takes booleans") end end - + newparam(:name) do desc "The name of the right or rule to be managed. - Corresponds to 'key' in Authorization Services. The key is the name - of a rule. A key uses the same naming conventions as a right. The - Security Server uses a rule’s key to match the rule with a right. - Wildcard keys end with a ‘.’. The generic rule has an empty key value. + Corresponds to 'key' in Authorization Services. The key is the name + of a rule. A key uses the same naming conventions as a right. The + Security Server uses a rule’s key to match the rule with a right. + Wildcard keys end with a ‘.’. The generic rule has an empty key value. Any rights that do not match a specific rule use the generic rule." isnamevar end - + newproperty(:auth_type) do - desc "type - can be a 'right' or a 'rule'. 'comment' has not yet been + desc "type - can be a 'right' or a 'rule'. 'comment' has not yet been implemented." - + newvalue(:right) newvalue(:rule) # newvalue(:comment) # not yet implemented. end - + newproperty(:allow_root, :boolean => true) do - desc "Corresponds to 'allow-root' in the authorization store, renamed - due to hyphens being problematic. Specifies whether a right should be - allowed automatically if the requesting process is running with - uid == 0. AuthorizationServices defaults this attribute to false if + desc "Corresponds to 'allow-root' in the authorization store, renamed + due to hyphens being problematic. Specifies whether a right should be + allowed automatically if the requesting process is running with + uid == 0. AuthorizationServices defaults this attribute to false if not specified" - + newvalue(:true) newvalue(:false) - + munge do |value| @resource.munge_boolean(value) end end - + newproperty(:authenticate_user, :boolean => true) do - desc "Corresponds to 'authenticate-user' in the authorization store, + desc "Corresponds to 'authenticate-user' in the authorization store, renamed due to hyphens being problematic." - + newvalue(:true) newvalue(:false) - + munge do |value| @resource.munge_boolean(value) end end newproperty(:auth_class) do - desc "Corresponds to 'class' in the authorization store, renamed due + desc "Corresponds to 'class' in the authorization store, renamed due to 'class' being a reserved word." - + newvalue(:user) newvalue(:'evaluate-mechanisms') end - + newproperty(:comment) do desc "The 'comment' attribute for authorization resources." end - + newproperty(:group) do - desc "The user must authenticate as a member of this group. This + desc "The user must authenticate as a member of this group. This attribute can be set to any one group." end - + newproperty(:k_of_n) do - desc "k-of-n. Built-in rights only show a value of '1' or absent, + desc "k-of-n. Built-in rights only show a value of '1' or absent, other values may be acceptable. Undocumented." end - + newproperty(:mechanisms, :array_matching => :all) do desc "an array of suitable mechanisms." end - + newproperty(:rule, :array_match => :all) do desc "The rule(s) that this right refers to." end newproperty(:session_owner, :boolean => true) do - desc "Corresponds to 'session-owner' in the authorization store, - renamed due to hyphens being problematic. Whether the session owner + desc "Corresponds to 'session-owner' in the authorization store, + renamed due to hyphens being problematic. Whether the session owner automatically matches this rule or right." - + newvalue(:true) newvalue(:false) - + munge do |value| @resource.munge_boolean(value) end end - + newproperty(:shared, :boolean => true) do desc "If this is set to true, then the Security Server marks the - credentials used to gain this right as shared. The Security Server - may use any shared credentials to authorize this right. For maximum - security, set sharing to false so credentials stored by the Security + credentials used to gain this right as shared. The Security Server + may use any shared credentials to authorize this right. For maximum + security, set sharing to false so credentials stored by the Security Server for one application may not be used by another application." - + newvalue(:true) newvalue(:false) - + munge do |value| @resource.munge_boolean(value) end end - + newproperty(:timeout) do - desc "The credential used by this rule expires in the specified - number of seconds. For maximum security where the user must - authenticate every time, set the timeout to 0. For minimum security, - remove the timeout attribute so the user authenticates only once per + desc "The credential used by this rule expires in the specified + number of seconds. For maximum security where the user must + authenticate every time, set the timeout to 0. For minimum security, + remove the timeout attribute so the user authenticates only once per session." end - + newproperty(:tries) do desc "The number of tries allowed." end - + end diff --git a/lib/puppet/type/mailalias.rb b/lib/puppet/type/mailalias.rb index 50ca26ef6..249f99d5e 100755 --- a/lib/puppet/type/mailalias.rb +++ b/lib/puppet/type/mailalias.rb @@ -1,7 +1,7 @@ module Puppet newtype(:mailalias) do @doc = "Creates an email alias in the local alias database." - + ensurable newparam(:name, :namevar => true) do diff --git a/lib/puppet/type/maillist.rb b/lib/puppet/type/maillist.rb index 088004a1c..e2430aa13 100755 --- a/lib/puppet/type/maillist.rb +++ b/lib/puppet/type/maillist.rb @@ -2,7 +2,7 @@ module Puppet newtype(:maillist) do @doc = "Manage email lists. This resource type currently can only create and remove lists, it cannot reconfigure them." - + ensurable do defaultvalues diff --git a/lib/puppet/type/mcx.rb b/lib/puppet/type/mcx.rb index f92cc467d..388d02357 100644 --- a/lib/puppet/type/mcx.rb +++ b/lib/puppet/type/mcx.rb @@ -2,8 +2,8 @@ # Copyright (C) 2008 Jeffrey J McCune. # This program and entire repository is free software; you can -# redistribute it and/or modify it under the terms of the GNU -# General Public License as published by the Free Software +# redistribute it and/or modify it under the terms of the GNU +# General Public License as published by the Free Software # Foundation; either version 2 of the License, or any later version. # This program is distributed in the hope that it will be useful, @@ -61,7 +61,7 @@ to other machines. default naming convention is followed." isnamevar end - + newparam(:ds_type) do desc "The DirectoryService type this MCX setting attaches to." diff --git a/lib/puppet/type/mount.rb b/lib/puppet/type/mount.rb index 2ceacb3fe..18509e349 100755 --- a/lib/puppet/type/mount.rb +++ b/lib/puppet/type/mount.rb @@ -2,7 +2,7 @@ module Puppet # We want the mount to refresh when it changes. newtype(:mount, :self_refresh => true) do @doc = "Manages mounted filesystems, including putting mount - information into the mount table. The actual behavior depends + information into the mount table. The actual behavior depends on the value of the 'ensure' parameter. Note that if a ``mount`` receives an event from another resource, @@ -10,7 +10,7 @@ module Puppet feature :refreshable, "The provider can remount the filesystem.", :methods => [:remount] - + # Use the normal parent class, because we actually want to # call code when sync() is called. newproperty(:ensure) do @@ -44,7 +44,7 @@ module Puppet newvalue(:mounted, :event => :mount_mounted) do # Create the mount point if it does not already exist. current_value = self.retrieve - provider.create if current_value.nil? or current_value == :absent + provider.create if current_value.nil? or current_value == :absent syncothers() @@ -54,7 +54,7 @@ module Puppet def retrieve # We need to special case :mounted; if we're absent, we still - # want + # want curval = super() if curval == :absent return curval @@ -179,12 +179,12 @@ module Puppet super end end - + newparam(:remounts) do desc "Whether the mount can be remounted ``mount -o remount``. If this is false, then the filesystem will be unmounted and remounted manually, which is prone to failure." - + newvalues(:true, :false) defaultto do case Facter.value(:operatingsystem) diff --git a/lib/puppet/type/notify.rb b/lib/puppet/type/notify.rb index 15911d441..cfaa24056 100644 --- a/lib/puppet/type/notify.rb +++ b/lib/puppet/type/notify.rb @@ -12,7 +12,7 @@ module Puppet case @resource["withpath"] when :true send(@resource[:loglevel], self.should) - else + else Puppet.send(@resource[:loglevel], self.should) end return @@ -29,11 +29,11 @@ module Puppet defaultto { @resource[:name] } end - newparam(:withpath) do + newparam(:withpath) do desc "Whether to not to show the full object path." defaultto :false - newvalues(:true, :false) + newvalues(:true, :false) end newparam(:name) do diff --git a/lib/puppet/type/package.rb b/lib/puppet/type/package.rb index 655f9e06d..bb3db2838 100644 --- a/lib/puppet/type/package.rb +++ b/lib/puppet/type/package.rb @@ -55,7 +55,7 @@ module Puppet newvalue(:absent, :event => :package_removed) do provider.uninstall end - + newvalue(:purged, :event => :package_purged, :required_features => :purgeable) do provider.purge end @@ -115,7 +115,7 @@ module Puppet when :latest # Short-circuit packages that are not present return false if is == :absent or is == :purged - + # Don't run 'latest' more than about every 5 minutes if @latest and ((Time.now.to_i - @lateststamp) / 60) < 5 #self.debug "Skipping latest check" @@ -202,7 +202,7 @@ module Puppet alias => openssh, require => Package[openssl] } - + " isnamevar end diff --git a/lib/puppet/type/resources.rb b/lib/puppet/type/resources.rb index d316b4b13..ab564a1d6 100644 --- a/lib/puppet/type/resources.rb +++ b/lib/puppet/type/resources.rb @@ -8,27 +8,27 @@ Puppet::Type.newtype(:resources) do metaparams specified here will be passed on to any generated resources, so you can purge umanaged resources but set ``noop`` to true so the purging is only logged and does not actually happen." - - + + newparam(:name) do desc "The name of the type to be managed." - + validate do |name| unless Puppet::Type.type(name) raise ArgumentError, "Could not find resource type '%s'" % name end end - + munge { |v| v.to_s } end - + newparam(:purge, :boolean => true) do desc "Purge unmanaged resources. This will delete any resource that is not specified in your configuration and is not required by any specified resources." - + newvalues(:true, :false) - + validate do |value| if [:true, true, "true"].include?(value) unless @resource.resource_type.respond_to?(:instances) @@ -40,14 +40,14 @@ Puppet::Type.newtype(:resources) do end end end - + newparam(:unless_system_user) do desc "This keeps system users from being purged. By default, it does not purge users whose UIDs are less than or equal to 500, but you can specify a different UID as the inclusive limit." - + newvalues(:true, :false, /^\d+$/) - + munge do |value| case value when /^\d+/ @@ -61,7 +61,7 @@ Puppet::Type.newtype(:resources) do raise ArgumentError, "Invalid value %s" % value.inspect end end - + defaultto { if @resource[:name] == "user" 500 @@ -70,7 +70,7 @@ Puppet::Type.newtype(:resources) do end } end - + def check(resource) unless defined? @checkmethod @checkmethod = "%s_check" % self[:name] @@ -84,13 +84,13 @@ Puppet::Type.newtype(:resources) do return true end end - + # Generate any new resources we need to manage. This is pretty hackish # right now, because it only supports purging. def generate return [] unless self.purge? hascheck = false - method = + method = resource_type.instances.find_all do |resource| ! resource.managed? end.find_all do |resource| @@ -113,7 +113,7 @@ Puppet::Type.newtype(:resources) do resource.purging end end - + def resource_type unless defined? @resource_type unless type = Puppet::Type.type(self[:name]) @@ -123,16 +123,16 @@ Puppet::Type.newtype(:resources) do end @resource_type end - + # Make sure we don't purge users below a certain uid, if the check # is enabled. def user_check(resource) return true unless self[:name] == "user" return true unless self[:unless_system_user] - + resource[:check] = :uid current_values = resource.retrieve - + if system_users().include?(resource[:name]) return false end diff --git a/lib/puppet/type/schedule.rb b/lib/puppet/type/schedule.rb index 5c9cfd7f4..e51744c69 100755 --- a/lib/puppet/type/schedule.rb +++ b/lib/puppet/type/schedule.rb @@ -4,7 +4,7 @@ module Puppet about how schedules are currently implemented in Puppet is that they can only be used to stop a resource from being applied, they never guarantee that it is applied. - + Every time Puppet applies its configuration, it will collect the list of resources whose schedule does not eliminate them from running right then, but there is currently no system in place to @@ -12,12 +12,12 @@ module Puppet specify a very restrictive schedule and Puppet happens to run at a time within that schedule, then the resources will get applied; otherwise, that work may never get done. - + Thus, it behooves you to use wider scheduling (e.g., over a couple of hours) combined with periods and repetitions. For instance, if you wanted to restrict certain resources to only running once, between the hours of two and 4 AM, then you would use this schedule:: - + schedule { maint: range => \"2 - 4\", period => daily, @@ -29,7 +29,7 @@ module Puppet get applied again between 2 and 4 because they will have already run once that day, and they won't get applied outside that schedule because they will be outside the scheduled range. - + Puppet automatically creates a schedule for each valid period with the same name as that period (e.g., hourly and daily). Additionally, a schedule named *puppet* is created and used as the default, @@ -46,7 +46,7 @@ module Puppet newparam(:name) do desc "The name of the schedule. This name is used to retrieve the schedule when assigning it to an object:: - + schedule { daily: period => daily, range => [2, 4] @@ -55,7 +55,7 @@ module Puppet exec { \"/usr/bin/apt-get update\": schedule => daily } - + " isnamevar end @@ -70,7 +70,7 @@ module Puppet schedule { maintenance: range => \"1:30 - 4:30\" } - + This is mostly useful for restricting certain resources to being applied in maintenance windows or during off-peak hours." @@ -169,7 +169,7 @@ module Puppet ary = limits[1].to_a ary[3] += 1 limits[1] = Time.local(*ary) - + #self.devfail("Lower limit is above higher limit: %s" % # limits.inspect #) @@ -224,7 +224,7 @@ module Puppet internal factors might prevent it from actually running that often (e.g., long-running Puppet runs will squash conflictingly scheduled runs). - + See the ``periodmatch`` attribute for tuning whether to match times by their distance apart or by their specific value." diff --git a/lib/puppet/type/selmodule.rb b/lib/puppet/type/selmodule.rb index 883cd954d..90b28b094 100644 --- a/lib/puppet/type/selmodule.rb +++ b/lib/puppet/type/selmodule.rb @@ -48,7 +48,7 @@ Puppet::Type.newtype(:selmodule) do [self[:selmodulepath]] else ["#{self[:selmoduledir]}/#{self[:name]}.pp"] - end + end end end diff --git a/lib/puppet/type/service.rb b/lib/puppet/type/service.rb index b296f7c39..04fd9042c 100644 --- a/lib/puppet/type/service.rb +++ b/lib/puppet/type/service.rb @@ -21,10 +21,10 @@ module Puppet the service will get restarted. The actual command to restart the service depends on the platform. You can provide a special command for restarting with the ``restart`` attribute." - + feature :refreshable, "The provider can restart the service.", :methods => [:restart] - + feature :enableable, "The provider can enable and disable the service", :methods => [:disable, :enable, :enabled?] @@ -95,7 +95,7 @@ module Puppet manually whether the service you are running has such a command (or you can specify a specific command using the ``status`` parameter). - + If you do not specify anything, then the service name will be looked for in the process table." @@ -113,7 +113,7 @@ module Puppet munge do |value| value = [value] unless value.is_a?(Array) - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] # It affects stand-alone blocks, too. paths = value.flatten.collect { |p| x = p.split(":") }.flatten.find_all do |path| if FileTest.directory?(path) @@ -139,10 +139,10 @@ module Puppet support init scripts, and is also used for determining service status on those service whose init scripts do not include a status command. - + If this is left unspecified and is needed to check the status of a service, then the service name will be used instead. - + The pattern can be a simple string or any legal Ruby pattern." defaultto { @resource[:binary] || @resource[:name] } diff --git a/lib/puppet/type/ssh_authorized_key.rb b/lib/puppet/type/ssh_authorized_key.rb index 52c650998..d02170e4a 100644 --- a/lib/puppet/type/ssh_authorized_key.rb +++ b/lib/puppet/type/ssh_authorized_key.rb @@ -60,7 +60,7 @@ module Puppet end newproperty(:options, :array_matching => :all) do - desc "Key options, see sshd(8) for possible values. Multiple values + desc "Key options, see sshd(8) for possible values. Multiple values should be specified as an array." defaultto do :absent end diff --git a/lib/puppet/type/sshkey.rb b/lib/puppet/type/sshkey.rb index c2bdd39e3..c9e8f3d8b 100755 --- a/lib/puppet/type/sshkey.rb +++ b/lib/puppet/type/sshkey.rb @@ -3,12 +3,12 @@ module Puppet @doc = "Installs and manages ssh host keys. At this point, this type only knows how to install keys into /etc/ssh/ssh_known_hosts, and it cannot manage user authorized keys yet." - + ensurable newproperty(:type) do desc "The encryption type used. Probably ssh-dss or ssh-rsa." - + newvalue("ssh-dss") newvalue("ssh-rsa") aliasvalue(:dsa, "ssh-dss") diff --git a/lib/puppet/type/tidy.rb b/lib/puppet/type/tidy.rb index d9469aee4..f45171d90 100755 --- a/lib/puppet/type/tidy.rb +++ b/lib/puppet/type/tidy.rb @@ -68,7 +68,7 @@ Puppet::Type.newtype(:tidy) do the specified time. You can choose seconds, minutes, hours, days, or weeks by specifying the first letter of any of those words (e.g., '1w'). - + Specifying 0 will remove all files." @@ageconvertors = { @@ -91,7 +91,7 @@ Puppet::Type.newtype(:tidy) do def tidy?(path, stat) # If the file's older than we allow, we should get rid of it. if (Time.now.to_i - stat.send(resource[:type]).to_i) > value - return true + return true else return false end @@ -137,7 +137,7 @@ Puppet::Type.newtype(:tidy) do self.fail "Invalid size unit '%s'" % unit end end - + def tidy?(path, stat) if stat.size > value return true @@ -145,7 +145,7 @@ Puppet::Type.newtype(:tidy) do return false end end - + munge do |size| case size when /^([0-9]+)(\w)\w*$/ @@ -164,7 +164,7 @@ Puppet::Type.newtype(:tidy) do newparam(:type) do desc "Set the mechanism for determining age." - + newvalues(:atime, :mtime, :ctime) defaultto :atime @@ -200,7 +200,7 @@ Puppet::Type.newtype(:tidy) do newvalues :true, :false end - + # Erase PFile's validate method validate do end @@ -219,7 +219,7 @@ Puppet::Type.newtype(:tidy) do self[:backup] = false end end - + # Make a file resource to remove a given file. def mkfile(path) # Force deletion, so directories actually get deleted. @@ -228,13 +228,13 @@ Puppet::Type.newtype(:tidy) do def retrieve # Our ensure property knows how to retrieve everything for us. - if obj = @parameters[:ensure] + if obj = @parameters[:ensure] return obj.retrieve else return {} end end - + # Hack things a bit so we only ever check the ensure property. def properties [] @@ -267,7 +267,7 @@ Puppet::Type.newtype(:tidy) do files_by_name.keys.sort { |a,b| b <=> b }.each do |path| dir = File.dirname(path) next unless resource = files_by_name[dir] - if resource[:require] + if resource[:require] resource[:require] << Puppet::Resource::Reference.new(:file, path) else resource[:require] = [Puppet::Resource::Reference.new(:file, path)] diff --git a/lib/puppet/type/user.rb b/lib/puppet/type/user.rb index bc7c243a1..28b1631cb 100755 --- a/lib/puppet/type/user.rb +++ b/lib/puppet/type/user.rb @@ -9,7 +9,7 @@ module Puppet @doc = "Manage users. This type is mostly built to manage system users, so it is lacking some features useful for managing normal users. - + This resource type uses the prescribed native tools for creating groups and generally uses POSIX APIs for retrieving information about them. It does not directly modify /etc/passwd or anything." diff --git a/lib/puppet/type/yumrepo.rb b/lib/puppet/type/yumrepo.rb index 4f7b26b8a..5d6a727f6 100644 --- a/lib/puppet/type/yumrepo.rb +++ b/lib/puppet/type/yumrepo.rb @@ -30,7 +30,7 @@ module Puppet def retrieve return resource.section[inikey] end - + def inikey name.to_s end @@ -56,7 +56,7 @@ module Puppet the files indicated by reposdir in that file (see yum.conf(5) for details) - Most parameters are identical to the ones documented + Most parameters are identical to the ones documented in yum.conf(5) Continuation lines that yum supports for example for the @@ -74,7 +74,7 @@ module Puppet self.filetype = Puppet::Util::FileType.filetype(:flat) @inifile = nil - + @yumconf = "/etc/yum.conf" # Where to put files for brand new sections @@ -107,9 +107,9 @@ module Puppet @inifile = read() main = @inifile['main'] if main.nil? - raise Puppet::Error, "File #{yumconf} does not contain a main section" + raise Puppet::Error, "File #{yumconf} does not contain a main section" end - reposdir = main['reposdir'] + reposdir = main['reposdir'] reposdir ||= "/etc/yum.repos.d, /etc/yum/repos.d" reposdir.gsub!(/[\n,]/, " ") reposdir.split.each do |dir| @@ -137,7 +137,7 @@ module Puppet result.read(yumconf) main = result['main'] if main.nil? - raise Puppet::Error, "File #{yumconf} does not contain a main section" + raise Puppet::Error, "File #{yumconf} does not contain a main section" end reposdir = main['reposdir'] reposdir ||= "/etc/yum.repos.d, /etc/yum/repos.d" @@ -231,13 +231,13 @@ module Puppet end newproperty(:descr, :parent => Puppet::IniProperty) do - desc "A human readable description of the repository. + desc "A human readable description of the repository. #{ABSENT_DOC}" newvalue(:absent) { self.should = :absent } newvalue(/.*/) { } inikey "name" end - + newproperty(:mirrorlist, :parent => Puppet::IniProperty) do desc "The URL that holds the list of mirrors for this repository. #{ABSENT_DOC}" @@ -252,9 +252,9 @@ module Puppet # Should really check that it's a valid URL newvalue(/.*/) { } end - + newproperty(:enabled, :parent => Puppet::IniProperty) do - desc "Whether this repository is enabled or disabled. Possible + desc "Whether this repository is enabled or disabled. Possible values are '0', and '1'.\n#{ABSENT_DOC}" newvalue(:absent) { self.should = :absent } newvalue(%r{(0|1)}) { } @@ -301,7 +301,7 @@ module Puppet newproperty(:enablegroups, :parent => Puppet::IniProperty) do desc "Determines whether yum will allow the use of - package groups for this repository. Possible + package groups for this repository. Possible values are '0', and '1'.\n#{ABSENT_DOC}" newvalue(:absent) { self.should = :absent } newvalue(%r{(0|1)}) { } @@ -314,14 +314,14 @@ module Puppet end newproperty(:keepalive, :parent => Puppet::IniProperty) do - desc "Either '1' or '0'. This tells yum whether or not HTTP/1.1 + desc "Either '1' or '0'. This tells yum whether or not HTTP/1.1 keepalive should be used with this repository.\n#{ABSENT_DOC}" newvalue(:absent) { self.should = :absent } newvalue(%r{(0|1)}) { } end newproperty(:timeout, :parent => Puppet::IniProperty) do - desc "Number of seconds to wait for a connection before timing + desc "Number of seconds to wait for a connection before timing out.\n#{ABSENT_DOC}" newvalue(:absent) { self.should = :absent } newvalue(%r{[0-9]+}) { } @@ -335,7 +335,7 @@ module Puppet end newproperty(:protect, :parent => Puppet::IniProperty) do - desc "Enable or disable protection for this repository. Requires + desc "Enable or disable protection for this repository. Requires that the protectbase plugin is installed and enabled. #{ABSENT_DOC}" newvalue(:absent) { self.should = :absent } diff --git a/lib/puppet/type/zone.rb b/lib/puppet/type/zone.rb index c286ececd..b8a7e9aa9 100644 --- a/lib/puppet/type/zone.rb +++ b/lib/puppet/type/zone.rb @@ -15,7 +15,7 @@ Puppet::Type.newtype(:zone) do class ZoneMultiConfigProperty < ZoneConfigProperty def configtext list = @should - + current_value = self.retrieve unless current_value.is_a? Symbol @@ -212,7 +212,7 @@ Puppet::Type.newtype(:zone) do end interface, address = value.split(':') - + begin IPAddr.new(address) rescue ArgumentError @@ -230,7 +230,7 @@ end " end - # Convert a string into the component interface and address + # Convert a string into the component interface and address def ipsplit(str) interface, address = str.split(':') return interface, address @@ -260,7 +260,7 @@ end end newproperty(:pool, :parent => ZoneConfigProperty) do - desc "The resource pool for this zone." + desc "The resource pool for this zone." def configtext "set pool=#{self.should}" @@ -307,7 +307,7 @@ end newparam(:sysidcfg) do desc %{The text to go into the sysidcfg file when the zone is first booted. The best way is to use a template:: - + # $templatedir/sysidcfg system_locale=en_US timezone=GMT @@ -361,7 +361,7 @@ end newparam(:create_args) do desc "Arguments to the zonecfg create command. This can be used to create branded zones." end - + newparam(:install_args) do desc "Arguments to the zoneadm install command. This can be used to create branded zones." end diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb index fc9f36083..50a669e9b 100644 --- a/lib/puppet/util.rb +++ b/lib/puppet/util.rb @@ -9,7 +9,7 @@ module Puppet end module Util require 'benchmark' - + # These are all for backward compatibility -- these are methods that used # to be in Puppet::Util but have been moved into external modules. require 'puppet/util/posix' @@ -37,8 +37,8 @@ module Util end unless Puppet::Util::SUIDManager.gid == group begin - Puppet::Util::SUIDManager.egid = group - Puppet::Util::SUIDManager.gid = group + Puppet::Util::SUIDManager.egid = group + Puppet::Util::SUIDManager.gid = group rescue => detail Puppet.warning "could not change to group %s: %s" % [group.inspect, detail] @@ -58,8 +58,8 @@ module Util end unless Puppet::Util::SUIDManager.uid == user begin - Puppet::Util::SUIDManager.uid = user - Puppet::Util::SUIDManager.euid = user + Puppet::Util::SUIDManager.uid = user + Puppet::Util::SUIDManager.euid = user rescue $stderr.puts "could not change to user %s" % user exit(74) @@ -255,14 +255,14 @@ module Util else Puppet.debug "Executing '%s'" % str end - + if arguments[:uid] arguments[:uid] = Puppet::Util::SUIDManager.convert_xid(:uid, arguments[:uid]) end if arguments[:gid] arguments[:gid] = Puppet::Util::SUIDManager.convert_xid(:gid, arguments[:gid]) end - + @@os ||= Facter.value(:operatingsystem) output = nil child_pid, child_status = nil @@ -300,7 +300,7 @@ module Util $stdout.reopen(output_file) $stderr.reopen(error_file) - 3.upto(256){|fd| IO::new(fd).close rescue nil} + 3.upto(256){|fd| IO::new(fd).close rescue nil} if arguments[:gid] Process.egid = arguments[:gid] Process.gid = arguments[:gid] unless @@os == "Darwin" diff --git a/lib/puppet/util/classgen.rb b/lib/puppet/util/classgen.rb index 4e1e57c85..1aa961399 100644 --- a/lib/puppet/util/classgen.rb +++ b/lib/puppet/util/classgen.rb @@ -95,7 +95,7 @@ module Puppet::Util::ClassGen end @name = name end - else + else options[:parent] ||= self evalmethod = :class_eval # Create the class, with the correct name. diff --git a/lib/puppet/util/config_store.rb b/lib/puppet/util/config_store.rb index 668d73f6e..ad18259bd 100644 --- a/lib/puppet/util/config_store.rb +++ b/lib/puppet/util/config_store.rb @@ -54,8 +54,8 @@ module Puppet::Util def collect_exported(client, conditions) raise Puppet::DevError, "%s has not overridden collect_exported" % self.class.name - end - + end + end end diff --git a/lib/puppet/util/constant_inflector.rb b/lib/puppet/util/constant_inflector.rb index eeeaa0632..29d334348 100644 --- a/lib/puppet/util/constant_inflector.rb +++ b/lib/puppet/util/constant_inflector.rb @@ -5,7 +5,7 @@ # file names. module Puppet::Util::ConstantInflector def file2constant(file) - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] x = file.split("/").collect { |name| name.capitalize }.join("::").gsub(/_+(.)/) { |term| $1.capitalize } end diff --git a/lib/puppet/util/diff.rb b/lib/puppet/util/diff.rb index f37ea0850..ac3a1c3c9 100644 --- a/lib/puppet/util/diff.rb +++ b/lib/puppet/util/diff.rb @@ -35,8 +35,8 @@ module Puppet::Util::Diff diffs.each do |piece| begin - hunk = ::Diff::LCS::Hunk.new(data_old, data_new, piece, - context_lines, + hunk = ::Diff::LCS::Hunk.new(data_old, data_new, piece, + context_lines, file_length_difference) file_length_difference = hunk.file_length_difference next unless oldhunk diff --git a/lib/puppet/util/execution.rb b/lib/puppet/util/execution.rb index b8dcde58d..7db7137fb 100644 --- a/lib/puppet/util/execution.rb +++ b/lib/puppet/util/execution.rb @@ -1,5 +1,5 @@ module Puppet::Util::Execution - module_function + module_function # Run some code with a specific environment. Resets the environment back to # what it was at the end of the code. diff --git a/lib/puppet/util/feature.rb b/lib/puppet/util/feature.rb index 2669d1ab1..94ee3be8b 100644 --- a/lib/puppet/util/feature.rb +++ b/lib/puppet/util/feature.rb @@ -26,7 +26,7 @@ class Puppet::Util::Feature end @results[name] = result end - + meta_def(method) do unless @results.include?(name) @results[name] = test(name, options) @@ -34,14 +34,14 @@ class Puppet::Util::Feature @results[name] end end - + # Create a new feature collection. def initialize(path) @path = path @results = {} @loader = Puppet::Util::Autoload.new(self, @path) end - + def load @loader.loadall end @@ -66,12 +66,12 @@ class Puppet::Util::Feature result = true if ary = options[:libs] ary = [ary] unless ary.is_a?(Array) - + ary.each do |lib| unless lib.is_a?(String) raise ArgumentError, "Libraries must be passed as strings not %s" % lib.class end - + begin require lib rescue Exception diff --git a/lib/puppet/util/fileparsing.rb b/lib/puppet/util/fileparsing.rb index dca0d51c0..06f8a2e7d 100644 --- a/lib/puppet/util/fileparsing.rb +++ b/lib/puppet/util/fileparsing.rb @@ -169,7 +169,7 @@ module Puppet::Util::FileParsing fields = [] ret = {} record.fields.zip(match.captures).each do |field, value| - if value == record.absent + if value == record.absent ret[field] = :absent else ret[field] = value @@ -223,7 +223,7 @@ module Puppet::Util::FileParsing # Split text into separate lines using the record separator. def lines(text) # Remove any trailing separators, and then split based on them - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] x = text.sub(/#{self.line_separator}\Q/,'').split(self.line_separator) end diff --git a/lib/puppet/util/filetype.rb b/lib/puppet/util/filetype.rb index 34feeab90..93c002fa9 100755 --- a/lib/puppet/util/filetype.rb +++ b/lib/puppet/util/filetype.rb @@ -111,9 +111,9 @@ class Puppet::Util::FileType # Overwrite the file. def write(text) require "tempfile" - tf = Tempfile.new("puppet") - tf.print text; tf.flush - FileUtils.cp(tf.path, @path) + tf = Tempfile.new("puppet") + tf.print text; tf.flush + FileUtils.cp(tf.path, @path) tf.close # If SELinux is present, we need to ensure the file has its expected context set_selinux_default_context(@path) @@ -217,7 +217,7 @@ class Puppet::Util::FileType raise Puppet::Error, "User %s not authorized to use cron" % @path if output.include?("you are not authorized to use cron") return output rescue => detail - raise Puppet::Error, "Could not read crontab for %s: %s" % [@path, detail] + raise Puppet::Error, "Could not read crontab for %s: %s" % [@path, detail] end end diff --git a/lib/puppet/util/graph.rb b/lib/puppet/util/graph.rb index fc05cafd9..a052bf8f1 100644 --- a/lib/puppet/util/graph.rb +++ b/lib/puppet/util/graph.rb @@ -13,11 +13,11 @@ module Puppet::Util::Graph # Allow our calling function to send in a graph, so that we # can call this recursively with one graph. graph ||= Puppet::SimpleGraph.new - + self.each do |child| unless block_given? and ! yield(child) graph.add_edge(self, child) - + if child.respond_to?(:to_graph) child.to_graph(graph, &block) end @@ -25,7 +25,7 @@ module Puppet::Util::Graph end # Do a topsort, which will throw an exception if the graph is cyclic. - + graph end end diff --git a/lib/puppet/util/inifile.rb b/lib/puppet/util/inifile.rb index f5fab8530..3c82f7d37 100644 --- a/lib/puppet/util/inifile.rb +++ b/lib/puppet/util/inifile.rb @@ -5,7 +5,7 @@ # something has changed are written back to disk # Great care is taken to preserve comments and blank lines from the original # files -# +# # The parsing tries to stay close to python's ConfigParser require 'puppet/util/filetype' @@ -79,7 +79,7 @@ module Puppet::Util::IniConfig return text end - private + private def find_entry(key) @entries.each do |entry| if entry.is_a?(Array) && entry[0] == key @@ -88,7 +88,7 @@ module Puppet::Util::IniConfig end return nil end - + end # A logical .ini-file that can be spread across several physical @@ -113,7 +113,7 @@ module Puppet::Util::IniConfig text.each_line do |l| line += 1 if l.strip.empty? || "#;".include?(l[0,1]) || - (l.split(nil, 2)[0].downcase == "rem" && + (l.split(nil, 2)[0].downcase == "rem" && l[0,1].downcase == "r") # Whitespace or comment if section.nil? @@ -146,7 +146,7 @@ module Puppet::Util::IniConfig end # Store all modifications made to sections in this file back - # to the physical files. If no modifications were made to + # to the physical files. If no modifications were made to # a physical file, nothing is written def store @files.each do |file, lines| diff --git a/lib/puppet/util/log.rb b/lib/puppet/util/log.rb index 8f8d46097..94b0bcffa 100644 --- a/lib/puppet/util/log.rb +++ b/lib/puppet/util/log.rb @@ -129,7 +129,7 @@ class Puppet::Util::Log unless @levels.index(hash[:level]) raise Puppet::DevError, "Invalid log level %s" % hash[:level] end - if @levels.index(hash[:level]) >= @loglevel + if @levels.index(hash[:level]) >= @loglevel return Puppet::Util::Log.new(hash) else return nil @@ -251,8 +251,8 @@ class Puppet::Util::Log end newdesttype :console do - - + + RED = {:console => "[0;31m", :html => "FFA0A0"} GREEN = {:console => "[0;32m", :html => "00CD00"} YELLOW = {:console => "[0;33m", :html => "FFFF60"} @@ -279,7 +279,7 @@ class Puppet::Util::Log :emerg => HRED, :crit => HRED } - + def colorize(level, str) case Puppet[:color] when false; str @@ -287,11 +287,11 @@ class Puppet::Util::Log when :html, "html"; html_color(level, str) end end - + def console_color(level, str) @@colormap[level][:console] + str + RESET[:console] end - + def html_color(level, str) %{<span style="color: %s">%s</span>} % [@@colormap[level][:html], str] end @@ -432,7 +432,7 @@ class Puppet::Util::Log # for a loop here, if the machine somehow gets the destination set as # itself. def Log.newmessage(msg) - if @levels.index(msg.level) < @loglevel + if @levels.index(msg.level) < @loglevel return end @@ -444,7 +444,7 @@ class Puppet::Util::Log end def Log.sendlevel?(level) - @levels.index(level) >= @loglevel + @levels.index(level) >= @loglevel end # Reopen all of our logs. diff --git a/lib/puppet/util/metric.rb b/lib/puppet/util/metric.rb index f352462cd..b713246d5 100644 --- a/lib/puppet/util/metric.rb +++ b/lib/puppet/util/metric.rb @@ -3,7 +3,7 @@ require 'puppet' # A class for handling metrics. This is currently ridiculously hackish. class Puppet::Util::Metric - + attr_accessor :type, :name, :value, :label attr_writer :values @@ -32,7 +32,7 @@ class Puppet::Util::Metric start ||= Time.now.to_i - 5 @rrd = RRDtool.new(self.path) - args = [] + args = [] values.each { |value| # the 7200 is the heartbeat -- this means that any data that isn't @@ -81,7 +81,7 @@ class Puppet::Util::Metric args << defs args << lines args.flatten! - if range + if range args.push("--start",range[0],"--end",range[1]) else args.push("--start", Time.now.to_i - time, "--end", Time.now.to_i) @@ -147,7 +147,7 @@ class Puppet::Util::Metric end private - + # Convert a name into a label. def labelize(name) name.to_s.capitalize.gsub("_", " ") diff --git a/lib/puppet/util/package.rb b/lib/puppet/util/package.rb index 613aa6b1e..9beed3d00 100644 --- a/lib/puppet/util/package.rb +++ b/lib/puppet/util/package.rb @@ -11,10 +11,10 @@ module Puppet::Util::Package b = bx.shift if( a == b ) then next - elsif (a == '-' && b == '-') then next + elsif (a == '-' && b == '-') then next elsif (a == '-') then return -1 elsif (b == '-') then return 1 - elsif (a == '.' && b == '.') then next + elsif (a == '.' && b == '.') then next elsif (a == '.' ) then return -1 elsif (b == '.' ) then return 1 elsif (a =~ /^\d+$/ && b =~ /^\d+$/) then @@ -22,12 +22,12 @@ module Puppet::Util::Package return a.to_s.upcase <=> b.to_s.upcase end return a.to_i <=> b.to_i - else + else return a.upcase <=> b.upcase end end return version_a <=> version_b; end - + module_function :versioncmp end diff --git a/lib/puppet/util/posix.rb b/lib/puppet/util/posix.rb index 40a175eb3..837c37a07 100755 --- a/lib/puppet/util/posix.rb +++ b/lib/puppet/util/posix.rb @@ -28,7 +28,7 @@ module Puppet::Util::POSIX end # A degenerate method of retrieving name/id mappings. The job of this method is - # to retrieve all objects of a certain type, search for a specific entry + # to retrieve all objects of a certain type, search for a specific entry # and then return a given field from that entry. def search_posix_field(type, field, id) idmethod = idfield(type) @@ -57,7 +57,7 @@ module Puppet::Util::POSIX end return nil end - + # Determine what the field name is for users and groups. def idfield(space) case Puppet::Util.symbolize(space) @@ -67,7 +67,7 @@ module Puppet::Util::POSIX raise ArgumentError.new("Can only handle users and groups") end end - + # Determine what the method is to get users and groups by id def methodbyid(space) case Puppet::Util.symbolize(space) @@ -77,7 +77,7 @@ module Puppet::Util::POSIX raise ArgumentError.new("Can only handle users and groups") end end - + # Determine what the method is to get users and groups by name def methodbyname(space) case Puppet::Util.symbolize(space) @@ -87,7 +87,7 @@ module Puppet::Util::POSIX raise ArgumentError.new("Can only handle users and groups") end end - + # Get the GID of a given group, provided either a GID or a name def gid(group) begin diff --git a/lib/puppet/util/provider_features.rb b/lib/puppet/util/provider_features.rb index 5b0c99525..7986f6eae 100644 --- a/lib/puppet/util/provider_features.rb +++ b/lib/puppet/util/provider_features.rb @@ -14,7 +14,7 @@ module Puppet::Util::ProviderFeatures # Are all of the requirements met? def available?(obj) - if self.methods + if self.methods if methods_available?(obj) return true else @@ -126,8 +126,8 @@ module Puppet::Util::ProviderFeatures # Create a method that will list all functional features. @feature_module.send(:define_method, :features) do return false unless defined?(features) - features.keys.find_all { |n| feature?(n) }.sort { |a,b| - a.to_s <=> b.to_s + features.keys.find_all { |n| feature?(n) }.sort { |a,b| + a.to_s <=> b.to_s } end diff --git a/lib/puppet/util/queue.rb b/lib/puppet/util/queue.rb index ce462ac66..329b07b22 100644 --- a/lib/puppet/util/queue.rb +++ b/lib/puppet/util/queue.rb @@ -5,7 +5,7 @@ require 'puppet/util/instance_loader' # Implements a message queue client type plugin registry for use by the indirector facility. # Client modules for speaking a particular protocol (e.g. Stomp::Client for Stomp message # brokers, Memcached for Starling and Sparrow, etc.) register themselves with this module. -# +# # Client classes are expected to live under the Puppet::Util::Queue namespace and corresponding # directory; the attempted use of a client via its typename (see below) will cause Puppet::Util::Queue # to attempt to load the corresponding plugin if it is not yet loaded. The client class registers itself @@ -43,7 +43,7 @@ module Puppet::Util::Queue # # # register with default name +:you+ # register_queue_type(Foo::You) - # + # # # register with explicit queue type name +:myself+ # register_queue_type(Foo::Me, :myself) # diff --git a/lib/puppet/util/rdoc/code_objects.rb b/lib/puppet/util/rdoc/code_objects.rb index 52df2193e..312fe0c9b 100644 --- a/lib/puppet/util/rdoc/code_objects.rb +++ b/lib/puppet/util/rdoc/code_objects.rb @@ -4,7 +4,7 @@ module RDoc # This modules contains various class that are used to hold information # about the various Puppet language structures we found while parsing. - # + # # Those will be mapped to their html counterparts which are defined in # PuppetGenerator. diff --git a/lib/puppet/util/rdoc/generators/puppet_generator.rb b/lib/puppet/util/rdoc/generators/puppet_generator.rb index 22f001164..bf2609fd6 100644 --- a/lib/puppet/util/rdoc/generators/puppet_generator.rb +++ b/lib/puppet/util/rdoc/generators/puppet_generator.rb @@ -4,14 +4,14 @@ module Generators # This module holds all the classes needed to generate the HTML documentation # of a bunch of puppet manifests. - # - # It works by traversing all the code objects defined by the Puppet RDoc::Parser + # + # It works by traversing all the code objects defined by the Puppet RDoc::Parser # and produces HTML counterparts objects that in turns are used by RDoc template engine # to produce the final HTML. - # + # # It is also responsible of creating the whole directory hierarchy, and various index # files. - # + # # It is to be noted that the whole system is built on top of ruby RDoc. As such there # is an implicit mapping of puppet entities to ruby entitites: # @@ -20,7 +20,7 @@ module Generators # Module Module # Class Class # Definition Method - # Resource + # Resource # Node # Plugin # Fact diff --git a/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb b/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb index c71f81915..e12b6519c 100644 --- a/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb +++ b/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb @@ -239,11 +239,11 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; } ##################################################################### -### H E A D E R T E M P L A T E +### H E A D E R T E M P L A T E ##################################################################### XHTML_PREAMBLE = %{<?xml version="1.0" encoding="%charset%"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> } @@ -271,7 +271,7 @@ HEADER = XHTML_PREAMBLE + %{ return false; elemStyle = elem.style; - + if ( elemStyle.display != "block" ) { elemStyle.display = "block" } else { @@ -280,10 +280,10 @@ HEADER = XHTML_PREAMBLE + %{ return true; } - + // Make codeblocks hidden by default document.writeln( "<style type=\\"text/css\\">div.method-source-code { display: none }</style>" ) - + // ]]> </script> @@ -516,7 +516,7 @@ IF:sectitle IF:seccomment <div class="section-comment"> %seccomment% - </div> + </div> ENDIF:seccomment ENDIF:sectitle END:sections @@ -608,7 +608,7 @@ IF:sectitle IF:seccomment <div class="section-comment"> %seccomment% - </div> + </div> ENDIF:seccomment ENDIF:sectitle @@ -720,7 +720,7 @@ END:attributes </div> </div> ENDIF:attributes - + <!-- if method_list --> @@ -755,7 +755,7 @@ IF:sourcecode </a> ENDIF:sourcecode </div> - + <div class="method-description"> IF:m_desc %m_desc% @@ -797,7 +797,7 @@ START:params END:params ENDIF:params </div> - + <div class="method-description"> IF:m_desc %m_desc% @@ -935,7 +935,7 @@ METHOD_INDEX = FILE_INDEX COMBO_INDEX = XHTML_PREAMBLE + %{ <!-- - %classes_title% & %defines_title% + %classes_title% & %defines_title% --> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> @@ -950,7 +950,7 @@ COMBO_INDEX = XHTML_PREAMBLE + %{ parent.docwin.location.href = url; } //--></SCRIPT> - + </head> <body> <div id="index"> @@ -1019,7 +1019,7 @@ ENDIF:plugins } INDEX = %{<?xml version="1.0" encoding="%charset%"?> -<!DOCTYPE html +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb index f13600680..7be119c6f 100644 --- a/lib/puppet/util/selinux.rb +++ b/lib/puppet/util/selinux.rb @@ -122,7 +122,7 @@ module Puppet::Util::SELinux else context = value end - + retval = Selinux.lsetfilecon(file, context) if retval == 0 return true @@ -179,12 +179,12 @@ module Puppet::Util::SELinux unless mnts = read_mounts() return nil end - + # For a given file: - # Check if the filename is in the data structure; + # Check if the filename is in the data structure; # return the fstype if it is. # Just in case: return something if you're down to "/" or "" - # Remove the last slash and everything after it, + # Remove the last slash and everything after it, # and repeat with that as the file for the next loop through. ary = file.split('/') while not ary.empty? do diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index 0871ee869..4fbf602f6 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -168,7 +168,7 @@ class Puppet::Util::Settings def initialize @config = {} @shortnames = {} - + @created = [] @searchpath = nil @@ -332,7 +332,7 @@ class Puppet::Util::Settings parse_file(file).each do |area, values| @values[area] = values end - + # Determine our environment, if we have one. if @config[:environment] env = self.value(:environment).to_sym @@ -616,7 +616,7 @@ Generated on #{Time.now}. if transaction.any_failed? report = transaction.report failures = report.logs.find_all { |log| log.level == :err } - raise "Got %s failure(s) while initializing: %s" % [failures.length, failures.collect { |l| l.to_s }.join("; ")] + raise "Got %s failure(s) while initializing: %s" % [failures.length, failures.collect { |l| l.to_s }.join("; ")] end end end @@ -663,7 +663,7 @@ Generated on #{Time.now}. end throw :foundval, nil end - + # If we didn't get a value, use the default val = @config[param].default if val.nil? @@ -759,7 +759,7 @@ Generated on #{Time.now}. return obj end - + # Create the transportable objects for users and groups. def add_user_resources(catalog, sections) return unless Puppet.features.root? diff --git a/lib/puppet/util/subclass_loader.rb b/lib/puppet/util/subclass_loader.rb index dd0d6dd03..8776e855c 100644 --- a/lib/puppet/util/subclass_loader.rb +++ b/lib/puppet/util/subclass_loader.rb @@ -31,7 +31,7 @@ module Puppet::Util::SubclassLoader # that we're defining a class method here, not an instance. meta_def(name) do |subname| subname = subname.to_s.downcase - + unless c = @subclasses.find { |c| c.name.to_s.downcase == subname } loader.load(subname) c = @subclasses.find { |c| c.name.to_s.downcase == subname } diff --git a/lib/puppet/util/suidmanager.rb b/lib/puppet/util/suidmanager.rb index b071dca6f..c5df0d198 100644 --- a/lib/puppet/util/suidmanager.rb +++ b/lib/puppet/util/suidmanager.rb @@ -29,14 +29,14 @@ module Puppet::Util::SUIDManager begin self.egid = convert_xid :gid, new_gid if new_gid self.euid = convert_xid :uid, new_uid if new_uid - + yield ensure self.euid, self.egid = old_euid, old_egid end end module_function :asuser - + # Make sure the passed argument is a number. def convert_xid(type, id) map = {:gid => :group, :uid => :user} diff --git a/lib/puppet/util/tagging.rb b/lib/puppet/util/tagging.rb index e06e13a2c..f421d18d8 100644 --- a/lib/puppet/util/tagging.rb +++ b/lib/puppet/util/tagging.rb @@ -16,7 +16,7 @@ module Puppet::Util::Tagging @tags << tag unless @tags.include?(tag) end - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] qualified.collect { |name| x = name.split("::") }.flatten.each { |tag| @tags << tag unless @tags.include?(tag) } end diff --git a/man/man8/filebucket.8 b/man/man8/filebucket.8 index 0ef4c3842..afdae7d10 100644 --- a/man/man8/filebucket.8 +++ b/man/man8/filebucket.8 @@ -1,6 +1,6 @@ .TH "" "" "" .SH NAME - \- + \- .\" Man page generated from reStructeredText. @@ -113,4 +113,4 @@ License .\" Generated by docutils manpage writer on 2008-05-05 09:33. -.\" +.\" diff --git a/man/man8/pi.8 b/man/man8/pi.8 index ba685797a..433791616 100644 --- a/man/man8/pi.8 +++ b/man/man8/pi.8 @@ -1,6 +1,6 @@ .TH "" "" "" .SH NAME - \- + \- .\" Man page generated from reStructeredText. @@ -31,4 +31,4 @@ Include metaparams .\" Generated by docutils manpage writer on 2008-05-05 09:33. -.\" +.\" diff --git a/man/man8/puppet.8 b/man/man8/puppet.8 index 8fc24aab2..bd0641ac0 100644 --- a/man/man8/puppet.8 +++ b/man/man8/puppet.8 @@ -1,6 +1,6 @@ .TH "" "" "" .SH NAME - \- + \- .\" Man page generated from reStructeredText. @@ -74,4 +74,4 @@ License .\" Generated by docutils manpage writer on 2008-05-05 09:33. -.\" +.\" diff --git a/man/man8/puppet.conf.8 b/man/man8/puppet.conf.8 index 1bc1eb65a..21c94f802 100644 --- a/man/man8/puppet.conf.8 +++ b/man/man8/puppet.conf.8 @@ -1,37 +1,37 @@ .TH Configuration Reference "" "" "" .SH NAME -Configuration Reference \- +Configuration Reference \- .\" Man page generated from reStructeredText. -This page is autogenerated; any changes will get overwritten +This page is autogenerated; any changes will get overwritten .I (last generated on Mon May 05 09:33:01 +1000 2008) .\" topic: Contents -.\" +.\" .\" Specifying Configuration Parameters -.\" +.\" .\" Signals -.\" +.\" .\" Configuration Parameter Reference .SH Specifying Configuration Parameters .SS On The Command\-Line -Every Puppet executable (with the exception of +Every Puppet executable (with the exception of .\" visit_literal puppetdoc .\" depart_literal ) accepts all of the parameters below, but not all of the arguments make sense for every executable. Each parameter has a section listed with it in parentheses; often, that section -will map to an executable (e.g., +will map to an executable (e.g., .\" visit_literal puppetd .\" depart_literal ), in which case it probably only -makes sense for that one executable. If +makes sense for that one executable. If .\" visit_literal main .\" depart_literal @@ -43,7 +43,7 @@ arguments, so it should be obvious whether an argument is appropriate or not. These parameters can be supplied to the executables either as command\-line options or in the configuration file. For instance, the command\-line -invocation below would set the configuration directory to +invocation below would set the configuration directory to .\" visit_literal /private/puppet .\" depart_literal @@ -69,17 +69,17 @@ the client configuration. .SS Configuration Files As mentioned above, the configuration parameters can also be stored in a configuration file, located in the configuration directory. As root, the -default configuration directory is +default configuration directory is .\" visit_literal /etc/puppet .\" depart_literal , and as a regular user, the -default configuration directory is +default configuration directory is .\" visit_literal ~user/.puppet .\" depart_literal . As of 0.23.0, all -executables look for +executables look for .\" visit_literal puppet.conf .\" depart_literal @@ -89,7 +89,7 @@ puppet.conf .\" visit_literal puppet.conf .\" depart_literal - is located at + is located at .\" visit_literal /etc/puppet/puppet.conf .\" depart_literal @@ -100,27 +100,27 @@ puppet.conf .\" depart_literal as a regular user by default. -All executables will set any parameters set within the +All executables will set any parameters set within the .\" visit_literal main .\" depart_literal section, while each executable will also look for a section named for the executable -and load those parameters. For example, +and load those parameters. For example, .\" visit_literal puppetd .\" depart_literal will look for a -section named +section named .\" visit_literal puppetd .\" depart_literal -, and +, and .\" visit_literal puppetmasterd .\" depart_literal looks for a section -named +named .\" visit_literal puppetmasterd .\" depart_literal @@ -142,7 +142,7 @@ puppet.conf confdir = /private/puppet storeconfigs = true .fi -Note that boolean parameters must be explicitly specified as +Note that boolean parameters must be explicitly specified as .I true or @@ -159,7 +159,7 @@ so within curly braces on the same line: .fi If you\'re starting out with a fresh configuration, you may wish to let the executable generate a template configuration file for you by invoking -the executable in question with the +the executable in question with the .I \-\-genconfig command. The executable will print a template configuration to standard output, which can be @@ -178,9 +178,9 @@ valuable information. All parameters will be under a single section heading matching the name of the process used to generate the configuraiton (\'puppetd\', in this case). -Like the +Like the .I \-\-genconfig - argument, the executables also accept a + argument, the executables also accept a .I \-\-genmanifest argument, which will generate a manifest that can be used to manage all of @@ -191,14 +191,14 @@ likewise be redirected to a file: .nf $ puppetd \-\-genmanifest > /etc/puppet/manifests/site.pp .fi -Puppet can also create user and group accounts for itself (one +Puppet can also create user and group accounts for itself (one .I puppet group -and one +and one .I puppet - user) if it is invoked as + user) if it is invoked as .I root - with the + with the .I \-\-mkusers argument: @@ -208,11 +208,11 @@ $ puppetd \-\-mkusers .fi .SH Signals -The +The .\" visit_literal puppetd .\" depart_literal - and + and .\" visit_literal puppetmasterd .\" depart_literal @@ -226,32 +226,32 @@ tself. Predictably, interrupt and terminate ( .\" visit_literal SIGINT .\" depart_literal - and + and .\" visit_literal SIGHUP .\" depart_literal ) will shut -down the server, whether it be an instance of +down the server, whether it be an instance of .\" visit_literal puppetd .\" depart_literal - or + or .\" visit_literal puppetmasterd .\" depart_literal . -Sending the +Sending the .\" visit_literal SIGUSR1 .\" depart_literal - signal to an instance of + signal to an instance of .\" visit_literal puppetd .\" depart_literal will cause it to immediately begin a new configuration transaction with the server. This -signal has no effect on +signal has no effect on .\" visit_literal puppetmasterd .\" depart_literal @@ -264,11 +264,11 @@ Puppet executables, but the executables will ignore any inappropriate values. .SS authconfig -The configuration file that defines the rights to the different namespaces and methods. This can be used as a coarse\-grained authorization system for both +The configuration file that defines the rights to the different namespaces and methods. This can be used as a coarse\-grained authorization system for both .\" visit_literal puppetd .\" depart_literal - and + and .\" visit_literal puppetmasterd .\" depart_literal @@ -464,11 +464,11 @@ Default: absinthe.lovedthanlost.net .SS classfile -The file in which puppetd stores a list of the classes associated with the retrieved configuration. Can be loaded in the separate +The file in which puppetd stores a list of the classes associated with the retrieved configuration. Can be loaded in the separate .\" visit_literal puppet .\" depart_literal - executable using the + executable using the .\" visit_literal \-\-loadclasses .\" depart_literal @@ -490,7 +490,7 @@ Default: $vardir/clientbucket .SS code -Code to parse directly. This is essentially only used by +Code to parse directly. This is essentially only used by .\" visit_literal puppet .\" depart_literal @@ -498,19 +498,19 @@ puppet .SS color -Whether to use colors when logging to the console. Valid values are +Whether to use colors when logging to the console. Valid values are .\" visit_literal ansi .\" depart_literal - (equivalent to + (equivalent to .\" visit_literal true .\" depart_literal -), +), .\" visit_literal html .\" depart_literal - (mostly used during testing with TextMate), and + (mostly used during testing with TextMate), and .\" visit_literal false .\" depart_literal @@ -523,11 +523,11 @@ Default: ansi .SS confdir -The main Puppet configuration directory. The default for this parameter is calculated based on the user. If the process is runnig as root or the user that +The main Puppet configuration directory. The default for this parameter is calculated based on the user. If the process is runnig as root or the user that .\" visit_literal puppetmasterd .\" depart_literal - is supposed to run as, it defaults to a system directory, but if it\'s running as any other user, it defaults to being in + is supposed to run as, it defaults to a system directory, but if it\'s running as any other user, it defaults to being in .\" visit_literal ~ .\" depart_literal @@ -678,11 +678,11 @@ Default: memorysize,memoryfree,swapsize,swapfree .SS environment -The environment Puppet is running in. For clients (e.g., +The environment Puppet is running in. For clients (e.g., .\" visit_literal puppetd .\" depart_literal -) this determines the environment itself, which is used to find modules and much more. For servers (i.e., +) this determines the environment itself, which is used to find modules and much more. For servers (i.e., .\" visit_literal puppetmasterd .\" depart_literal @@ -713,19 +713,19 @@ Default: false .SS external_nodes -An external command that can produce node information. The output must be a YAML dump of a hash, and that hash must have one or both of +An external command that can produce node information. The output must be a YAML dump of a hash, and that hash must have one or both of .\" visit_literal classes .\" depart_literal - and + and .\" visit_literal parameters .\" depart_literal -, where +, where .\" visit_literal classes .\" depart_literal - is an array and + is an array and .\" visit_literal parameters .\" depart_literal @@ -765,7 +765,7 @@ Default: .svn CVS .SS factsource -From where to retrieve facts. The standard Puppet +From where to retrieve facts. The standard Puppet .\" visit_literal file .\" depart_literal @@ -1002,7 +1002,7 @@ The password to use to connect to LDAP. .SS ldapport -The LDAP port. Only used if +The LDAP port. Only used if .\" visit_literal ldapnodes .\" depart_literal @@ -1015,7 +1015,7 @@ Default: 389 .SS ldapserver -The LDAP server. Only used if +The LDAP server. Only used if .\" visit_literal ldapnodes .\" depart_literal @@ -1077,11 +1077,11 @@ Default: $vardir/lib .SS listen -Whether puppetd should listen for connections. If this is true, then by default only the +Whether puppetd should listen for connections. If this is true, then by default only the .\" visit_literal runner .\" depart_literal - server is started, which allows remote authorized and authenticated nodes to connect and trigger + server is started, which allows remote authorized and authenticated nodes to connect and trigger .\" visit_literal puppetd .\" depart_literal @@ -1193,7 +1193,7 @@ Default: $confdir/modules:/usr/share/puppet/modules .SS name -The name of the service, if we are running as one. The default is essentially $0 without the path or +The name of the service, if we are running as one. The default is essentially $0 without the path or .\" visit_literal .rb .\" depart_literal @@ -1300,7 +1300,7 @@ Default: .svn CVS .SS pluginsource -From where to retrieve plugins. The standard Puppet +From where to retrieve plugins. The standard Puppet .\" visit_literal file .\" depart_literal @@ -1376,11 +1376,11 @@ Default: 8139 .SS rails_loglevel -The log level for Rails connections. The value must be a valid log level within Rails. Production environments normally use +The log level for Rails connections. The value must be a valid log level within Rails. Production environments normally use .\" visit_literal info .\" depart_literal - and other environments normally use + and other environments normally use .\" visit_literal debug .\" depart_literal @@ -1532,7 +1532,7 @@ Default: webrick .SS show_diff -Whether to print a contextual diff when files are being replaced. The diff is printed on stdout, so this option is meaningless unless you are running Puppet interactively. This feature currently requires the +Whether to print a contextual diff when files are being replaced. The diff is printed on stdout, so this option is meaningless unless you are running Puppet interactively. This feature currently requires the .\" visit_literal diff/lcs .\" depart_literal @@ -1581,7 +1581,7 @@ Default: $runinterval .SS ssl_client_header -The header containing an authenticated client\'s SSL DN. Only used with Mongrel. This header must be set by the proxy to the authenticated client\'s SSL DN (e.g., +The header containing an authenticated client\'s SSL DN. Only used with Mongrel. This header must be set by the proxy to the authenticated client\'s SSL DN (e.g., .\" visit_literal /CN=puppet.reductivelabs.com .\" depart_literal @@ -1744,4 +1744,4 @@ Default: $vardir/yaml .\" Generated by docutils manpage writer on 2008-05-05 09:33. -.\" +.\" diff --git a/man/man8/puppetca.8 b/man/man8/puppetca.8 index f9f89a95f..581f3252d 100644 --- a/man/man8/puppetca.8 +++ b/man/man8/puppetca.8 @@ -1,6 +1,6 @@ .TH "" "" "" .SH NAME - \- + \- .\" Man page generated from reStructeredText. @@ -115,4 +115,4 @@ License .\" Generated by docutils manpage writer on 2008-05-05 09:33. -.\" +.\" diff --git a/man/man8/puppetd.8 b/man/man8/puppetd.8 index 9cadcd4e3..c448e89f6 100644 --- a/man/man8/puppetd.8 +++ b/man/man8/puppetd.8 @@ -1,6 +1,6 @@ .TH Synopsis "" "" "" .SH NAME -Synopsis \- +Synopsis \- .\" Man page generated from reStructeredText. Retrieve the client configuration from the central puppet server and @@ -181,4 +181,4 @@ Public License .\" Generated by docutils manpage writer on 2008-05-05 09:33. -.\" +.\" diff --git a/man/man8/puppetdoc.8 b/man/man8/puppetdoc.8 index 8303b7ae0..db6d1d78e 100644 --- a/man/man8/puppetdoc.8 +++ b/man/man8/puppetdoc.8 @@ -1,6 +1,6 @@ .TH "" "" "" .SH NAME - \- + \- .\" Man page generated from reStructeredText. @@ -59,4 +59,4 @@ Public License .\" Generated by docutils manpage writer on 2008-05-05 09:33. -.\" +.\" diff --git a/man/man8/puppetmasterd.8 b/man/man8/puppetmasterd.8 index c14da72d3..be43a8b4a 100644 --- a/man/man8/puppetmasterd.8 +++ b/man/man8/puppetmasterd.8 @@ -1,6 +1,6 @@ .TH "" "" "" .SH NAME - \- + \- .\" Man page generated from reStructeredText. @@ -84,4 +84,4 @@ License .\" Generated by docutils manpage writer on 2008-05-05 09:33. -.\" +.\" diff --git a/man/man8/puppetrun.8 b/man/man8/puppetrun.8 index 6b4048170..72df1db78 100644 --- a/man/man8/puppetrun.8 +++ b/man/man8/puppetrun.8 @@ -1,6 +1,6 @@ .TH "" "" "" .SH NAME - \- + \- .\" Man page generated from reStructeredText. @@ -148,4 +148,4 @@ License .\" Generated by docutils manpage writer on 2008-05-05 09:33. -.\" +.\" diff --git a/man/man8/ralsh.8 b/man/man8/ralsh.8 index 89c99c982..2b0938c52 100644 --- a/man/man8/ralsh.8 +++ b/man/man8/ralsh.8 @@ -1,6 +1,6 @@ .TH "" "" "" .SH NAME - \- + \- .\" Man page generated from reStructeredText. vim: softtabstop=4 shiftwidth=4 expandtab @@ -97,7 +97,7 @@ verbose: Print extra information. .SH EXAMPLE -This example uses +This example uses .\" visit_literal ralsh .\" depart_literal @@ -132,4 +132,4 @@ Public License .\" Generated by docutils manpage writer on 2008-05-05 09:33. -.\" +.\" diff --git a/sbin/puppetca b/sbin/puppetca index 771e31b71..572f72c03 100755 --- a/sbin/puppetca +++ b/sbin/puppetca @@ -36,7 +36,7 @@ # '--clean', or '--list'. # # clean:: -# Remove all files related to a host from puppetca's storage. This is +# Remove all files related to a host from puppetca's storage. This is # useful when rebuilding hosts, since new certificate signing requests # will only be honored if puppetca does not have a copy of a signed # certificate for that host. The certificate of the host remains valid. @@ -54,7 +54,7 @@ # Print this help message # # list:: -# List outstanding certificate requests. If '--all' is specified, +# List outstanding certificate requests. If '--all' is specified, # signed certificates are also listed, prefixed by '+'. # # print:: @@ -97,4 +97,4 @@ # Licensed under the GNU Public License require 'puppet/application/puppetca' -Puppet::Application[:puppetca].run
\ No newline at end of file +Puppet::Application[:puppetca].run diff --git a/sbin/puppetd b/sbin/puppetd index 08accf576..650a7e722 100755 --- a/sbin/puppetd +++ b/sbin/puppetd @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# == Synopsis +# == Synopsis # # Retrieve the client configuration from the central puppet server and apply # it to the local host. diff --git a/sbin/puppetqd b/sbin/puppetqd index 14a15b519..5487a324f 100755 --- a/sbin/puppetqd +++ b/sbin/puppetqd @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# == Synopsis +# == Synopsis # # Retrieve serialized records from a queue and process them in order. # diff --git a/sbin/puppetrun b/sbin/puppetrun index da4f24a98..d3b2630af 100755 --- a/sbin/puppetrun +++ b/sbin/puppetrun @@ -44,10 +44,10 @@ # # [fileserver] # allow *.madstop.com -# +# # [puppetmaster] # allow *.madstop.com -# +# # [puppetrunner] # allow culain.madstop.com # @@ -109,7 +109,7 @@ # option requires LDAP support at this point. # # ping:: -# +# # Do a ICMP echo against the target host. Skip hosts that don't respond to ping. # # = Example diff --git a/spec/integration/indirector/rest.rb b/spec/integration/indirector/rest.rb index 26f3d60a8..27ffc95fe 100755 --- a/spec/integration/indirector/rest.rb +++ b/spec/integration/indirector/rest.rb @@ -7,19 +7,19 @@ require 'puppet/indirector/rest' # a fake class that will be indirected via REST class Puppet::TestIndirectedFoo - extend Puppet::Indirector + extend Puppet::Indirector indirects :test_indirected_foo, :terminus_setting => :test_indirected_foo_terminus - + attr_reader :value - + def initialize(value = 0) @value = value end - + def self.from_yaml(yaml) YAML.load(yaml) end - + def name "bob" end @@ -77,18 +77,18 @@ describe Puppet::Indirector::REST do # do not trigger the authorization layer Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:check_authorization).returns(true) end - + describe "when finding a model instance over REST" do describe "when a matching model instance can be found" do before :each do @model_instance = Puppet::TestIndirectedFoo.new(23) @mock_model.stubs(:find).returns @model_instance end - + it "should not fail" do lambda { Puppet::TestIndirectedFoo.find('bar') }.should_not raise_error end - + it 'should return an instance of the model class' do Puppet::TestIndirectedFoo.find('bar').class.should == Puppet::TestIndirectedFoo end @@ -97,11 +97,11 @@ describe Puppet::Indirector::REST do @mock_model.expects(:find).with { |key, args| args[:one] == "two" and args[:three] == "four" }.returns @model_instance Puppet::TestIndirectedFoo.find('bar', :one => "two", :three => "four") end - + it 'should return the instance of the model class associated with the provided lookup key' do Puppet::TestIndirectedFoo.find('bar').value.should == @model_instance.value end - + it 'should set an expiration on model instance' do Puppet::TestIndirectedFoo.find('bar').expiration.should_not be_nil end @@ -113,25 +113,25 @@ describe Puppet::Indirector::REST do Puppet::TestIndirectedFoo.find('bar') end end - + describe "when no matching model instance can be found" do before :each do @mock_model = stub('faked model', :name => "foo", :find => nil) Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model) end - + it "should return nil" do Puppet::TestIndirectedFoo.find('bar').should be_nil end end - + describe "when an exception is encountered in looking up a model instance" do before :each do @mock_model = stub('faked model', :name => "foo") @mock_model.stubs(:find).raises(RuntimeError) - Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model) + Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model) end - + it "should raise an exception" do lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(Net::HTTPError) end @@ -149,11 +149,11 @@ describe Puppet::Indirector::REST do @mock_model.stubs(:render_multiple).returns @model_instances.to_yaml end - + it "should not fail" do lambda { Puppet::TestIndirectedFoo.search('bar') }.should_not raise_error end - + it 'should return all matching results' do Puppet::TestIndirectedFoo.search('bar').length.should == @model_instances.length end @@ -162,13 +162,13 @@ describe Puppet::Indirector::REST do @mock_model.expects(:search).with { |key, args| args[:one] == "two" and args[:three] == "four" }.returns @model_instances Puppet::TestIndirectedFoo.search("foo", :one => "two", :three => "four") end - + it 'should return model instances' do - Puppet::TestIndirectedFoo.search('bar').each do |result| + Puppet::TestIndirectedFoo.search('bar').each do |result| result.class.should == Puppet::TestIndirectedFoo end end - + it 'should return the instance of the model class associated with the provided lookup key' do Puppet::TestIndirectedFoo.search('bar').collect { |i| i.value }.should == @model_instances.collect { |i| i.value } end @@ -179,7 +179,7 @@ describe Puppet::Indirector::REST do @mock_model = stub('faked model', :name => "foo", :find => nil) Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model) end - + it "should return nil" do Puppet::TestIndirectedFoo.find('bar').should be_nil end @@ -189,11 +189,11 @@ describe Puppet::Indirector::REST do before :each do @mock_model = stub('faked model') @mock_model.stubs(:find).raises(RuntimeError) - Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model) + Puppet::Indirector::Request.any_instance.stubs(:model).returns(@mock_model) end - + it "should raise an exception" do - lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(Net::HTTPError) + lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(Net::HTTPError) end end end @@ -203,33 +203,33 @@ describe Puppet::Indirector::REST do before :each do @mock_model.stubs(:destroy).returns true end - + it "should not fail" do lambda { Puppet::TestIndirectedFoo.destroy('bar') }.should_not raise_error end - + it 'should return success' do Puppet::TestIndirectedFoo.destroy('bar').should == true end end - + describe "when no matching model instance can be found" do before :each do @mock_model.stubs(:destroy).returns false end - + it "should return failure" do Puppet::TestIndirectedFoo.destroy('bar').should == false end end - + describe "when an exception is encountered in destroying a model instance" do before :each do @mock_model.stubs(:destroy).raises(RuntimeError) end - + it "should raise an exception" do - lambda { Puppet::TestIndirectedFoo.destroy('bar') }.should raise_error(Net::HTTPError) + lambda { Puppet::TestIndirectedFoo.destroy('bar') }.should raise_error(Net::HTTPError) end end end @@ -239,43 +239,43 @@ describe Puppet::Indirector::REST do @instance = Puppet::TestIndirectedFoo.new(42) @mock_model.stubs(:save_object).returns @instance @mock_model.stubs(:convert_from).returns @instance - Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:save_object).returns(@instance) + Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:save_object).returns(@instance) end - + describe "when a successful save can be performed" do before :each do end - + it "should not fail" do lambda { @instance.save }.should_not raise_error end - + it 'should return an instance of the model class' do @instance.save.class.should == Puppet::TestIndirectedFoo end - + it 'should return a matching instance of the model class' do @instance.save.value.should == @instance.value end end - + describe "when a save cannot be completed" do before :each do Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:save_object).returns(false) end - + it "should return failure" do @instance.save.should == false end end - + describe "when an exception is encountered in performing a save" do before :each do - Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:save_object).raises(RuntimeError) + Puppet::Network::HTTP::WEBrickREST.any_instance.stubs(:save_object).raises(RuntimeError) end - + it "should raise an exception" do - lambda { @instance.save }.should raise_error(Net::HTTPError) + lambda { @instance.save }.should raise_error(Net::HTTPError) end end end @@ -287,7 +287,7 @@ describe Puppet::Indirector::REST do describe "when using mongrel" do confine "Mongrel is not available" => Puppet.features.mongrel? - + before :each do Puppet[:servertype] = 'mongrel' @params = { :port => 34343, :handlers => [ :test_indirected_foo ] } @@ -314,18 +314,18 @@ describe Puppet::Indirector::REST do after do @server.unlisten end - + describe "when finding a model instance over REST" do describe "when a matching model instance can be found" do before :each do @model_instance = Puppet::TestIndirectedFoo.new(23) @mock_model.stubs(:find).returns @model_instance end - + it "should not fail" do lambda { Puppet::TestIndirectedFoo.find('bar') }.should_not raise_error end - + it 'should return an instance of the model class' do Puppet::TestIndirectedFoo.find('bar').class.should == Puppet::TestIndirectedFoo end @@ -334,11 +334,11 @@ describe Puppet::Indirector::REST do @mock_model.expects(:find).with { |key, args| args[:one] == "two" and args[:three] == "four" }.returns @model_instance Puppet::TestIndirectedFoo.find('bar', :one => "two", :three => "four") end - + it 'should return the instance of the model class associated with the provided lookup key' do Puppet::TestIndirectedFoo.find('bar').value.should == @model_instance.value end - + it 'should set an expiration on model instance' do Puppet::TestIndirectedFoo.find('bar').expiration.should_not be_nil end @@ -350,24 +350,24 @@ describe Puppet::Indirector::REST do Puppet::TestIndirectedFoo.find('bar') end end - + describe "when no matching model instance can be found" do before :each do @mock_model.stubs(:find).returns nil end - + it "should return nil" do Puppet::TestIndirectedFoo.find('bar').should be_nil end end - + describe "when an exception is encountered in looking up a model instance" do before :each do @mock_model.stubs(:find).raises(RuntimeError) end - + it "should raise an exception" do - lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(Net::HTTPError) + lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(Net::HTTPError) end end end @@ -383,11 +383,11 @@ describe Puppet::Indirector::REST do @mock_model.stubs(:search).returns @model_instances @mock_model.stubs(:render_multiple).returns @model_instances.to_yaml end - + it "should not fail" do lambda { Puppet::TestIndirectedFoo.search('bar') }.should_not raise_error end - + it 'should return all matching results' do Puppet::TestIndirectedFoo.search('bar').length.should == @model_instances.length end @@ -396,42 +396,42 @@ describe Puppet::Indirector::REST do @mock_model.expects(:search).with { |key, args| args[:one] == "two" and args[:three] == "four" }.returns @model_instances Puppet::TestIndirectedFoo.search('bar', :one => "two", :three => "four") end - + it 'should return model instances' do - Puppet::TestIndirectedFoo.search('bar').each do |result| + Puppet::TestIndirectedFoo.search('bar').each do |result| result.class.should == Puppet::TestIndirectedFoo end end - + it 'should return the instance of the model class associated with the provided lookup key' do Puppet::TestIndirectedFoo.search('bar').collect { |i| i.value }.should == @model_instances.collect { |i| i.value } end - + it 'should set an expiration on model instances' do Puppet::TestIndirectedFoo.search('bar').each do |result| result.expiration.should_not be_nil end end end - + describe "when no matching model instance can be found" do before :each do @mock_model.stubs(:search).returns nil @mock_model.stubs(:render_multiple).returns nil.to_yaml end - + it "should return nil" do Puppet::TestIndirectedFoo.search('bar').should == [] end end - + describe "when an exception is encountered in looking up a model instance" do before :each do @mock_model.stubs(:find).raises(RuntimeError) end - + it "should raise an exception" do - lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(Net::HTTPError) + lambda { Puppet::TestIndirectedFoo.find('bar') }.should raise_error(Net::HTTPError) end end end @@ -441,33 +441,33 @@ describe Puppet::Indirector::REST do before :each do @mock_model.stubs(:destroy).returns true end - + it "should not fail" do lambda { Puppet::TestIndirectedFoo.destroy('bar') }.should_not raise_error end - + it 'should return success' do Puppet::TestIndirectedFoo.destroy('bar').should == true end end - + describe "when no matching model instance can be found" do before :each do @mock_model.stubs(:destroy).returns false end - + it "should return failure" do Puppet::TestIndirectedFoo.destroy('bar').should == false end end - + describe "when an exception is encountered in destroying a model instance" do before :each do @mock_model.stubs(:destroy).raises(RuntimeError) end - + it "should raise an exception" do - lambda { Puppet::TestIndirectedFoo.destroy('bar') }.should raise_error(Net::HTTPError) + lambda { Puppet::TestIndirectedFoo.destroy('bar') }.should raise_error(Net::HTTPError) end end end @@ -479,13 +479,13 @@ describe Puppet::Indirector::REST do # LAK:NOTE This stub is necessary to prevent the REST call from calling # REST.save again, thus producing painful infinite recursion. - Puppet::Network::HTTP::MongrelREST.any_instance.stubs(:save_object).returns(@instance) + Puppet::Network::HTTP::MongrelREST.any_instance.stubs(:save_object).returns(@instance) end - + describe "when a successful save can be performed" do before :each do end - + it "should not fail" do lambda { @instance.save }.should_not raise_error end @@ -493,29 +493,29 @@ describe Puppet::Indirector::REST do it 'should return an instance of the model class' do @instance.save.class.should == Puppet::TestIndirectedFoo end - + it 'should return a matching instance of the model class' do @instance.save.value.should == @instance.value end end - + describe "when a save cannot be completed" do before :each do Puppet::Network::HTTP::MongrelREST.any_instance.stubs(:save_object).returns(false) end - + it "should return failure" do @instance.save.should == false end end - + describe "when an exception is encountered in performing a save" do before :each do - Puppet::Network::HTTP::MongrelREST.any_instance.stubs(:save_object).raises(RuntimeError) + Puppet::Network::HTTP::MongrelREST.any_instance.stubs(:save_object).raises(RuntimeError) end - + it "should raise an exception" do - lambda { @instance.save }.should raise_error(Net::HTTPError) + lambda { @instance.save }.should raise_error(Net::HTTPError) end end end diff --git a/spec/integration/network/server/mongrel.rb b/spec/integration/network/server/mongrel.rb index d621220e2..1365fbd41 100755 --- a/spec/integration/network/server/mongrel.rb +++ b/spec/integration/network/server/mongrel.rb @@ -7,12 +7,12 @@ require 'socket' describe Puppet::Network::Server do describe "when using mongrel" do confine "Mongrel is not available" => Puppet.features.mongrel? - + before :each do Puppet[:servertype] = 'mongrel' Puppet[:server] = '127.0.0.1' @params = { :port => 34346, :handlers => [ :node ] } - @server = Puppet::Network::Server.new(@params) + @server = Puppet::Network::Server.new(@params) end after { Puppet.settings.clear } @@ -26,11 +26,11 @@ describe Puppet::Network::Server do describe "when listening" do it "should be reachable on the specified address and port" do @server.listen - lambda { TCPSocket.new('127.0.0.1', 34346) }.should_not raise_error + lambda { TCPSocket.new('127.0.0.1', 34346) }.should_not raise_error end it "should default to '127.0.0.1' as its bind address" do - @server = Puppet::Network::Server.new(@params.merge(:port => 34343)) + @server = Puppet::Network::Server.new(@params.merge(:port => 34343)) @server.stubs(:unlisten) # we're breaking listening internally, so we have to keep it from unlistening @server.send(:http_server).expects(:listen).with { |args| args[:address] == "127.0.0.1" } @server.listen @@ -38,7 +38,7 @@ describe Puppet::Network::Server do it "should use any specified bind address" do Puppet[:bindaddress] = "0.0.0.0" - @server = Puppet::Network::Server.new(@params.merge(:port => 34343)) + @server = Puppet::Network::Server.new(@params.merge(:port => 34343)) @server.stubs(:unlisten) # we're breaking listening internally, so we have to keep it from unlistening @server.send(:http_server).expects(:listen).with { |args| args[:address] == "0.0.0.0" } @server.listen @@ -50,17 +50,17 @@ describe Puppet::Network::Server do lambda { @server2.listen }.should raise_error end end - + describe "after unlistening" do it "should not be reachable on the port and address assigned" do @server.listen @server.unlisten - lambda { TCPSocket.new('127.0.0.1', 34346) }.should raise_error(Errno::ECONNREFUSED) + lambda { TCPSocket.new('127.0.0.1', 34346) }.should raise_error(Errno::ECONNREFUSED) end end - + after :each do @server.unlisten if @server.listening? - end + end end end diff --git a/spec/integration/network/server/webrick.rb b/spec/integration/network/server/webrick.rb index 06916573f..73616d22d 100755 --- a/spec/integration/network/server/webrick.rb +++ b/spec/integration/network/server/webrick.rb @@ -42,13 +42,13 @@ describe Puppet::Network::Server do describe "when listening" do it "should be reachable on the specified address and port" do - @server = Puppet::Network::Server.new(@params.merge(:port => 34343)) + @server = Puppet::Network::Server.new(@params.merge(:port => 34343)) @server.listen - lambda { TCPSocket.new('127.0.0.1', 34343) }.should_not raise_error + lambda { TCPSocket.new('127.0.0.1', 34343) }.should_not raise_error end it "should default to '0.0.0.0' as its bind address" do - @server = Puppet::Network::Server.new(@params.merge(:port => 34343)) + @server = Puppet::Network::Server.new(@params.merge(:port => 34343)) @server.stubs(:unlisten) # we're breaking listening internally, so we have to keep it from unlistening @server.send(:http_server).expects(:listen).with { |args| args[:address] == "0.0.0.0" } @server.listen @@ -56,14 +56,14 @@ describe Puppet::Network::Server do it "should use any specified bind address" do Puppet[:bindaddress] = "127.0.0.1" - @server = Puppet::Network::Server.new(@params.merge(:port => 34343)) + @server = Puppet::Network::Server.new(@params.merge(:port => 34343)) @server.stubs(:unlisten) # we're breaking listening internally, so we have to keep it from unlistening @server.send(:http_server).expects(:listen).with { |args| args[:address] == "127.0.0.1" } @server.listen end it "should not allow multiple servers to listen on the same address and port" do - @server = Puppet::Network::Server.new(@params.merge(:port => 34343)) + @server = Puppet::Network::Server.new(@params.merge(:port => 34343)) @server.listen @server2 = Puppet::Network::Server.new(@params.merge(:port => 34343)) lambda { @server2.listen }.should raise_error @@ -76,10 +76,10 @@ describe Puppet::Network::Server do describe "after unlistening" do it "should not be reachable on the port and address assigned" do - @server = Puppet::Network::Server.new(@params.merge(:port => 34343)) + @server = Puppet::Network::Server.new(@params.merge(:port => 34343)) @server.listen @server.unlisten - lambda { TCPSocket.new('127.0.0.1', 34343) }.should raise_error(Errno::ECONNREFUSED) + lambda { TCPSocket.new('127.0.0.1', 34343) }.should raise_error(Errno::ECONNREFUSED) end end end diff --git a/spec/integration/type/file.rb b/spec/integration/type/file.rb index ef0cd3924..2877153f0 100755 --- a/spec/integration/type/file.rb +++ b/spec/integration/type/file.rb @@ -143,7 +143,7 @@ describe Puppet::Type.type(:file) do @catalog.resource(:file, File.join(@dest, "two")).should be_instance_of(@file.class) end end - + it "should have an edge to each resource in the relationship graph" do @catalog.apply do |trans| one = @catalog.resource(:file, File.join(@dest, "one")) diff --git a/spec/integration/type/tidy.rb b/spec/integration/type/tidy.rb index c2206f97d..632e21bb8 100755 --- a/spec/integration/type/tidy.rb +++ b/spec/integration/type/tidy.rb @@ -14,7 +14,7 @@ describe Puppet::Type.type(:tidy) do target = tmpfile("no_such_file_tidy_link_testing") Dir.mkdir(dir) File.symlink(target, link) - + tidy = Puppet::Type.type(:tidy).new :path => dir, :recurse => true catalog = Puppet::Resource::Catalog.new diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 5c7b6ee86..7e19b1d07 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -6,7 +6,7 @@ $LOAD_PATH.unshift("#{dir}/../lib") $LOAD_PATH.unshift("#{dir}/../test/lib") # Add the old test dir, so that we can still find our local mocha and spec # include any gems in vendor/gems -Dir["#{dir}/../vendor/gems/**"].each do |path| +Dir["#{dir}/../vendor/gems/**"].each do |path| libpath = File.join(path, "lib") if File.directory?(libpath) $LOAD_PATH.unshift(libpath) diff --git a/spec/unit/agent.rb b/spec/unit/agent.rb index a583a5210..c133ca9cc 100755 --- a/spec/unit/agent.rb +++ b/spec/unit/agent.rb @@ -169,7 +169,7 @@ describe Puppet::Agent do @agent.should be_splayed end end - + describe "when stopping" do it "should do nothing if already stopping" do @agent.expects(:stopping?).returns true diff --git a/spec/unit/configurer.rb b/spec/unit/configurer.rb index c27445a64..95d205d56 100755 --- a/spec/unit/configurer.rb +++ b/spec/unit/configurer.rb @@ -55,7 +55,7 @@ describe Puppet::Configurer, "when executing a catalog run" do catalog.expects(:apply).with(:one => true) @agent.run :one => true end - + it "should benchmark how long it takes to apply the catalog" do @agent.expects(:benchmark).with(:notice, "Finished catalog run") diff --git a/spec/unit/daemon.rb b/spec/unit/daemon.rb index 0477decb1..960d79d50 100755 --- a/spec/unit/daemon.rb +++ b/spec/unit/daemon.rb @@ -133,7 +133,7 @@ describe Puppet::Daemon do sync = mock 'sync' Puppet::Util.expects(:sync).with("me").returns sync - + sync.expects(:synchronize).with(Sync::EX) @daemon.create_pidfile end @@ -170,7 +170,7 @@ describe Puppet::Daemon do sync = mock 'sync' Puppet::Util.expects(:sync).with("me").returns sync - + sync.expects(:synchronize).with(Sync::EX) @daemon.remove_pidfile end diff --git a/spec/unit/indirector.rb b/spec/unit/indirector.rb index c77ab0f62..0b4c61695 100755 --- a/spec/unit/indirector.rb +++ b/spec/unit/indirector.rb @@ -36,7 +36,7 @@ describe Puppet::Indirector, "when registering an indirection" do @indirection = @thingie.indirects(:test) @indirection.should be_instance_of(Puppet::Indirector::Indirection) end - + it "should not allow a model to register under multiple names" do # Keep track of the indirection instance so we can delete it on cleanup @indirection = @thingie.indirects :first diff --git a/spec/unit/indirector/active_record.rb b/spec/unit/indirector/active_record.rb index 6d81b0fbe..c3cdc07ed 100755 --- a/spec/unit/indirector/active_record.rb +++ b/spec/unit/indirector/active_record.rb @@ -47,7 +47,7 @@ describe Puppet::Indirector::ActiveRecord do @terminus.find(@request) end - + it "should return nil if no instance is found" do @ar_model.expects(:find_by_name).with(@name).returns nil @terminus.find(@request).should be_nil diff --git a/spec/unit/indirector/catalog/active_record.rb b/spec/unit/indirector/catalog/active_record.rb index 2b5395a36..4b02178cd 100755 --- a/spec/unit/indirector/catalog/active_record.rb +++ b/spec/unit/indirector/catalog/active_record.rb @@ -54,7 +54,7 @@ describe Puppet::Resource::Catalog::ActiveRecord do result.should be_instance_of(Puppet::Resource::Catalog) result.name.should == "foo" end - + it "should set each of the host's resources as a transportable resource within the catalog" do host = stub 'host', :name => "foo" Puppet::Rails::Host.expects(:find_by_name).returns host diff --git a/spec/unit/indirector/catalog/compiler.rb b/spec/unit/indirector/catalog/compiler.rb index 9dac76f0e..6e49a6529 100755 --- a/spec/unit/indirector/catalog/compiler.rb +++ b/spec/unit/indirector/catalog/compiler.rb @@ -189,7 +189,7 @@ describe Puppet::Resource::Catalog::Compiler do end it "should look node information up via the Node class with the provided key" do - @node.stubs :merge + @node.stubs :merge Puppet::Node.expects(:find).with(@name).returns(@node) @compiler.find(@request) end diff --git a/spec/unit/indirector/file.rb b/spec/unit/indirector/file.rb index d64ed9f57..c19d8bee1 100755 --- a/spec/unit/indirector/file.rb +++ b/spec/unit/indirector/file.rb @@ -24,7 +24,7 @@ describe Puppet::Indirector::File do @request = stub 'request', :key => @path end - + describe Puppet::Indirector::File, " when finding files" do it "should provide a method to return file contents at a specified path" do diff --git a/spec/unit/indirector/indirection.rb b/spec/unit/indirector/indirection.rb index af649bb88..5d9efd2ea 100755 --- a/spec/unit/indirector/indirection.rb +++ b/spec/unit/indirector/indirection.rb @@ -209,7 +209,7 @@ describe Puppet::Indirector::Indirection do @indirection.request(:funtest, "yayness").should equal(request) end end - + describe "and looking for a model instance" do before { @method = :find } @@ -425,7 +425,7 @@ describe Puppet::Indirector::Indirection do end end end - + describe "and removing a model instance" do before { @method = :destroy } @@ -580,7 +580,7 @@ describe Puppet::Indirector::Indirection do @indirection = Puppet::Indirector::Indirection.new(mock('model'), :test) Puppet::Indirector::Indirection.instance(:test).should equal(@indirection) end - + it "should return nil when the named indirection has not been created" do Puppet::Indirector::Indirection.instance(:test).should be_nil end @@ -590,7 +590,7 @@ describe Puppet::Indirector::Indirection do @indirection = Puppet::Indirector::Indirection.new(mock_model, :test) Puppet::Indirector::Indirection.model(:test).should equal(mock_model) end - + it "should return nil when no model matches the requested name" do Puppet::Indirector::Indirection.model(:test).should be_nil end @@ -776,10 +776,10 @@ describe Puppet::Indirector::Indirection do describe "and saving" do end - + describe "and finding" do end - + after :each do @indirection.delete end diff --git a/spec/unit/indirector/node/ldap.rb b/spec/unit/indirector/node/ldap.rb index d407796c6..e25bc36c4 100755 --- a/spec/unit/indirector/node/ldap.rb +++ b/spec/unit/indirector/node/ldap.rb @@ -12,7 +12,7 @@ describe Puppet::Node::Ldap do describe "when searching for a single node" do before :each do @searcher = Puppet::Node::Ldap.new - + @name = "mynode.domain.com" @node = stub 'node', :name => @name, :name= => nil @node.stub_everything diff --git a/spec/unit/indirector/node/rest.rb b/spec/unit/indirector/node/rest.rb index 3b99e33c4..c00bb98d0 100755 --- a/spec/unit/indirector/node/rest.rb +++ b/spec/unit/indirector/node/rest.rb @@ -8,6 +8,6 @@ describe Puppet::Node::Rest do before do @searcher = Puppet::Node::Rest.new end - - + + end diff --git a/spec/unit/indirector/rest.rb b/spec/unit/indirector/rest.rb index d135b8dba..9f77deb55 100755 --- a/spec/unit/indirector/rest.rb +++ b/spec/unit/indirector/rest.rb @@ -22,7 +22,7 @@ describe "a REST http call", :shared => true do @searcher.expects(:deserialize).with(@response).returns "myobject" @searcher.send(@method, *@arguments).should == 'myobject' - end + end end describe Puppet::Indirector::REST do @@ -171,7 +171,7 @@ describe Puppet::Indirector::REST do @searcher.expects(:deserialize).with(@response).returns "myobject" @searcher.find(@request).should == 'myobject' - end + end it "should use the URI generated by the Handler module" do @searcher.expects(:indirection2uri).with(@request).returns "/my/uri" @@ -218,7 +218,7 @@ describe Puppet::Indirector::REST do @searcher.expects(:deserialize).with(@response, true).returns "myobject" @searcher.search(@request).should == 'myobject' - end + end it "should use the URI generated by the Handler module" do @searcher.expects(:indirection2uri).with(@request).returns "/mys/uri" @@ -243,7 +243,7 @@ describe Puppet::Indirector::REST do @searcher.expects(:deserialize).raises(ArgumentError) lambda { @searcher.search(@request) }.should raise_error(ArgumentError) end - end + end describe "when doing a destroy" do before :each do @@ -270,7 +270,7 @@ describe Puppet::Indirector::REST do @searcher.expects(:deserialize).with(@response).returns "myobject" @searcher.destroy(@request).should == 'myobject' - end + end it "should use the URI generated by the Handler module" do @searcher.expects(:indirection2uri).with(@request).returns "/my/uri" @@ -341,7 +341,7 @@ describe Puppet::Indirector::REST do @searcher.expects(:deserialize).with(@response).returns "myobject" @searcher.save(@request).should == 'myobject' - end + end it "should provide an Accept header containing the list of supported formats joined with commas" do @connection.expects(:put).with { |path, data, args| args["Accept"] == "supported, formats" }.returns(@response) diff --git a/spec/unit/indirector/ssl_file.rb b/spec/unit/indirector/ssl_file.rb index 559e2f98d..7a9d629de 100755 --- a/spec/unit/indirector/ssl_file.rb +++ b/spec/unit/indirector/ssl_file.rb @@ -62,7 +62,7 @@ describe Puppet::Indirector::SslFile do Puppet::SSL::Host.expects(:ca_name).returns "amaca" @searcher.should be_ca("amaca") end - + describe "when choosing the location for certificates" do it "should set them at the ca setting's path if a ca setting is available and the name resolves to the CA name" do @file_class.store_in nil diff --git a/spec/unit/network/handler/fileserver.rb b/spec/unit/network/handler/fileserver.rb index 386e77693..fbb5c8ae2 100644 --- a/spec/unit/network/handler/fileserver.rb +++ b/spec/unit/network/handler/fileserver.rb @@ -157,7 +157,7 @@ describe Puppet::Network::Handler::FileServer do it "should list a file within a directory when given the file path with recursion" do @mount.list("facter/fact.rb", true, "false").should == [["/", "file"], ["/", "file"]] end - + it "should return a merged view of all plugins for all modules" do list = @mount.list("facter",true,false) list.should == [["/", "directory"], ["/fact.rb", "file"], ["/", "directory"], ["/fact.rb", "file"]] diff --git a/spec/unit/network/http.rb b/spec/unit/network/http.rb index 1fa025b0b..220726788 100755 --- a/spec/unit/network/http.rb +++ b/spec/unit/network/http.rb @@ -11,7 +11,7 @@ describe Puppet::Network::HTTP do it "should return the webrick HTTP server class when asked for a webrick server" do Puppet::Network::HTTP.server_class_by_type(:webrick).should be(Puppet::Network::HTTP::WEBrick) end - + describe "when asked for a mongrel server" do if Puppet.features.mongrel? it "should return the mongrel server class" do @@ -23,12 +23,12 @@ describe Puppet::Network::HTTP do end end end - + it "should fail to return the mongrel HTTP server class if mongrel is not available " do Puppet.features.expects(:mongrel?).returns(false) Proc.new { Puppet::Network::HTTP.server_class_by_type(:mongrel) }.should raise_error(ArgumentError) end - + it "should return an error when asked for an unknown server" do Proc.new { Puppet::Network::HTTP.server_class_by_type :foo }.should raise_error(ArgumentError) end diff --git a/spec/unit/network/http/handler.rb b/spec/unit/network/http/handler.rb index 1d10447af..8ef6e00d1 100755 --- a/spec/unit/network/http/handler.rb +++ b/spec/unit/network/http/handler.rb @@ -12,7 +12,7 @@ describe Puppet::Network::HTTP::Handler do before do @handler = HttpHandled.new end - + it "should include the v1 REST API" do Puppet::Network::HTTP::Handler.ancestors.should be_include(Puppet::Network::HTTP::API::V1) end diff --git a/spec/unit/network/http/mongrel.rb b/spec/unit/network/http/mongrel.rb index 59f893251..c0ca68e43 100755 --- a/spec/unit/network/http/mongrel.rb +++ b/spec/unit/network/http/mongrel.rb @@ -8,7 +8,7 @@ require 'puppet/network/http' describe "Puppet::Network::HTTP::Mongrel", "after initializing" do confine "Mongrel is not available" => Puppet.features.mongrel? - + it "should not be listening" do require 'puppet/network/http/mongrel' @@ -33,34 +33,34 @@ describe "Puppet::Network::HTTP::Mongrel", "when turning on listening" do @listen_params = { :address => "127.0.0.1", :port => 31337, :protocols => [ :rest, :xmlrpc ], :xmlrpc_handlers => [ :status, :fileserver ] } end - + it "should fail if already listening" do @server.listen(@listen_params) Proc.new { @server.listen(@listen_params) }.should raise_error(RuntimeError) end - + it "should require at least one protocol" do Proc.new { @server.listen(@listen_params.delete_if {|k,v| :protocols == k}) }.should raise_error(ArgumentError) end - + it "should require a listening address to be specified" do Proc.new { @server.listen(@listen_params.delete_if {|k,v| :address == k})}.should raise_error(ArgumentError) end - + it "should require a listening port to be specified" do Proc.new { @server.listen(@listen_params.delete_if {|k,v| :port == k})}.should raise_error(ArgumentError) end - + it "should order a mongrel server to start" do @mock_mongrel.expects(:run) @server.listen(@listen_params) end - + it "should tell mongrel to listen on the specified address and port" do Mongrel::HttpServer.expects(:new).with("127.0.0.1", 31337).returns(@mock_mongrel) @server.listen(@listen_params) end - + it "should be listening" do Mongrel::HttpServer.expects(:new).returns(@mock_mongrel) @server.listen(@listen_params) @@ -72,9 +72,9 @@ describe "Puppet::Network::HTTP::Mongrel", "when turning on listening" do Puppet::Network::HTTP::MongrelREST.expects(:new).returns "myhandler" @mock_mongrel.expects(:register).with("/", "myhandler") - @server.listen(@listen_params) + @server.listen(@listen_params) end - + it "should use a Mongrel + REST class to configure Mongrel when REST services are requested" do @server.expects(:class_for_protocol).with(:rest).at_least_once.returns(Puppet::Network::HTTP::MongrelREST) @server.listen(@listen_params) @@ -102,26 +102,26 @@ end describe "Puppet::Network::HTTP::Mongrel", "when turning off listening" do confine "Mongrel is not available" => Puppet.features.mongrel? - + before do @mock_mongrel = mock('mongrel httpserver') @mock_mongrel.stubs(:run) @mock_mongrel.stubs(:register) Mongrel::HttpServer.stubs(:new).returns(@mock_mongrel) - @server = Puppet::Network::HTTP::Mongrel.new + @server = Puppet::Network::HTTP::Mongrel.new @listen_params = { :address => "127.0.0.1", :port => 31337, :handlers => [ :node, :catalog ], :protocols => [ :rest ] } end - + it "should fail unless listening" do Proc.new { @server.unlisten }.should raise_error(RuntimeError) end - + it "should order mongrel server to stop" do @server.listen(@listen_params) @mock_mongrel.expects(:stop) @server.unlisten end - + it "should not be listening" do @server.listen(@listen_params) @mock_mongrel.stubs(:stop) diff --git a/spec/unit/network/http/webrick.rb b/spec/unit/network/http/webrick.rb index a6fbfc83f..d0c4b5562 100755 --- a/spec/unit/network/http/webrick.rb +++ b/spec/unit/network/http/webrick.rb @@ -16,7 +16,7 @@ end describe Puppet::Network::HTTP::WEBrick, "when turning on listening" do before do @mock_webrick = stub('webrick', :[] => {}) - [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)} + [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)} WEBrick::HTTPServer.stubs(:new).returns(@mock_webrick) @server = Puppet::Network::HTTP::WEBrick.new [:setup_logger, :setup_ssl].each {|meth| @server.stubs(meth).returns({})} # the empty hash is required because of how we're merging @@ -37,7 +37,7 @@ describe Puppet::Network::HTTP::WEBrick, "when turning on listening" do end it "should require a listening port to be specified" do - Proc.new { @server.listen(@listen_params.delete_if {|k,v| :port == k})}.should raise_error(ArgumentError) + Proc.new { @server.listen(@listen_params.delete_if {|k,v| :port == k})}.should raise_error(ArgumentError) end it "should order a webrick server to start" do @@ -146,7 +146,7 @@ describe Puppet::Network::HTTP::WEBrick, "when looking up the class to handle a end it "should accept a protocol" do - lambda { Puppet::Network::HTTP::WEBrick.class_for_protocol("bob") }.should_not raise_error(ArgumentError) + lambda { Puppet::Network::HTTP::WEBrick.class_for_protocol("bob") }.should_not raise_error(ArgumentError) end it "should use a WEBrick + REST class when a REST protocol is specified" do @@ -163,7 +163,7 @@ describe Puppet::Network::HTTP::WEBrick, "when turning off listening" do @mock_webrick = stub('webrick', :[] => {}) [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)} WEBrick::HTTPServer.stubs(:new).returns(@mock_webrick) - @server = Puppet::Network::HTTP::WEBrick.new + @server = Puppet::Network::HTTP::WEBrick.new [:setup_logger, :setup_ssl].each {|meth| @server.stubs(meth).returns({})} # the empty hash is required because of how we're merging @listen_params = { :address => "127.0.0.1", :port => 31337, :handlers => [ :node, :catalog ], :protocols => [ :rest ] } end @@ -188,7 +188,7 @@ end describe Puppet::Network::HTTP::WEBrick do before do @mock_webrick = stub('webrick', :[] => {}) - [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)} + [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)} WEBrick::HTTPServer.stubs(:new).returns(@mock_webrick) @server = Puppet::Network::HTTP::WEBrick.new end diff --git a/spec/unit/network/rights.rb b/spec/unit/network/rights.rb index 8a86c8c34..244fa18c8 100755 --- a/spec/unit/network/rights.rb +++ b/spec/unit/network/rights.rb @@ -508,9 +508,9 @@ describe Puppet::Network::Rights do # mocha doesn't allow testing super... # it "should delegate to the AuthStore for the result" do # @acl.method(:save) - # + # # @acl.expects(:allowed?).with("me","127.0.0.1") - # + # # @acl.allowed?("me","127.0.0.1", :save) # end end diff --git a/spec/unit/network/server.rb b/spec/unit/network/server.rb index 081848d85..2aeb99a8b 100755 --- a/spec/unit/network/server.rb +++ b/spec/unit/network/server.rb @@ -68,7 +68,7 @@ describe Puppet::Network::Server do it "should fail to initialize if no listening port can be found" do Puppet.settings.stubs(:value).with(:bindaddress).returns("127.0.0.1") Puppet.settings.stubs(:value).with(:masterport).returns(nil) - lambda { Puppet::Network::Server.new }.should raise_error(ArgumentError) + lambda { Puppet::Network::Server.new }.should raise_error(ArgumentError) end it "should use the Puppet configurator to determine which HTTP server will be used to provide access to clients" do @@ -164,7 +164,7 @@ describe Puppet::Network::Server do sync = mock 'sync' Puppet::Util.expects(:sync).with("me").returns sync - + sync.expects(:synchronize).with(Sync::EX) @server.create_pidfile end @@ -201,7 +201,7 @@ describe Puppet::Network::Server do sync = mock 'sync' Puppet::Util.expects(:sync).with("me").returns sync - + sync.expects(:synchronize).with(Sync::EX) @server.remove_pidfile end @@ -265,7 +265,7 @@ describe Puppet::Network::Server do it "should allow the use of indirection names to specify which indirections are to be no longer accessible to clients" do @server.register(:foo) - lambda { @server.unregister(:foo) }.should_not raise_error + lambda { @server.unregister(:foo) }.should_not raise_error end it "should leave other indirections accessible to clients when turning off indirections" do @@ -292,7 +292,7 @@ describe Puppet::Network::Server do it "should disable client access immediately when turning off indirections" do @server.register(:foo, :bar) - @server.unregister(:foo) + @server.unregister(:foo) lambda { @server.unregister(:foo) }.should raise_error(ArgumentError) end @@ -339,7 +339,7 @@ describe Puppet::Network::Server do @server2.unregister(:foo, :xyzzy) lambda { @server.unregister(:xyzzy) }.should raise_error(ArgumentError) lambda { @server2.unregister(:bar) }.should raise_error(ArgumentError) - end + end describe "when managing xmlrpc registrations" do before do @@ -392,7 +392,7 @@ describe Puppet::Network::Server do it "should disable client access immediately when turning off namespaces" do @server.register_xmlrpc(:foo, :bar) - @server.unregister_xmlrpc(:foo) + @server.unregister_xmlrpc(:foo) lambda { @server.unregister_xmlrpc(:foo) }.should raise_error(ArgumentError) end @@ -414,7 +414,7 @@ describe Puppet::Network::Server do it "should indicate that it is not listening" do @server.should_not be_listening - end + end it "should not allow listening to be turned off" do lambda { @server.unlisten }.should raise_error(RuntimeError) @@ -461,7 +461,7 @@ describe Puppet::Network::Server do it "should fetch an instance of an HTTP server" do @server.stubs(:http_server_class).returns(@mock_http_server_class) @mock_http_server_class.expects(:new).returns(@mock_http_server) - @server.listen + @server.listen end it "should cause the HTTP server to listen" do @@ -507,7 +507,7 @@ describe Puppet::Network::Server do @mock_http_server.expects(:listen).with do |args| args[:protocols] == [ :rest, :xmlrpc ] end - @server.listen + @server.listen end end @@ -528,7 +528,7 @@ describe Puppet::Network::Server do Puppet::Indirector::Indirection.stubs(:model).returns mock('indirection') @server.register(:foo) - lambda { @server.unregister(:foo) }.should raise_error(RuntimeError) + lambda { @server.unregister(:foo) }.should raise_error(RuntimeError) end end end diff --git a/spec/unit/node/environment.rb b/spec/unit/node/environment.rb index 3b58a115b..f8b2dea7f 100755 --- a/spec/unit/node/environment.rb +++ b/spec/unit/node/environment.rb @@ -13,11 +13,11 @@ describe Puppet::Node::Environment do it "should include the Cacher module" do Puppet::Node::Environment.ancestors.should be_include(Puppet::Util::Cacher) end - + it "should use the filetimeout for the ttl for the modulepath" do Puppet::Node::Environment.attr_ttl(:modulepath).should == Integer(Puppet[:filetimeout]) end - + it "should use the filetimeout for the ttl for the module list" do Puppet::Node::Environment.attr_ttl(:modules).should == Integer(Puppet[:filetimeout]) end diff --git a/spec/unit/node/facts.rb b/spec/unit/node/facts.rb index a557066b8..a6e227ac3 100755 --- a/spec/unit/node/facts.rb +++ b/spec/unit/node/facts.rb @@ -36,7 +36,7 @@ describe Puppet::Node::Facts, "when indirecting" do Puppet.settings.expects(:value).with(:downcasefacts).returns true @facts.values["one"] = "Two" - + @facts.downcase_if_necessary @facts.values["one"].should == "two" end diff --git a/spec/unit/parser/ast.rb b/spec/unit/parser/ast.rb index 35e2b1eff..35f575b1b 100644 --- a/spec/unit/parser/ast.rb +++ b/spec/unit/parser/ast.rb @@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' require 'puppet/parser/ast' describe Puppet::Parser::AST do - + it "should use the file lookup module" do Puppet::Parser::AST.ancestors.should be_include(Puppet::FileCollection::Lookup) end diff --git a/spec/unit/parser/ast/arithmetic_operator.rb b/spec/unit/parser/ast/arithmetic_operator.rb index 9c1ff864e..4a0be483b 100755 --- a/spec/unit/parser/ast/arithmetic_operator.rb +++ b/spec/unit/parser/ast/arithmetic_operator.rb @@ -17,7 +17,7 @@ describe Puppet::Parser::AST::ArithmeticOperator do lval.expects(:safeevaluate).with(@scope).returns(1) rval = stub "rval" rval.expects(:safeevaluate).with(@scope).returns(2) - + operator = ast::ArithmeticOperator.new :rval => rval, :operator => "+", :lval => lval operator.evaluate(@scope) end @@ -65,7 +65,7 @@ describe Puppet::Parser::AST::ArithmeticOperator do @scope.expects(:lookupvar).with("two").returns(2) one = ast::Variable.new( :value => "one" ) two = ast::Variable.new( :value => "two" ) - + operator = ast::ArithmeticOperator.new :lval => one, :operator => "+", :rval => two operator.evaluate(@scope).should == 3 end diff --git a/spec/unit/parser/ast/astarray.rb b/spec/unit/parser/ast/astarray.rb index b3026fe1e..212c3fd14 100755 --- a/spec/unit/parser/ast/astarray.rb +++ b/spec/unit/parser/ast/astarray.rb @@ -11,14 +11,14 @@ describe Puppet::Parser::AST::ASTArray do array = Puppet::Parser::AST::ASTArray.new :children => [] array.should respond_to(:[]) end - + it "should evaluate all its children" do item1 = stub "item1", :is_a? => true item2 = stub "item2", :is_a? => true item1.expects(:safeevaluate).with(@scope).returns(123) item2.expects(:safeevaluate).with(@scope).returns(246) - + operator = Puppet::Parser::AST::ASTArray.new :children => [item1,item2] operator.evaluate(@scope) end @@ -29,9 +29,9 @@ describe Puppet::Parser::AST::ASTArray do item2.stubs(:is_a?).with(Puppet::Parser::AST).returns(true) item2.stubs(:instance_of?).with(Puppet::Parser::AST::ASTArray).returns(true) item2.stubs(:each).yields(item1) - + item1.expects(:safeevaluate).with(@scope).returns(123) - + operator = Puppet::Parser::AST::ASTArray.new :children => [item2] operator.evaluate(@scope).should == [123] end @@ -42,9 +42,9 @@ describe Puppet::Parser::AST::ASTArray do item2.stubs(:is_a?).with(Puppet::Parser::AST).returns(true) item2.stubs(:instance_of?).with(Puppet::Parser::AST::ASTArray).returns(true) item2.stubs(:each).yields([item1]) - + item1.expects(:safeevaluate).with(@scope).returns(123) - + operator = Puppet::Parser::AST::ASTArray.new :children => [item2] operator.evaluate(@scope).should == [123] end @@ -55,12 +55,12 @@ describe Puppet::Parser::AST::ASTArray do item2.stubs(:is_a?).with(Puppet::Parser::AST).returns(true) item2.stubs(:instance_of?).with(Puppet::Parser::AST::ASTArray).returns(true) item2.stubs(:each).yields([item1]) - + item1.expects(:safeevaluate).with(@scope).returns([123]) - + operator = Puppet::Parser::AST::ASTArray.new :children => [item2] operator.evaluate(@scope).should == [[123]] end - - + + end diff --git a/spec/unit/parser/ast/boolean_operator.rb b/spec/unit/parser/ast/boolean_operator.rb index 13f5e6530..d8e9603e8 100755 --- a/spec/unit/parser/ast/boolean_operator.rb +++ b/spec/unit/parser/ast/boolean_operator.rb @@ -17,7 +17,7 @@ describe Puppet::Parser::AST::BooleanOperator do lval.expects(:safeevaluate).with(@scope).returns("true") rval = stub "rval", :safeevaluate => false rval.expects(:safeevaluate).never - + operator = ast::BooleanOperator.new :rval => rval, :operator => "or", :lval => lval operator.evaluate(@scope) end diff --git a/spec/unit/parser/ast/collexpr.rb b/spec/unit/parser/ast/collexpr.rb index 5f0ca941e..51cd820a2 100755 --- a/spec/unit/parser/ast/collexpr.rb +++ b/spec/unit/parser/ast/collexpr.rb @@ -7,9 +7,9 @@ describe Puppet::Parser::AST::CollExpr do ast = Puppet::Parser::AST before :each do - @scope = Puppet::Parser::Scope.new() + @scope = Puppet::Parser::Scope.new() end - + describe "when evaluating with two operands" do before :each do @test1 = mock 'test1' @@ -31,14 +31,14 @@ describe Puppet::Parser::AST::CollExpr do end it "should propagate expression type and form to child if expression themselves" do - [@test1, @test2].each do |t| + [@test1, @test2].each do |t| t.expects(:is_a?).returns(true) t.expects(:form).returns(false) t.expects(:type).returns(false) t.expects(:type=) t.expects(:form=) end - + collexpr = ast::CollExpr.new(:test1 => @test1, :test2 => @test2, :oper=>"==", :form => true, :type => true) result = collexpr.evaluate(@scope) end @@ -48,7 +48,7 @@ describe Puppet::Parser::AST::CollExpr do @resource = mock 'resource' @resource.expects(:[]).with("test1").at_least(1).returns("test2") end - + it "should evaluate like the original expression for ==" do collexpr = ast::CollExpr.new(:test1 => @test1, :test2 => @test2, :oper => "==") collexpr.evaluate(@scope)[1].call(@resource).should === (@resource["test1"] == "test2") @@ -73,7 +73,7 @@ describe Puppet::Parser::AST::CollExpr do end end end - + it "should check for array member equality if resource parameter is an array for ==" do array = mock 'array', :safeevaluate => "array" test1 = mock 'test1' diff --git a/spec/unit/parser/ast/comparison_operator.rb b/spec/unit/parser/ast/comparison_operator.rb index 80e8307fa..26311797f 100755 --- a/spec/unit/parser/ast/comparison_operator.rb +++ b/spec/unit/parser/ast/comparison_operator.rb @@ -14,7 +14,7 @@ describe Puppet::Parser::AST::ComparisonOperator do lval.expects(:safeevaluate).with(@scope) rval = stub "rval" rval.expects(:safeevaluate).with(@scope) - + operator = Puppet::Parser::AST::ComparisonOperator.new :lval => lval, :operator => "==", :rval => rval operator.evaluate(@scope) end @@ -22,18 +22,18 @@ describe Puppet::Parser::AST::ComparisonOperator do it "should convert arguments strings to numbers if they are" do Puppet::Parser::Scope.expects(:number?).with("1").returns(1) Puppet::Parser::Scope.expects(:number?).with("2").returns(2) - + operator = Puppet::Parser::AST::ComparisonOperator.new :lval => @one, :operator => "==", :rval => @two operator.evaluate(@scope) end - + %w{< > <= >= ==}.each do |oper| it "should use string comparison #{oper} if operands are strings" do lval = stub 'one', :safeevaluate => "one" rval = stub 'two', :safeevaluate => "two" Puppet::Parser::Scope.stubs(:number?).with("one").returns(nil) Puppet::Parser::Scope.stubs(:number?).with("two").returns(nil) - + operator = Puppet::Parser::AST::ComparisonOperator.new :lval => lval, :operator => oper, :rval => rval operator.evaluate(@scope).should == "one".send(oper,"two") end @@ -44,11 +44,11 @@ describe Puppet::Parser::AST::ComparisonOperator do rval = stub 'two', :safeevaluate => "2" Puppet::Parser::Scope.stubs(:number?).with("one").returns(nil) Puppet::Parser::Scope.stubs(:number?).with("2").returns(2) - + operator = Puppet::Parser::AST::ComparisonOperator.new :lval => lval, :operator => ">", :rval => rval lambda { operator.evaluate(@scope) }.should raise_error(ArgumentError) end - + it "should fail for an unknown operator" do lambda { operator = Puppet::Parser::AST::ComparisonOperator.new :lval => @one, :operator => "or", :rval => @two }.should raise_error end @@ -56,7 +56,7 @@ describe Puppet::Parser::AST::ComparisonOperator do %w{< > <= >= ==}.each do |oper| it "should return the result of using '#{oper}' to compare the left and right sides" do operator = Puppet::Parser::AST::ComparisonOperator.new :lval => @one, :operator => oper, :rval => @two - + operator.evaluate(@scope).should == 1.send(oper,2) end end @@ -73,7 +73,7 @@ describe Puppet::Parser::AST::ComparisonOperator do @scope.expects(:lookupvar).with("one").returns(1) @scope.expects(:lookupvar).with("two").returns(2) - + operator = Puppet::Parser::AST::ComparisonOperator.new :lval => one, :operator => "<", :rval => two operator.evaluate(@scope).should == true end @@ -84,7 +84,7 @@ describe Puppet::Parser::AST::ComparisonOperator do ten = stub 'one', :safeevaluate => "10" nine = stub 'two', :safeevaluate => "9" operator = Puppet::Parser::AST::ComparisonOperator.new :lval => ten, :operator => oper, :rval => nine - + operator.evaluate(@scope).should == 10.send(oper,9) end end diff --git a/spec/unit/parser/ast/minus.rb b/spec/unit/parser/ast/minus.rb index 83bd92d0d..782fd3e0c 100755 --- a/spec/unit/parser/ast/minus.rb +++ b/spec/unit/parser/ast/minus.rb @@ -10,7 +10,7 @@ describe Puppet::Parser::AST::Minus do it "should evaluate its argument" do value = stub "value" value.expects(:safeevaluate).with(@scope).returns(123) - + operator = Puppet::Parser::AST::Minus.new :value => value operator.evaluate(@scope) end diff --git a/spec/unit/parser/ast/not.rb b/spec/unit/parser/ast/not.rb index 0fe2deddd..a3bf0b85d 100755 --- a/spec/unit/parser/ast/not.rb +++ b/spec/unit/parser/ast/not.rb @@ -12,7 +12,7 @@ describe Puppet::Parser::AST::Not do it "should evaluate its child expression" do val = stub "val" val.expects(:safeevaluate).with(@scope) - + operator = Puppet::Parser::AST::Not.new :value => val operator.evaluate(@scope) end diff --git a/spec/unit/parser/ast/resource_override.rb b/spec/unit/parser/ast/resource_override.rb index c1520bf78..2735757d4 100755 --- a/spec/unit/parser/ast/resource_override.rb +++ b/spec/unit/parser/ast/resource_override.rb @@ -31,19 +31,19 @@ describe Puppet::Parser::AST::ResourceOverride do it "should return the overriden resource directly when called with one item" do klass = stub 'klass', :title => "title", :type => "one" object = mock 'object', :safeevaluate => klass - override = ast::ResourceOverride.new(:object => object , :params => @params).evaluate(@scope) + override = ast::ResourceOverride.new(:object => object , :params => @params).evaluate(@scope) override.should be_an_instance_of(Puppet::Parser::Resource) override.title.should == "title" - override.type.should == "One" + override.type.should == "One" end it "should return an array of overriden resources when called with an array of titles" do klass1 = stub 'klass1', :title => "title1", :type => "one" klass2 = stub 'klass2', :title => "title2", :type => "one" - + object = mock 'object', :safeevaluate => [klass1,klass2] - - override = ast::ResourceOverride.new(:object => object , :params => @params).evaluate(@scope) + + override = ast::ResourceOverride.new(:object => object , :params => @params).evaluate(@scope) override.should have(2).elements override.each {|o| o.should be_an_instance_of(Puppet::Parser::Resource) } end diff --git a/spec/unit/parser/ast/resource_reference.rb b/spec/unit/parser/ast/resource_reference.rb index ce2915a97..c7b6e8780 100755 --- a/spec/unit/parser/ast/resource_reference.rb +++ b/spec/unit/parser/ast/resource_reference.rb @@ -23,7 +23,7 @@ describe Puppet::Parser::AST::ResourceReference do it "should evaluate correctly reference to define" do klass = stub 'klass', :title => "three", :classname => type @scope.stubs(:finddefine).returns(klass) - + newref("three", type).evaluate(@scope).to_ref.should == Puppet::Parser::Resource::Reference.new( :type => type, :title => "three" ).to_ref end end @@ -31,13 +31,13 @@ describe Puppet::Parser::AST::ResourceReference do it "should be able to call qualified_class" do klass = stub 'klass', :title => "three", :classname => "one" @scope.expects(:findclass).with("one").returns(klass) - newref("three","class").qualified_class(@scope,"one").should == "one" + newref("three","class").qualified_class(@scope,"one").should == "one" end it "should be able to find qualified classes when evaluating" do klass = stub 'klass', :title => "one", :classname => "one" @scope.stubs(:findclass).returns(klass) - + evaled = newref("one", "class").evaluate(@scope) evaled.type.should == "Class" evaled.title.should == "one" @@ -47,7 +47,7 @@ describe Puppet::Parser::AST::ResourceReference do titles = mock 'titles', :safeevaluate => ["title1","title2"] ref = ast::ResourceReference.new( :title => titles, :type => "Resource" ) ref.stubs(:qualified_type).with(@scope).returns("Resource") - + ref.evaluate(@scope).should have(2).elements end @@ -56,7 +56,7 @@ describe Puppet::Parser::AST::ResourceReference do ref = ast::ResourceReference.new( :title => titles, :type => "Class" ) ref.expects(:qualified_class).with(@scope,"title1").returns("class") ref.expects(:qualified_class).with(@scope,"title2").returns("class") - + ref.evaluate(@scope) end diff --git a/spec/unit/parser/ast/vardef.rb b/spec/unit/parser/ast/vardef.rb index 6bd355c89..14de68923 100755 --- a/spec/unit/parser/ast/vardef.rb +++ b/spec/unit/parser/ast/vardef.rb @@ -12,11 +12,11 @@ describe Puppet::Parser::AST::VarDef do it "should evaluate arguments" do name = mock 'name' value = mock 'value' - + name.expects(:safeevaluate).with(@scope) value.expects(:safeevaluate).with(@scope) - vardef = Puppet::Parser::AST::VarDef.new :name => name, :value => value, :file => nil, + vardef = Puppet::Parser::AST::VarDef.new :name => name, :value => value, :file => nil, :line => nil vardef.evaluate(@scope) end @@ -24,21 +24,21 @@ describe Puppet::Parser::AST::VarDef do it "should be in append=false mode if called without append" do name = stub 'name', :safeevaluate => "var" value = stub 'value', :safeevaluate => "1" - + @scope.expects(:setvar).with { |name,value,file,line,append| append == nil } - - vardef = Puppet::Parser::AST::VarDef.new :name => name, :value => value, :file => nil, + + vardef = Puppet::Parser::AST::VarDef.new :name => name, :value => value, :file => nil, :line => nil vardef.evaluate(@scope) end - + it "should call scope in append mode if append is true" do name = stub 'name', :safeevaluate => "var" value = stub 'value', :safeevaluate => "1" - + @scope.expects(:setvar).with { |name,value,file,line,append| append == true } - - vardef = Puppet::Parser::AST::VarDef.new :name => name, :value => value, :file => nil, + + vardef = Puppet::Parser::AST::VarDef.new :name => name, :value => value, :file => nil, :line => nil, :append => true vardef.evaluate(@scope) end diff --git a/spec/unit/parser/collector.rb b/spec/unit/parser/collector.rb index 4756204ce..813fbb8c0 100755 --- a/spec/unit/parser/collector.rb +++ b/spec/unit/parser/collector.rb @@ -496,7 +496,7 @@ describe Puppet::Parser::Collector, "when building its ActiveRecord query for co Puppet::Rails::Resource.stubs(:find).with { |*arguments| options = arguments[3] - options[:conditions][0] =~ /^host_id != \?/ and options[:conditions][1] == 5 + options[:conditions][0] =~ /^host_id != \?/ and options[:conditions][1] == 5 }.returns([]) @collector.evaluate diff --git a/spec/unit/parser/compiler.rb b/spec/unit/parser/compiler.rb index cf5ad086a..1a037b090 100755 --- a/spec/unit/parser/compiler.rb +++ b/spec/unit/parser/compiler.rb @@ -187,7 +187,7 @@ describe Puppet::Parser::Compiler do @compiler.add_resource(@scope, resource) resource.expects(:evaluate).never - + @compiler.compile end @@ -198,7 +198,7 @@ describe Puppet::Parser::Compiler do # We have to now mark the resource as evaluated resource.expects(:evaluate).with { |*whatever| resource.evaluated = true } - + @compiler.compile end @@ -206,7 +206,7 @@ describe Puppet::Parser::Compiler do resource = stub 'already_evaluated', :ref => "File[testing]", :builtin? => false, :evaluated? => true, :virtual? => false @compiler.add_resource(@scope, resource) resource.expects(:evaluate).never - + @compiler.compile end @@ -220,7 +220,7 @@ describe Puppet::Parser::Compiler do resource.expects(:evaluate).with { |*whatever| resource.evaluated = true; @compiler.add_resource(@scope, resource2) } resource2.expects(:evaluate).with { |*whatever| resource2.evaluated = true } - + @compiler.compile end @@ -296,7 +296,7 @@ describe Puppet::Parser::Compiler do @compiler.add_resource(@scope, resource) resource.expects(:evaluate).never - + @compiler.compile end end @@ -307,7 +307,7 @@ describe Puppet::Parser::Compiler do 2.times { |i| coll = mock 'coll%s' % i @compiler.add_collection(coll) - + # This is the hard part -- we have to emulate the fact that # collections delete themselves if they are done evaluating. coll.expects(:evaluate).with do diff --git a/spec/unit/parser/files.rb b/spec/unit/parser/files.rb index 2c91ea7e4..7aa1a34f5 100644 --- a/spec/unit/parser/files.rb +++ b/spec/unit/parser/files.rb @@ -26,7 +26,7 @@ describe Puppet::Parser::Files do mod.expects(:template).returns("/one/mymod/templates/mytemplate") Puppet::Parser::Files.find_template("mymod/mytemplate").should == "/one/mymod/templates/mytemplate" end - + it "should return the file in the templatedir if it exists" do Puppet.settings.expects(:value).with(:templatedir, nil).returns("/my/templates") Puppet[:modulepath] = "/one:/two" diff --git a/spec/unit/parser/functions/versioncmp.rb b/spec/unit/parser/functions/versioncmp.rb index 06b125ea0..0595f8711 100755 --- a/spec/unit/parser/functions/versioncmp.rb +++ b/spec/unit/parser/functions/versioncmp.rb @@ -15,11 +15,11 @@ describe "the versioncmp function" do it "should raise a ParseError if there is less than 2 arguments" do lambda { @scope.function_versioncmp(["1.2"]) }.should raise_error(Puppet::ParseError) end - + it "should raise a ParseError if there is more than 2 arguments" do lambda { @scope.function_versioncmp(["1.2", "2.4.5", "3.5.6"]) }.should raise_error(Puppet::ParseError) end - + it "should call Puppet::Util::Package.versioncmp (included in scope)" do Puppet::Util::Package.expects(:versioncmp).with("1.2", "1.3").returns(-1) diff --git a/spec/unit/parser/interpreter.rb b/spec/unit/parser/interpreter.rb index fe63bbd65..f06186a4e 100755 --- a/spec/unit/parser/interpreter.rb +++ b/spec/unit/parser/interpreter.rb @@ -98,7 +98,7 @@ describe Puppet::Parser::Interpreter do @interp.expects(:create_parser).with(:myenv).raises(Puppet::Error, "Could not parse") - lambda { @interp.parser(:myenv) }.should raise_error(Puppet::Error) + lambda { @interp.parser(:myenv) }.should raise_error(Puppet::Error) end end end diff --git a/spec/unit/parser/lexer.rb b/spec/unit/parser/lexer.rb index 24c34632f..2946c4152 100755 --- a/spec/unit/parser/lexer.rb +++ b/spec/unit/parser/lexer.rb @@ -135,10 +135,10 @@ describe Puppet::Parser::Lexer::TOKENS do :LBRACE => '{', :RBRACE => '}', :LPAREN => '(', - :RPAREN => ')', + :RPAREN => ')', :EQUALS => '=', :ISEQUAL => '==', - :GREATEREQUAL => '>=', + :GREATEREQUAL => '>=', :GREATERTHAN => '>', :LESSTHAN => '<', :LESSEQUAL => '<=', @@ -551,7 +551,7 @@ describe "Puppet::Parser::Lexer in the old tests" do it "should correctly parse names with numerals" do string = %w{1name name1 11names names11} - + string.each { |t| @lexer.string = t @lexer.fullscan.should == [[:NAME,t],[false,false]] diff --git a/spec/unit/parser/parser.rb b/spec/unit/parser/parser.rb index ef05bc876..2c34bb64b 100755 --- a/spec/unit/parser/parser.rb +++ b/spec/unit/parser/parser.rb @@ -40,7 +40,7 @@ describe Puppet::Parser do end it "boolean operation, it should create the correct ast objects" do - ast::BooleanOperator.expects(:new).with { + ast::BooleanOperator.expects(:new).with { |h| h[:rval].is_a?(ast::Boolean) and h[:lval].is_a?(ast::Boolean) and h[:operator]=="or" } @parser.parse("if true or true { $var = 1 }") @@ -48,7 +48,7 @@ describe Puppet::Parser do end it "comparison operation, it should create the correct ast objects" do - ast::ComparisonOperator.expects(:new).with { + ast::ComparisonOperator.expects(:new).with { |h| h[:lval].is_a?(ast::Name) and h[:rval].is_a?(ast::Name) and h[:operator]=="<" } @parser.parse("if 1 < 2 { $var = 1 }") @@ -60,10 +60,10 @@ describe Puppet::Parser do describe Puppet::Parser, "when parsing if complex expressions" do it "should create a correct ast tree" do aststub = stub_everything 'ast' - ast::ComparisonOperator.expects(:new).with { + ast::ComparisonOperator.expects(:new).with { |h| h[:rval].is_a?(ast::Name) and h[:lval].is_a?(ast::Name) and h[:operator]==">" }.returns(aststub) - ast::ComparisonOperator.expects(:new).with { + ast::ComparisonOperator.expects(:new).with { |h| h[:rval].is_a?(ast::Name) and h[:lval].is_a?(ast::Name) and h[:operator]=="==" }.returns(aststub) ast::BooleanOperator.expects(:new).with { @@ -79,7 +79,7 @@ describe Puppet::Parser do end describe Puppet::Parser, "when parsing resource references" do - + it "should not raise syntax errors" do lambda { @parser.parse('exec { test: param => File["a"] }') }.should_not raise_error end @@ -87,18 +87,18 @@ describe Puppet::Parser do it "should not raise syntax errors with multiple references" do lambda { @parser.parse('exec { test: param => File["a","b"] }') }.should_not raise_error end - + it "should create an ast::ResourceReference" do ast::Resource.stubs(:new) - ast::ResourceReference.expects(:new).with { |arg| + ast::ResourceReference.expects(:new).with { |arg| arg[:line]==1 and arg[:type]=="File" and arg[:title].is_a?(ast::ASTArray) } @parser.parse('exec { test: command => File["a","b"] }') end end - + describe Puppet::Parser, "when parsing resource overrides" do - + it "should not raise syntax errors" do lambda { @parser.parse('Resource["title"] { param => value }') }.should_not raise_error end @@ -108,14 +108,14 @@ describe Puppet::Parser do end it "should create an ast::ResourceOverride" do - ast::ResourceOverride.expects(:new).with { |arg| + ast::ResourceOverride.expects(:new).with { |arg| arg[:line]==1 and arg[:object].is_a?(ast::ResourceReference) and arg[:params].is_a?(ast::ResourceParam) } @parser.parse('Resource["title1","title2"] { param => value }') end - + end - + describe Puppet::Parser, "when parsing if statements" do it "should not raise errors with empty if" do @@ -172,7 +172,7 @@ describe Puppet::Parser do lambda { @parser.parse("$a = [1,2,]") }.should_not raise_error end end - + describe Puppet::Parser, "when instantiating class of same name" do before :each do diff --git a/spec/unit/provider/macauthorization.rb b/spec/unit/provider/macauthorization.rb index 8c9636f16..8e0ba2456 100755 --- a/spec/unit/provider/macauthorization.rb +++ b/spec/unit/provider/macauthorization.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# +# # Unit testing for the macauthorization provider # @@ -11,20 +11,20 @@ require 'facter/util/plist' provider_class = Puppet::Type.type(:macauthorization).provider(:macauthorization) describe provider_class do - + before :each do # Create a mock resource @resource = stub 'resource' - + @authname = "foo.spam.eggs.puppettest" @authplist = {} - + @rules = {@authname => @authplist} - + authdb = {} authdb["rules"] = { "foorule" => "foo" } authdb["rights"] = { "fooright" => "foo" } - + # Stub out Plist::parse_xml Plist.stubs(:parse_xml).returns(authdb) @@ -38,42 +38,42 @@ describe provider_class do @provider = provider_class.new(@resource) end - + it "should have a create method" do @provider.should respond_to(:create) end - + it "should have a destroy method" do @provider.should respond_to(:destroy) end - + it "should have an exists? method" do @provider.should respond_to(:exists?) end - + it "should have a flush method" do @provider.should respond_to(:flush) end - + properties = [ :allow_root, :authenticate_user, :auth_class, :comment, :group, :k_of_n, :mechanisms, :rule, :session_owner, :shared, :timeout, :tries, :auth_type ] - + properties.each do |prop| it "should have a #{prop.to_s} method" do @provider.should respond_to(prop.to_s) end - + it "should have a #{prop.to_s}= method" do @provider.should respond_to(prop.to_s + "=") end end - + describe "when destroying a right" do before :each do @resource.stubs(:[]).with(:auth_type).returns(:right) end - + it "should call the internal method destroy_right" do @provider.expects(:destroy_right) @provider.destroy @@ -83,41 +83,41 @@ describe provider_class do @provider.destroy end end - + describe "when destroying a rule" do before :each do @resource.stubs(:[]).with(:auth_type).returns(:rule) end - + it "should call the internal method destroy_rule" do @provider.expects(:destroy_rule) @provider.destroy end end - + describe "when flushing a right" do before :each do @resource.stubs(:[]).with(:auth_type).returns(:right) end - + it "should call the internal method flush_right" do @provider.expects(:flush_right) @provider.flush end - + it "should call the internal method set_right" do @provider.expects(:set_right) @provider.flush end - + it "should read and write to the auth database with the right arguments" do - @provider.expects(:execute).with() { |cmds, args| + @provider.expects(:execute).with() { |cmds, args| cmds.include?("read") and cmds.include?(@authname) and args[:combine] == false }.once - - @provider.expects(:execute).with() { |cmds, args| + + @provider.expects(:execute).with() { |cmds, args| cmds.include?("write") and cmds.include?(@authname) and args[:combine] == false and @@ -125,23 +125,23 @@ describe provider_class do }.once @provider.flush end - + end - + describe "when flushing a rule" do before :each do @resource.stubs(:[]).with(:auth_type).returns(:rule) end - + it "should call the internal method flush_rule" do @provider.expects(:flush_rule) @provider.flush end - + it "should call the internal method set_rule" do @provider.expects(:set_rule) @provider.flush end end -end
\ No newline at end of file +end diff --git a/spec/unit/provider/mcx/mcxcontent.rb b/spec/unit/provider/mcx/mcxcontent.rb index eedff7dad..d8f431afe 100755 --- a/spec/unit/provider/mcx/mcxcontent.rb +++ b/spec/unit/provider/mcx/mcxcontent.rb @@ -3,8 +3,8 @@ # Copyright (C) 2008 Jeffrey J McCune. # This program and entire repository is free software; you can -# redistribute it and/or modify it under the terms of the GNU -# General Public License as published by the Free Software +# redistribute it and/or modify it under the terms of the GNU +# General Public License as published by the Free Software # Foundation; either version 2 of the License, or any later version. # This program is distributed in the hope that it will be useful, @@ -74,11 +74,11 @@ describe provider_class do it "should execute external command dscl from :create" do @provider.class.expects(:dscl).returns('').once @provider.create - end + end it "should execute external command dscl from :destroy" do @provider.class.expects(:dscl).with('localhost', '-mcxdelete', @ds_path).returns('').once @provider.destroy - end + end it "should execute external command dscl from :exists?" do @provider.class.expects(:dscl).with('localhost', '-mcxexport', @ds_path).returns('').once @provider.exists? diff --git a/spec/unit/provider/package/apt.rb b/spec/unit/provider/package/apt.rb index 0ec1cd9ed..25d74bf90 100755 --- a/spec/unit/provider/package/apt.rb +++ b/spec/unit/provider/package/apt.rb @@ -98,40 +98,40 @@ Version table: it "should use 'apt-get install' with the package name if no version is asked for" do @resource.expects(:[]).with(:ensure).returns :installed @provider.expects(:aptget).with { |*command| command[-1] == "asdf" and command[-2] == :install } - + @provider.install end it "should specify the package version if one is asked for" do @resource.expects(:[]).with(:ensure).returns "1.0" @provider.expects(:aptget).with { |*command| command[-1] == "asdf=1.0" } - + @provider.install end it "should do a quiet install" do @provider.expects(:aptget).with { |*command| command.include?("-q") } - + @provider.install end it "should default to 'yes' for all questions" do @provider.expects(:aptget).with { |*command| command.include?("-y") } - + @provider.install end it "should keep config files if asked" do @resource.expects(:[]).with(:configfiles).returns :keep @provider.expects(:aptget).with { |*command| command.include?("DPkg::Options::=--force-confold") } - + @provider.install end it "should replace config files if asked" do @resource.expects(:[]).with(:configfiles).returns :replace @provider.expects(:aptget).with { |*command| command.include?("DPkg::Options::=--force-confnew") } - + @provider.install end end diff --git a/spec/unit/provider/package/pkgdmg.rb b/spec/unit/provider/package/pkgdmg.rb index ea65ba2d4..d43757401 100755 --- a/spec/unit/provider/package/pkgdmg.rb +++ b/spec/unit/provider/package/pkgdmg.rb @@ -8,11 +8,11 @@ describe provider do before do @resource = stub 'resource', :[] => "dummypkgdmg" @provider = provider.new(@resource) - + @fakemountpoint = "/tmp/dmg.foo" @fakehdiutilinfo = {"system-entities" => [{"mount-point" => @fakemountpoint}] } @fakehdiutilplist = Plist::Emit.dump(@fakehdiutilinfo) - + @hdiutilmountargs = ["mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp"] end @@ -20,17 +20,17 @@ describe provider do it "should not be versionable" do provider.versionable?.should be_false end - + it "should not be uninstallable" do provider.uninstallable?.should be_false end - + describe "when installing it should fail when" do it "no source is specified" do @resource.stubs(:[]).with(:source).returns nil lambda { @provider.install }.should raise_error(Puppet::Error) end - + it "no name is specified" do @resource.stubs(:[]).with(:name).returns nil lambda { @provider.install }.should raise_error(Puppet::Error) @@ -40,13 +40,13 @@ describe provider do @resource.stubs(:[]).with(:source).returns "notendingindotdmg" lambda { @provider.install }.should raise_error(Puppet::Error) end - + it "a disk image with no system entities is mounted" do @provider.stubs(:[]).with(:hdiutil).returns "" lambda { @provider.install }.should raise_error(Puppet::Error) end end - + # These tests shouldn't be this messy. The pkgdmg provider needs work... describe "when installing" do before do @@ -55,14 +55,14 @@ describe provider do @resource.stubs(:[]).with(:source).returns "foo.dmg" File.stubs(:open).yields fh end - + it "should call hdiutil to mount and eject the disk image" do Dir.stubs(:entries).returns [] @provider.class.expects(:hdiutil).with("eject", @fakemountpoint).returns 0 @provider.class.expects(:hdiutil).with("mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", nil).returns @fakehdiutilplist @provider.install end - + it "should call installpkg if a pkg/mpkg is found on the dmg" do Dir.stubs(:entries).returns ["foo.pkg"] @provider.class.stubs(:hdiutil).returns @fakehdiutilplist diff --git a/spec/unit/provider/selboolean.rb b/spec/unit/provider/selboolean.rb index 4006df151..2004485ca 100755 --- a/spec/unit/provider/selboolean.rb +++ b/spec/unit/provider/selboolean.rb @@ -26,7 +26,7 @@ describe provider_class do @provider.expects(:execpipe).with("/usr/sbin/setsebool foo off") @provider.value = :off end - + it "should call execpipe with -P when updating persistent boolean setting" do @resource.stubs(:[]).with(:persistent).returns :true @provider.expects(:command).with(:setsebool).returns "/usr/sbin/setsebool" diff --git a/spec/unit/provider/selmodule.rb b/spec/unit/provider/selmodule.rb index e92441d23..5f60322d8 100755 --- a/spec/unit/provider/selmodule.rb +++ b/spec/unit/provider/selmodule.rb @@ -16,7 +16,7 @@ describe provider_class do @provider = provider_class.new(@resource) end - describe "exists? method" do + describe "exists? method" do it "should find a module if it is already loaded" do @provider.expects(:command).with(:semodule).returns "/usr/sbin/semodule" @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields ["bar\t1.2.3\n", "foo\t4.4.4\n", "bang\t1.0.0\n"] @@ -45,7 +45,7 @@ describe provider_class do describe "syncversion" do it "should return :true if loaded and file modules are in sync" do - @provider.expects(:selmodversion_loaded).returns "1.5.0" + @provider.expects(:selmodversion_loaded).returns "1.5.0" @provider.expects(:selmodversion_file).returns "1.5.0" @provider.syncversion.should == :true end diff --git a/spec/unit/provider/service/daemontools.rb b/spec/unit/provider/service/daemontools.rb index 29e9dd5be..2e9abaca8 100644 --- a/spec/unit/provider/service/daemontools.rb +++ b/spec/unit/provider/service/daemontools.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# +# # Unit testing for the Daemontools service Provider # # author Brice Figureau @@ -32,7 +32,7 @@ describe provider_class do @provider.stubs(:resource).returns @resource end - + it "should have a restartcmd method" do @provider.should respond_to(:restartcmd) end diff --git a/spec/unit/provider/service/launchd.rb b/spec/unit/provider/service/launchd.rb index 8e657a622..b2c51a4d6 100755 --- a/spec/unit/provider/service/launchd.rb +++ b/spec/unit/provider/service/launchd.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# +# # Unit testing for the launchd service provider # @@ -14,7 +14,7 @@ describe provider_class do before :each do # Create a mock resource @resource = stub 'resource' - + @provider = provider_class.new @joblabel = "com.foo.food" @jobplist = {} @@ -30,7 +30,7 @@ describe provider_class do # stub out the provider methods that actually touch the filesystem # or execute commands - @provider.stubs(:plist_from_label).returns([@joblabel, @jobplist]) + @provider.stubs(:plist_from_label).returns([@joblabel, @jobplist]) @provider.stubs(:execute).returns("") @provider.stubs(:resource).returns @resource end @@ -38,28 +38,28 @@ describe provider_class do it "should have a start method for #{@provider.object_id}" do @provider.should respond_to(:start) end - + it "should have a stop method" do @provider.should respond_to(:stop) end - + it "should have an enabled? method" do @provider.should respond_to(:enabled?) end - + it "should have an enable method" do @provider.should respond_to(:enable) end - + it "should have a disable method" do @provider.should respond_to(:disable) end - + it "should have a status method" do @provider.should respond_to(:status) end - - + + describe "when checking status" do it "should call the external command 'launchctl list' once" do @provider.expects(:launchctl).with(:list).returns("rotating-strawberry-madonnas") @@ -74,7 +74,7 @@ describe provider_class do @provider.status.should == :running end end - + describe "when starting the service" do it "should look for the relevant plist once" do @provider.expects(:plist_from_label).once @@ -97,7 +97,7 @@ describe provider_class do @provider.start end end - + describe "when stopping the service" do it "should look for the relevant plist once" do @provider.expects(:plist_from_label).once @@ -120,7 +120,7 @@ describe provider_class do @provider.stop end end - + describe "when enabling the service" do it "should look for the relevant plist once" do @provider.expects(:plist_from_label).once @@ -131,12 +131,12 @@ describe provider_class do @provider.stop end end - + describe "when disabling the service" do it "should look for the relevant plist once" do @provider.expects(:plist_from_label).once @provider.stop end end - + end diff --git a/spec/unit/provider/service/runit.rb b/spec/unit/provider/service/runit.rb index 8eb53849b..b0c5dd896 100644 --- a/spec/unit/provider/service/runit.rb +++ b/spec/unit/provider/service/runit.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# +# # Unit testing for the Runit service Provider # # author Brice Figureau diff --git a/spec/unit/provider/user/ldap.rb b/spec/unit/provider/user/ldap.rb index f1c571779..a004e2081 100755 --- a/spec/unit/provider/user/ldap.rb +++ b/spec/unit/provider/user/ldap.rb @@ -27,7 +27,7 @@ describe provider_class do it "should be able to manage passwords" do provider_class.should be_manages_passwords end - + it "should use the ldap group provider to convert group names to numbers" do provider = provider_class.new(:name => "foo") Puppet::Type.type(:group).provider(:ldap).expects(:name2id).with("bar").returns 10 diff --git a/spec/unit/provider/user/user_role_add.rb b/spec/unit/provider/user/user_role_add.rb index 49359eb10..781eba428 100644 --- a/spec/unit/provider/user/user_role_add.rb +++ b/spec/unit/provider/user/user_role_add.rb @@ -239,7 +239,7 @@ describe provider_class do File.stubs(:rename) @provider.password=("hashedpassword") end - + it "should rename the /etc/shadow_tmp to /etc/shadow" do File.stubs(:open).with("/etc/shadow", "r") File.expects(:rename).with("/etc/shadow_tmp", "/etc/shadow") diff --git a/spec/unit/provider/zfs/solaris.rb b/spec/unit/provider/zfs/solaris.rb index 9189e44f0..8167340ce 100755 --- a/spec/unit/provider/zfs/solaris.rb +++ b/spec/unit/provider/zfs/solaris.rb @@ -43,15 +43,15 @@ describe provider_class do @provider.delete end end - + describe "when calling exist?" do it "should call zfs with :list" do #return stuff because we have to slice and dice it @provider.expects(:zfs).with(:list).returns("NAME USED AVAIL REFER MOUNTPOINT\nmyzfs 100K 27.4M /myzfs") @provider.exists? end - - it "should return true if returned values match the name" do + + it "should return true if returned values match the name" do @provider.stubs(:zfs).with(:list).returns("NAME USED AVAIL REFER MOUNTPOINT\n#{@resource[:name]} 100K 27.4M /myzfs") @provider.exists?.should == true end @@ -60,7 +60,7 @@ describe provider_class do @provider.stubs(:zfs).with(:list).returns("no soup for you") @provider.exists?.should == false end - + end [:mountpoint, :compression, :copies, :quota, :reservation, :sharenfs, :snapdir].each do |prop| diff --git a/spec/unit/provider/zone/solaris.rb b/spec/unit/provider/zone/solaris.rb index b7dd74705..4f061fef0 100755 --- a/spec/unit/provider/zone/solaris.rb +++ b/spec/unit/provider/zone/solaris.rb @@ -25,7 +25,7 @@ describe provider_class do @provider.expects(:zoneadm) @provider.install end - + it "should just install if there are no install args" do @resource.stubs(:[]).with(:install_args).returns(nil) @provider.expects(:zoneadm).with(:install) diff --git a/spec/unit/rails.rb b/spec/unit/rails.rb index df3f149da..d98c88774 100755 --- a/spec/unit/rails.rb +++ b/spec/unit/rails.rb @@ -18,18 +18,18 @@ describe Puppet::Rails, "when initializing any connection" do it "should use settings" do Puppet.settings.expects(:use).with(:main, :rails, :puppetmasterd) - + Puppet::Rails.connect end - + it "should set up a logger with the appropriate Rails log file" do logger = mock 'logger' Logger.expects(:new).with(Puppet[:railslog]).returns(logger) ActiveRecord::Base.expects(:logger=).with(logger) - + Puppet::Rails.connect end - + it "should set the log level to whatever the value is in the settings" do Puppet.settings.stubs(:use) Puppet.settings.stubs(:value).with(:rails_loglevel).returns("debug") @@ -42,20 +42,20 @@ describe Puppet::Rails, "when initializing any connection" do ActiveRecord::Base.stubs(:verify_active_connections!) ActiveRecord::Base.stubs(:establish_connection) Puppet::Rails.stubs(:database_arguments) - + Puppet::Rails.connect end - + it "should call ActiveRecord::Base.verify_active_connections!" do ActiveRecord::Base.expects(:verify_active_connections!) - + Puppet::Rails.connect end - + it "should call ActiveRecord::Base.establish_connection with database_arguments" do Puppet::Rails.expects(:database_arguments) ActiveRecord::Base.expects(:establish_connection) - + Puppet::Rails.connect end end @@ -67,7 +67,7 @@ describe Puppet::Rails, "when initializing a sqlite3 connection" do Puppet.settings.expects(:value).with(:dbadapter).returns("sqlite3") Puppet.settings.expects(:value).with(:rails_loglevel).returns("testlevel") Puppet.settings.expects(:value).with(:dblocation).returns("testlocation") - + Puppet::Rails.database_arguments.should == { :adapter => "sqlite3", :log_level => "testlevel", @@ -87,7 +87,7 @@ describe Puppet::Rails, "when initializing a mysql or postgresql connection" do Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword") Puppet.settings.stubs(:value).with(:dbname).returns("testname") Puppet.settings.stubs(:value).with(:dbsocket).returns("") - + Puppet::Rails.database_arguments.should == { :adapter => "mysql", :log_level => "testlevel", @@ -97,7 +97,7 @@ describe Puppet::Rails, "when initializing a mysql or postgresql connection" do :database => "testname" } end - + it "should provide the adapter, log_level, and host, username, password, database, and socket arguments" do Puppet.settings.stubs(:value).with(:dbadapter).returns("mysql") Puppet.settings.stubs(:value).with(:rails_loglevel).returns("testlevel") @@ -106,7 +106,7 @@ describe Puppet::Rails, "when initializing a mysql or postgresql connection" do Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword") Puppet.settings.stubs(:value).with(:dbname).returns("testname") Puppet.settings.stubs(:value).with(:dbsocket).returns("testsocket") - + Puppet::Rails.database_arguments.should == { :adapter => "mysql", :log_level => "testlevel", diff --git a/spec/unit/resource/catalog.rb b/spec/unit/resource/catalog.rb index bf46f25cd..cf6a87461 100755 --- a/spec/unit/resource/catalog.rb +++ b/spec/unit/resource/catalog.rb @@ -114,7 +114,7 @@ describe Puppet::Resource::Catalog, "when compiling" do bucket.expects(:type=).with("Class") bucket.expects(:name=).with(:main) main.stubs(:builtin?).returns(false) - + Puppet::TransBucket.expects(:new).returns bucket config.extract_to_transportable.should equal(bucket) @@ -380,7 +380,7 @@ describe Puppet::Resource::Catalog, "when compiling" do @catalog.make_default_resources @catalog.resource(:schedule, "daily").should_not be_nil end - + it "should optionally support an initialization block and should finalize after such blocks" do @one.expects :finish @two.expects :finish @@ -539,7 +539,7 @@ describe Puppet::Resource::Catalog, "when compiling" do @transaction.expects :cleanup @catalog.apply end - + it "should return the transaction" do @catalog.apply.should equal(@transaction) end @@ -549,7 +549,7 @@ describe Puppet::Resource::Catalog, "when compiling" do trans.should equal(@transaction) end end - + it "should default to not being a host catalog" do @catalog.host_config.should be_nil end @@ -589,7 +589,7 @@ describe Puppet::Resource::Catalog, "when compiling" do @transaction.stubs(:addtimes) file = Puppet::Type.type(:file).new(:name => "/yay", :ensure => :file) @catalog.apply do |trans| - @catalog.add_resource file + @catalog.add_resource file @catalog.resource("File[/yay]").should_not be_nil end @catalog.resource("File[/yay]").should be_nil @@ -644,7 +644,7 @@ describe Puppet::Resource::Catalog, "when compiling" do before do @catalog.host_config = false end - + it "should never send reports" do Puppet[:report] = true Puppet[:summarize] = true diff --git a/spec/unit/simple_graph.rb b/spec/unit/simple_graph.rb index 739ce4ee8..22d6ebe3d 100755 --- a/spec/unit/simple_graph.rb +++ b/spec/unit/simple_graph.rb @@ -251,7 +251,7 @@ describe Puppet::SimpleGraph do @graph.vertex?(:one).should be_true @graph.vertex?(:two).should be_true end - + it "should retain labels on edges" do @graph.add_edge(:one, :two, :callback => :awesome) edge = @graph.reversal.edge(:two, :one) @@ -377,7 +377,7 @@ describe Puppet::SimpleGraph do describe "when determining dependencies" do before do @graph = Puppet::SimpleGraph.new - + @graph.add_edge("a", "b") @graph.add_edge("a", "c") @graph.add_edge("b", "d") @@ -402,7 +402,7 @@ describe Puppet::SimpleGraph do it "should find single dependencies" do @graph.dependencies("c").sort.should == %w{a} end - + it "should return an empty array when there are no dependencies" do @graph.dependencies("a").sort.should == [] end @@ -417,16 +417,16 @@ describe Puppet::SimpleGraph do def each @children.each do |c| yield c end end - + def initialize(name, ary) @name = name @children = ary end - + def push(*ary) ary.each { |c| @children.push(c)} end - + def to_s @name end diff --git a/spec/unit/ssl/certificate_authority.rb b/spec/unit/ssl/certificate_authority.rb index fb30cb027..4c2466d93 100755 --- a/spec/unit/ssl/certificate_authority.rb +++ b/spec/unit/ssl/certificate_authority.rb @@ -274,7 +274,7 @@ describe Puppet::SSL::CertificateAuthority do @ca.next_serial.should == 2 end - + it "should write the next serial number to the serial file as hex" do @filehandle.expects(:<<).with("0002") @@ -552,7 +552,7 @@ describe Puppet::SSL::CertificateAuthority do @ca.waiting?.should == %w{one two} end - + it "should delegate removing hosts to the Host class" do Puppet::SSL::Host.expects(:destroy).with("myhost") diff --git a/spec/unit/ssl/certificate_authority/interface.rb b/spec/unit/ssl/certificate_authority/interface.rb index 617cfa6ba..784c6cf9a 100755 --- a/spec/unit/ssl/certificate_authority/interface.rb +++ b/spec/unit/ssl/certificate_authority/interface.rb @@ -107,7 +107,7 @@ describe Puppet::SSL::CertificateAuthority::Interface do it "should call :generate on the CA for each host specified" do @applier = @class.new(:generate, %w{host1 host2}) - + @ca.expects(:generate).with("host1") @ca.expects(:generate).with("host2") diff --git a/spec/unit/ssl/certificate_factory.rb b/spec/unit/ssl/certificate_factory.rb index 822b330f2..089ce3f43 100755 --- a/spec/unit/ssl/certificate_factory.rb +++ b/spec/unit/ssl/certificate_factory.rb @@ -96,7 +96,7 @@ describe Puppet::SSL::CertificateFactory do @factory.result end end - + describe "when building extensions" do it "should have tests" end diff --git a/spec/unit/ssl/host.rb b/spec/unit/ssl/host.rb index e4140f44c..38a1f3ed9 100755 --- a/spec/unit/ssl/host.rb +++ b/spec/unit/ssl/host.rb @@ -673,7 +673,7 @@ describe Puppet::SSL::Host do @host.expects(:exit).with(1).raises(SystemExit) lambda { @host.wait_for_cert(0) }.should raise_error(SystemExit) end - + it "should exit if the wait time is 0 and it can neither find nor retrieve a certificate" do @host.stubs(:certificate).returns nil @host.expects(:generate) diff --git a/spec/unit/transaction/change.rb b/spec/unit/transaction/change.rb index 1f69311cd..9e0cedc5c 100755 --- a/spec/unit/transaction/change.rb +++ b/spec/unit/transaction/change.rb @@ -93,7 +93,7 @@ describe Puppet::Transaction::Change do @change.stubs :event @change.forward end - + it "should produce a :noop event and return" do @property.stub_everything diff --git a/spec/unit/type.rb b/spec/unit/type.rb index 1d7f0d1a1..a9e48a274 100755 --- a/spec/unit/type.rb +++ b/spec/unit/type.rb @@ -128,7 +128,7 @@ describe Puppet::Type do it "should use the name from the hash as the title if no explicit title is provided" do Puppet::Type.type(:mount).new(:name => "/yay").title.should == "/yay" end - + it "should use the Resource Type's namevar to determine how to find the name in the hash" do Puppet::Type.type(:file).new(:path => "/yay").title.should == "/yay" end @@ -233,7 +233,7 @@ describe Puppet::Type do it "should use the name from the hash as the title if no explicit title is provided" do @type.hash2resource(:name => "foo").title.should == "foo" end - + it "should use the Resource Type's namevar to determine how to find the name in the hash" do @type.stubs(:namevar).returns :myname diff --git a/spec/unit/type/augeas.rb b/spec/unit/type/augeas.rb index 4a605f8f2..ff34d57ca 100644 --- a/spec/unit/type/augeas.rb +++ b/spec/unit/type/augeas.rb @@ -11,10 +11,10 @@ describe augeas do it "should have a default provider inheriting from Puppet::Provider" do augeas.defaultprovider.ancestors.should be_include(Puppet::Provider) end - + it "should have a valid provider" do augeas.new(:name => "foo").provider.class.ancestors.should be_include(Puppet::Provider) - end + end end describe "basic structure" do @@ -27,14 +27,14 @@ describe augeas do it "should have an parse_commands feature" do augeas.provider_feature(:parse_commands).should_not be_nil end - + it "should have an need_to_run? feature" do augeas.provider_feature(:need_to_run?).should_not be_nil - end - + end + it "should have an execute_changes feature" do augeas.provider_feature(:execute_changes).should_not be_nil - end + end properties = [:returns] params = [:name, :context, :onlyif, :changes, :root, :load_path, :type_check] @@ -47,8 +47,8 @@ describe augeas do it "should have documentation for its %s property" % property do augeas.attrclass(property).doc.should be_instance_of(String) end - end - + end + params.each do |param| it "should have a %s parameter" % param do augeas.attrclass(param).ancestors.should be_include(Puppet::Parameter) @@ -57,9 +57,9 @@ describe augeas do it "should have documentation for its %s parameter" % param do augeas.attrclass(param).doc.should be_instance_of(String) end - end + end end - + describe "default values" do before do provider_class = augeas.provider(augeas.providers[0]) @@ -69,24 +69,24 @@ describe augeas do it "should be blank for context" do augeas.new(:name => :context)[:context].should == "" end - + it "should be blank for onlyif" do augeas.new(:name => :onlyif)[:onlyif].should == "" - end - + end + it "should be blank for load_path" do augeas.new(:name => :load_path)[:load_path].should == "" - end - + end + it "should be / for root" do augeas.new(:name => :root)[:root].should == "/" - end - + end + it "should be false for type_check" do augeas.new(:name => :type_check)[:type_check].should == :false - end + end end - + describe "provider interaction" do it "should munge the changes" do provider = stub("provider", :parse_commands => "Jar Jar Binks") @@ -95,19 +95,19 @@ describe augeas do changes.value= "Testing 123" changes.value.should == "Jar Jar Binks" end - + it "should return 0 if it does not need to run" do provider = stub("provider", :need_to_run? => false) resource = stub('resource', :resource => nil, :provider => provider, :line => nil, :file => nil) changes = augeas.attrclass(:returns).new(:resource => resource) changes.retrieve.should == 0 - end - + end + it "should return :need_to_run if it needs to run" do provider = stub("provider", :need_to_run? => true) resource = stub('resource', :resource => nil, :provider => provider, :line => nil, :file => nil) changes = augeas.attrclass(:returns).new(:resource => resource) changes.retrieve.should == :need_to_run - end + end end end diff --git a/spec/unit/type/component.rb b/spec/unit/type/component.rb index 99421f81d..64d26d5e2 100755 --- a/spec/unit/type/component.rb +++ b/spec/unit/type/component.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby - + require File.dirname(__FILE__) + '/../../spec_helper' component = Puppet::Type.type(:component) diff --git a/spec/unit/type/computer.rb b/spec/unit/type/computer.rb index 26299487e..c81ee45ee 100755 --- a/spec/unit/type/computer.rb +++ b/spec/unit/type/computer.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby - + require File.dirname(__FILE__) + '/../../spec_helper' computer = Puppet::Type.type(:computer) @@ -15,16 +15,16 @@ describe Puppet::Type.type(:computer), " when checking computer objects" do @properties = {} @ensure = Puppet::Type::Computer.attrclass(:ensure).new(:resource => @resource) end - + it "should be able to create a instance" do provider_class = Puppet::Type::Computer.provider(Puppet::Type::Computer.providers[0]) Puppet::Type::Computer.expects(:defaultprovider).returns provider_class computer.new(:name => "bar").should_not be_nil end - + properties = [:en_address, :ip_address] params = [:name] - + properties.each do |property| it "should have a %s property" % property do computer.attrclass(property).ancestors.should be_include(Puppet::Property) @@ -33,14 +33,14 @@ describe Puppet::Type.type(:computer), " when checking computer objects" do it "should have documentation for its %s property" % property do computer.attrclass(property).doc.should be_instance_of(String) end - + it "should accept :absent as a value" do prop = computer.attrclass(property).new(:resource => @resource) prop.should = :absent prop.should.must == :absent end end - + params.each do |param| it "should have a %s parameter" % param do computer.attrclass(param).ancestors.should be_include(Puppet::Parameter) @@ -50,7 +50,7 @@ describe Puppet::Type.type(:computer), " when checking computer objects" do computer.attrclass(param).doc.should be_instance_of(String) end end - + describe "default values" do before do provider_class = computer.provider(computer.providers[0]) @@ -60,17 +60,17 @@ describe Puppet::Type.type(:computer), " when checking computer objects" do it "should be nil for en_address" do computer.new(:name => :en_address)[:en_address].should == nil end - + it "should be nil for ip_address" do computer.new(:name => :ip_address)[:ip_address].should == nil end end - - describe "when managing the ensure property" do + + describe "when managing the ensure property" do it "should support a :present value" do lambda { @ensure.should = :present }.should_not raise_error end - + it "should support an :absent value" do lambda { @ensure.should = :absent }.should_not raise_error end diff --git a/spec/unit/type/file.rb b/spec/unit/type/file.rb index 582cc1f81..efe2ac251 100755 --- a/spec/unit/type/file.rb +++ b/spec/unit/type/file.rb @@ -443,7 +443,7 @@ describe Puppet::Type.type(:file) do it "should store the metadata in the source property for each resource so the source does not have to requery the metadata" do @file.stubs(:perform_recursion).returns [@first] @resource.expects(:parameter).with(:source).returns @parameter - + @parameter.expects(:metadata=).with(@first) @file.recurse_remote("first" => @resource) @@ -463,7 +463,7 @@ describe Puppet::Type.type(:file) do @file.stubs(:perform_recursion).returns [@first] @file.parameter(:source).expects(:metadata=).with @first - + @file.recurse_remote("first" => @resource) end diff --git a/spec/unit/type/file/content.rb b/spec/unit/type/file/content.rb index 0529cd33f..8bdb1f226 100755 --- a/spec/unit/type/file/content.rb +++ b/spec/unit/type/file/content.rb @@ -34,7 +34,7 @@ describe content do @content = content.new(:resource => @resource) @content.checksum_type.should == :litemd5 end - + it "should only return the checksum type from the checksum parameter if the parameter returns a whole checksum" do checksum = mock 'checksum' checksum.expects(:checktype).returns "{md5}something" diff --git a/spec/unit/type/macauthorization.rb b/spec/unit/type/macauthorization.rb index 5873265f5..191a16bd0 100755 --- a/spec/unit/type/macauthorization.rb +++ b/spec/unit/type/macauthorization.rb @@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' macauth_type = Puppet::Type.type(:macauthorization) describe Puppet::Type.type(:macauthorization), "when checking macauthorization objects" do - + before do authplist = {} authplist["rules"] = { "foorule" => "foo" } @@ -14,60 +14,60 @@ describe Puppet::Type.type(:macauthorization), "when checking macauthorization o Plist.stubs(:parse_xml).with("/etc/authorization").returns(authplist) macauth_type.stubs(:defaultprovider).returns provider_class end - + describe "when validating attributes" do - + parameters = [:name,] - properties = [:auth_type, :allow_root, :authenticate_user, :auth_class, - :comment, :group, :k_of_n, :mechanisms, :rule, + properties = [:auth_type, :allow_root, :authenticate_user, :auth_class, + :comment, :group, :k_of_n, :mechanisms, :rule, :session_owner, :shared, :timeout, :tries] - + parameters.each do |parameter| it "should have a %s parameter" % parameter do macauth_type.attrclass(parameter).ancestors.should be_include(Puppet::Parameter) end - + it "should have documentation for its %s parameter" % parameter do macauth_type.attrclass(parameter).doc.should be_instance_of(String) end end - + properties.each do |property| it "should have a %s property" % property do macauth_type.attrclass(property).ancestors.should be_include(Puppet::Property) end - + it "should have documentation for its %s property" % property do macauth_type.attrclass(property).doc.should be_instance_of(String) end end - + end - + describe "when validating properties" do - + it "should have a default provider inheriting from Puppet::Provider" do macauth_type.defaultprovider.ancestors.should be_include(Puppet::Provider) end - + it "should be able to create an instance" do lambda { macauth_type.new(:name => 'foo') }.should_not raise_error end - + it "should support :present as a value to :ensure" do lambda { macauth_type.new(:name => "foo", :ensure => :present) }.should_not raise_error end - + it "should support :absent as a value to :ensure" do lambda { macauth_type.new(:name => "foo", :ensure => :absent) }.should_not raise_error end - + end end diff --git a/spec/unit/type/mcx.rb b/spec/unit/type/mcx.rb index eee7793d8..8b5dfb073 100755 --- a/spec/unit/type/mcx.rb +++ b/spec/unit/type/mcx.rb @@ -3,8 +3,8 @@ # Copyright (C) 2008 Jeffrey J McCune. # This program and entire repository is free software; you can -# redistribute it and/or modify it under the terms of the GNU -# General Public License as published by the Free Software +# redistribute it and/or modify it under the terms of the GNU +# General Public License as published by the Free Software # Foundation; either version 2 of the License, or any later version. # This program is distributed in the hope that it will be useful, diff --git a/spec/unit/type/tidy.rb b/spec/unit/type/tidy.rb index cf244ca0e..caf5b22b7 100755 --- a/spec/unit/type/tidy.rb +++ b/spec/unit/type/tidy.rb @@ -15,7 +15,7 @@ describe tidy do File.expects(:lstat).with("/foo/bar").returns stat resource.stat("/foo/bar").should == stat end - + [:age, :size, :path, :matches, :type, :recurse, :rmdirs].each do |param| it "should have a %s parameter" % param do Puppet::Type.type(:tidy).attrclass(param).ancestors.should be_include(Puppet::Parameter) diff --git a/spec/unit/util/cache_accumulator.rb b/spec/unit/util/cache_accumulator.rb index 55ecb7e34..2d976d0b1 100644 --- a/spec/unit/util/cache_accumulator.rb +++ b/spec/unit/util/cache_accumulator.rb @@ -56,7 +56,7 @@ describe Puppet::Util::CacheAccumulator do name = 'foo' @test_class.expects(:find_or_create_by_name).with(name).returns(@test_class.new(name)).once @alt_class.expects(:find_or_create_by_name).with(name).returns(@alt_class.new(name)).once - + [@test_class, @alt_class].each do |klass| klass.accumulate_by_name(name).name.should == name klass.accumulate_by_name(name).class.should == klass diff --git a/spec/unit/util/cacher.rb b/spec/unit/util/cacher.rb index a1dd17adb..40688bc88 100755 --- a/spec/unit/util/cacher.rb +++ b/spec/unit/util/cacher.rb @@ -123,7 +123,7 @@ describe Puppet::Util::Cacher do it "should allow specification of a ttl for cached attributes" do klass = Class.new do - include Puppet::Util::Cacher + include Puppet::Util::Cacher end klass.cached_attr(:myattr, :ttl => 5) { Time.now } @@ -133,7 +133,7 @@ describe Puppet::Util::Cacher do it "should allow specification of a ttl as a string" do klass = Class.new do - include Puppet::Util::Cacher + include Puppet::Util::Cacher end klass.cached_attr(:myattr, :ttl => "5") { Time.now } @@ -143,7 +143,7 @@ describe Puppet::Util::Cacher do it "should fail helpfully if the ttl cannot be converted to an integer" do klass = Class.new do - include Puppet::Util::Cacher + include Puppet::Util::Cacher end lambda { klass.cached_attr(:myattr, :ttl => "yep") { Time.now } }.should raise_error(ArgumentError) @@ -151,7 +151,7 @@ describe Puppet::Util::Cacher do it "should not check for a ttl expiration if the class does not support that method" do klass = Class.new do - extend Puppet::Util::Cacher + extend Puppet::Util::Cacher end klass.metaclass.cached_attr(:myattr) { "eh" } @@ -163,7 +163,7 @@ describe Puppet::Util::Cacher do def self.to_s "CacheTestClass" end - include Puppet::Util::Cacher + include Puppet::Util::Cacher attr_accessor :value end diff --git a/spec/unit/util/package.rb b/spec/unit/util/package.rb index 7d956efb5..45eef4643 100644 --- a/spec/unit/util/package.rb +++ b/spec/unit/util/package.rb @@ -14,8 +14,8 @@ describe Puppet::Util::Package, " versioncmp" do ary = %w{ 1.1.6 2.3 1.1a 3.0 1.5 1 2.4 1.1-4 2.3.1 1.2 2.3.0 1.1-3 2.4b 2.4 2.40.2 2.3a.1 3.1 0002 1.1-5 1.1.a 1.06} newary = ary.sort { |a, b| Puppet::Util::Package.versioncmp(a,b) } - + newary.should == ["0002", "1", "1.06", "1.1-3", "1.1-4", "1.1-5", "1.1.6", "1.1.a", "1.1a", "1.2", "1.5", "2.3", "2.3.0", "2.3.1", "2.3a.1", "2.4", "2.4", "2.4b", "2.40.2", "3.0", "3.1"] end - + end diff --git a/spec/unit/util/selinux.rb b/spec/unit/util/selinux.rb index db3ee413a..d5ec6d2d4 100644 --- a/spec/unit/util/selinux.rb +++ b/spec/unit/util/selinux.rb @@ -49,7 +49,7 @@ describe Puppet::Util::SELinux do it "should match a path on / to ext3" do find_fs('/etc/puppet/testfile').should == "ext3" end - + it "should match a path on /mnt/nfs to nfs" do find_fs('/mnt/nfs/testfile/foobar').should == "nfs" end @@ -112,7 +112,7 @@ describe Puppet::Util::SELinux do self.expects(:find_fs).with("/foo").returns "nfs" get_selinux_default_context("/foo").should be_nil end - + end describe "parse_selinux_context" do diff --git a/spec/unit/util/settings.rb b/spec/unit/util/settings.rb index 0bf2dbb19..c700c0c5f 100755 --- a/spec/unit/util/settings.rb +++ b/spec/unit/util/settings.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' -describe Puppet::Util::Settings do +describe Puppet::Util::Settings do describe "when specifying defaults" do before do @settings = Puppet::Util::Settings.new @@ -521,7 +521,7 @@ describe Puppet::Util::Settings do # Now replace the value text = "[main]\none = disk-replace\n" - + # This is kinda ridiculous - the reason it parses twice is that # it goes to parse again when we ask for the value, because the # mock always says it should get reparsed. diff --git a/spec/unit/util/storage.rb b/spec/unit/util/storage.rb index 7fdc3650d..a7dea4001 100755 --- a/spec/unit/util/storage.rb +++ b/spec/unit/util/storage.rb @@ -95,7 +95,7 @@ describe Puppet::Util::Storage do @path = transient.path() transient.close!() end - + it "should not fail to load()" do FileTest.exists?(@path).should be_false() Puppet[:statedir] = @path @@ -109,10 +109,10 @@ describe Puppet::Util::Storage do Puppet::Util::Storage.cache(:yayness) Puppet::Util::Storage.state().should == {:yayness=>{}} - + Puppet[:statefile] = @path proc { Puppet::Util::Storage.load() }.should_not raise_error() - + Puppet::Util::Storage.state().should == {:yayness=>{}} end end @@ -140,7 +140,7 @@ describe Puppet::Util::Storage do proc { Puppet::Util::Storage.load() }.should_not raise_error() Puppet::Util::Storage.state().should == test_yaml end - + it "should initialize with a clear internal state if the state file does not contain valid YAML" do @state_file.write(:booness) @state_file.flush() @@ -184,7 +184,7 @@ describe Puppet::Util::Storage do proc { Puppet::Util::Storage.load() }.should_not raise_error() Puppet::Util::Storage.state().should == test_yaml end - + after(:each) do @state_file.close!() Puppet[:statefile] = @saved_statefile diff --git a/test/Rakefile b/test/Rakefile index a1f8c26ec..47be213d9 100644 --- a/test/Rakefile +++ b/test/Rakefile @@ -75,8 +75,8 @@ filemap.each do |dir, files| t.libs += $test_library_paths + ['..'] t.libs << '..' t.test_files = [ file ] - t.verbose = true - end + t.verbose = true + end end end diff --git a/test/certmgr/ca.rb b/test/certmgr/ca.rb index e354f3dea..5b7944b46 100755 --- a/test/certmgr/ca.rb +++ b/test/certmgr/ca.rb @@ -22,11 +22,11 @@ class TestCA < Test::Unit::TestCase def mkca Puppet::SSLCertificates::CA.new end - + def test_clean dirs = [:csrdir, :signeddir, :publickeydir, :privatekeydir, :certdir] ca = mkca - + hosts.each do |host| files = [] dirs.each do |dir| @@ -46,7 +46,7 @@ class TestCA < Test::Unit::TestCase end end end - + def test_host2Xfile ca = mkca hosts.each do |host| @@ -60,7 +60,7 @@ class TestCA < Test::Unit::TestCase end end end - + def test_list ca = mkca # Make a fake csr @@ -71,7 +71,7 @@ class TestCA < Test::Unit::TestCase File.open(file, "w") { |f| f.puts "yay" } list << host.downcase end - + assert_equal(list.sort, ca.list.sort, "list was not correct") end diff --git a/test/certmgr/certmgr.rb b/test/certmgr/certmgr.rb index 033700089..2c4605f03 100755 --- a/test/certmgr/certmgr.rb +++ b/test/certmgr/certmgr.rb @@ -164,7 +164,7 @@ class TestCertMgr < Test::Unit::TestCase assert_equal($?,0) assert_equal(File.join(Puppet[:certdir], "signedcertest.pem: OK\n"), output) end - + def test_interactiveca ca = nil @@ -224,14 +224,14 @@ class TestCertMgr < Test::Unit::TestCase ca = mkCA() h1 = mksignedcert(ca, "host1.example.com") h2 = mksignedcert(ca, "host2.example.com") - + assert(ca.cert.verify(ca.cert.public_key)) assert(h1.verify(ca.cert.public_key)) assert(h2.verify(ca.cert.public_key)) crl = ca.crl assert_not_nil(crl) - + store = mkStore(ca) assert( store.verify(ca.cert)) assert( store.verify(h1, [ca.cert])) @@ -252,7 +252,7 @@ class TestCertMgr < Test::Unit::TestCase assert( store.verify(ca.cert), "Could not verify CA certs after reloading certs.") assert(!store.verify(h1, [ca.cert]), "Incorrectly verified revoked cert.") assert( store.verify(h2, [ca.cert]), "Could not verify certs with reloaded CA.") - + ca.revoke(h2.serial) assert_equal(1, ca.crl.extensions.size) diff --git a/test/data/providers/cron/crontab.allthree b/test/data/providers/cron/crontab.allthree index dd2a40466..c1a61c30d 100644 --- a/test/data/providers/cron/crontab.allthree +++ b/test/data/providers/cron/crontab.allthree @@ -1,4 +1,4 @@ ---- +--- - | # comment 1 # Puppet Name: name2 @@ -9,7 +9,7 @@ - - :record_type: :comment :line: "# comment 1" - :command: command4 - :environment: + :environment: - env3=val :name: name2 :record_type: :crontab diff --git a/test/data/providers/cron/crontab.envNcomment b/test/data/providers/cron/crontab.envNcomment index 63effe076..44d41f535 100644 --- a/test/data/providers/cron/crontab.envNcomment +++ b/test/data/providers/cron/crontab.envNcomment @@ -1,4 +1,4 @@ ---- +--- - | # comment 9 env10=val diff --git a/test/data/providers/cron/crontab.envNname b/test/data/providers/cron/crontab.envNname index cc058248e..7cbc3fce1 100644 --- a/test/data/providers/cron/crontab.envNname +++ b/test/data/providers/cron/crontab.envNname @@ -1,4 +1,4 @@ ---- +--- - | env6=val # Puppet Name: name7 diff --git a/test/data/providers/cron/crontab.multirecords b/test/data/providers/cron/crontab.multirecords index 63effe076..44d41f535 100644 --- a/test/data/providers/cron/crontab.multirecords +++ b/test/data/providers/cron/crontab.multirecords @@ -1,4 +1,4 @@ ---- +--- - | # comment 9 env10=val diff --git a/test/data/providers/cron/crontab_collections.yaml b/test/data/providers/cron/crontab_collections.yaml index 45c8eaf65..b323830d5 100644 --- a/test/data/providers/cron/crontab_collections.yaml +++ b/test/data/providers/cron/crontab_collections.yaml @@ -1,43 +1,43 @@ ---- -:with_name: +--- +:with_name: - :name - :spaces_in_command_with_times -:with_env: +:with_env: - :environment - :spaces_in_command_with_times -:simple: +:simple: - :spaces_in_command_with_times -:with_multiple_envs: +:with_multiple_envs: - :environment - :lowercase_environment - :spaces_in_command_with_times -:with_name_and_env: +:with_name_and_env: - :name_with_spaces - :another_env - :spaces_in_command_with_times -:with_name_and_multiple_envs: +:with_name_and_multiple_envs: - :long_name - :another_env - :fourth_env - :spaces_in_command_with_times ---- -:with_name: +--- +:with_name: - :name - :spaces_in_command_with_times -:with_env: +:with_env: - :environment - :spaces_in_command_with_times -:simple: +:simple: - :spaces_in_command_with_times -:with_multiple_envs: +:with_multiple_envs: - :environment - :lowercase_environment - :spaces_in_command_with_times -:with_name_and_env: +:with_name_and_env: - :name_with_spaces - :another_env - :spaces_in_command_with_times -:with_name_and_multiple_envs: +:with_name_and_multiple_envs: - :long_name - :another_env - :fourth_env diff --git a/test/data/providers/cron/crontab_multiple_with_env.yaml b/test/data/providers/cron/crontab_multiple_with_env.yaml index 8573bd467..ff7af8eb3 100644 --- a/test/data/providers/cron/crontab_multiple_with_env.yaml +++ b/test/data/providers/cron/crontab_multiple_with_env.yaml @@ -1,4 +1,4 @@ ---- +--- - | # comment 1 # Puppet Name: name2 @@ -13,19 +13,19 @@ - - :record_type: :comment :line: "# comment 1" - :command: command4 - :environment: + :environment: - env3=val :name: name2 :record_type: :crontab - :command: command5 - :environment: + :environment: - env3=val - env4=other :name: name with spaces :record_type: :crontab - :record_type: :comment :line: "# comment 5" ---- +--- - | # comment 1 # Puppet Name: name2 @@ -40,12 +40,12 @@ - - :record_type: :comment :line: "# comment 1" - :command: command4 - :environment: + :environment: - env3=val :name: name2 :record_type: :crontab - :command: command5 - :environment: + :environment: - env3=val - env4=other :name: name with spaces diff --git a/test/data/providers/cron/crontab_sample_records.yaml b/test/data/providers/cron/crontab_sample_records.yaml index cafe9de25..56dd6ad49 100644 --- a/test/data/providers/cron/crontab_sample_records.yaml +++ b/test/data/providers/cron/crontab_sample_records.yaml @@ -1,272 +1,272 @@ ---- -:longcommment: +--- +:longcommment: :text: "# This is a comment" - :record: + :record: :line: "# This is a comment" :record_type: :comment -:special: +:special: :text: "@hourly /bin/date" - :record: + :record: :special: hourly :command: /bin/date :record_type: :freebsd_special -:long_name: +:long_name: :text: "# Puppet Name: long_name" - :record: + :record: :line: "# Puppet Name: long_name" :name: long_name :record_type: :comment -:multiple_minutes: +:multiple_minutes: :text: 5,15 * * * * /bin/date - :record: - :minute: + :record: + :minute: - "5" - "15" :command: /bin/date :record_type: :crontab -:environment: +:environment: :text: ONE=TWO - :record: + :record: :line: ONE=TWO :record_type: :environment -:empty: +:empty: :text: "" - :record: + :record: :line: "" :record_type: :blank -:simple: +:simple: :text: "* * * * * /bin/date" - :record: + :record: :command: /bin/date :record_type: :crontab -:whitespace: +:whitespace: :text: " " - :record: + :record: :line: " " :record_type: :blank -:minute_and_hour: +:minute_and_hour: :text: 5 15 * * * /bin/date - :record: - :minute: + :record: + :minute: - "5" - :hour: + :hour: - "15" :command: /bin/date :record_type: :crontab -:lowercase_environment: +:lowercase_environment: :text: a=b - :record: + :record: :line: a=b :record_type: :environment -:special_with_spaces: +:special_with_spaces: :text: "@daily /bin/echo testing" - :record: + :record: :special: daily :command: /bin/echo testing :record_type: :freebsd_special -:tabs: +:tabs: :text: !binary | CQ== - :record: + :record: :line: !binary | CQ== :record_type: :blank -:multiple_minute_and_hour: +:multiple_minute_and_hour: :text: 5,10 15,20 * * * /bin/date - :record: - :minute: + :record: + :minute: - "5" - "10" - :hour: + :hour: - "15" - "20" :command: /bin/date :record_type: :crontab -:name: +:name: :text: "# Puppet Name: testing" - :record: + :record: :line: "# Puppet Name: testing" :name: testing :record_type: :comment -:another_env: +:another_env: :text: Testing=True - :record: + :record: :line: Testing=True :record_type: :environment -:shortcomment: +:shortcomment: :text: "#" - :record: + :record: :line: "#" :record_type: :comment -:spaces_in_command: +:spaces_in_command: :text: "* * * * * /bin/echo testing" - :record: + :record: :command: /bin/echo testing :record_type: :crontab -:fourth_env: +:fourth_env: :text: True=False - :record: + :record: :line: True=False :record_type: :environment -:simple_with_minute: +:simple_with_minute: :text: 5 * * * * /bin/date - :record: - :minute: + :record: + :minute: - "5" :command: /bin/date :record_type: :crontab -:spaces_in_command_with_times: +:spaces_in_command_with_times: :text: 5,10 15,20 * * * /bin/echo testing - :record: - :minute: + :record: + :minute: - "5" - "10" - :hour: + :hour: - "15" - "20" :command: /bin/echo testing :record_type: :crontab -:name_with_spaces: +:name_with_spaces: :text: "# Puppet Name: another name" - :record: + :record: :line: "# Puppet Name: another name" :name: another name :record_type: :comment ---- -:longcommment: +--- +:longcommment: :text: "# This is a comment" - :record: + :record: :line: "# This is a comment" :record_type: :comment -:special: +:special: :text: "@hourly /bin/date" - :record: + :record: :special: hourly :command: /bin/date :record_type: :freebsd_special -:long_name: +:long_name: :text: "# Puppet Name: long_name" - :record: + :record: :line: "# Puppet Name: long_name" :name: long_name :record_type: :comment -:multiple_minutes: +:multiple_minutes: :text: 5,15 * * * * /bin/date - :record: - :minute: + :record: + :minute: - "5" - "15" :command: /bin/date :record_type: :crontab -:environment: +:environment: :text: ONE=TWO - :record: + :record: :line: ONE=TWO :record_type: :environment -:empty: +:empty: :text: "" - :record: + :record: :line: "" :record_type: :blank -:simple: +:simple: :text: "* * * * * /bin/date" - :record: + :record: :command: /bin/date :record_type: :crontab -:whitespace: +:whitespace: :text: " " - :record: + :record: :line: " " :record_type: :blank -:minute_and_hour: +:minute_and_hour: :text: 5 15 * * * /bin/date - :record: - :minute: + :record: + :minute: - "5" - :hour: + :hour: - "15" :command: /bin/date :record_type: :crontab -:lowercase_environment: +:lowercase_environment: :text: a=b - :record: + :record: :line: a=b :record_type: :environment -:special_with_spaces: +:special_with_spaces: :text: "@daily /bin/echo testing" - :record: + :record: :special: daily :command: /bin/echo testing :record_type: :freebsd_special -:tabs: +:tabs: :text: !binary | CQ== - :record: + :record: :line: !binary | CQ== :record_type: :blank -:multiple_minute_and_hour: +:multiple_minute_and_hour: :text: 5,10 15,20 * * * /bin/date - :record: - :minute: + :record: + :minute: - "5" - "10" - :hour: + :hour: - "15" - "20" :command: /bin/date :record_type: :crontab -:name: +:name: :text: "# Puppet Name: testing" - :record: + :record: :line: "# Puppet Name: testing" :name: testing :record_type: :comment -:another_env: +:another_env: :text: Testing=True - :record: + :record: :line: Testing=True :record_type: :environment -:shortcomment: +:shortcomment: :text: "#" - :record: + :record: :line: "#" :record_type: :comment -:spaces_in_command: +:spaces_in_command: :text: "* * * * * /bin/echo testing" - :record: + :record: :command: /bin/echo testing :record_type: :crontab -:fourth_env: +:fourth_env: :text: True=False - :record: + :record: :line: True=False :record_type: :environment -:simple_with_minute: +:simple_with_minute: :text: 5 * * * * /bin/date - :record: - :minute: + :record: + :minute: - "5" :command: /bin/date :record_type: :crontab -:spaces_in_command_with_times: +:spaces_in_command_with_times: :text: 5,10 15,20 * * * /bin/echo testing - :record: - :minute: + :record: + :minute: - "5" - "10" - :hour: + :hour: - "15" - "20" :command: /bin/echo testing :record_type: :crontab -:name_with_spaces: +:name_with_spaces: :text: "# Puppet Name: another name" - :record: + :record: :line: "# Puppet Name: another name" :name: another name :record_type: :comment diff --git a/test/data/providers/package/testpackages.yaml b/test/data/providers/package/testpackages.yaml index 8d8935eb9..7d7ce0225 100644 --- a/test/data/providers/package/testpackages.yaml +++ b/test/data/providers/package/testpackages.yaml @@ -1,6 +1,6 @@ ---- +--- - :operatingsystem: Solaris - :files: + :files: - /usr/local/pkg/rdesktop-1.3.1-sol10-intel-local - /usr/local/pkg/rdesktop-1.4.1-sol10-x86-local :hardwareisa: i386 @@ -11,21 +11,21 @@ :name: cabextract :provider: :blastwave - :operatingsystem: Solaris - :files: + :files: - /usr/local/pkg/arc-5.21e-sol8-sparc-local :hardwareisa: sparc :name: SMCarc :operatingsystemrelease: "5.8" :provider: :sun - :operatingsystem: Solaris - :files: + :files: - /usr/local/pkg/arc-5.21e-sol8-intel-local :hardwareisa: i386 :name: SMCarc :operatingsystemrelease: "5.8" :provider: :sun - :operatingsystem: OpenBSD - :files: + :files: - ftp://ftp.usa.openbsd.org/pub/OpenBSD/3.8/packages/i386/aalib-1.2-no_x11.tgz :name: aalib :provider: :openbsd @@ -42,7 +42,7 @@ - Fedora - CentOS - RedHat - :files: + :files: - /home/luke/rpm/RPMS/noarch/enhost-1.0.1-1.noarch.rpm - /home/luke/rpm/RPMS/noarch/enhost-1.0.2-1.noarch.rpm :name: enhost diff --git a/test/data/reports/1.yaml b/test/data/reports/1.yaml index 3805e90f5..bc72b8241 100644 --- a/test/data/reports/1.yaml +++ b/test/data/reports/1.yaml @@ -1,12 +1,12 @@ ---- !ruby/object:Puppet::Transaction::Report +--- !ruby/object:Puppet::Transaction::Report host: culain.madstop.com -logs: -- !ruby/object:Puppet::Log +logs: +- !ruby/object:Puppet::Log level: :notice message: executed successfully objectsource: true source: //culain.madstop.com/puppetserver/exec=/bin/echo testing/returns - tags: + tags: - :puppetserver - :puppetserver - :basenode @@ -15,12 +15,12 @@ logs: - :exec - :returns time: 2006-09-21 13:06:59.867782 -05:00 -- !ruby/object:Puppet::Log +- !ruby/object:Puppet::Log level: :notice message: ensure changed 'stopped' to 'running' objectsource: true source: //culain.madstop.com/mailserver/service=spamassassin/ensure - tags: + tags: - :mailserver - :mailserver - :basenode @@ -29,12 +29,12 @@ logs: - :service - :ensure time: 2006-09-21 13:07:01.336511 -05:00 -- !ruby/object:Puppet::Log +- !ruby/object:Puppet::Log level: :notice message: ensure changed 'stopped' to 'running' objectsource: true source: //culain.madstop.com/mailserver/service=courier-imap-ssl/ensure - tags: + tags: - :mailserver - :mailserver - :basenode @@ -43,12 +43,12 @@ logs: - :service - :ensure time: 2006-09-21 13:07:01.573506 -05:00 -- !ruby/object:Puppet::Log +- !ruby/object:Puppet::Log level: :notice message: ensure changed 'stopped' to 'running' objectsource: true source: //culain.madstop.com/mailserver/service=courier-authdaemon/ensure - tags: + tags: - :mailserver - :mailserver - :basenode @@ -57,28 +57,28 @@ logs: - :service - :ensure time: 2006-09-21 13:07:01.680440 -05:00 -metrics: - time: !ruby/object:Puppet::Metric +metrics: + time: !ruby/object:Puppet::Metric label: Time name: time - values: + values: - - :config_retrieval - Config retrieval - 2.26467204093933 - - :total - Total - 21.7894113063812 - changes: !ruby/object:Puppet::Metric + changes: !ruby/object:Puppet::Metric label: Changes name: changes - values: + values: - - :total - Total - 4 - objects: !ruby/object:Puppet::Metric + objects: !ruby/object:Puppet::Metric label: Objects name: objects - values: + values: - - :scheduled - Scheduled - 78 diff --git a/test/data/reports/tagmail_passers.conf b/test/data/reports/tagmail_passers.conf index 6cadf03f8..ae6d2e7f2 100644 --- a/test/data/reports/tagmail_passers.conf +++ b/test/data/reports/tagmail_passers.conf @@ -7,7 +7,7 @@ one: abuse@domain.com # with weird spacing - one : abuse@domain.com + one : abuse@domain.com # with multiple tags one, two: abuse@domain.com @@ -25,6 +25,6 @@ one, two-three, !four-five, !six: abuse@domain.com one, two: abuse@domain.com, testing@domain.com # and with weird spacing -one, two: abuse@domain.com , testing@domain.com +one, two: abuse@domain.com , testing@domain.com # and a trailing comment diff --git a/test/data/snippets/casestatement.pp b/test/data/snippets/casestatement.pp index 4fcf2e408..955982819 100644 --- a/test/data/snippets/casestatement.pp +++ b/test/data/snippets/casestatement.pp @@ -19,10 +19,10 @@ case $ovar { } "booness", "yayness": { case $var { - "nep": { + "nep": { file { "/tmp/noexistsfile": mode => 644, ensure => file } } - "value": { + "value": { file { "/tmp/existsfile2": mode => 755, ensure => file } } } diff --git a/test/data/snippets/classincludes.pp b/test/data/snippets/classincludes.pp index 927800599..bd5b44ed7 100644 --- a/test/data/snippets/classincludes.pp +++ b/test/data/snippets/classincludes.pp @@ -12,6 +12,6 @@ class sub2 inherits base { file { "/tmp/classincludes3": ensure => file, mode => 755 } } -$sub = "sub2" +$sub = "sub2" include sub1, $sub diff --git a/test/data/snippets/fqparents.pp b/test/data/snippets/fqparents.pp index 40fb93344..ee2f65423 100644 --- a/test/data/snippets/fqparents.pp +++ b/test/data/snippets/fqparents.pp @@ -1,8 +1,8 @@ class base { class one { file { "/tmp/fqparent1": ensure => file } - } -} + } +} class two::three inherits base::one { file { "/tmp/fqparent2": ensure => file } diff --git a/test/data/types/hosts/1 b/test/data/types/hosts/1 index f0b27f359..286dcb72d 100644 --- a/test/data/types/hosts/1 +++ b/test/data/types/hosts/1 @@ -1,3 +1,3 @@ # Do not remove the following line, or various programs # that require network functionality will fail. -127.0.0.1 hostname.domain.net hostname localhost.localdomain localhost +127.0.0.1 hostname.domain.net hostname localhost.localdomain localhost diff --git a/test/data/types/port/darwin b/test/data/types/port/darwin index c5e5376a2..3d27dd506 100644 --- a/test/data/types/port/darwin +++ b/test/data/types/port/darwin @@ -285,7 +285,7 @@ dixie 96/tcp # DIXIE Protocol Specification swift-rvf 97/udp # Swift Remote Virtural File Protocol swift-rvf 97/tcp # Swift Remote Virtural File Protocol # Maurice R. Turcotte -# <mailrus!uflorida!rm1!dnmrt%rmatl@uunet.UU.NET> +# <mailrus!uflorida!rm1!dnmrt%rmatl@uunet.UU.NET> tacnews 98/udp # TAC News tacnews 98/tcp # TAC News # Jon Postel <postel@isi.edu> @@ -306,7 +306,7 @@ acr-nema 104/tcp # ACR-NEMA Digital Imag. & Comm. 300 # Patrick McNamee <--none---> cso 105/udp # CCSO name server protocol cso 105/tcp # CCSO name server protocol -# Martin Hamilton <martin@mrrl.lut.as.uk> +# Martin Hamilton <martin@mrrl.lut.as.uk> csnet-ns 105/udp # Mailbox Name Nameserver csnet-ns 105/tcp # Mailbox Name Nameserver # Marvin Solomon <solomon@CS.WISC.EDU> @@ -333,7 +333,7 @@ mcidas 112/udp # McIDAS Data Transmission Protocol mcidas 112/tcp # McIDAS Data Transmission Protocol # Glenn Davis <support@unidata.ucar.edu> auth 113/udp # Authentication Service -ident 113/tcp auth # +ident 113/tcp auth # # Mike St. Johns <stjohns@arpa.mil> audionews 114/udp # Audio News Multicast audionews 114/tcp # Audio News Multicast @@ -402,11 +402,11 @@ ingres-net 134/tcp # INGRES-NET Service epmap 135/udp # DCE endpoint resolution epmap 135/tcp # DCE endpoint resolution # Joe Pato <pato@apollo.hp.com> -profile 136/udp # PROFILE Naming System -profile 136/tcp # PROFILE Naming System +profile 136/udp # PROFILE Naming System +profile 136/tcp # PROFILE Naming System # Larry Peterson <llp@ARIZONA.EDU> -netbios-ns 137/udp # NETBIOS Name Service -netbios-ns 137/tcp # NETBIOS Name Service +netbios-ns 137/udp # NETBIOS Name Service +netbios-ns 137/tcp # NETBIOS Name Service netbios-dgm 138/udp # NETBIOS Datagram Service netbios-dgm 138/tcp # NETBIOS Datagram Service netbios-ssn 139/udp # NETBIOS Session Service @@ -417,8 +417,8 @@ emfis-data 140/tcp # EMFIS Data Service emfis-cntl 141/udp # EMFIS Control Service emfis-cntl 141/tcp # EMFIS Control Service # Gerd Beling <GBELING@ISI.EDU> -bl-idm 142/udp # Britton-Lee IDM -bl-idm 142/tcp # Britton-Lee IDM +bl-idm 142/udp # Britton-Lee IDM +bl-idm 142/tcp # Britton-Lee IDM # Susie Snitzer <---none---> imap 143/udp # Internet Message Access Protocol imap 143/tcp # Internet Message Access Protocol @@ -426,8 +426,8 @@ imap 143/tcp # Internet Message Access Protocol uma 144/udp # Universal Management Architecture uma 144/tcp # Universal Management Architecture # Jay Whitney <jw@powercenter.com> -uaac 145/udp # UAAC Protocol -uaac 145/tcp # UAAC Protocol +uaac 145/udp # UAAC Protocol +uaac 145/tcp # UAAC Protocol # David A. Gomberg <gomberg@GATEWAY.MITRE.ORG> iso-tp0 146/udp # ISO-IP0 iso-tp0 146/tcp # ISO-IP0 @@ -437,144 +437,144 @@ iso-ip 147/tcp # ISO-IP jargon 148/udp # Jargon jargon 148/tcp # Jargon # Bill Weinman <wew@bearnet.com> -aed-512 149/udp # AED 512 Emulation Service -aed-512 149/tcp # AED 512 Emulation Service +aed-512 149/udp # AED 512 Emulation Service +aed-512 149/tcp # AED 512 Emulation Service # Albert G. Broscius <broscius@DSL.CIS.UPENN.EDU> -sql-net 150/udp # SQL-NET -sql-net 150/tcp # SQL-NET +sql-net 150/udp # SQL-NET +sql-net 150/tcp # SQL-NET # Martin Picard <<---none---> -hems 151/udp # HEMS -hems 151/tcp # HEMS -bftp 152/udp # Background File Transfer Program -bftp 152/tcp # Background File Transfer Program +hems 151/udp # HEMS +hems 151/tcp # HEMS +bftp 152/udp # Background File Transfer Program +bftp 152/tcp # Background File Transfer Program # Annette DeSchon <DESCHON@ISI.EDU> -sgmp 153/udp # SGMP -sgmp 153/tcp # SGMP +sgmp 153/udp # SGMP +sgmp 153/tcp # SGMP # Marty Schoffstahl <schoff@NISC.NYSER.NET> -netsc-prod 154/udp # NETSC -netsc-prod 154/tcp # NETSC -netsc-dev 155/udp # NETSC -netsc-dev 155/tcp # NETSC +netsc-prod 154/udp # NETSC +netsc-prod 154/tcp # NETSC +netsc-dev 155/udp # NETSC +netsc-dev 155/tcp # NETSC # Sergio Heker <heker@JVNCC.CSC.ORG> -sqlsrv 156/udp # SQL Service -sqlsrv 156/tcp # SQL Service +sqlsrv 156/udp # SQL Service +sqlsrv 156/tcp # SQL Service # Craig Rogers <Rogers@ISI.EDU> knet-cmp 157/udp # KNET/VM Command/Message Protocol knet-cmp 157/tcp # KNET/VM Command/Message Protocol # Gary S. Malkin <GMALKIN@XYLOGICS.COM> -pcmail-srv 158/udp # PCMail Server -pcmail-srv 158/tcp # PCMail Server +pcmail-srv 158/udp # PCMail Server +pcmail-srv 158/tcp # PCMail Server # Mark L. Lambert <markl@PTT.LCS.MIT.EDU> -nss-routing 159/udp # NSS-Routing -nss-routing 159/tcp # NSS-Routing +nss-routing 159/udp # NSS-Routing +nss-routing 159/tcp # NSS-Routing # Yakov Rekhter <Yakov@IBM.COM> -sgmp-traps 160/udp # SGMP-TRAPS -sgmp-traps 160/tcp # SGMP-TRAPS +sgmp-traps 160/udp # SGMP-TRAPS +sgmp-traps 160/tcp # SGMP-TRAPS # Marty Schoffstahl <schoff@NISC.NYSER.NET> snmp 161/udp # SNMP snmp 161/tcp # SNMP snmptrap 162/udp # SNMPTRAP snmptrap 162/tcp # SNMPTRAP # Marshall Rose <mrose@dbc.mtview.ca.us> -cmip-man 163/udp # CMIP/TCP Manager -cmip-man 163/tcp # CMIP/TCP Manager -cmip-agent 164/udp # CMIP/TCP Agent -cmip-agent 164/tcp # CMIP/TCP Agent +cmip-man 163/udp # CMIP/TCP Manager +cmip-man 163/tcp # CMIP/TCP Manager +cmip-agent 164/udp # CMIP/TCP Agent +cmip-agent 164/tcp # CMIP/TCP Agent # Amatzia Ben-Artzi <---none---> -xns-courier 165/udp # Xerox -xns-courier 165/tcp # Xerox +xns-courier 165/udp # Xerox +xns-courier 165/tcp # Xerox # Susie Armstrong <Armstrong.wbst128@XEROX.COM> -s-net 166/udp # Sirius Systems -s-net 166/tcp # Sirius Systems +s-net 166/udp # Sirius Systems +s-net 166/tcp # Sirius Systems # Brian Lloyd <brian@lloyd.com> -namp 167/udp # NAMP -namp 167/tcp # NAMP +namp 167/udp # NAMP +namp 167/tcp # NAMP # Marty Schoffstahl <schoff@NISC.NYSER.NET> -rsvd 168/udp # RSVD -rsvd 168/tcp # RSVD +rsvd 168/udp # RSVD +rsvd 168/tcp # RSVD # Neil Todd <mcvax!ist.co.uk!neil@UUNET.UU.NET> -send 169/udp # SEND -send 169/tcp # SEND +send 169/udp # SEND +send 169/tcp # SEND # William D. Wisner <wisner@HAYES.FAI.ALASKA.EDU> -print-srv 170/udp # Network PostScript -print-srv 170/tcp # Network PostScript +print-srv 170/udp # Network PostScript +print-srv 170/tcp # Network PostScript # Brian Reid <reid@DECWRL.DEC.COM> multiplex 171/udp # Network Innovations Multiplex multiplex 171/tcp # Network Innovations Multiplex -cl/1 172/udp # Network Innovations CL/1 -cl/1 172/tcp # Network Innovations CL/1 +cl/1 172/udp # Network Innovations CL/1 +cl/1 172/tcp # Network Innovations CL/1 # Kevin DeVault <<---none---> -xyplex-mux 173/udp # Xyplex -xyplex-mux 173/tcp # Xyplex +xyplex-mux 173/udp # Xyplex +xyplex-mux 173/tcp # Xyplex # Bob Stewart <STEWART@XYPLEX.COM> -mailq 174/udp # MAILQ -mailq 174/tcp # MAILQ +mailq 174/udp # MAILQ +mailq 174/tcp # MAILQ # Rayan Zachariassen <rayan@AI.TORONTO.EDU> -vmnet 175/udp # VMNET -vmnet 175/tcp # VMNET +vmnet 175/udp # VMNET +vmnet 175/tcp # VMNET # Christopher Tengi <tengi@Princeton.EDU> -genrad-mux 176/udp # GENRAD-MUX -genrad-mux 176/tcp # GENRAD-MUX +genrad-mux 176/udp # GENRAD-MUX +genrad-mux 176/tcp # GENRAD-MUX # Ron Thornton <thornton@qm7501.genrad.com> -xdmcp 177/udp # X Display Manager Control Protocol -xdmcp 177/tcp # X Display Manager Control Protocol +xdmcp 177/udp # X Display Manager Control Protocol +xdmcp 177/tcp # X Display Manager Control Protocol # Robert W. Scheifler <RWS@XX.LCS.MIT.EDU> -nextstep 178/udp # NextStep Window Server -nextstep 178/tcp # NextStep Window Server +nextstep 178/udp # NextStep Window Server +nextstep 178/tcp # NextStep Window Server # Leo Hourvitz <leo@NEXT.COM> -bgp 179/udp # Border Gateway Protocol -bgp 179/tcp # Border Gateway Protocol +bgp 179/udp # Border Gateway Protocol +bgp 179/tcp # Border Gateway Protocol # Kirk Lougheed <LOUGHEED@MATHOM.CISCO.COM> -ris 180/udp # Intergraph -ris 180/tcp # Intergraph +ris 180/udp # Intergraph +ris 180/tcp # Intergraph # Dave Buehmann <ingr!daveb@UUNET.UU.NET> -unify 181/udp # Unify -unify 181/tcp # Unify +unify 181/udp # Unify +unify 181/tcp # Unify # Mark Ainsley <ianaportmaster@unify.com> -audit 182/udp # Unisys Audit SITP -audit 182/tcp # Unisys Audit SITP +audit 182/udp # Unisys Audit SITP +audit 182/tcp # Unisys Audit SITP # Gil Greenbaum <gcole@nisd.cam.unisys.com> -ocbinder 183/udp # OCBinder -ocbinder 183/tcp # OCBinder -ocserver 184/udp # OCServer -ocserver 184/tcp # OCServer +ocbinder 183/udp # OCBinder +ocbinder 183/tcp # OCBinder +ocserver 184/udp # OCServer +ocserver 184/tcp # OCServer # Jerrilynn Okamura <--none---> -remote-kis 185/udp # Remote-KIS -remote-kis 185/tcp # Remote-KIS -kis 186/udp # KIS Protocol -kis 186/tcp # KIS Protocol +remote-kis 185/udp # Remote-KIS +remote-kis 185/tcp # Remote-KIS +kis 186/udp # KIS Protocol +kis 186/tcp # KIS Protocol # Ralph Droms <rdroms@NRI.RESTON.VA.US> aci 187/udp # Application Communication Interface aci 187/tcp # Application Communication Interface # Rick Carlos <rick.ticipa.csc.ti.com> -mumps 188/udp # Plus Five's MUMPS -mumps 188/tcp # Plus Five's MUMPS +mumps 188/udp # Plus Five's MUMPS +mumps 188/tcp # Plus Five's MUMPS # Hokey Stenn <hokey@PLUS5.COM> -qft 189/udp # Queued File Transport -qft 189/tcp # Queued File Transport +qft 189/udp # Queued File Transport +qft 189/tcp # Queued File Transport # Wayne Schroeder <schroeder@SDS.SDSC.EDU> gacp 190/udp # Gateway Access Control Protocol gacp 190/tcp # Gateway Access Control Protocol # C. Philip Wood <cpw@LANL.GOV> -prospero 191/udp # Prospero Directory Service -prospero 191/tcp # Prospero Directory Service +prospero 191/udp # Prospero Directory Service +prospero 191/tcp # Prospero Directory Service # B. Clifford Neuman <bcn@isi.edu> -osu-nms 192/udp # OSU Network Monitoring System -osu-nms 192/tcp # OSU Network Monitoring System +osu-nms 192/udp # OSU Network Monitoring System +osu-nms 192/tcp # OSU Network Monitoring System # Doug Karl <KARL-D@OSU-20.IRCC.OHIO-STATE.EDU> -srmp 193/udp # Spider Remote Monitoring Protocol -srmp 193/tcp # Spider Remote Monitoring Protocol +srmp 193/udp # Spider Remote Monitoring Protocol +srmp 193/tcp # Spider Remote Monitoring Protocol # Ted J. Socolofsky <Teds@SPIDER.CO.UK> -irc 194/udp # Internet Relay Chat Protocol -irc 194/tcp # Internet Relay Chat Protocol +irc 194/udp # Internet Relay Chat Protocol +irc 194/tcp # Internet Relay Chat Protocol # Jarkko Oikarinen <jto@TOLSUN.OULU.FI> -dn6-nlm-aud 195/udp # DNSIX Network Level Module Audit -dn6-nlm-aud 195/tcp # DNSIX Network Level Module Audit +dn6-nlm-aud 195/udp # DNSIX Network Level Module Audit +dn6-nlm-aud 195/tcp # DNSIX Network Level Module Audit dn6-smm-red 196/udp # DNSIX Session Mgt Module Audit Redir dn6-smm-red 196/tcp # DNSIX Session Mgt Module Audit Redir # Lawrence Lebahn <DIA3@PAXRV-NES.NAVY.MIL> -dls 197/udp # Directory Location Service -dls 197/tcp # Directory Location Service +dls 197/udp # Directory Location Service +dls 197/tcp # Directory Location Service dls-mon 198/udp # Directory Location Service Monitor dls-mon 198/tcp # Directory Location Service Monitor # Scott Bellew <smb@cs.purdue.edu> @@ -584,40 +584,40 @@ smux 199/tcp # SMUX src 200/udp # IBM System Resource Controller src 200/tcp # IBM System Resource Controller # Gerald McBrearty <---none---> -at-rtmp 201/udp # AppleTalk Routing Maintenance -at-rtmp 201/tcp # AppleTalk Routing Maintenance -at-nbp 202/udp # AppleTalk Name Binding -at-nbp 202/tcp # AppleTalk Name Binding -at-3 203/udp # AppleTalk Unused -at-3 203/tcp # AppleTalk Unused -at-echo 204/udp # AppleTalk Echo -at-echo 204/tcp # AppleTalk Echo -at-5 205/udp # AppleTalk Unused -at-5 205/tcp # AppleTalk Unused -at-zis 206/udp # AppleTalk Zone Information -at-zis 206/tcp # AppleTalk Zone Information -at-7 207/udp # AppleTalk Unused -at-7 207/tcp # AppleTalk Unused -at-8 208/udp # AppleTalk Unused -at-8 208/tcp # AppleTalk Unused +at-rtmp 201/udp # AppleTalk Routing Maintenance +at-rtmp 201/tcp # AppleTalk Routing Maintenance +at-nbp 202/udp # AppleTalk Name Binding +at-nbp 202/tcp # AppleTalk Name Binding +at-3 203/udp # AppleTalk Unused +at-3 203/tcp # AppleTalk Unused +at-echo 204/udp # AppleTalk Echo +at-echo 204/tcp # AppleTalk Echo +at-5 205/udp # AppleTalk Unused +at-5 205/tcp # AppleTalk Unused +at-zis 206/udp # AppleTalk Zone Information +at-zis 206/tcp # AppleTalk Zone Information +at-7 207/udp # AppleTalk Unused +at-7 207/tcp # AppleTalk Unused +at-8 208/udp # AppleTalk Unused +at-8 208/tcp # AppleTalk Unused # Rob Chandhok <chandhok@gnome.cs.cmu.edu> qmtp 209/udp # The Quick Mail Transfer Protocol qmtp 209/tcp # The Quick Mail Transfer Protocol # Dan Bernstein <djb@silverton.berkeley.edu> z39.50 210/udp # ANSI Z39.50 z39.50 210/tcp # ANSI Z39.50 -# Mark H. Needleman <markn@sirsi.com> +# Mark H. Needleman <markn@sirsi.com> 914c/g 211/udp # Texas Instruments 914C/G Terminal 914c/g 211/tcp # Texas Instruments 914C/G Terminal # Bill Harrell <---none---> -anet 212/udp # ATEXSSTR -anet 212/tcp # ATEXSSTR +anet 212/udp # ATEXSSTR +anet 212/tcp # ATEXSSTR # Jim Taylor <taylor@heart.epps.kodak.com> -ipx 213/udp # IPX +ipx 213/udp # IPX ipx 213/tcp # IPX # Don Provan <donp@xlnvax.novell.com> -vmpwscs 214/udp # VM PWSCS -vmpwscs 214/tcp # VM PWSCS +vmpwscs 214/udp # VM PWSCS +vmpwscs 214/tcp # VM PWSCS # Dan Shia <dset!shia@uunet.UU.NET> softpc 215/udp # Insignia Solutions softpc 215/tcp # Insignia Solutions @@ -628,22 +628,22 @@ CAIlic 216/tcp # Computer Associates Int'l License Server dbase 217/udp # dBASE Unix dbase 217/tcp # dBASE Unix # Don Gibson -# <sequent!aero!twinsun!ashtate.A-T.COM!dong@uunet.UU.NET> +# <sequent!aero!twinsun!ashtate.A-T.COM!dong@uunet.UU.NET> mpp 218/udp # Netix Message Posting Protocol mpp 218/tcp # Netix Message Posting Protocol # Shannon Yeh <yeh@netix.com> -uarps 219/udp # Unisys ARPs -uarps 219/tcp # Unisys ARPs +uarps 219/udp # Unisys ARPs +uarps 219/tcp # Unisys ARPs # Ashok Marwaha <---none---> imap3 220/udp # Interactive Mail Access Protocol v3 imap3 220/tcp # Interactive Mail Access Protocol v3 # James Rice <RICE@SUMEX-AIM.STANFORD.EDU> -fln-spx 221/udp # Berkeley rlogind with SPX auth -fln-spx 221/tcp # Berkeley rlogind with SPX auth -rsh-spx 222/udp # Berkeley rshd with SPX auth -rsh-spx 222/tcp # Berkeley rshd with SPX auth -cdc 223/udp # Certificate Distribution Center -cdc 223/tcp # Certificate Distribution Center +fln-spx 221/udp # Berkeley rlogind with SPX auth +fln-spx 221/tcp # Berkeley rlogind with SPX auth +rsh-spx 222/udp # Berkeley rshd with SPX auth +rsh-spx 222/tcp # Berkeley rshd with SPX auth +cdc 223/udp # Certificate Distribution Center +cdc 223/tcp # Certificate Distribution Center # Kannan Alagappan <kannan@sejour.enet.dec.com> ########### Possible Conflict of Port 222 with "Masqdialer"############## ### Contact for Masqdialer is Charles Wright <cpwright@villagenet.com>### @@ -655,16 +655,16 @@ masqdialer 224/tcp # masqdialer direct 242/udp # Direct direct 242/tcp # Direct # Herb Sutter <HerbS@cntc.com> -sur-meas 243/udp # Survey Measurement -sur-meas 243/tcp # Survey Measurement +sur-meas 243/udp # Survey Measurement +sur-meas 243/tcp # Survey Measurement # Dave Clark <ddc@LCS.MIT.EDU> inbusiness 244/udp # inbusiness inbusiness 244/tcp # inbusiness # Derrick Hisatake <derrick.i.hisatake@intel.com> link 245/udp # LINK link 245/tcp # LINK -dsp3270 246/udp # Display Systems Protocol -dsp3270 246/tcp # Display Systems Protocol +dsp3270 246/udp # Display Systems Protocol +dsp3270 246/tcp # Display Systems Protocol # Weldon J. Showalter <Gamma@MINTAKA.DCA.MIL> subntbcst_tftp 247/udp # SUBNTBCST_TFTP subntbcst_tftp 247/tcp # SUBNTBCST_TFTP @@ -729,19 +729,19 @@ rescap 283/tcp # rescap corerjd 284/udp # corerjd corerjd 284/tcp # corerjd # Chris Thornhill <cjt@corenetworks.com> -# 285 Unassigned +# 285 Unassigned fxp-1 286/udp # FXP-1 fxp-1 286/tcp # FXP-1 -# James Darnall <jim@cennoid.com> +# James Darnall <jim@cennoid.com> k-block 287/udp # K-BLOCK k-block 287/tcp # K-BLOCK -# Simon P Jackson <jacko@kring.co.uk> +# Simon P Jackson <jacko@kring.co.uk> # 288-307 Unassigned novastorbakcup 308/udp # Novastor Backup novastorbakcup 308/tcp # Novastor Backup # Brian Dickman <brian@novastor.com> -entrusttime 309/udp # EntrustTime -entrusttime 309/tcp # EntrustTime +entrusttime 309/udp # EntrustTime +entrusttime 309/tcp # EntrustTime # Peter Whittaker <pww@entrust.com> bhmds 310/udp # bhmds bhmds 310/tcp # bhmds @@ -884,7 +884,7 @@ hassle 375/udp # Hassle hassle 375/tcp # Hassle # Reinhard Doelz <doelz@comp.bioz.unibas.ch> nip 376/udp # Amiga Envoy Network Inquiry Proto -nip 376/tcp # Amiga Envoy Network Inquiry Proto +nip 376/tcp # Amiga Envoy Network Inquiry Proto # Heinz Wrobel <hwrobel@gmx.de> tnETOS 377/udp # NEC Corporation tnETOS 377/tcp # NEC Corporation @@ -915,15 +915,15 @@ asa 386/tcp # ASA Message Router Object Def. aurp 387/udp # Appletalk Update-Based Routing Pro. aurp 387/tcp # Appletalk Update-Based Routing Pro. # Chris Ranch <cranch@novell.com> -unidata-ldm 388/udp # Unidata LDM -unidata-ldm 388/tcp # Unidata LDM +unidata-ldm 388/udp # Unidata LDM +unidata-ldm 388/tcp # Unidata LDM # Glenn Davis <support@unidata.ucar.edu> ldap 389/udp # Lightweight Directory Access Protocol ldap 389/tcp # Lightweight Directory Access Protocol # Tim Howes <Tim.Howes@terminator.cc.umich.edu> uis 390/udp # UIS uis 390/tcp # UIS -# Ed Barron <---none---> +# Ed Barron <---none---> synotics-relay 391/udp # SynOptics SNMP Relay Port synotics-relay 391/tcp # SynOptics SNMP Relay Port synotics-broker 392/udp # SynOptics Port Broker Port @@ -1011,7 +1011,7 @@ smpte 420/tcp # SMPTE # Si Becker <71362.22@CompuServe.COM> ariel2 421/udp # Ariel 2 ariel2 421/tcp # Ariel 2 -ariel3 422/udp # Ariel 3 +ariel3 422/udp # Ariel 3 ariel3 422/tcp # Ariel 3 # Joel Karafin <jkarafin@infotrieve.com> opc-job-start 423/udp # IBM Operations Planning and Control Start @@ -1037,8 +1037,8 @@ utmpsd 430/udp # UTMPSD utmpsd 430/tcp # UTMPSD utmpcd 431/udp # UTMPCD utmpcd 431/tcp # UTMPCD -iasd 432/udp # IASD -iasd 432/tcp # IASD +iasd 432/udp # IASD +iasd 432/tcp # IASD # Nir Baroz <nbaroz@encore.com> nnsp 433/udp # NNSP nnsp 433/tcp # NNSP @@ -1048,8 +1048,8 @@ mobileip-agent 434/tcp # MobileIP-Agent mobilip-mn 435/udp # MobilIP-MN mobilip-mn 435/tcp # MobilIP-MN # Kannan Alagappan <kannan@sejour.lkg.dec.com> -dna-cml 436/udp # DNA-CML -dna-cml 436/tcp # DNA-CML +dna-cml 436/udp # DNA-CML +dna-cml 436/tcp # DNA-CML # Dan Flowers <flowers@smaug.lkg.dec.com> comscm 437/udp # comscm comscm 437/tcp # comscm @@ -1060,8 +1060,8 @@ dsfgw 438/tcp # dsfgw dasp 439/udp # dasp tommy@inlab.m.eunet.de dasp 439/tcp # dasp Thomas Obermair # Thomas Obermair <tommy@inlab.m.eunet.de> -sgcp 440/udp # sgcp -sgcp 440/tcp # sgcp +sgcp 440/udp # sgcp +sgcp 440/tcp # sgcp # Marshall Rose <mrose@dbc.mtview.ca.us> decvms-sysmgt 441/udp # decvms-sysmgt decvms-sysmgt 441/tcp # decvms-sysmgt @@ -1113,10 +1113,10 @@ scohelp 457/tcp # scohelp # Faith Zack <faithz@sco.com> appleqtc 458/udp # apple quick time appleqtc 458/tcp # apple quick time -# Murali Ranganathan +# Murali Ranganathan # <murali_ranganathan@quickmail.apple.com> -ampr-rcmd 459/udp # ampr-rcmd -ampr-rcmd 459/tcp # ampr-rcmd +ampr-rcmd 459/udp # ampr-rcmd +ampr-rcmd 459/tcp # ampr-rcmd # Rob Janssen <rob@sys3.pe1chl.ampr.org> skronk 460/udp # skronk skronk 460/tcp # skronk @@ -1132,7 +1132,7 @@ alpes 463/tcp # alpes kpasswd 464/udp # kpasswd kpasswd 464/tcp # kpasswd # Theodore Ts'o <tytso@MIT.EDU> -igmpv3lite 465/udp # IGMP over UDP for SSM +igmpv3lite 465/udp # IGMP over UDP for SSM urd 465/tcp # URL Rendesvous Directory for SSM # Toerless Eckert <eckert@cisco.com> digital-vrc 466/udp # digital-vrc @@ -1185,7 +1185,7 @@ ph 481/tcp # Ph service # Roland Hedberg <Roland.Hedberg@umdac.umu.se> bgs-nsi 482/udp # bgs-nsi bgs-nsi 482/tcp # bgs-nsi -# Jon Saperia <saperia@bgs.com> +# Jon Saperia <saperia@bgs.com> ulpnet 483/udp # ulpnet ulpnet 483/tcp # ulpnet # Kevin Mooney <kevinm@bfs.unibol.com> @@ -1197,7 +1197,7 @@ powerburst 485/tcp # Air Soft Power Burst # <gary@airsoft.com> avian 486/udp # avian avian 486/tcp # avian -# Robert Ullmann +# Robert Ullmann # <Robert_Ullmann/CAM/Lotus.LOTUS@crd.lotus.com> saft 487/udp # saft Simple Asynchronous File Transfer saft 487/tcp # saft Simple Asynchronous File Transfer @@ -1221,7 +1221,7 @@ ticf-2 493/tcp # Transport Independent Convergence for FNA # Mamoru Ito <Ito@pcnet.ks.pfu.co.jp> pov-ray 494/udp # POV-Ray pov-ray 494/tcp # POV-Ray -# POV-Team Co-ordinator +# POV-Team Co-ordinator # <iana-port.remove-spamguard@povray.org> intecourier 495/udp # intecourier intecourier 495/tcp # intecourier @@ -1277,9 +1277,9 @@ passgo 511/tcp # PassGo exec 512/tcp # remote process execution; # authentication performed using # passwords and UNIX login names -comsat 512/udp biff # +comsat 512/udp biff # # of new mail received; currently -# receives messages only from +# receives messages only from # processes on the same machine login 513/tcp # remote login a la telnet; # automatic authentication performed @@ -1287,13 +1287,13 @@ login 513/tcp # remote login a la telnet; # and distributed data bases which # identify "authentication domains" who 513/udp # maintains data bases showing who's -# logged in to machines on a local +# logged in to machines on a local # net and the load average of the # machine shell 514/tcp # cmd -# like exec, but automatic authentication +# like exec, but automatic authentication # is performed as for login server -syslog 514/udp # +syslog 514/udp # printer 515/udp # spooler printer 515/tcp # spooler videotex 516/udp # videotex @@ -1309,8 +1309,8 @@ talk 517/udp # like tenex link, but across # use link protocol (this is actually # just a rendezvous port from which a # tcp connection is established) -ntalk 518/udp # -ntalk 518/tcp # +ntalk 518/udp # +ntalk 518/tcp # utime 519/udp # unixtime utime 519/tcp # unixtime router 520/udp # local routing process (on site); @@ -1320,13 +1320,13 @@ efs 520/tcp # extended file name server ripng 521/udp # ripng ripng 521/tcp # ripng # Robert E. Minnear <minnear@ipsilon.com> -ulp 522/udp # ULP -ulp 522/tcp # ULP +ulp 522/udp # ULP +ulp 522/tcp # ULP # Max Morris <maxm@MICROSOFT.com> ibm-db2 523/udp # IBM-DB2 ibm-db2 523/tcp # IBM-DB2 # Peter Pau <pau@VNET.IBM.COM> -ncp 524/udp # NCP +ncp 524/udp # NCP ncp 524/tcp # NCP # Don Provan <donp@sjf.novell.com> timed 525/udp # timeserver @@ -1338,7 +1338,7 @@ stx 527/udp # Stock IXChange stx 527/tcp # Stock IXChange custix 528/udp # Customer IXChange custix 528/tcp # Customer IXChange -# Ferdi Ladeira <ferdi.ladeira@ixchange.com> +# Ferdi Ladeira <ferdi.ladeira@ixchange.com> irc-serv 529/udp # IRC-SERV irc-serv 529/tcp # IRC-SERV # Brian Tackett <cym@acrux.net> @@ -1370,18 +1370,18 @@ apertus-ldp 539/tcp # Apertus Technologies Load Determination uucp 540/udp # uucpd uucp 540/tcp # uucpd uucp-rlogin 541/udp # uucp-rlogin -uucp-rlogin 541/tcp # uucp-rlogin +uucp-rlogin 541/tcp # uucp-rlogin # Stuart Lynne <sl@wimsey.com> commerce 542/udp # commerce commerce 542/tcp # commerce # Randy Epstein <repstein@host.net> -klogin 543/udp # -klogin 543/tcp # +klogin 543/udp # +klogin 543/tcp # kshell 544/udp # krcmd kshell 544/tcp # krcmd appleqtcsrvr 545/udp # appleqtcsrvr appleqtcsrvr 545/tcp # appleqtcsrvr -# Murali Ranganathan +# Murali Ranganathan # <Murali_Ranganathan@quickmail.apple.com> dhcpv6-client 546/udp # DHCPv6 Client dhcpv6-client 546/tcp # DHCPv6 Client @@ -1408,8 +1408,8 @@ pirp 553/tcp # pirp rtsp 554/udp # Real Time Stream Control Protocol rtsp 554/tcp # Real Time Stream Control Protocol # Rob Lanphier <robla@prognet.com> -dsf 555/udp # -dsf 555/tcp # +dsf 555/udp # +dsf 555/tcp # remotefs 556/udp # rfs server remotefs 556/tcp # rfs server openvms-sysipc 557/udp # openvms-sysipc @@ -1422,8 +1422,8 @@ teedtap 559/tcp # TEEDTAP # Mort Hoffman <hoffman@mail.ndhm.gtegsc.com> rmonitor 560/udp # rmonitord rmonitor 560/tcp # rmonitord -monitor 561/udp # -monitor 561/tcp # +monitor 561/udp # +monitor 561/tcp # chshell 562/udp # chcmd chshell 562/tcp # chcmd nntps 563/udp # nntp protocol over TLS/SSL (was snntp) @@ -1554,14 +1554,14 @@ nqs 607/udp # nqs nqs 607/tcp # nqs # Bill Schiefelbein <schief@aspen.cray.com> sift-uft 608/udp # Sender-Initiated/Unsolicited File Transfer -sift-uft 608/tcp # Sender-Initiated/Unsolicited File Transfer +sift-uft 608/tcp # Sender-Initiated/Unsolicited File Transfer # Rick Troth <troth@rice.edu> npmp-trap 609/udp # npmp-trap npmp-trap 609/tcp # npmp-trap npmp-local 610/udp # npmp-local npmp-local 610/tcp # npmp-local -npmp-gui 611/udp # npmp-gui -npmp-gui 611/tcp # npmp-gui +npmp-gui 611/udp # npmp-gui +npmp-gui 611/tcp # npmp-gui # John Barnes <jbarnes@crl.com> hmmp-ind 612/udp # HMMP Indication hmmp-ind 612/tcp # HMMP Indication @@ -1667,13 +1667,13 @@ ldp 646/tcp # LDP # Bob Thomas <rhthomas@cisco.com> dhcp-failover 647/udp # DHCP Failover dhcp-failover 647/tcp # DHCP Failover -# Bernard Volz <volz@ipworks.com> +# Bernard Volz <volz@ipworks.com> rrp 648/udp # Registry Registrar Protocol (RRP) rrp 648/tcp # Registry Registrar Protocol (RRP) # Scott Hollenbeck <shollenb@netsol.com> cadview-3d 649/udp # Cadview-3d - streaming 3d models over the internet cadview-3d 649/tcp # Cadview-3d - streaming 3d models over the internet -# David Cooper <david.cooper@oracle.com> +# David Cooper <david.cooper@oracle.com> obex 650/udp # OBEX obex 650/tcp # OBEX # Jeff Garbers <FJG030@email.mot.com> @@ -1803,7 +1803,7 @@ ha-cluster 694/tcp # ha-cluster # Alan Robertson <alanr@unix.sh> ieee-mms-ssl 695/udp # IEEE-MMS-SSL ieee-mms-ssl 695/tcp # IEEE-MMS-SSL -# Curtis Anderson <ecanderson@turbolinux.com> +# Curtis Anderson <ecanderson@turbolinux.com> rushd 696/udp # RUSHD rushd 696/tcp # RUSHD # Greg Ercolano <erco@netcom.com> @@ -1812,7 +1812,7 @@ uuidgen 697/tcp # UUIDGEN # James Falkner <james.falkner@sun.com> olsr 698/udp # OLSR olsr 698/tcp # OLSR -# Thomas Clausen <thomas.clausen@inria.fr> +# Thomas Clausen <thomas.clausen@inria.fr> accessnetwork 699/udp # Access Network accessnetwork 699/tcp # Access Network # Yingchun Xu <Yingchun_Xu@3com.com> @@ -1845,7 +1845,7 @@ netviewdm2 730/tcp # IBM NetView DM/6000 send/tcp netviewdm3 731/udp # IBM NetView DM/6000 receive/tcp netviewdm3 731/tcp # IBM NetView DM/6000 receive/tcp # Philippe Binet (phbinet@vnet.IBM.COM) -# 732-740 Unassigned +# 732-740 Unassigned netgw 741/udp # netGW netgw 741/tcp # netGW # Oliver Korfmacher (okorf@netcs.com) @@ -1856,7 +1856,7 @@ netrcs 742/tcp # Network based Rev. Cont. Sys. flexlm 744/udp # Flexible License Manager flexlm 744/tcp # Flexible License Manager # Matt Christiano -# <globes@matt@oliveb.atc.olivetti.com> +# <globes@matt@oliveb.atc.olivetti.com> # 745-746 Unassigned fujitsu-dev 747/udp # Fujitsu Device Control fujitsu-dev 747/tcp # Fujitsu Device Control @@ -1864,7 +1864,7 @@ ris-cm 748/udp # Russell Info Sci Calendar Manager ris-cm 748/tcp # Russell Info Sci Calendar Manager kerberos-adm 749/udp # kerberos administration kerberos-adm 749/tcp # kerberos administration -loadav 750/udp kerberos-iv # +loadav 750/udp kerberos-iv # rfile 750/tcp # # Martin Hamilton <martin@mrrl.lut.as.uk> pump 751/udp # @@ -1887,8 +1887,8 @@ rxe 761/udp # rxe 761/tcp # quotad 762/udp # quotad 762/tcp # -cycleserv 763/udp # -cycleserv 763/tcp # +cycleserv 763/udp # +cycleserv 763/tcp # omserv 764/udp # omserv 764/tcp # webster 765/udp # @@ -1901,19 +1901,19 @@ phonebook 767/tcp # phone # 768 Unassigned vid 769/udp # vid 769/tcp # -cadlock 770/udp # -cadlock 770/tcp # +cadlock 770/udp # +cadlock 770/tcp # rtip 771/udp # rtip 771/tcp # -cycleserv2 772/udp # -cycleserv2 772/tcp # +cycleserv2 772/udp # +cycleserv2 772/tcp # notify 773/udp # submit 773/tcp # -acmaint_dbd 774/udp # +acmaint_dbd 774/udp # rpasswd 774/tcp # acmaint_transd 775/udp # entomb 775/tcp # -wpages 776/udp # +wpages 776/udp # wpages 776/tcp # # Josyula R. Rao <jrrao@watson.ibm.com> multiling-http 777/udp # Multiling HTTP @@ -1945,7 +1945,7 @@ pkix-3-ca-ra 829/tcp # PKIX-3 CA/RA # 830-846 Unassigned dhcp-failover2 847/udp # dhcp-failover 2 dhcp-failover2 847/tcp # dhcp-failover 2 -# Bernard Volz <volz@ipworks.com> +# Bernard Volz <volz@ipworks.com> gdoi 848/udp # GDOI gdoi 848/tcp # GDOI # RFC-ietf-msec-gdoi-07.txt @@ -1982,14 +1982,14 @@ ideafarm-chat 902/udp # IDEAFARM-CHAT ideafarm-chat 902/tcp # IDEAFARM-CHAT ideafarm-catch 903/udp # IDEAFARM-CATCH ideafarm-catch 903/tcp # IDEAFARM-CATCH -# Wo'o Ideafarm <wo@ideafarm.com> +# Wo'o Ideafarm <wo@ideafarm.com> # 904-910 Unassigned xact-backup 911/udp # xact-backup xact-backup 911/tcp # xact-backup # Bill Carroll <billc@xactlabs.com> apex-mesh 912/udp # APEX relay-relay service apex-mesh 912/tcp # APEX relay-relay service -apex-edge 913/udp # APEX endpoint-relay service +apex-edge 913/udp # APEX endpoint-relay service apex-edge 913/tcp # APEX endpoint-relay service # [RFC3340] # 914-988 Unassigned @@ -2032,7 +2032,7 @@ surf 1010/tcp # surf 1023/udp # Reserved 1023/tcp # Reserved # IANA <iana@iana.org> - 1024/udp # Reserved + 1024/udp # Reserved 1024/tcp # Reserved # IANA <iana@iana.org> # @@ -2047,7 +2047,7 @@ cap 1026/tcp # Calender Access Protocol exosee 1027/udp # ExoSee exosee 1027/tcp # ExoSee # Chagdali Isamail <chagdali@free.fr> June 2003 -# 1028-1029 Unassigned +# 1028-1029 Unassigned iad1 1030/udp # BBN IAD iad1 1030/tcp # BBN IAD iad2 1031/udp # BBN IAD @@ -2086,7 +2086,7 @@ td-postman 1049/tcp # Tobit David Postman VPMN # Franz-Josef Leuders <development@tobit.com> cma 1050/udp # CORBA Management Agent cma 1050/tcp # CORBA Management Agent -# Ramy Zaarour <ramy@lumos.com> +# Ramy Zaarour <ramy@lumos.com> optima-vnet 1051/udp # Optima VNET optima-vnet 1051/tcp # Optima VNET # Ralf Doewich <ralf.doewich@optimatele.com> @@ -2095,19 +2095,19 @@ ddt 1052/tcp # Dynamic DNS Tools # Remi Lefebvre <remi@debian.org> remote-as 1053/udp # Remote Assistant (RA) remote-as 1053/tcp # Remote Assistant (RA) -# Roman Kriis <roman@previo.ee> +# Roman Kriis <roman@previo.ee> brvread 1054/udp # BRVREAD brvread 1054/tcp # BRVREAD # Gilles Roussel <groussel@eu-symtrax.com> ansyslmd 1055/udp # ANSYS - License Manager -ansyslmd 1055/tcp # ANSYS - License Manager +ansyslmd 1055/tcp # ANSYS - License Manager # Suzanne Lorrin <suzanne.lorrin@ansys.com> -vfo 1056/udp # VFO +vfo 1056/udp # VFO vfo 1056/tcp # VFO # Anthony Gonzalez <agonzal1@telcordia.com> startron 1057/udp # STARTRON startron 1057/tcp # STARTRON -# Markus Sabadello <sabadello@startron.org> +# Markus Sabadello <sabadello@startron.org> nim 1058/udp # nim nim 1058/tcp # nim nimreg 1059/udp # nimreg @@ -2124,21 +2124,21 @@ veracity 1062/tcp # Veracity # Ross Williams <ross@rocksoft.com> kyoceranetdev 1063/udp # KyoceraNetDev kyoceranetdev 1063/tcp # KyoceraNetDev -# Shigenaka Kanemitsu +# Shigenaka Kanemitsu # <Shigenaka_Kanemitsu@ypd.kyocera.co.jp> jstel 1064/udp # JSTEL jstel 1064/tcp # JSTEL -# Duane Kiser <dkiser@jsexpress.com> +# Duane Kiser <dkiser@jsexpress.com> syscomlan 1065/udp # SYSCOMLAN syscomlan 1065/tcp # SYSCOMLAN # Urs Ryf <urs.ryf@selectron.ch> fpo-fns 1066/udp # FPO-FNS fpo-fns 1066/tcp # FPO-FNS # Jens Klose <jklose@intercope.com> -instl_boots 1067/udp # Installation Bootstrap Proto. Serv. -instl_boots 1067/tcp # Installation Bootstrap Proto. Serv. -instl_bootc 1068/udp # Installation Bootstrap Proto. Cli. -instl_bootc 1068/tcp # Installation Bootstrap Proto. Cli. +instl_boots 1067/udp # Installation Bootstrap Proto. Serv. +instl_boots 1067/tcp # Installation Bootstrap Proto. Serv. +instl_bootc 1068/udp # Installation Bootstrap Proto. Cli. +instl_bootc 1068/tcp # Installation Bootstrap Proto. Cli. # David Arko <darko@hpfcrn.fc.hp.com> cognex-insight 1069/udp # COGNEX-INSIGHT cognex-insight 1069/tcp # COGNEX-INSIGHT @@ -2161,7 +2161,7 @@ fastechnologlm 1074/tcp # FASTechnologies License Manager # <rhenn@fastechnologies.com> rdrmshc 1075/udp # RDRMSHC rdrmshc 1075/tcp # RDRMSHC -# Ericko Shimada <eriko@kel.fujitsu.co.jp> +# Ericko Shimada <eriko@kel.fujitsu.co.jp> dab-sti-c 1076/udp # DAB STI-C dab-sti-c 1076/tcp # DAB STI-C # World DAB <worlddab_irc@worlddab.org> @@ -2170,17 +2170,17 @@ imgames 1077/tcp # IMGames # Jean A. Ames <engr-admin@flipside.com> avocent-proxy 1078/udp # Avocent Proxy Protocol avocent-proxy 1078/tcp # Avocent Proxy Protocol -# Steven W. Clark <steven.clark@avocent.com> +# Steven W. Clark <steven.clark@avocent.com> asprovatalk 1079/udp # ASPROVATalk asprovatalk 1079/tcp # ASPROVATalk # Chiew Farn Chung <cfchung@asprova.com> -socks 1080/udp # Socks -socks 1080/tcp # Socks +socks 1080/udp # Socks +socks 1080/tcp # Socks # Ying-Da Lee <ylee@syl.dl.nec.com pvuniwien 1081/udp # PVUNIWIEN pvuniwien 1081/tcp # PVUNIWIEN # Peter Lipp >Peter.Lipp@iaik.at> -amt-esd-prot 1082/udp # AMT-ESD-PROT +amt-esd-prot 1082/udp # AMT-ESD-PROT amt-esd-prot 1082/tcp # AMT-ESD-PROT # AMTEC S.p.A <sp.amtec@interbusiness.it> ansoft-lm-1 1083/udp # Anasoft License Manager @@ -2192,21 +2192,21 @@ webobjects 1085/tcp # Web Objects # Andy Belk <abelk@apple.com> cplscrambler-lg 1086/udp # CPL Scrambler Logging cplscrambler-lg 1086/tcp # CPL Scrambler Logging -cplscrambler-in 1087/udp # CPL Scrambler Internal +cplscrambler-in 1087/udp # CPL Scrambler Internal cplscrambler-in 1087/tcp # CPL Scrambler Internal cplscrambler-al 1088/udp # CPL Scrambler Alarm Log cplscrambler-al 1088/tcp # CPL Scrambler Alarm Log -# Richard Corn <rac@racc.com> -ff-annunc 1089/udp # FF Annunciation -ff-annunc 1089/tcp # FF Annunciation +# Richard Corn <rac@racc.com> +ff-annunc 1089/udp # FF Annunciation +ff-annunc 1089/tcp # FF Annunciation ff-fms 1090/udp # FF Fieldbus Message Specification -ff-fms 1090/tcp # FF Fieldbus Message Specification +ff-fms 1090/tcp # FF Fieldbus Message Specification ff-sm 1091/udp # FF System Management ff-sm 1091/tcp # FF System Management # Fieldbus Foundation <dave.glanzer@fieldbus.org> obrpd 1092/udp # Open Business Reporting Protocol obrpd 1092/tcp # Open Business Reporting Protocol -# William Randolph Royere III +# William Randolph Royere III # <william@royere.net> proofd 1093/udp # PROOFD proofd 1093/tcp # PROOFD @@ -2215,10 +2215,10 @@ rootd 1094/tcp # ROOTD # Fons Rademakers <Fons.Rademakers@cern.ch> nicelink 1095/udp # NICELink nicelink 1095/tcp # NICELink -# Jordi Lisbona <jlisbona@tango04.net> +# Jordi Lisbona <jlisbona@tango04.net> cnrprotocol 1096/udp # Common Name Resolution Protocol cnrprotocol 1096/tcp # Common Name Resolution Protocol -# Michael Mealling <michaelm@netsol.com> +# Michael Mealling <michaelm@netsol.com> sunclustermgr 1097/udp # Sun Cluster Manager sunclustermgr 1097/tcp # Sun Cluster Manager # Ashit Patel <Ashit.Patel@eng.Sun.COM> @@ -2228,12 +2228,12 @@ rmiregistry 1099/udp # RMI Registry rmiregistry 1099/tcp # RMI Registry # Mark Hodapp <mark.hodapp@sun.com> mctp 1100/udp # MCTP -mctp 1100/tcp # MCTP +mctp 1100/tcp # MCTP # Vitaly Revsin <vitaly@webmanage.com> pt2-discover 1101/udp # PT2-DISCOVER pt2-discover 1101/tcp # PT2-DISCOVER -# Ralph Kammerlander -# <ralph.kammerlander@khe.siemens.de> +# Ralph Kammerlander +# <ralph.kammerlander@khe.siemens.de> adobeserver-1 1102/udp # ADOBE SERVER 1 adobeserver-1 1102/tcp # ADOBE SERVER 1 adobeserver-2 1103/udp # ADOBE SERVER 2 @@ -2244,12 +2244,12 @@ xrl 1104/tcp # XRL # Patrick Robinson <probinson@plosive.com> ftranhc 1105/udp # FTRANHC ftranhc 1105/tcp # FTRANHC -# Eriko Shimada <eriko@kel.fujitsu.co.jp> -isoipsigport-1 1106/udp # ISOIPSIGPORT-1 +# Eriko Shimada <eriko@kel.fujitsu.co.jp> +isoipsigport-1 1106/udp # ISOIPSIGPORT-1 isoipsigport-1 1106/tcp # ISOIPSIGPORT-1 -isoipsigport-2 1107/udp # ISOIPSIGPORT-2 -isoipsigport-2 1107/tcp # ISOIPSIGPORT-2 -# Peter Egli <peter.egli@inalp.com> +isoipsigport-2 1107/udp # ISOIPSIGPORT-2 +isoipsigport-2 1107/tcp # ISOIPSIGPORT-2 +# Peter Egli <peter.egli@inalp.com> ratio-adp 1108/udp # ratio-adp ratio-adp 1108/tcp # ratio-adp # Oliver Thulke <oth@ratio.de> @@ -2262,8 +2262,8 @@ lmsocialserver 1111/tcp # LM Social Server # Ron Lussier <coyote@likeminds.com> icp 1112/udp # Intelligent Communication Protocol icp 1112/tcp # Intelligent Communication Protocol -# Mark H. David <mhd@gensym.com> -# 1113 Unassigned +# Mark H. David <mhd@gensym.com> +# 1113 Unassigned mini-sql 1114/udp # Mini SQL mini-sql 1114/tcp # Mini SQL # David Hughes <bambi@Hughes.com.au> @@ -2277,13 +2277,13 @@ ardus-mtrns 1117/tcp # ARDUS Multicast Transfer # 1118-1121 Unassigned availant-mgr 1122/udp # availant-mgr availant-mgr 1122/tcp # availant-mgr -# Steven Pelletier <stevep@Availant.com> +# Steven Pelletier <stevep@Availant.com> murray 1123/udp # Murray murray 1123/tcp # Murray # Stu Mark <fordii@j51.com> -# 1124-1154 Unassigned -nfa 1155/udp # Network File Access -nfa 1155/tcp # Network File Access +# 1124-1154 Unassigned +nfa 1155/udp # Network File Access +nfa 1155/tcp # Network File Access # James Powell <james@mailhost.unidata.com> # 1156-1160 Unassigned health-polling 1161/udp # Health Polling @@ -2341,13 +2341,13 @@ anthony-data 1206/tcp # Anthony Data # Paul Dollemore <pauld@anthonydata.com> metasage 1207/udp # MetaSage metasage 1207/tcp # MetaSage -# Peter Anvelt <panvelt@xnai.com> +# Peter Anvelt <panvelt@xnai.com> seagull-ais 1208/udp # SEAGULL AIS seagull-ais 1208/tcp # SEAGULL AIS -# Lee Breisacher <lbreisacher@seagullsw.com> +# Lee Breisacher <lbreisacher@seagullsw.com> ipcd3 1209/udp # IPCD3 ipcd3 1209/tcp # IPCD3 -# Mark Ciskey <mlciskey@plato.com> +# Mark Ciskey <mlciskey@plato.com> eoss 1210/udp # EOSS eoss 1210/tcp # EOSS # Robert Armes <rarmes@axarte.com> @@ -2362,7 +2362,7 @@ mpc-lifenet 1213/tcp # MPC LIFENET # Ward Silver <hwardsil@wolfenet.com> kazaa 1214/udp # KAZAA kazaa 1214/tcp # KAZAA -# Ahti Heinla <ahti@ahti.bluemoon.ee> +# Ahti Heinla <ahti@ahti.bluemoon.ee> scanstat-1 1215/udp # scanSTAT 1.0 scanstat-1 1215/tcp # scanSTAT 1.0 # William Scheding <wls@wls.org> @@ -2382,22 +2382,22 @@ qt-serveradmin 1220/tcp # QT SERVER ADMIN # Chris LeCroy <lecroy@apple.com> sweetware-apps 1221/udp # SweetWARE Apps sweetware-apps 1221/tcp # SweetWARE Apps -# David Dunetz <david@sweetware.com> -nerv 1222/udp # SNI R&D network -nerv 1222/tcp # SNI R&D network +# David Dunetz <david@sweetware.com> +nerv 1222/udp # SNI R&D network +nerv 1222/tcp # SNI R&D network # Martin Freiss <freiss.pad@sni.de> tgp 1223/udp # TGP tgp 1223/tcp # TGP -# Gur Kimchi <gur@mail.trulyglobal.com> +# Gur Kimchi <gur@mail.trulyglobal.com> vpnz 1224/udp # VPNz vpnz 1224/tcp # VPNz -# Tom Strack <TSTRACK@Advnw.com> +# Tom Strack <TSTRACK@Advnw.com> slinkysearch 1225/udp # SLINKYSEARCH slinkysearch 1225/tcp # SLINKYSEARCH # Desmond Chan <deschan@prismedia.com> stgxfws 1226/udp # STGXFWS stgxfws 1226/tcp # STGXFWS -# Tetsuya Shioda <tetsuya@saint.nm.fujitsu.co.jp> +# Tetsuya Shioda <tetsuya@saint.nm.fujitsu.co.jp> dns2go 1227/udp # DNS2Go dns2go 1227/tcp # DNS2Go # Mark Richards <mark.richards@deerfield.com> @@ -2406,7 +2406,7 @@ florence 1228/tcp # FLORENCE # Brian Trammell <btrammell@iventurelab.com> novell-zfs 1229/udp # Novell ZFS novell-zfs 1229/tcp # Novell ZFS -# Ty Ellis <tellis@novell.com> +# Ty Ellis <tellis@novell.com> periscope 1230/udp # Periscope periscope 1230/tcp # Periscope # Kevin Madden <Kevin@emailxtras.com> @@ -2428,7 +2428,7 @@ bvcontrol 1236/tcp # bvcontrol # Daniel J Walsh <dwalsh@bindview.com> tsdos390 1237/udp # tsdos390 tsdos390 1237/tcp # tsdos390 -# Ben Pracht <ben.pracht@tivoli.com> +# Ben Pracht <ben.pracht@tivoli.com> hacl-qs 1238/udp # hacl-qs hacl-qs 1238/tcp # hacl-qs # Farid Faez <farid_faez@hp.com> @@ -2437,7 +2437,7 @@ nmsd 1239/tcp # NMSD # Yuri Machkasov <yuri@ptc.com> instantia 1240/udp # Instantia instantia 1240/tcp # Instantia -# Ruth Slater <ruth.slater@ideagen.co.uk> +# Ruth Slater <ruth.slater@ideagen.co.uk> nessus 1241/udp # nessus nessus 1241/tcp # nessus # Jordan Hrycaj <jordan@mjh.teddy-net.com> @@ -2489,7 +2489,7 @@ opennl 1258/udp # Open Network Library opennl 1258/tcp # Open Network Library opennl-voice 1259/udp # Open Network Library Voice opennl-voice 1259/tcp # Open Network Library Voice -# Phil Frisbie <phil@hawksoft.com> +# Phil Frisbie <phil@hawksoft.com> ibm-ssd 1260/udp # ibm-ssd ibm-ssd 1260/tcp # ibm-ssd # Barry Whyte <barry_whyte@uk.ibm.com> @@ -2498,19 +2498,19 @@ mpshrsv 1261/tcp # mpshrsv # Makoto Ikeyama <ikeyama@ael.fujitsu.co.jp> qnts-orb 1262/udp # QNTS-ORB qnts-orb 1262/tcp # QNTS-ORB -# Raghurama Bhat <raghu@quintus.com> +# Raghurama Bhat <raghu@quintus.com> dka 1263/udp # dka dka 1263/tcp # dka # Chris Griffin <cgriffin@dka.com> prat 1264/udp # PRAT prat 1264/tcp # PRAT -# Keith Wood <keith.wood@epid.eurotherm.co.uk> +# Keith Wood <keith.wood@epid.eurotherm.co.uk> dssiapi 1265/udp # DSSIAPI dssiapi 1265/tcp # DSSIAPI -# Steve Sando <steve.sando@diversifiedsoftware.com> +# Steve Sando <steve.sando@diversifiedsoftware.com> dellpwrappks 1266/udp # DELLPWRAPPKS dellpwrappks 1266/tcp # DELLPWRAPPKS -# David Troeger <David_Troeger@dell.com> +# David Troeger <David_Troeger@dell.com> epc 1267/udp # eTrust Policy Compliance epc 1267/tcp # eTrust Policy Compliance # Aaron Stein <aaron.stein@ca.com> @@ -2545,15 +2545,15 @@ miva-mqs 1277/tcp # mqs # Miva Corporation <jwoods@miva.com.au> dellwebadmin-1 1278/udp # Dell Web Admin 1 dellwebadmin-1 1278/tcp # Dell Web Admin 1 -dellwebadmin-2 1279/udp # Dell Web Admin 2 +dellwebadmin-2 1279/udp # Dell Web Admin 2 dellwebadmin-2 1279/tcp # Dell Web Admin 2 -# Bridget Navoda <Bridget_Navoda@dell.com> +# Bridget Navoda <Bridget_Navoda@dell.com> pictrography 1280/udp # Pictrography pictrography 1280/tcp # Pictrography -# Takashi Hoshino <hoshino@miya.fujifilm.co.jp> +# Takashi Hoshino <hoshino@miya.fujifilm.co.jp> healthd 1281/udp # healthd healthd 1281/tcp # healthd -# James E. Housley <jim@thehousleys.net> +# James E. Housley <jim@thehousleys.net> emperion 1282/udp # Emperion emperion 1282/tcp # Emperion # Claus Thor Barth <ctb@satworks.net> @@ -2565,7 +2565,7 @@ iee-qfx 1284/tcp # IEE-QFX neoiface 1285/udp # neoiface neoiface 1285/tcp # neoiface # Jason McManus <jasonm@neoinformatics.com> -netuitive 1286/udp # netuitive +netuitive 1286/udp # netuitive netuitive 1286/tcp # netuitive # Clayton Wilkinson <cwilkinson@netuitive.com> # 1287 Unassigned @@ -2574,8 +2574,8 @@ navbuddy 1288/tcp # NavBuddy # Eric Hackman <ehackman@millapps.com> jwalkserver 1289/udp # JWalkServer jwalkserver 1289/tcp # JWalkServer -winjaserver 1290/udp # WinJaServer -winjaserver 1290/tcp # WinJaServer +winjaserver 1290/udp # WinJaServer +winjaserver 1290/tcp # WinJaServer seagulllms 1291/udp # SEAGULLLMS seagulllms 1291/tcp # SEAGULLLMS # Lee Breisacher <lbreisacher@seafullsw.com> @@ -2590,18 +2590,18 @@ cmmdriver 1294/tcp # CMMdriver # Lutz Karras <karras@zeiss.de> ehtp 1295/udp # End-by-Hop Transmission Protocol ehtp 1295/tcp # End-by-Hop Transmission Protocol -# Alexander Bogdanov <alexandr_bgd@softhome.net> +# Alexander Bogdanov <alexandr_bgd@softhome.net> dproxy 1296/udp # dproxy dproxy 1296/tcp # dproxy sdproxy 1297/udp # sdproxy sdproxy 1297/tcp # sdproxy -# Raimond Diederik <rdiederik@descartes.com> +# Raimond Diederik <rdiederik@descartes.com> lpcp 1298/udp # lpcp lpcp 1298/tcp # lpcp # Christian Stredicke <stredicke@snom.de> hp-sci 1299/udp # hp-sci hp-sci 1299/tcp # hp-sci -# Kim Scott <kims@cup.hp.com> +# Kim Scott <kims@cup.hp.com> h323hostcallsc 1300/udp # H323 Host Call Secure h323hostcallsc 1300/tcp # H323 Host Call Secure # Jim Toga <jtoga@ideal.jf.intel.com> @@ -2624,10 +2624,10 @@ re-conn-proto 1306/tcp # RE-Conn-Proto # Sandeep Singhal <sandeep@reefedge.com> pacmand 1307/udp # Pacmand pacmand 1307/tcp # Pacmand -# Edward T. O'Shea <oshea@bellsouth.net> +# Edward T. O'Shea <oshea@bellsouth.net> odsi 1308/udp # Optical Domain Service Interconnect (ODSI) odsi 1308/tcp # Optical Domain Service Interconnect (ODSI) -# K. Arvind <arvind@tenornetworks.com> +# K. Arvind <arvind@tenornetworks.com> jtag-server 1309/udp # JTAG server jtag-server 1309/tcp # JTAG server # Andrew Draper <adraper@altera.com> @@ -2657,10 +2657,10 @@ vrts-ipcserver 1317/tcp # vrts-ipcserver # Bruce Hestand <Bruce.Hestand@veritas.com> krb5gatekeeper 1318/udp # krb5gatekeeper krb5gatekeeper 1318/tcp # krb5gatekeeper -# Patrick Moore <pcmoore@sandia.gov> +# Patrick Moore <pcmoore@sandia.gov> panja-icsp 1319/udp # Panja-ICSP panja-icsp 1319/tcp # Panja-ICSP -# Ron Barber <ron.barber@panja.com> +# Ron Barber <ron.barber@panja.com> panja-axbnet 1320/udp # Panja-AXBNET panja-axbnet 1320/tcp # Panja-AXBNET # Andrew van Wensen <avanwensen@panja.com> @@ -2675,7 +2675,7 @@ brcd 1323/tcp # brcd # Todd Picquelle <todd@convergence.net> delta-mcp 1324/udp # delta-mcp delta-mcp 1324/tcp # delta-mcp -# Quinton Tormanen <quinton@deltacompsys.com> +# Quinton Tormanen <quinton@deltacompsys.com> dx-instrument 1325/udp # DX-Instrument dx-instrument 1325/tcp # DX-Instrument # Walt Modic <Walt.Modic@dionex.com> @@ -2693,19 +2693,19 @@ netdb-export 1329/tcp # netdb-export # Konstantinos Kostis <netdb@kostis.net> streetperfect 1330/udp # StreetPerfect streetperfect 1330/tcp # StreetPerfect -# Michael R. Young <michael.young@tor.sunpub.com> +# Michael R. Young <michael.young@tor.sunpub.com> intersan 1331/udp # intersan intersan 1331/tcp # intersan -# Barry H. Feild <barry@intersan.net> +# Barry H. Feild <barry@intersan.net> pcia-rxp-b 1332/udp # PCIA RXP-B pcia-rxp-b 1332/tcp # PCIA RXP-B # James Dabbs <jdabbs@tga.com> passwrd-policy 1333/udp # Password Policy passwrd-policy 1333/tcp # Password Policy -# Tonio Pirotta <tonio@tpis.com.au> +# Tonio Pirotta <tonio@tpis.com.au> writesrv 1334/udp # writesrv writesrv 1334/tcp # writesrv -# Marvin Toungate <toungate@austin.ibm.com> +# Marvin Toungate <toungate@austin.ibm.com> digital-notary 1335/udp # Digital Notary Protocol digital-notary 1335/tcp # Digital Notary Protocol # Wes Doonan @@ -2717,7 +2717,7 @@ menandmice-dns 1337/tcp # menandmice DNS # Sigfus Magnusson <sigfusm@menandmice.com> wmc-log-svc 1338/udp # WMC-log-svr wmc-log-svc 1338/tcp # WMC-log-svr -# Stephen Brosseau <brosseau@workingmachines.com> +# Stephen Brosseau <brosseau@workingmachines.com> kjtsiteserver 1339/udp # kjtsiteserver kjtsiteserver 1339/tcp # kjtsiteserver # Jason Aubain <jaubain@kjt.com> @@ -2726,7 +2726,7 @@ naap 1340/tcp # NAAP # Henry Haverinen <henry.haverinen@nokia.com> qubes 1341/udp # QuBES qubes 1341/tcp # QuBES -# Eric Grange <egrange@creative-it.net> +# Eric Grange <egrange@creative-it.net> esbroker 1342/udp # ESBroker esbroker 1342/tcp # ESBroker # Alexander Medvinsky <smedvinsky@gi.com> @@ -2739,154 +2739,154 @@ icap 1344/tcp # ICAP vpjp 1345/udp # VPJP vpjp 1345/tcp # VPJP # Michael Collins <UBMCollins@aol.com> -alta-ana-lm 1346/udp # Alta Analytics License Manager -alta-ana-lm 1346/tcp # Alta Analytics License Manager +alta-ana-lm 1346/udp # Alta Analytics License Manager +alta-ana-lm 1346/tcp # Alta Analytics License Manager bbn-mmc 1347/udp # multi media conferencing bbn-mmc 1347/tcp # multi media conferencing bbn-mmx 1348/udp # multi media conferencing bbn-mmx 1348/tcp # multi media conferencing -sbook 1349/udp # Registration Network Protocol -sbook 1349/tcp # Registration Network Protocol -editbench 1350/udp # Registration Network Protocol -editbench 1350/tcp # Registration Network Protocol +sbook 1349/udp # Registration Network Protocol +sbook 1349/tcp # Registration Network Protocol +editbench 1350/udp # Registration Network Protocol +editbench 1350/tcp # Registration Network Protocol # Simson L. Garfinkel <simsong@next.cambridge.ma.us> -equationbuilder 1351/udp # Digital Tool Works (MIT) -equationbuilder 1351/tcp # Digital Tool Works (MIT) +equationbuilder 1351/udp # Digital Tool Works (MIT) +equationbuilder 1351/tcp # Digital Tool Works (MIT) # Terrence J. Talbot <lexcube!tjt@bu.edu> -lotusnote 1352/udp # Lotus Note -lotusnote 1352/tcp # Lotus Note +lotusnote 1352/udp # Lotus Note +lotusnote 1352/tcp # Lotus Note # Greg Pflaum <iris.com!Greg_Pflaum@uunet.uu.net> -relief 1353/udp # Relief Consulting -relief 1353/tcp # Relief Consulting +relief 1353/udp # Relief Consulting +relief 1353/tcp # Relief Consulting # John Feiler <relief!jjfeiler@uu2.psi.com> -rightbrain 1354/udp # RightBrain Software -rightbrain 1354/tcp # RightBrain Software +rightbrain 1354/udp # RightBrain Software +rightbrain 1354/tcp # RightBrain Software # Glenn Reid <glann@rightbrain.com> -intuitive-edge 1355/udp # Intuitive Edge -intuitive-edge 1355/tcp # Intuitive Edge +intuitive-edge 1355/udp # Intuitive Edge +intuitive-edge 1355/tcp # Intuitive Edge # Montgomery Zukowski -# <monty@nextnorth.acs.ohio-state.edu> -cuillamartin 1356/udp # CuillaMartin Company -cuillamartin 1356/tcp # CuillaMartin Company -pegboard 1357/udp # Electronic PegBoard -pegboard 1357/tcp # Electronic PegBoard +# <monty@nextnorth.acs.ohio-state.edu> +cuillamartin 1356/udp # CuillaMartin Company +cuillamartin 1356/tcp # CuillaMartin Company +pegboard 1357/udp # Electronic PegBoard +pegboard 1357/tcp # Electronic PegBoard # Chris Cuilla -# <balr!vpnet!cuilla!chris@clout.chi.il.us> -connlcli 1358/udp # CONNLCLI -connlcli 1358/tcp # CONNLCLI -ftsrv 1359/udp # FTSRV -ftsrv 1359/tcp # FTSRV +# <balr!vpnet!cuilla!chris@clout.chi.il.us> +connlcli 1358/udp # CONNLCLI +connlcli 1358/tcp # CONNLCLI +ftsrv 1359/udp # FTSRV +ftsrv 1359/tcp # FTSRV # Ines Homem de Melo <sidinf@brfapesp.bitnet> -mimer 1360/udp # MIMER -mimer 1360/tcp # MIMER +mimer 1360/udp # MIMER +mimer 1360/tcp # MIMER # Per Schroeder <Per.Schroder@mimer.se> -linx 1361/udp # LinX -linx 1361/tcp # LinX +linx 1361/udp # LinX +linx 1361/tcp # LinX # Steffen Schilke <---none---> -timeflies 1362/udp # TimeFlies -timeflies 1362/tcp # TimeFlies +timeflies 1362/udp # TimeFlies +timeflies 1362/tcp # TimeFlies # Doug Kent <mouthers@slugg@nwnexus.wa.com> ndm-requester 1363/udp # Network DataMover Requester ndm-requester 1363/tcp # Network DataMover Requester -ndm-server 1364/udp # Network DataMover Server -ndm-server 1364/tcp # Network DataMover Server +ndm-server 1364/udp # Network DataMover Server +ndm-server 1364/tcp # Network DataMover Server # Toshio Watanabe -# <watanabe@godzilla.rsc.spdd.ricoh.co.j> +# <watanabe@godzilla.rsc.spdd.ricoh.co.j> adapt-sna 1365/udp # Network Software Associates adapt-sna 1365/tcp # Network Software Associates # Jeffery Chiao <714-768-401> netware-csp 1366/udp # Novell NetWare Comm Service Platform netware-csp 1366/tcp # Novell NetWare Comm Service Platform # Laurie Lindsey <llindsey@novell.com> -dcs 1367/udp # DCS -dcs 1367/tcp # DCS +dcs 1367/udp # DCS +dcs 1367/tcp # DCS # Stefan Siebert <ssiebert@dcs.de> -screencast 1368/udp # ScreenCast -screencast 1368/tcp # ScreenCast +screencast 1368/udp # ScreenCast +screencast 1368/tcp # ScreenCast # Bill Tschumy <other!bill@uunet.UU.NET> -gv-us 1369/udp # GlobalView to Unix Shell -gv-us 1369/tcp # GlobalView to Unix Shell -us-gv 1370/udp # Unix Shell to GlobalView -us-gv 1370/tcp # Unix Shell to GlobalView +gv-us 1369/udp # GlobalView to Unix Shell +gv-us 1369/tcp # GlobalView to Unix Shell +us-gv 1370/udp # Unix Shell to GlobalView +us-gv 1370/tcp # Unix Shell to GlobalView # Makoto Mita <mita@ssdev.ksp.fujixerox.co.jp> -fc-cli 1371/udp # Fujitsu Config Protocol -fc-cli 1371/tcp # Fujitsu Config Protocol -fc-ser 1372/udp # Fujitsu Config Protocol -fc-ser 1372/tcp # Fujitsu Config Protocol +fc-cli 1371/udp # Fujitsu Config Protocol +fc-cli 1371/tcp # Fujitsu Config Protocol +fc-ser 1372/udp # Fujitsu Config Protocol +fc-ser 1372/tcp # Fujitsu Config Protocol # Ryuichi Horie <horie@spad.sysrap.cs.fujitsu.co.jp> -chromagrafx 1373/udp # Chromagrafx -chromagrafx 1373/tcp # Chromagrafx +chromagrafx 1373/udp # Chromagrafx +chromagrafx 1373/tcp # Chromagrafx # Mike Barthelemy <msb@chromagrafx.com> -molly 1374/udp # EPI Software Systems -molly 1374/tcp # EPI Software Systems +molly 1374/udp # EPI Software Systems +molly 1374/tcp # EPI Software Systems # Jim Vlcek <jvlcek@veeco.com> -bytex 1375/udp # Bytex -bytex 1375/tcp # Bytex +bytex 1375/udp # Bytex +bytex 1375/tcp # Bytex # Mary Ann Burt <bytex!ws054!maryann@uunet.UU.NET> -ibm-pps 1376/udp # IBM Person to Person Software -ibm-pps 1376/tcp # IBM Person to Person Software +ibm-pps 1376/udp # IBM Person to Person Software +ibm-pps 1376/tcp # IBM Person to Person Software # Simon Phipps <sphipps@vnet.ibm.com> -cichlid 1377/udp # Cichlid License Manager -cichlid 1377/tcp # Cichlid License Manager +cichlid 1377/udp # Cichlid License Manager +cichlid 1377/tcp # Cichlid License Manager # Andy Burgess <aab@cichlid.com> -elan 1378/udp # Elan License Manager -elan 1378/tcp # Elan License Manager +elan 1378/udp # Elan License Manager +elan 1378/tcp # Elan License Manager # Ken Greer <kg@elan.com> -dbreporter 1379/udp # Integrity Solutions -dbreporter 1379/tcp # Integrity Solutions +dbreporter 1379/udp # Integrity Solutions +dbreporter 1379/tcp # Integrity Solutions # Tim Dawson <tdawson%mspboss@uunet.UU.NET> -telesis-licman 1380/udp # Telesis Network License Manager -telesis-licman 1380/tcp # Telesis Network License Manager +telesis-licman 1380/udp # Telesis Network License Manager +telesis-licman 1380/tcp # Telesis Network License Manager # Karl Schendel, Jr. <wiz@telesis.com> -apple-licman 1381/udp # Apple Network License Manager -apple-licman 1381/tcp # Apple Network License Manager +apple-licman 1381/udp # Apple Network License Manager +apple-licman 1381/tcp # Apple Network License Manager # Earl Wallace <earlw@apple.com> udt_os 1382/udp # udt_os udt_os 1382/tcp # udt_os gwha 1383/udp # GW Hannaway Network License Manager gwha 1383/tcp # GW Hannaway Network License Manager # J. Gabriel Foster <fop@gwha.com> -os-licman 1384/udp # Objective Solutions License Manager -os-licman 1384/tcp # Objective Solutions License Manager +os-licman 1384/udp # Objective Solutions License Manager +os-licman 1384/tcp # Objective Solutions License Manager # Donald Cornwell <don.cornwell@objective.com> atex_elmd 1385/udp # Atex Publishing License Manager atex_elmd 1385/tcp # Atex Publishing License Manager # Brett Sorenson <bcs@atex.com> -checksum 1386/udp # CheckSum License Manager -checksum 1386/tcp # CheckSum License Manager +checksum 1386/udp # CheckSum License Manager +checksum 1386/tcp # CheckSum License Manager # Andreas Glocker <glocker@sirius.com> -cadsi-lm 1387/udp # Computer Aided Design Software Inc LM -cadsi-lm 1387/tcp # Computer Aided Design Software Inc LM +cadsi-lm 1387/udp # Computer Aided Design Software Inc LM +cadsi-lm 1387/tcp # Computer Aided Design Software Inc LM # Sulistio Muljadi <e-mail?> objective-dbc 1388/udp # Objective Solutions DataBase Cache objective-dbc 1388/tcp # Objective Solutions DataBase Cache # Donald Cornwell <e-mail?> -iclpv-dm 1389/udp # Document Manager -iclpv-dm 1389/tcp # Document Manager -iclpv-sc 1390/udp # Storage Controller -iclpv-sc 1390/tcp # Storage Controller -iclpv-sas 1391/udp # Storage Access Server -iclpv-sas 1391/tcp # Storage Access Server -iclpv-pm 1392/udp # Print Manager -iclpv-pm 1392/tcp # Print Manager -iclpv-nls 1393/udp # Network Log Server -iclpv-nls 1393/tcp # Network Log Server -iclpv-nlc 1394/udp # Network Log Client -iclpv-nlc 1394/tcp # Network Log Client -iclpv-wsm 1395/udp # PC Workstation Manager software -iclpv-wsm 1395/tcp # PC Workstation Manager software +iclpv-dm 1389/udp # Document Manager +iclpv-dm 1389/tcp # Document Manager +iclpv-sc 1390/udp # Storage Controller +iclpv-sc 1390/tcp # Storage Controller +iclpv-sas 1391/udp # Storage Access Server +iclpv-sas 1391/tcp # Storage Access Server +iclpv-pm 1392/udp # Print Manager +iclpv-pm 1392/tcp # Print Manager +iclpv-nls 1393/udp # Network Log Server +iclpv-nls 1393/tcp # Network Log Server +iclpv-nlc 1394/udp # Network Log Client +iclpv-nlc 1394/tcp # Network Log Client +iclpv-wsm 1395/udp # PC Workstation Manager software +iclpv-wsm 1395/tcp # PC Workstation Manager software # A.P. Hobson <A.P.Hobson@bra0112.wins.icl.co.uk> -dvl-activemail 1396/udp # DVL Active Mail -dvl-activemail 1396/tcp # DVL Active Mail -audio-activmail 1397/udp # Audio Active Mail -audio-activmail 1397/tcp # Audio Active Mail -video-activmail 1398/udp # Video Active Mail -video-activmail 1398/tcp # Video Active Mail +dvl-activemail 1396/udp # DVL Active Mail +dvl-activemail 1396/tcp # DVL Active Mail +audio-activmail 1397/udp # Audio Active Mail +audio-activmail 1397/tcp # Audio Active Mail +video-activmail 1398/udp # Video Active Mail +video-activmail 1398/tcp # Video Active Mail # Avshalom Houri <Avshalom@ubique.com> -cadkey-licman 1399/udp # Cadkey License Manager -cadkey-licman 1399/tcp # Cadkey License Manager -cadkey-tablet 1400/udp # Cadkey Tablet Daemon -cadkey-tablet 1400/tcp # Cadkey Tablet Daemon +cadkey-licman 1399/udp # Cadkey License Manager +cadkey-licman 1399/tcp # Cadkey License Manager +cadkey-tablet 1400/udp # Cadkey Tablet Daemon +cadkey-tablet 1400/tcp # Cadkey Tablet Daemon # Joe McCollough <joe@cadkey.com> goldleaf-licman 1401/udp # Goldleaf License Manager goldleaf-licman 1401/tcp # Goldleaf License Manager @@ -2902,82 +2902,82 @@ ibm-res 1405/udp # IBM Remote Execution Starter ibm-res 1405/tcp # IBM Remote Execution Starter netlabs-lm 1406/udp # NetLabs License Manager netlabs-lm 1406/tcp # NetLabs License Manager -dbsa-lm 1407/udp # DBSA License Manager -dbsa-lm 1407/tcp # DBSA License Manager +dbsa-lm 1407/udp # DBSA License Manager +dbsa-lm 1407/tcp # DBSA License Manager # Scott Shattuck <ss@dbsa.com> -sophia-lm 1408/udp # Sophia License Manager -sophia-lm 1408/tcp # Sophia License Manager +sophia-lm 1408/udp # Sophia License Manager +sophia-lm 1408/tcp # Sophia License Manager # Eric Brown <sst!emerald!eric@uunet.UU.net> -here-lm 1409/udp # Here License Manager -here-lm 1409/tcp # Here License Manager +here-lm 1409/udp # Here License Manager +here-lm 1409/tcp # Here License Manager # David Ison <here@dialup.oar.net> -hiq 1410/udp # HiQ License Manager -hiq 1410/tcp # HiQ License Manager +hiq 1410/udp # HiQ License Manager +hiq 1410/tcp # HiQ License Manager # Rick Pugh <rick@bilmillennium.com> -af 1411/udp # AudioFile -af 1411/tcp # AudioFile +af 1411/udp # AudioFile +af 1411/tcp # AudioFile # Jim Gettys <jg@crl.dec.com> -innosys 1412/udp # InnoSys -innosys 1412/tcp # InnoSys -innosys-acl 1413/udp # Innosys-ACL -innosys-acl 1413/tcp # Innosys-ACL +innosys 1412/udp # InnoSys +innosys 1412/tcp # InnoSys +innosys-acl 1413/udp # Innosys-ACL +innosys-acl 1413/tcp # Innosys-ACL # Eric Welch <--none---> -ibm-mqseries 1414/udp # IBM MQSeries -ibm-mqseries 1414/tcp # IBM MQSeries +ibm-mqseries 1414/udp # IBM MQSeries +ibm-mqseries 1414/tcp # IBM MQSeries # Roger Meli <rmmeli%winvmd@vnet.ibm.com> -dbstar 1415/udp # DBStar -dbstar 1415/tcp # DBStar +dbstar 1415/udp # DBStar +dbstar 1415/tcp # DBStar # Jeffrey Millman <jcm@dbstar.com> -novell-lu6.2 1416/udp # Novell LU6.2 -novell-lu6.2 1416/tcp # Novell LU6.2 +novell-lu6.2 1416/udp # Novell LU6.2 +novell-lu6.2 1416/tcp # Novell LU6.2 # Peter Liu <--none---> -timbuktu-srv1 1417/udp # Timbuktu Service 1 Port -timbuktu-srv1 1417/tcp # Timbuktu Service 1 Port -timbuktu-srv2 1418/udp # Timbuktu Service 2 Port -timbuktu-srv2 1418/tcp # Timbuktu Service 2 Port -timbuktu-srv3 1419/udp # Timbuktu Service 3 Port -timbuktu-srv3 1419/tcp # Timbuktu Service 3 Port -timbuktu-srv4 1420/udp # Timbuktu Service 4 Port -timbuktu-srv4 1420/tcp # Timbuktu Service 4 Port +timbuktu-srv1 1417/udp # Timbuktu Service 1 Port +timbuktu-srv1 1417/tcp # Timbuktu Service 1 Port +timbuktu-srv2 1418/udp # Timbuktu Service 2 Port +timbuktu-srv2 1418/tcp # Timbuktu Service 2 Port +timbuktu-srv3 1419/udp # Timbuktu Service 3 Port +timbuktu-srv3 1419/tcp # Timbuktu Service 3 Port +timbuktu-srv4 1420/udp # Timbuktu Service 4 Port +timbuktu-srv4 1420/tcp # Timbuktu Service 4 Port # Marc Epard <marc@netopia.com> gandalf-lm 1421/udp # Gandalf License Manager gandalf-lm 1421/tcp # Gandalf License Manager # gilmer@gandalf.ca -autodesk-lm 1422/udp # Autodesk License Manager -autodesk-lm 1422/tcp # Autodesk License Manager +autodesk-lm 1422/udp # Autodesk License Manager +autodesk-lm 1422/tcp # Autodesk License Manager # David Ko <dko@autodesk.com> -essbase 1423/udp # Essbase Arbor Software -essbase 1423/tcp # Essbase Arbor Software -hybrid 1424/udp # Hybrid Encryption Protocol -hybrid 1424/tcp # Hybrid Encryption Protocol +essbase 1423/udp # Essbase Arbor Software +essbase 1423/tcp # Essbase Arbor Software +hybrid 1424/udp # Hybrid Encryption Protocol +hybrid 1424/tcp # Hybrid Encryption Protocol # Howard Hart <hch@hybrid.com> -zion-lm 1425/udp # Zion Software License Manager -zion-lm 1425/tcp # Zion Software License Manager +zion-lm 1425/udp # Zion Software License Manager +zion-lm 1425/tcp # Zion Software License Manager # David Ferrero <david@zion.com> sais 1426/udp # Satellite-data Acquisition System 1 sais 1426/tcp # Satellite-data Acquisition System 1 # Bill Taylor <sais@ssec.wisc.edu> -mloadd 1427/udp # mloadd monitoring tool -mloadd 1427/tcp # mloadd monitoring tool +mloadd 1427/udp # mloadd monitoring tool +mloadd 1427/tcp # mloadd monitoring tool # Bob Braden <braden@isi.edu> informatik-lm 1428/udp # Informatik License Manager informatik-lm 1428/tcp # Informatik License Manager # Harald Schlangmann -# <schlangm@informatik.uni-muenchen.de> -nms 1429/udp # Hypercom NMS -nms 1429/tcp # Hypercom NMS -tpdu 1430/udp # Hypercom TPDU -tpdu 1430/tcp # Hypercom TPDU +# <schlangm@informatik.uni-muenchen.de> +nms 1429/udp # Hypercom NMS +nms 1429/tcp # Hypercom NMS +tpdu 1430/udp # Hypercom TPDU +tpdu 1430/tcp # Hypercom TPDU # Noor Chowdhury <noor@hypercom.com> rgtp 1431/udp # Reverse Gossip Transport rgtp 1431/tcp # Reverse Gossip Transport # Ian Jackson <iwj@cam-orl.co.uk> -blueberry-lm 1432/udp # Blueberry Software License Manager -blueberry-lm 1432/tcp # Blueberry Software License Manager +blueberry-lm 1432/udp # Blueberry Software License Manager +blueberry-lm 1432/tcp # Blueberry Software License Manager # Steve Beigel <ublueb!steve@uunet.uu.net> -ms-sql-s 1433/udp # Microsoft-SQL-Server -ms-sql-s 1433/tcp # Microsoft-SQL-Server -ms-sql-m 1434/udp # Microsoft-SQL-Monitor +ms-sql-s 1433/udp # Microsoft-SQL-Server +ms-sql-s 1433/tcp # Microsoft-SQL-Server +ms-sql-m 1434/udp # Microsoft-SQL-Monitor ms-sql-m 1434/tcp # Microsoft-SQL-Monitor # Peter Hussey <peterhus@microsoft.com> ibm-cics 1435/udp # IBM CICS @@ -2989,27 +2989,27 @@ saism 1436/tcp # Satellite-data Acquisition System 2 tabula 1437/udp # Tabula tabula 1437/tcp # Tabula # Marcelo Einhorn -# <KGUNE%HUJIVM1.bitnet@taunivm.tau.ac.il> -eicon-server 1438/udp # Eicon Security Agent/Server -eicon-server 1438/tcp # Eicon Security Agent/Server -eicon-x25 1439/udp # Eicon X25/SNA Gateway -eicon-x25 1439/tcp # Eicon X25/SNA Gateway -eicon-slp 1440/udp # Eicon Service Location Protocol -eicon-slp 1440/tcp # Eicon Service Location Protocol +# <KGUNE%HUJIVM1.bitnet@taunivm.tau.ac.il> +eicon-server 1438/udp # Eicon Security Agent/Server +eicon-server 1438/tcp # Eicon Security Agent/Server +eicon-x25 1439/udp # Eicon X25/SNA Gateway +eicon-x25 1439/tcp # Eicon X25/SNA Gateway +eicon-slp 1440/udp # Eicon Service Location Protocol +eicon-slp 1440/tcp # Eicon Service Location Protocol # Pat Calhoun <CALHOUN@admin.eicon.qc.ca> -cadis-1 1441/udp # Cadis License Management -cadis-1 1441/tcp # Cadis License Management -cadis-2 1442/udp # Cadis License Management -cadis-2 1442/tcp # Cadis License Management +cadis-1 1441/udp # Cadis License Management +cadis-1 1441/tcp # Cadis License Management +cadis-2 1442/udp # Cadis License Management +cadis-2 1442/tcp # Cadis License Management # Todd Wichers <twichers@csn.org> -ies-lm 1443/udp # Integrated Engineering Software -ies-lm 1443/tcp # Integrated Engineering Software +ies-lm 1443/udp # Integrated Engineering Software +ies-lm 1443/tcp # Integrated Engineering Software # David Tong <David_Tong@integrated.mb.ca> -marcam-lm 1444/udp # Marcam License Management -marcam-lm 1444/tcp # Marcam License Management +marcam-lm 1444/udp # Marcam License Management +marcam-lm 1444/tcp # Marcam License Management # Therese Hunt <hunt@marcam.com> -proxima-lm 1445/udp # Proxima License Manager -proxima-lm 1445/tcp # Proxima License Manager +proxima-lm 1445/udp # Proxima License Manager +proxima-lm 1445/tcp # Proxima License Manager ora-lm 1446/udp # Optical Research Associates License Manager ora-lm 1446/tcp # Optical Research Associates License Manager apri-lm 1447/udp # Applied Parallel Research LM @@ -3018,29 +3018,29 @@ apri-lm 1447/tcp # Applied Parallel Research LM oc-lm 1448/udp # OpenConnect License Manager oc-lm 1448/tcp # OpenConnect License Manager # Sue Barnhill <snb@oc.com> -peport 1449/udp # PEport -peport 1449/tcp # PEport +peport 1449/udp # PEport +peport 1449/tcp # PEport # Qentin Neill <quentin@ColumbiaSC.NCR.COM> -dwf 1450/udp # Tandem Distributed Workbench Facility -dwf 1450/tcp # Tandem Distributed Workbench Facility +dwf 1450/udp # Tandem Distributed Workbench Facility +dwf 1450/tcp # Tandem Distributed Workbench Facility # Mike Bert <BERG_MIKE@tandem.com> infoman 1451/udp # IBM Information Management infoman 1451/tcp # IBM Information Management # Karen Burns <---none---> -gtegsc-lm 1452/udp # GTE Government Systems License Man -gtegsc-lm 1452/tcp # GTE Government Systems License Man +gtegsc-lm 1452/udp # GTE Government Systems License Man +gtegsc-lm 1452/tcp # GTE Government Systems License Man # Mike Gregory <Gregory_Mike@msmail.iipo.gtegsc.com> -genie-lm 1453/udp # Genie License Manager -genie-lm 1453/tcp # Genie License Manager +genie-lm 1453/udp # Genie License Manager +genie-lm 1453/tcp # Genie License Manager # Paul Applegate <p.applegate2@genie.geis.com> -interhdl_elmd 1454/udp # interHDL License Manager -interhdl_elmd 1454/tcp # interHDL License Manager +interhdl_elmd 1454/udp # interHDL License Manager +interhdl_elmd 1454/tcp # interHDL License Manager # Eli Sternheim eli@interhdl.com -esl-lm 1455/udp # ESL License Manager -esl-lm 1455/tcp # ESL License Manager +esl-lm 1455/udp # ESL License Manager +esl-lm 1455/tcp # ESL License Manager # Abel Chou <abel@willy.esl.com> -dca 1456/udp # DCA -dca 1456/tcp # DCA +dca 1456/udp # DCA +dca 1456/tcp # DCA # Jeff Garbers <jgarbers@netcom.com> valisys-lm 1457/udp # Valisys License Manager valisys-lm 1457/tcp # Valisys License Manager @@ -3053,8 +3053,8 @@ proshare1 1459/tcp # Proshare Notebook Application proshare2 1460/udp # Proshare Notebook Application proshare2 1460/tcp # Proshare Notebook Application # Robin Kar <Robin_Kar@ccm.hf.intel.com> -ibm_wrless_lan 1461/udp # IBM Wireless LAN -ibm_wrless_lan 1461/tcp # IBM Wireless LAN +ibm_wrless_lan 1461/udp # IBM Wireless LAN +ibm_wrless_lan 1461/tcp # IBM Wireless LAN # <flanne@vnet.IBM.COM> world-lm 1462/udp # World License Manager world-lm 1462/tcp # World License Manager @@ -3066,94 +3066,94 @@ msl_lmd 1464/udp # MSL License Manager msl_lmd 1464/tcp # MSL License Manager # Matt Timmermans pipes 1465/udp # Pipes Platform mfarlin@peerlogic.com -pipes 1465/tcp # Pipes Platform +pipes 1465/tcp # Pipes Platform # Mark Farlin <mfarlin@peerlogic.com> oceansoft-lm 1466/udp # Ocean Software License Manager oceansoft-lm 1466/tcp # Ocean Software License Manager # Randy Leonard <randy@oceansoft.com> -csdmbase 1467/udp # CSDMBASE -csdmbase 1467/tcp # CSDMBASE -csdm 1468/udp # CSDM -csdm 1468/tcp # CSDM +csdmbase 1467/udp # CSDMBASE +csdmbase 1467/tcp # CSDMBASE +csdm 1468/udp # CSDM +csdm 1468/tcp # CSDM # Robert Stabl <stabl@informatik.uni-muenchen.de> aal-lm 1469/udp # Active Analysis Limited License Manager aal-lm 1469/tcp # Active Analysis Limited License Manager # David Snocken +44 (71)437-7009 -uaiact 1470/udp # Universal Analytics -uaiact 1470/tcp # Universal Analytics +uaiact 1470/udp # Universal Analytics +uaiact 1470/tcp # Universal Analytics # Mark R. Ludwig <Mark-Ludwig@uai.com> -csdmbase 1471/udp # csdmbase -csdmbase 1471/tcp # csdmbase -csdm 1472/udp # csdm -csdm 1472/tcp # csdm +csdmbase 1471/udp # csdmbase +csdmbase 1471/tcp # csdmbase +csdm 1472/udp # csdm +csdm 1472/tcp # csdm # Robert Stabl <stabl@informatik.uni-muenchen.de> -openmath 1473/udp # OpenMath -openmath 1473/tcp # OpenMath +openmath 1473/udp # OpenMath +openmath 1473/tcp # OpenMath # Garth Mayville <mayville@maplesoft.on.ca> -telefinder 1474/udp # Telefinder -telefinder 1474/tcp # Telefinder +telefinder 1474/udp # Telefinder +telefinder 1474/tcp # Telefinder # Jim White <Jim_White@spiderisland.com> -taligent-lm 1475/udp # Taligent License Manager -taligent-lm 1475/tcp # Taligent License Manager +taligent-lm 1475/udp # Taligent License Manager +taligent-lm 1475/tcp # Taligent License Manager # Mark Sapsford <Mark_Sapsford@@taligent.com> -clvm-cfg 1476/udp # clvm-cfg -clvm-cfg 1476/tcp # clvm-cfg +clvm-cfg 1476/udp # clvm-cfg +clvm-cfg 1476/tcp # clvm-cfg # Eric Soderberg <seric@cup.hp.com> -ms-sna-server 1477/udp # ms-sna-server -ms-sna-server 1477/tcp # ms-sna-server -ms-sna-base 1478/udp # ms-sna-base -ms-sna-base 1478/tcp # ms-sna-base +ms-sna-server 1477/udp # ms-sna-server +ms-sna-server 1477/tcp # ms-sna-server +ms-sna-base 1478/udp # ms-sna-base +ms-sna-base 1478/tcp # ms-sna-base # Gordon Mangione <gordm@microsoft.com> -dberegister 1479/udp # dberegister -dberegister 1479/tcp # dberegister +dberegister 1479/udp # dberegister +dberegister 1479/tcp # dberegister # Brian Griswold <brian@dancingbear.com> -pacerforum 1480/udp # PacerForum -pacerforum 1480/tcp # PacerForum +pacerforum 1480/udp # PacerForum +pacerforum 1480/tcp # PacerForum # Peter Caswell <pfc@pacvax.pacersoft.com> -airs 1481/udp # AIRS -airs 1481/tcp # AIRS +airs 1481/udp # AIRS +airs 1481/tcp # AIRS # Bruce Wilson, 905-771-6161 miteksys-lm 1482/udp # Miteksys License Manager miteksys-lm 1482/tcp # Miteksys License Manager # Shane McRoberts <mcroberts@miteksys.com> -afs 1483/udp # AFS License Manager -afs 1483/tcp # AFS License Manager +afs 1483/udp # AFS License Manager +afs 1483/tcp # AFS License Manager # Michael R. Pizolato <michael@afs.com> -confluent 1484/udp # Confluent License Manager -confluent 1484/tcp # Confluent License Manager +confluent 1484/udp # Confluent License Manager +confluent 1484/tcp # Confluent License Manager # James Greenfiel <jim@pa.confluent.com> -lansource 1485/udp # LANSource -lansource 1485/tcp # LANSource +lansource 1485/udp # LANSource +lansource 1485/tcp # LANSource # Christopher Wells <Christopher_Wells@3com.com> -nms_topo_serv 1486/udp # nms_topo_serv -nms_topo_serv 1486/tcp # nms_topo_serv +nms_topo_serv 1486/udp # nms_topo_serv +nms_topo_serv 1486/tcp # nms_topo_serv # Sylvia Siu <Sylvia_Siu@Novell.CO> -localinfosrvr 1487/udp # LocalInfoSrvr -localinfosrvr 1487/tcp # LocalInfoSrvr +localinfosrvr 1487/udp # LocalInfoSrvr +localinfosrvr 1487/tcp # LocalInfoSrvr # Brian Matthews <brian_matthews@ibist.ibis.com> -docstor 1488/udp # DocStor -docstor 1488/tcp # DocStor +docstor 1488/udp # DocStor +docstor 1488/tcp # DocStor # Brian Spears <bspears@salix.com> -dmdocbroker 1489/udp # dmdocbroker -dmdocbroker 1489/tcp # dmdocbroker +dmdocbroker 1489/udp # dmdocbroker +dmdocbroker 1489/tcp # dmdocbroker # Razmik Abnous <abnous@documentum.com> -insitu-conf 1490/udp # insitu-conf -insitu-conf 1490/tcp # insitu-conf +insitu-conf 1490/udp # insitu-conf +insitu-conf 1490/tcp # insitu-conf # Paul Blacknell <paul@insitu.com> -anynetgateway 1491/udp # anynetgateway -anynetgateway 1491/tcp # anynetgateway +anynetgateway 1491/udp # anynetgateway +anynetgateway 1491/tcp # anynetgateway # Dan Poirier <poirier@VNET.IBM.COM> -stone-design-1 1492/udp # stone-design-1 -stone-design-1 1492/tcp # stone-design-1 +stone-design-1 1492/udp # stone-design-1 +stone-design-1 1492/tcp # stone-design-1 # Andrew Stone <andrew@stone.com> -netmap_lm 1493/udp # netmap_lm -netmap_lm 1493/tcp # netmap_lm +netmap_lm 1493/udp # netmap_lm +netmap_lm 1493/tcp # netmap_lm # Phillip Magson <philm@extro.ucc.su.OZ.AU> -ica 1494/udp # ica -ica 1494/tcp # ica +ica 1494/udp # ica +ica 1494/tcp # ica # John Richardson, Citrix Systems -cvc 1495/udp # cvc -cvc 1495/tcp # cvc +cvc 1495/udp # cvc +cvc 1495/tcp # cvc # Bill Davidson <billd@equalizer.cray.com> liberty-lm 1496/udp # liberty-lm liberty-lm 1496/tcp # liberty-lm @@ -3170,8 +3170,8 @@ fhc 1499/tcp # Federico Heinz Consultora vlsi-lm 1500/udp # VLSI License Manager vlsi-lm 1500/tcp # VLSI License Manager # Shue-Lin Kuo <shuelin@mdk.sanjose.vlsi.com> -saiscm 1501/udp # Satellite-data Acquisition System 3 -saiscm 1501/tcp # Satellite-data Acquisition System 3 +saiscm 1501/udp # Satellite-data Acquisition System 3 +saiscm 1501/tcp # Satellite-data Acquisition System 3 # Bill Taylor <sais@ssec.wisc.edu> shivadiscovery 1502/udp # Shiva shivadiscovery 1502/tcp # Shiva @@ -3239,8 +3239,8 @@ ingreslock 1524/udp # ingres ingreslock 1524/tcp # ingres orasrv 1525/udp prospero-np # oracle orasrv 1525/tcp prospero-np # oracle -pdap-np 1526/udp # Prospero Data Access Prot non-priv -pdap-np 1526/tcp # Prospero Data Access Prot non-priv +pdap-np 1526/udp # Prospero Data Access Prot non-priv +pdap-np 1526/tcp # Prospero Data Access Prot non-priv # B. Clifford Neuman <bcn@isi.edu> tlisrv 1527/udp # oracle tlisrv 1527/tcp # oracle @@ -3259,12 +3259,12 @@ miroconnect 1532/tcp # miroconnect # Michael Fischer +49 531 21 13 0 virtual-places 1533/udp # Virtual Places Software virtual-places 1533/tcp # Virtual Places Software -# Avshalom Houri <Avshalom@ubique.com> -micromuse-lm 1534/udp # micromuse-lm -micromuse-lm 1534/tcp # micromuse-lm +# Avshalom Houri <Avshalom@ubique.com> +micromuse-lm 1534/udp # micromuse-lm +micromuse-lm 1534/tcp # micromuse-lm # Adam Kerrison <adam@micromuse.co.uk> -ampr-info 1535/udp # ampr-info -ampr-info 1535/tcp # ampr-info +ampr-info 1535/udp # ampr-info +ampr-info 1535/tcp # ampr-info ampr-inter 1536/udp # ampr-inter ampr-inter 1536/tcp # ampr-inter # Rob Janssen <rob@sys3.pe1chl.ampr.org> @@ -3293,7 +3293,7 @@ aspeclmd 1544/tcp # aspeclmd # V. Balaji <balaji@aspec.com> vistium-share 1545/udp # vistium-share vistium-share 1545/tcp # vistium-share -# Allison Carleton +# Allison Carleton # <acarleto@naper1.napervilleil.ncr.com> abbaccuray 1546/udp # abbaccuray abbaccuray 1546/tcp # abbaccuray @@ -3366,7 +3366,7 @@ tsspmap 1568/tcp # tsspmap # Paul W. Nelson <nelson@thursby.com> ets 1569/udp # ets ets 1569/tcp # ets -# Carstein Seeberg <case@boole.no> +# Carstein Seeberg <case@boole.no> orbixd 1570/udp # orbixd orbixd 1570/tcp # orbixd # Bridget Walsh <bwalsh@iona.ie> @@ -3421,8 +3421,8 @@ ibm-abtact 1586/tcp # ibm-abtact pra_elmd 1587/udp # pra_elmd pra_elmd 1587/tcp # pra_elmd # Dennis Mastin <dennis@tasmania.platte.com> -triquest-lm 1588/udp # triquest-lm -triquest-lm 1588/tcp # triquest-lm +triquest-lm 1588/udp # triquest-lm +triquest-lm 1588/tcp # triquest-lm # Nand Kumar <nkumar@triquest-da.com> vqp 1589/udp # VQP vqp 1589/tcp # VQP @@ -3469,12 +3469,12 @@ picodbc 1603/tcp # pickodbc # John Lombardo <johnl@picksys.com> icabrowser 1604/udp # icabrowser icabrowser 1604/tcp # icabrowser -# Brad Pedersen <bradp@citrix.com> +# Brad Pedersen <bradp@citrix.com> slp 1605/udp # Salutation Manager (Salutation Protocol) slp 1605/tcp # Salutation Manager (Salutation Protocol) slm-api 1606/udp # Salutation Manager (SLM-API) slm-api 1606/tcp # Salutation Manager (SLM-API) -# Tohru Mori <tmori@VNET.IBM.COM> +# Tohru Mori <tmori@VNET.IBM.COM> stt 1607/udp # stt stt 1607/tcp # stt # Ryan Bolz <ryanbo@microsoft.com> @@ -3578,20 +3578,20 @@ isis-ambc 1643/tcp # isis-ambc # Ken Chapman <kchapman@isis.com> saiseh 1644/tcp # Satellite-data Acquisition System 4 # Bill Taylor <sais@ssec.wisc.edu> -sightline 1645/udp # SightLine -sightline 1645/tcp # SightLine +sightline 1645/udp # SightLine +sightline 1645/tcp # SightLine # Stuart J. Newman <stuart.newman@fortel.com> sa-msg-port 1646/udp # sa-msg-port sa-msg-port 1646/tcp # sa-msg-port # Eric Whitehill <eawhiteh@itt.com> rsap 1647/udp # rsap rsap 1647/tcp # rsap -# Holger Reif -# <Holger.Reif@prakinf.tu-ilmenau.de> +# Holger Reif +# <Holger.Reif@prakinf.tu-ilmenau.de> concurrent-lm 1648/udp # concurrent-lm concurrent-lm 1648/tcp # concurrent-lm # Maggie Brinsford <mjb@concurrent.co.uk> -kermit 1649/udp # kermit +kermit 1649/udp # kermit kermit 1649/tcp # kermit # Frank da Cruz <fdc@watsun.cc.columbia.edu> nkd 1650/udp # nkd @@ -3650,7 +3650,7 @@ netview-aix-11 1671/udp # netview-aix-11 netview-aix-11 1671/tcp # netview-aix-11 netview-aix-12 1672/udp # netview-aix-12 netview-aix-12 1672/tcp # netview-aix-12 -# Martha Crisson +# Martha Crisson # <CRISSON@ralvm12.vnet.ibm.com> proshare-mc-1 1673/udp # Intel Proshare Multicast proshare-mc-1 1673/tcp # Intel Proshare Multicast @@ -3674,7 +3674,7 @@ darcorp-lm 1679/tcp # darcorp-lm # <DARcorp@aol.com> microcom-sbp 1680/udp # microcom-sbp microcom-sbp 1680/tcp # microcom-sbp -# Boris B. Maiden <Boris_Maiden@smtp.microcom.com> +# Boris B. Maiden <Boris_Maiden@smtp.microcom.com> sd-elmd 1681/udp # sd-elmd sd-elmd 1681/tcp # sd-elmd # Bryan Otey <bwo@softdesk.com> @@ -3781,8 +3781,8 @@ fj-hdnet 1717/tcp # fj-hdnet # Manabu Makino <m-makino@ael.fujitsu.co.jp> h323gatedisc 1718/udp # h323gatedisc h323gatedisc 1718/tcp # h323gatedisc -h323gatestat 1719/udp # h323gatestat -h323gatestat 1719/tcp # h323gatestat +h323gatestat 1719/udp # h323gatestat +h323gatestat 1719/tcp # h323gatestat h323hostcall 1720/udp # h323hostcall h323hostcall 1720/tcp # h323hostcall # Jim Toga <jtoga@ibeam.jf.intel.com> @@ -3875,13 +3875,13 @@ aspen-services 1749/tcp # aspen-services sslp 1750/udp # Simple Socket Library's PortMaster sslp 1750/tcp # Simple Socket Library's PortMaster # Dr. Charles E. Campbell Jr. -# <cec@gryphon.gsfc.nasa.gov> +# <cec@gryphon.gsfc.nasa.gov> swiftnet 1751/udp # SwiftNet swiftnet 1751/tcp # SwiftNet # Terry Lim <tkl@pentek.com> -lofr-lm 1752/udp # Leap of Faith Research License Manager -lofr-lm 1752/tcp # Leap of Faith Research License Manager -# +lofr-lm 1752/udp # Leap of Faith Research License Manager +lofr-lm 1752/tcp # Leap of Faith Research License Manager +# translogic-lm 1753/udp # Translogic License Manager translogic-lm 1753/tcp # Translogic License Manager # Stan Dallas <stan@translogic.com> @@ -3957,14 +3957,14 @@ pharmasoft 1779/tcp # pharmasoft dpkeyserv 1780/udp # dpkeyserv dpkeyserv 1780/tcp # dpkeyserv # Yasunari Gon Yamasita <yamasita@omronsoft.co.jp> -answersoft-lm 1781/udp # answersoft-lm +answersoft-lm 1781/udp # answersoft-lm answersoft-lm 1781/tcp # answersoft-lm # James A. Brewster <jimbrew@answersoft.com> hp-hcip 1782/udp # hp-hcip hp-hcip 1782/tcp # hp-hcip # Allen Baker <abaker@boi.hp.com> -# 1783 Decomissioned Port 04/14/00, ms -# <naonao@kikaku.mmp.fujitsu.co.jp> +# 1783 Decomissioned Port 04/14/00, ms +# <naonao@kikaku.mmp.fujitsu.co.jp> finle-lm 1784/udp # Finle License Manager finle-lm 1784/tcp # Finle License Manager # Dongling Wang <dongling@finle.com> @@ -3982,7 +3982,7 @@ psmond 1788/tcp # psmond # Will Golson <golson@fc.hp.com> hello 1789/udp # hello hello 1789/tcp # hello -# D. J. Bernstein <djb@koobera.math.uic.edu> +# D. J. Bernstein <djb@koobera.math.uic.edu> nmsp 1790/udp # Narrative Media Streaming Protocol nmsp 1790/tcp # Narrative Media Streaming Protocol # Paul Santinelli, Jr. <psantinelli@narrative.com> @@ -4005,7 +4005,7 @@ vocaltec-admin 1796/udp # Vocaltec Server Administration vocaltec-admin 1796/tcp # Vocaltec Server Administration # Scott Petrack <Scott_Petrack@vocaltec.com> uma 1797/udp # UMA -uma 1797/tcp # UMA +uma 1797/tcp # UMA # Martin Kirk <m.kirk@opengroup.org> etp 1798/udp # Event Transfer Protocol etp 1798/tcp # Event Transfer Protocol @@ -4152,13 +4152,13 @@ tunstall-pnc 1846/tcp # Tunstall PNC # Robert M. Moore <r_moore@tunstall.co.uk> slp-notify 1847/udp # SLP Notification slp-notify 1847/tcp # SLP Notification -# James Kempf <james.kempf@sun.com> +# James Kempf <james.kempf@sun.com> fjdocdist 1848/udp # fjdocdist fjdocdist 1848/tcp # fjdocdist # Yuichi Ohiwa <y-ohiwa@ael.fujitsu.co.jp> alpha-sms 1849/udp # ALPHA-SMS alpha-sms 1849/tcp # ALPHA-SMS -# Benjamin Grimm <bg@webnetix.de> +# Benjamin Grimm <bg@webnetix.de> gsi 1850/udp # GSI gsi 1850/tcp # GSI # William Mullaney <mullanwi@usa.net> @@ -4173,21 +4173,21 @@ vids-avtp 1853/tcp # VIDS-AVTP # Sascha Kuemmel <kuemmel@vidsoft.de> buddy-draw 1854/udp # Buddy Draw buddy-draw 1854/tcp # Buddy Draw -# Marvin Shin <president@medialingo.com> +# Marvin Shin <president@medialingo.com> fiorano-rtrsvc 1855/udp # Fiorano RtrSvc fiorano-rtrsvc 1855/tcp # Fiorano RtrSvc fiorano-msgsvc 1856/udp # Fiorano MsgSvc fiorano-msgsvc 1856/tcp # Fiorano MsgSvc -# Albert Holt <alberth@fiorano.com> +# Albert Holt <alberth@fiorano.com> datacaptor 1857/udp # DataCaptor datacaptor 1857/tcp # DataCaptor # Steven M. Forrester <StevenF@CapsuleTech.com> privateark 1858/udp # PrivateArk privateark 1858/tcp # PrivateArk -# Ronen Zoran <ronenz@cyber-ark.com> +# Ronen Zoran <ronenz@cyber-ark.com> gammafetchsvr 1859/udp # Gamma Fetcher Server gammafetchsvr 1859/tcp # Gamma Fetcher Server -# Cnaan Aviv <cnaan@gammasite.com> +# Cnaan Aviv <cnaan@gammasite.com> sunscalar-svc 1860/udp # SunSCALAR Services sunscalar-svc 1860/tcp # SunSCALAR Services # Sanjay Radia <srradia@kasumbi.Eng.Sun.COM> @@ -4208,16 +4208,16 @@ entp 1865/tcp # ENTP # Seiko Epson <Ishida.Hitoshi@exc.epson.co.jp> swrmi 1866/udp # swrmi swrmi 1866/tcp # swrmi -# Jun Yoshii <yoshii@ael.fujitsu.co.jp> +# Jun Yoshii <yoshii@ael.fujitsu.co.jp> udrive 1867/udp # UDRIVE udrive 1867/tcp # UDRIVE # Robby Walker <webmaster@cd-lab.com> viziblebrowser 1868/udp # VizibleBrowser viziblebrowser 1868/tcp # VizibleBrowser -# Jimmy Talbot <jtalbot@vizible.com> +# Jimmy Talbot <jtalbot@vizible.com> yestrader 1869/udp # YesTrader yestrader 1869/tcp # YesTrader -# Robert Bryan <bbryan@yestrader.com> +# Robert Bryan <bbryan@yestrader.com> sunscalar-dns 1870/udp # SunSCALAR DNS Service sunscalar-dns 1870/tcp # SunSCALAR DNS Service # Sanjay Radia <srradia@kasumbi.Eng.Sun.COM> @@ -4248,7 +4248,7 @@ nettgain-nms 1879/tcp # NettGain NMS # Dr. Yair Shapira <yair@flashnetworks.com> vsat-control 1880/udp # Gilat VSAT Control vsat-control 1880/tcp # Gilat VSAT Control -# Yariv Kaplan <yarivk@gilat.com> +# Yariv Kaplan <yarivk@gilat.com> ibm-mqseries2 1881/udp # IBM WebSphere MQ ibm-mqseries2 1881/tcp # IBM WebSphere MQ # Richard Maxwell <richard_maxwell@uk.ibm.com> @@ -4260,7 +4260,7 @@ ibm-mqisdp 1883/tcp # IBM MQSeries SCADA # Andy Stanford-Clark <andysc@uk.ibm.com> idmaps 1884/udp # Internet Distance Map Svc idmaps 1884/tcp # Internet Distance Map Svc -# Sugih Jamim <jamin@eecs.umich.edu> +# Sugih Jamim <jamin@eecs.umich.edu> vrtstrapserver 1885/udp # Veritas Trap Server vrtstrapserver 1885/tcp # Veritas Trap Server # Russell Thrasher <rthrashe@veritas.com> @@ -4278,7 +4278,7 @@ unify-adapter 1889/tcp # Unify Web Adapter Service # Duane Gibson <ianaportmaster@unify.com> wilkenlistener 1890/udp # wilkenListener wilkenlistener 1890/tcp # wilkenListener -# Wilken GmbH <fy@wilken.de> +# Wilken GmbH <fy@wilken.de> childkey-notif 1891/udp # ChildKey Notification childkey-notif 1891/tcp # ChildKey Notification childkey-ctrl 1892/udp # ChildKey Control @@ -4290,7 +4290,7 @@ elad 1893/tcp # ELAD Protocol o2server-port 1894/udp # O2Server Port o2server-port 1894/tcp # O2Server Port # Tim Howard <timothygh@hotmail.com> -##### Microsoft (unoffically) using 1895 ##### +##### Microsoft (unoffically) using 1895 ##### b-novative-ls 1896/udp # b-novative license server b-novative-ls 1896/tcp # b-novative license server # Matthias Riese <Matthias.Riese@b-novative.de> @@ -4409,7 +4409,7 @@ xaapi 1934/tcp # IBM LM Appl Agent # Helga Wolin <hwolin@us.ibm.com> macromedia-fcs 1935/udp # Macromedia Flash Communications server MX macromedia-fcs 1935/tcp # Macromedia Flash Communications Server MX -# Pritham Shetty <pritham@macromedia.com> +# Pritham Shetty <pritham@macromedia.com> jetcmeserver 1936/udp # JetCmeServer Server Port jetcmeserver 1936/tcp # JetCmeServer Server Port jwserver 1937/udp # JetVWay Server Port @@ -4423,7 +4423,7 @@ jvclient 1940/tcp # JetVision Client Port # Stephen Tsun <stsun@jetstream.com> dic-aida 1941/udp # DIC-Aida dic-aida 1941/tcp # DIC-Aida -# Frans S.C. Witte <fscwitte@dicgroep.nl> +# Frans S.C. Witte <fscwitte@dicgroep.nl> res 1942/udp # Real Enterprise Service res 1942/tcp # Real Enterprise Service # Bob Janssen <bob@res.nl> @@ -4463,7 +4463,7 @@ abr-basic 1954/udp # ABR-Basic Data abr-basic 1954/tcp # ABR-Basic Data abr-secure 1955/udp # ABR-Secure Data abr-secure 1955/tcp # ABR-Secure Data -# Aero9 - Graham Wooden <graham@aero9.com> +# Aero9 - Graham Wooden <graham@aero9.com> vrtl-vmf-ds 1956/udp # Vertel VMF DS vrtl-vmf-ds 1956/tcp # Vertel VMF DS # Alan Akahoshi <alan-akahoshi@vertel.com> @@ -4472,10 +4472,10 @@ unix-status 1957/tcp # unix-status # Thomas Erskine <erskine@sourceworks.com> dxadmind 1958/udp # CA Administration Daemon dxadmind 1958/tcp # CA Administration Daemon -# John Birrell <birjo99@cai.com> +# John Birrell <birjo99@cai.com> simp-all 1959/udp # SIMP Channel simp-all 1959/tcp # SIMP Channel -# Tim Hunnewell <thunnewell@pinna.com> +# Tim Hunnewell <thunnewell@pinna.com> nasmanager 1960/udp # Merit DAC NASmanager nasmanager 1960/tcp # Merit DAC NASmanager # Richard S. Conto <rsc@merit.edu> @@ -4484,7 +4484,7 @@ bts-appserver 1961/tcp # BTS APPSERVER # Carl Obsorn <carl_osborn@sabre.com> biap-mp 1962/udp # BIAP-MP biap-mp 1962/tcp # BIAP-MP -# Chuck Shotton <cshotton@biap.com> +# Chuck Shotton <cshotton@biap.com> webmachine 1963/udp # WebMachine webmachine 1963/tcp # WebMachine # Tim Jowers <Tim.Jowers@ColumbiaSC.NCR.com> @@ -4504,7 +4504,7 @@ lipsinc 1968/udp # LIPSinc lipsinc 1968/tcp # LIPSinc lipsinc1 1969/udp # LIPSinc 1 lipsinc1 1969/tcp # LIPSinc 1 -# Robert Armington <rarmington@lipsinc.com> +# Robert Armington <rarmington@lipsinc.com> netop-rc 1970/udp # NetOp Remote Control netop-rc 1970/tcp # NetOp Remote Control netop-school 1971/udp # NetOp School @@ -4646,9 +4646,9 @@ submitserver 2028/tcp # # 2029 Unassigned device2 2030/udp # device2 2030/tcp # -# 2031 Unassigned -blackboard 2032/udp # -blackboard 2032/tcp # +# 2031 Unassigned +blackboard 2032/udp # +blackboard 2032/tcp # glogger 2033/udp # glogger 2033/tcp # scoremgr 2034/udp # @@ -4693,7 +4693,7 @@ epnsdp 2051/tcp # EPNSDP # Hiroyasu Ogata <Ogata.Hiroyasu@exc.epson.co.jp> clearvisn 2052/udp # clearVisn Services Port clearvisn 2052/tcp # clearVisn Services Port -# Dave Lyons <dlyons@dnpg.com> +# Dave Lyons <dlyons@dnpg.com> lot105-ds-upd 2053/udp # Lot105 DSuper Updates lot105-ds-upd 2053/tcp # Lot105 DSuper Updates # Piers Scannell <iana-form@lot105.com> @@ -4708,10 +4708,10 @@ omnisky 2056/tcp # OmniSky Port # Oren Hurvitz <oren@omnisky.com> rich-cp 2057/udp # Rich Content Protocol rich-cp 2057/tcp # Rich Content Protocol -# Ronen Vainish <ronen@digitalfountain.com> +# Ronen Vainish <ronen@digitalfountain.com> newwavesearch 2058/udp # NewWaveSearchables RMI newwavesearch 2058/tcp # NewWaveSearchables RMI -# Thomas Kerkau <Thomas.Kerkau@io-software.com> +# Thomas Kerkau <Thomas.Kerkau@io-software.com> bmc-messaging 2059/udp # BMC Messaging Service bmc-messaging 2059/tcp # BMC Messaging Service # Roger Huebner <Roger_Huebner@bmc.com> @@ -4727,14 +4727,14 @@ icg-bridge 2063/udp # ICG Bridge Port icg-bridge 2063/tcp # ICG Bridge Port icg-iprelay 2064/udp # ICG IP Relay Port icg-iprelay 2064/tcp # ICG IP Relay Port -# Steve Quintana <steve@icgresearch.com> +# Steve Quintana <steve@icgresearch.com> dlsrpn 2065/udp # Data Link Switch Read Port Number dlsrpn 2065/tcp # Data Link Switch Read Port Number # Amir Peless <amirp@radware.co.il> -# 2066 Unassigned +# 2066 Unassigned dlswpn 2067/udp # Data Link Switch Write Port Number dlswpn 2067/tcp # Data Link Switch Write Port Number -# Amir Peless <amirp@radware.co.il> +# Amir Peless <amirp@radware.co.il> avauthsrvprtcl 2068/udp # Avocent AuthSrv Protocol avauthsrvprtcl 2068/tcp # Avocent AuthSrv Protocol # Steven W. Clark <sclark@equinox.com> @@ -4743,7 +4743,7 @@ event-port 2069/tcp # HTTP Event Port # Larry Emlich <larry.emlich@compaq.com> ah-esp-encap 2070/udp # AH and ESP Encapsulated in UDP packet ah-esp-encap 2070/tcp # AH and ESP Encapsulated in UDP packet -# Amy Weaver <aweaver@vpnet.com> +# Amy Weaver <aweaver@vpnet.com> acp-port 2071/udp # Axon Control Protocol acp-port 2071/tcp # Axon Control Protocol # Christiaan Simons <christiaan.simons@axon.nl> @@ -4771,7 +4771,7 @@ idware-router 2079/tcp # IDWARE Router Port # Zdenek Kolba <zdenek.kolba@id-karta.cz> autodesk-nlm 2080/udp # Autodesk NLM (FLEXlm) autodesk-nlm 2080/tcp # Autodesk NLM (FLEXlm) -# Greg Suppes <greg.suppes@autodesk.com> +# Greg Suppes <greg.suppes@autodesk.com> kme-trap-port 2081/udp # KME PRINTER TRAP PORT kme-trap-port 2081/tcp # KME PRINTER TRAP PORT # Masakatsu Matsuo <masa@sdsft.kme.mei.co.jp> @@ -4784,10 +4784,10 @@ gnunet 2086/tcp # GNUnet # Christian Grothoff <grothoff@cs.purdue.edu> October 2002 eli 2087/udp # ELI - Event Logging Integration eli 2087/tcp # ELI - Event Logging Integration -# Maya Zimerman <mayaz@radware.co.il> -# 2088 Unassigned -sep 2089/udp # Security Encapsulation Protocol - SEP -sep 2089/tcp # Security Encapsulation Protocol - SEP +# Maya Zimerman <mayaz@radware.co.il> +# 2088 Unassigned +sep 2089/udp # Security Encapsulation Protocol - SEP +sep 2089/tcp # Security Encapsulation Protocol - SEP # Maya Zimerman <mayaz@radware.co.il> lrp 2090/udp # Load Report Protocol lrp 2090/tcp # Load Report Protocol @@ -4846,7 +4846,7 @@ ergolight 2109/tcp # Ergolight # Jindra Ryvola <jryvola@ledalite.com> umsp 2110/udp # UMSP umsp 2110/tcp # UMSP -# Alexander Bogdanov <alexander_bgd@softhome.net> +# Alexander Bogdanov <alexander_bgd@softhome.net> dsatp 2111/udp # DSATP dsatp 2111/tcp # DSATP # Ralph Beck <beck@altaworks.com> @@ -4855,7 +4855,7 @@ idonix-metanet 2112/tcp # Idonix MetaNet # Paul Harrison <paulh@idonix.co.uk> hsl-storm 2113/udp # HSL StoRM hsl-storm 2113/tcp # HSL StoRM -# Jost Faganel <jost.faganel@hermes.si> +# Jost Faganel <jost.faganel@hermes.si> newheights 2114/udp # NEWHEIGHTS newheights 2114/tcp # NEWHEIGHTS # Michael Levy <ml@nh.ca> @@ -4864,7 +4864,7 @@ kdm 2115/tcp # Key Distribution Manager # Mike Little <mike.little@GDC4S.com> ccowcmr 2116/udp # CCOWCMR ccowcmr 2116/tcp # CCOWCMR -# Mark Morwood <markm@sentillion.com> +# Mark Morwood <markm@sentillion.com> mentaclient 2117/udp # MENTACLIENT mentaclient 2117/tcp # MENTACLIENT mentaserver 2118/udp # MENTASERVER @@ -4881,7 +4881,7 @@ scientia-ssdb 2121/tcp # SCIENTIA-SSDB # Ian Miller <Ian_Miller@scientia.com> caupc-remote 2122/udp # CauPC Remote Control caupc-remote 2122/tcp # CauPC Remote Control -# Environics Oy <pasi.nuutinmaki@environics.fi> +# Environics Oy <pasi.nuutinmaki@environics.fi> gtp-control 2123/udp # GTP-Control Plane (3GPP) gtp-control 2123/tcp # GTP-Control Plane (3GPP) # Alessio Casati <a.casati@computer.org> @@ -4890,10 +4890,10 @@ elatelink 2124/tcp # ELATELINK # Tim Lawrence <lawrence@tao-group.com> lockstep 2125/udp # LOCKSTEP lockstep 2125/tcp # LOCKSTEP -# Karl Forster <kforster@lockstep.com> +# Karl Forster <kforster@lockstep.com> pktcable-cops 2126/udp # PktCable-COPS pktcable-cops 2126/tcp # PktCable-COPS -# Glenn Russell <grussell@cablelabs.com> +# Glenn Russell <grussell@cablelabs.com> index-pc-wb 2127/udp # INDEX-PC-WB index-pc-wb 2127/tcp # INDEX-PC-WB # James David Fisher <jfisher1@avaya.com> @@ -4920,13 +4920,13 @@ avenue 2134/tcp # AVENUE # Jason Cater <jason@ncsmags.com> gris 2135/udp # Grid Resource Information Server gris 2135/tcp # Grid Resource Information Server -# Steve Tuecke <tuecke@mcs.anl.gov> +# Steve Tuecke <tuecke@mcs.anl.gov> appworxsrv 2136/udp # APPWORXSRV appworxsrv 2136/tcp # APPWORXSRV # Fred McLain <fmclain@appworx.com> connect 2137/udp # CONNECT connect 2137/tcp # CONNECT -# Reid Ligon <reid@connectrf.com> +# Reid Ligon <reid@connectrf.com> unbind-cluster 2138/udp # UNBIND-CLUSTER unbind-cluster 2138/tcp # UNBIND-CLUSTER # Francois Harvey <securiweb@pandore.qc.ca> @@ -4956,7 +4956,7 @@ veritas-ucl 2148/tcp # VERITAS UNIVERSAL COMMUNICATION LAYER # Songlin Ren <ren@veritas.com> acptsys 2149/udp # ACPTSYS acptsys 2149/tcp # ACPTSYS -# Michael Lekias <admin@psdesign.com.au> +# Michael Lekias <admin@psdesign.com.au> dynamic3d 2150/udp # DYNAMIC3D dynamic3d 2150/tcp # DYNAMIC3D # Tobias Wegner <wegner@novagate.de> @@ -4965,7 +4965,7 @@ docent 2151/tcp # DOCENT # Hali Lindbloom <halil@docent.com> gtp-user 2152/udp # GTP-User Plane (3GPP) gtp-user 2152/tcp # GTP-User Plane (3GPP) -# Alessio Casati <a.casati@computer.org> +# Alessio Casati <a.casati@computer.org> # 2153-2158 Unassigned gdbremote 2159/udp # GDB Remote Debug Port gdbremote 2159/tcp # GDB Remote Debug Port @@ -5006,7 +5006,7 @@ tivoconnect 2190/tcp # TiVoConnect Beacon # Jeffrey J. Peters <jpeters@tivo.com> August 2002 tvbus 2191/udp # TvBus Messaging tvbus 2191/tcp # TvBus Messaging -# Brian W. Beach <brian@tivo.com> January 2003 +# Brian W. Beach <brian@tivo.com> January 2003 # 2192-2199 Unassigned ici 2200/udp # ICI ici 2200/tcp # ICI @@ -5060,7 +5060,7 @@ recipe 2240/tcp # RECIPe # Charlie Limoges <charlie.limoges@gd-cs.com> ivsd 2241/udp # IVS Daemon ivsd 2241/tcp # IVS Daemon -# Thierry Turletti +# Thierry Turletti # <Thierry.Turletti@sophia.inria.fr> foliocorp 2242/udp # Folio Remote Server foliocorp 2242/tcp # Folio Remote Server @@ -5081,7 +5081,7 @@ pc-mta-addrmap 2246/tcp # PacketCable MTA Addr Map # 2247 Unassigned ums 2248/udp # User Management Service ums 2248/tcp # User Management Service -# Andrew Crockford +# Andrew Crockford # <andrew.crockford@modus-interactive.co.uk> rfmp 2249/udp # RISO File Manager Protocol rfmp 2249/tcp # RISO File Manager Protocol @@ -5103,7 +5103,7 @@ seispoc 2254/tcp # Seismic P.O.C. Port # Robert Reimiller <bob@certsoft.com> vrtp 2255/udp # VRTP - ViRtue Transfer Protocol vrtp 2255/tcp # VRTP - ViRtue Transfer Protocol -# Max Fudim <fudim@virtue3d.com> +# Max Fudim <fudim@virtue3d.com> # 2256-2259 Unassigned apc-2260 2260/udp # APC 2260 apc-2260 2260/tcp # APC 2260 @@ -5124,10 +5124,10 @@ lnvmaps 2284/udp # LNVMAPS lnvmaps 2284/tcp # LNVMAPS lnvmailmon 2285/udp # LNVMAILMON lnvmailmon 2285/tcp # LNVMAILMON -# John Payne <jpayne@lotus.com> +# John Payne <jpayne@lotus.com> nas-metering 2286/udp # NAS-Metering nas-metering 2286/tcp # NAS-Metering -# Steven Sawkins <ssawkins@symantec.com> +# Steven Sawkins <ssawkins@symantec.com> dna 2287/udp # DNA dna 2287/tcp # DNA # Tung Nguyen <dash@ricochet.net> @@ -5327,8 +5327,8 @@ tl1 2361/tcp # TL1 digiman 2362/udp # digiman digiman 2362/tcp # digiman # Aaron S. Kurland <akurland@netsilicon.com> -mediacntrlnfsd 2363/udp # Media Central NFSD -mediacntrlnfsd 2363/tcp # Media Central NFSD +mediacntrlnfsd 2363/udp # Media Central NFSD +mediacntrlnfsd 2363/tcp # Media Central NFSD # shivakumar s. govindarajapuram <shivak@eng.sun.com> oi-2000 2364/udp # OI-2000 oi-2000 2364/tcp # OI-2000 @@ -5538,7 +5538,7 @@ powerclientcsf 2443/tcp # PowerClient Central Storage Facility # Brian Klassen <Brian.Klassen@Unisys.com> btpp2sectrans 2444/udp # BT PP2 Sectrans btpp2sectrans 2444/tcp # BT PP2 Sectrans -# Ian Daniels <btexact.ports@bt.com> +# Ian Daniels <btexact.ports@bt.com> dtn1 2445/udp # DTN1 dtn1 2445/tcp # DTN1 # Bob Gaddie <bobg@dtn.com> @@ -6261,8 +6261,8 @@ vspread 2695/tcp # VSPREAD unifyadmin 2696/udp # Unify Admin unifyadmin 2696/tcp # Unify Admin # Duane Gibson <ianaportmaster@unify.com> -oce-snmp-trap 2697/udp # Oce SNMP Trap Port -oce-snmp-trap 2697/tcp # Oce SNMP Trap Port +oce-snmp-trap 2697/udp # Oce SNMP Trap Port +oce-snmp-trap 2697/tcp # Oce SNMP Trap Port # Peter Teeuwen <ptee@oce.nl> mck-ivpip 2698/udp # MCK-IVPIP mck-ivpip 2698/tcp # MCK-IVPIP @@ -6520,7 +6520,7 @@ piccolo 2787/tcp # piccolo - Cornerstone Software # Dave Bellivea <DaveBelliveau@corsof.com> fryeserv 2788/udp # NetWare Loadable Module - Seagate Software fryeserv 2788/tcp # NetWare Loadable Module - Seagate Software -# Joseph LoPilato +# Joseph LoPilato # <Joseph_M_LoPilato@notes.seagate.com> media-agent 2789/udp # Media Agent media-agent 2789/tcp # Media Agent @@ -6623,7 +6623,7 @@ ka0wuc 2822/tcp # ka0wuc # Kit Haskins <kit@ka0wuc.org> cqg-netlan 2823/udp # CQG Net/LAN cqg-netlan 2823/tcp # CQG Net/LAN -cqg-netlan-1 2824/udp # CQG Net/Lan 1 +cqg-netlan-1 2824/udp # CQG Net/Lan 1 cqg-netlan-1 2824/tcp # CQG Net/LAN 1 # Jeff Wood <jw@cqg.com> # 2825 (unassigned) Possibly assigned @@ -6838,16 +6838,16 @@ powergemplus 2899/tcp # POWERGEMPLUS # Koich Nakamura <naka@case.nm.fujitsu.co.jp> quicksuite 2900/udp # QUICKSUITE quicksuite 2900/tcp # QUICKSUITE -# William Egge <begge@emagisoft.com> +# William Egge <begge@emagisoft.com> allstorcns 2901/udp # ALLSTORCNS allstorcns 2901/tcp # ALLSTORCNS -# Steve Dobson <sdobson@allstor.com> +# Steve Dobson <sdobson@allstor.com> netaspi 2902/udp # NET ASPI netaspi 2902/tcp # NET ASPI -# Johnson Luo <johnson_luo@mail.sercomm.com.tw> +# Johnson Luo <johnson_luo@mail.sercomm.com.tw> suitcase 2903/udp # SUITCASE suitcase 2903/tcp # SUITCASE -# Milton E. Sagen <msagen@extensis.com> +# Milton E. Sagen <msagen@extensis.com> m2ua 2904/sctp # M2UA m2ua 2904/udp # M2UA m2ua 2904/tcp # M2UA @@ -6905,7 +6905,7 @@ cesdcdman 2921/tcp # CESD Contents Delivery Management # Shinya Abe <abeabe@pfu.co.jp> cesdcdtrn 2922/udp # CESD Contents Delivery Data Transfer cesdcdtrn 2922/tcp # CESD Contents Delivery Data Transfer -# Shinya Abe <abeabe@pfu.co.jp> +# Shinya Abe <abeabe@pfu.co.jp> wta-wsp-wtp-s 2923/udp # WTA-WSP-WTP-S wta-wsp-wtp-s 2923/tcp # WTA-WSP-WTP-S # Sebastien Bury (WAP Forum) @@ -6936,7 +6936,7 @@ incp 2932/udp # INCP incp 2932/tcp # INCP # Keith Paulsen <kpaulsen@phobos.com> 4-tieropmgw 2933/udp # 4-TIER OPM GW -4-tieropmgw 2933/tcp # 4-TIER OPM GW +4-tieropmgw 2933/tcp # 4-TIER OPM GW # Francois Peloffy <fpeloffy@4tier.com> 4-tieropmcli 2934/udp # 4-TIER OPM CLI 4-tieropmcli 2934/tcp # 4-TIER OPM CLI @@ -6960,15 +6960,15 @@ sm-pas-4 2941/udp # SM-PAS-4 sm-pas-4 2941/tcp # SM-PAS-4 sm-pas-5 2942/udp # SM-PAS-5 sm-pas-5 2942/tcp # SM-PAS-5 -# Tom Haapanen <tomh@metrics.com> +# Tom Haapanen <tomh@metrics.com> ttnrepository 2943/udp # TTNRepository ttnrepository 2943/tcp # TTNRepository -# Robert Orr <rorr@teltone.com> +# Robert Orr <rorr@teltone.com> megaco-h248 2944/udp # Megaco H-248 megaco-h248 2944/tcp # Megaco H-248 h248-binary 2945/udp # H248 Binary h248-binary 2945/tcp # H248 Binary -# Tom Taylor <taylor@nortelnetworks.com> +# Tom Taylor <taylor@nortelnetworks.com> fjsvmpor 2946/udp # FJSVmpor fjsvmpor 2946/tcp # FJSVmpor # Naoki Hayashi <ha@fjh.se.fujitsu.co.jp> @@ -7025,10 +7025,10 @@ bullant-rap 2965/tcp # BULLANT RAP # Michael Cahill <Michael.Cahill@bullant.net> idp-infotrieve 2966/udp # IDP-INFOTRIEVE idp-infotrieve 2966/tcp # IDP-INFOTRIEVE -# Kevin Bruckert <kbruckert@idpco.com> +# Kevin Bruckert <kbruckert@idpco.com> ssc-agent 2967/udp # SSC-AGENT ssc-agent 2967/tcp # SSC-AGENT -# George Dzieciol <gdzieciol@symantec.com> +# George Dzieciol <gdzieciol@symantec.com> enpp 2968/udp # ENPP enpp 2968/tcp # ENPP # Kazuhito Gassho <Gassho.Kasuhito@exc.epson.co.jp> @@ -7088,7 +7088,7 @@ identify 2987/udp # identify identify 2987/tcp # identify hippad 2988/udp # HIPPA Reporting Protocol hippad 2988/tcp # HIPPA Reporting Protocol -# William Randolph Royere III +# William Randolph Royere III # <william@royere.net> zarkov 2989/udp # ZARKOV Intelligent Agent Communication zarkov 2989/tcp # ZARKOV Intelligent Agent Communication @@ -7101,7 +7101,7 @@ wkstn-mon 2991/tcp # WKSTN-MON # William David <william.david@lmco.com> itb301 2992/udp # ITB301 itb301 2992/tcp # ITB301 -# Bodo Rueskamp <br@itchigo.com> +# Bodo Rueskamp <br@itchigo.com> veritas-vis1 2993/udp # VERITAS VIS1 veritas-vis1 2993/tcp # VERITAS VIS1 veritas-vis2 2994/udp # VERITAS VIS2 @@ -7204,8 +7204,8 @@ magicnotes 3023/tcp # magicnotes nds_sso 3024/udp # NDS_SSO nds_sso 3024/tcp # NDS_SSO # Mel Oyler <mel@novell.com> -arepa-raft 3025/udp # Arepa Raft -arepa-raft 3025/tcp # Arepa Raft +arepa-raft 3025/udp # Arepa Raft +arepa-raft 3025/tcp # Arepa Raft # Mark Ellison <ellison@ieee.org> agri-gateway 3026/udp # AGRI Gateway agri-gateway 3026/tcp # AGRI Gateway @@ -7246,7 +7246,7 @@ santak-ups 3038/tcp # Santak UPS # Tom Liu <ssc@sc.stk.com.cn> cogitate 3039/udp # Cogitate, Inc. cogitate 3039/tcp # Cogitate, Inc. -# Jim Harlan <jimh@infowest.com> +# Jim Harlan <jimh@infowest.com> tomato-springs 3040/udp # Tomato Springs tomato-springs 3040/tcp # Tomato Springs # Jack Waller III <jack@tomatosprings.com> @@ -7261,7 +7261,7 @@ brp 3043/tcp # BRP # Greg Gee <ggee@hns.com> epp 3044/udp # EndPoint Protocol epp 3044/tcp # EndPoint Protocol -# Stephen Cipolli <scipolli@radvision.com> +# Stephen Cipolli <scipolli@radvision.com> responsenet 3045/udp # ResponseNet responsenet 3045/tcp # ResponseNet # Chul Yoon <cyoon@responsenetworks.com> @@ -7344,7 +7344,7 @@ csd-monitor 3072/tcp # ContinuStor Monitor Port # Ray Jantz <ray.jantz@lsil.com> vcrp 3073/udp # Very simple chatroom prot vcrp 3073/tcp # Very simple chatroom prot -# Andreas Wurf <a.wurf@mediaTools.de> +# Andreas Wurf <a.wurf@mediaTools.de> xbox 3074/udp # Xbox game port xbox 3074/tcp # Xbox game port # Damon Danieli <damond@microsoft.com> @@ -7382,13 +7382,13 @@ jdl-dbkitchen 3086/tcp # JDL-DBKitchen # Hideo Wakabayashi <hiwaka@alles.or.jp> asoki-sma 3087/udp # Asoki SMA asoki-sma 3087/tcp # Asoki SMA -# Andrew Mossberg <amossberg@asoki.net> +# Andrew Mossberg <amossberg@asoki.net> xdtp 3088/udp # eXtensible Data Transfer Protocol xdtp 3088/tcp # eXtensible Data Transfer Protocol -# Michael Shearson <mshearson@peerglobal.com> +# Michael Shearson <mshearson@peerglobal.com> ptk-alink 3089/udp # ParaTek Agent Linking ptk-alink 3089/tcp # ParaTek Agent Linking -# Robert Hodgson <robert@paratek.co.uk> +# Robert Hodgson <robert@paratek.co.uk> rtss 3090/udp # Rappore Session Services rtss 3090/tcp # Rappore Session Services # Peter Boucher <pboucher@rappore.com> @@ -7397,7 +7397,7 @@ rtss 3090/tcp # Rappore Session Services # Ralf Bensmann <iana@1ci.de> njfss 3092/udp # Netware sync services njfss 3092/tcp # Netware sync services -# Gordon Ross <G.Ross@ccw.gov.uk> +# Gordon Ross <G.Ross@ccw.gov.uk> rapidmq-center 3093/udp # Jiiva RapidMQ Center rapidmq-center 3093/tcp # Jiiva RapidMQ Center rapidmq-reg 3094/udp # Jiiva RapidMQ Registry @@ -7408,7 +7408,7 @@ panasas 3095/tcp # Panasas rendevous port # Peter Berger <peterb@panasas.com> ndl-aps 3096/udp # Active Print Server Port ndl-aps 3096/tcp # Active Print Server Port -# Martin Norman <martin@ndl.co.uk> +# Martin Norman <martin@ndl.co.uk> # 3097/tcp Reserved # 3097/udp Reserved itu-bicc-stc 3097/sctp # ITU-T Q.1902.1/Q.2150.3 @@ -7421,7 +7421,7 @@ chmd 3099/tcp # CHIPSY Machine Daemon # Trond Borsting <Trond.Borsting@telelogic.com> opcon-xps 3100/udp # OpCon/xps opcon-xps 3100/tcp # OpCon/xps -# David Bourland <DBourland@smausa.com> +# David Bourland <DBourland@smausa.com> hp-pxpib 3101/udp # HP PolicyXpert PIB Server hp-pxpib 3101/tcp # HP PolicyXpert PIB Server # Brian O'Keefe <bokeefe@cnd.hp.com> @@ -7444,7 +7444,7 @@ geolocate 3108/udp # Geolocate protocol geolocate 3108/tcp # Geolocate protocol personnel 3109/udp # Personnel protocol personnel 3109/tcp # Personnel protocol -# William Randolph Royere III +# William Randolph Royere III # <william@royere.net> sim-control 3110/udp # simulator control port sim-control 3110/tcp # simulator control port @@ -7461,21 +7461,21 @@ cs-auth-svr 3113/tcp # CS-Authenticate Svr Port # Andy Georgiou <ageorgiou@crypto-solutions.co.uk> ccmad 3114/udp # CCM AutoDiscover ccmad 3114/tcp # CCM AutoDiscover -# Ram Sudama <rsudama@on.com> +# Ram Sudama <rsudama@on.com> mctet-master 3115/udp # MCTET Master mctet-master 3115/tcp # MCTET Master mctet-gateway 3116/udp # MCTET Gateway mctet-gateway 3116/tcp # MCTET Gateway mctet-jserv 3117/udp # MCTET Jserv mctet-jserv 3117/tcp # MCTET Jserv -# Manuel Veloso <veloso@us.itmasters.com> +# Manuel Veloso <veloso@us.itmasters.com> pkagent 3118/udp # PKAgent pkagent 3118/tcp # PKAgent # Michael Douglass <mikedoug@datafoundry.net> d2000kernel 3119/udp # D2000 Kernel Port d2000kernel 3119/tcp # D2000 Kernel Port d2000webserver 3120/udp # D2000 Webserver Port -d2000webserver 3120/tcp # D2000 Webserver Port +d2000webserver 3120/tcp # D2000 Webserver Port # Tomas Rajcan <trajcan@ipesoft.sk> epp-temp 3121/udp # Extensible Provisioning Protocol epp-temp 3121/tcp # Extensible Provisioning Protocol @@ -7627,7 +7627,7 @@ serverview-rm 3172/udp # SERVERVIEW-RM serverview-rm 3172/tcp # SERVERVIEW-RM serverview-icc 3173/udp # SERVERVIEW-ICC serverview-icc 3173/tcp # SERVERVIEW-ICC -# Guenther Kroenert +# Guenther Kroenert # <Guenther.Kroenert@fujitsu-siemens.com> armi-server 3174/udp # ARMI Server armi-server 3174/tcp # ARMI Server @@ -7775,7 +7775,7 @@ digivote 3223/tcp # DIGIVOTE (R) Vote-Server # Christian Treczoks <ct@braehler.com> aes-discovery 3224/udp # AES Discovery Port aes-discovery 3224/tcp # AES Discovery Port -# Ken Richard <kenr@aeseducation.com> +# Ken Richard <kenr@aeseducation.com> fcip-port 3225/udp # FCIP fcip-port 3225/tcp # FCIP # RFC-ietf-ips-fcovertcpip-12.txt @@ -7803,7 +7803,7 @@ whisker 3233/udp # WhiskerControl main port whisker 3233/tcp # WhiskerControl main port # Rudolf Cardinal <rudolf@pobox.com> February 2002 alchemy 3234/udp # Alchemy Server -alchemy 3234/tcp # Alchemy Server +alchemy 3234/tcp # Alchemy Server # Mikhail Belov <mikhail@imrgold.com> February 2002 mdap-port 3235/udp # MDAP Port mdap-port 3235/tcp # MDAP port @@ -7991,7 +7991,7 @@ cytel-lm 3297/tcp # Cytel License Manager # Yogesh P. Gajjar <yogesh@cytel.com> deskview 3298/udp # DeskView deskview 3298/tcp # DeskView -# Manfred Randelzofer +# Manfred Randelzofer # <manfred.randelzofer@fujitsu-siemens.com> pdrncs 3299/udp # pdrncs pdrncs 3299/tcp # pdrncs @@ -8508,12 +8508,12 @@ dtp-dia 3489/tcp # DTP/DIA colubris 3490/udp # Colubris Management Port colubris 3490/tcp # Colubris Management Port # Gilbert Moineau <gilbert.moineau@colubris.com> May 2002 -swr-port 3491/udp # SWR Port +swr-port 3491/udp # SWR Port swr-port 3491/tcp # SWR Port # Ian Manning <imanning@dtsuk.com> May 2002 tvdumtray-port 3492/udp # TVDUM Tray Port tvdumtray-port 3492/tcp # TVDUM Tray Port -# Peter Boers <boers@isisglobal.nl> May 2002 +# Peter Boers <boers@isisglobal.nl> May 2002 nut 3493/udp # Network UPS Tools nut 3493/tcp # Network UPS Tools # Russell Kroll <nut-iana@exploits.org> May 2002 @@ -8581,7 +8581,7 @@ must-p2p 3514/tcp # MUST Peer to Peer must-backplane 3515/udp # MUST Backplane must-backplane 3515/tcp # MUST Backplane # Rick Stefanik <r.stefanik@gatelinx.com> May 2002 -smartcard-port 3516/udp # Smartcard Port +smartcard-port 3516/udp # Smartcard Port smartcard-port 3516/tcp # Smartcard Port # Scott Guthery <sguthery@mobile-mind.com> May 2002 802-11-iapp 3517/udp # IEEE 802.11 WLANs WG IAPP @@ -8603,7 +8603,7 @@ nssocketport 3522/udp # DO over NSSocketPort nssocketport 3522/tcp # DO over NSSocketPort # Douglas Davidson <drd@apple.com> June 2002 odeumservlink 3523/udp # Odeum Serverlink -odeumservlink 3523/tcp # Odeum Serverlink +odeumservlink 3523/tcp # Odeum Serverlink # Mads Peter Back <iana-contact@webhouse.dk> June 2002 ecmport 3524/udp # ECM Server port ecmport 3524/tcp # ECM Server port @@ -8637,7 +8637,7 @@ urld-port 3534/tcp # URL Daemon Port # Jim Binkley <jrb@cs.pdx.edu> June 2002 ms-la 3535/udp # MS-LA ms-la 3535/tcp # MS-LA -# Eric Ledoux <ericle@microsoft.com> +# Eric Ledoux <ericle@microsoft.com> snac 3536/udp # SNAC snac 3536/tcp # SNAC # Tatsuya Igarashi <Tatsuya.Igarashi@jp.sony.com> July 2002 @@ -8675,7 +8675,7 @@ interworld 3548/udp # Interworld interworld 3548/tcp # Interworld # John Stephen <iana@mundocani.com> July 2002 tellumat-nms 3549/udp # Tellumat MDR NMS -tellumat-nms 3549/tcp # Tellumat MDR NMS +tellumat-nms 3549/tcp # Tellumat MDR NMS # Hennie van der Merwe <hvandermerwe@tellumat.com> July 2002 ssmpp 3550/udp # Secure SMPP ssmpp 3550/tcp # Secure SMPP @@ -8715,7 +8715,7 @@ bmc-onekey 3561/tcp # BMC-OneKey # Alon Tam <alon_tam@bmc.com> August 2002 sdbproxy 3562/udp # SDBProxy sdbproxy 3562/tcp # SDBProxy -# Eric Grange <egrange@creative-it.net> August 2002 +# Eric Grange <egrange@creative-it.net> August 2002 watcomdebug 3563/udp # Watcom Debug watcomdebug 3563/tcp # Watcom Debug # Dave Neudoerffer <Dave.Neudoerffer@ianywhere.com> @@ -8870,13 +8870,13 @@ start-network 3615/tcp # Start Messaging Network cd3o-protocol 3616/udp # cd3o Control Protocol cd3o-protocol 3616/tcp # cd3o Control Protocol # Chris Wilcox <cwilcox@cd3o.com> October 2002 -sharp-server 3617/udp # ATI SHARP Logic Engine +sharp-server 3617/udp # ATI SHARP Logic Engine sharp-server 3617/tcp # ATI SHARP Logic Engine # Bill Reveile <Bill@allentek.com> aairnet-1 3618/udp # AAIR-Network 1 aairnet-1 3618/tcp # AAIR-Network 1 aairnet-2 3619/udp # AAIR-Network 2 -aairnet-2 3619/tcp # AAIR-Network 2 +aairnet-2 3619/tcp # AAIR-Network 2 # James Mealey <jymealey@yahoo.com> October 2002 ep-pcp 3620/udp # EPSON Projector Control Port ep-pcp 3620/tcp # EPSON Projector Control Port @@ -8918,7 +8918,7 @@ distcc 3632/tcp # distributed compiler wacp 3633/udp # Wyrnix AIS port wacp 3633/tcp # Wyrnix AIS port # Harry T. Vennik <htvennik@zonnet.nl> November 2002 -hlibmgr 3634/udp # hNTSP Library Manager +hlibmgr 3634/udp # hNTSP Library Manager hlibmgr 3634/tcp # hNTSP Library Manager # Kenji Tetsuyama <kenji@onkyo.co.jp> November 2002 sdo 3635/udp # Simple Distributed Objects @@ -8933,8 +8933,8 @@ scservp 3637/tcp # Customer Service Port ehp-backup 3638/udp # EHP Backup Protocol ehp-backup 3638/tcp # EHP Backup Protocol # Ed Fair <ed_fair@yahoo.com> November 2002 -xap-ha 3639/udp # Extensible Automation -xap-ha 3639/tcp # Extensible Automation +xap-ha 3639/udp # Extensible Automation +xap-ha 3639/tcp # Extensible Automation # Mark Harrison <Mark@xapautomation.org> November 2002 netplay-port1 3640/udp # Netplay Port 1 netplay-port1 3640/tcp # Netplay Port 1 @@ -8950,9 +8950,9 @@ audiojuggler 3643/tcp # AudioJuggler ssowatch 3644/udp # ssowatch ssowatch 3644/tcp # ssowatch # Stephane Vinsot <vinsot@enatel.com> November 2002 -cyc 3645/udp # Cyc +cyc 3645/udp # Cyc cyc 3645/tcp # Cyc -# Stephen Reed <reed@cyc.com> January 2003 +# Stephen Reed <reed@cyc.com> January 2003 xss-srv-port 3646/udp # XSS Server Port xss-srv-port 3646/tcp # XSS Server Port # Joe Purcell <jpurcell@ensuretech.com> January 2003 @@ -8980,7 +8980,7 @@ tsp 3653/tcp # Tunnel Setup Protocol vaprtm 3654/udp # VAP RealTime Messenger vaprtm 3654/tcp # VAP RealTime Messenger # Boris Polevoy <vapcom@mail.ru> January 2003 -abatemgr 3655/udp # ActiveBatch Exec Agent +abatemgr 3655/udp # ActiveBatch Exec Agent abatemgr 3655/tcp # ActiveBatch Exec Agent abatjss 3656/udp # ActiveBatch Job Scheduler abatjss 3656/tcp # ActiveBatch Job Scheduler @@ -9112,7 +9112,7 @@ kpn-icw 3699/tcp # Internet Call Waiting lrs-paging 3700/udp # LRS NetPage lrs-paging 3700/tcp # LRS NetPage # Geoffrey Wossum <geoffrey@pager.net> February 2003 -netcelera 3701/udp # NetCelera +netcelera 3701/udp # NetCelera netcelera 3701/tcp # NetCelera # Tarek Nabhan <standards@itworx.com> February 2003 upnp-discovery 3702/udp # UPNP v2 Discovery @@ -9133,7 +9133,7 @@ rt-event-s 3707/tcp # Real-Time Event Secure Port # 3708 Unassigned ca-idms 3709/udp # CA-IDMS Server ca-idms 3709/tcp # CA-IDMS Server -# Dave Ross <david.ross@ca.com> +# Dave Ross <david.ross@ca.com> portgate-auth 3710/udp # PortGate Authentication portgate-auth 3710/tcp # PortGate Authentication # Scott Harris <Scott@XRamp.com> February 2003 @@ -9259,7 +9259,7 @@ nattyserver 3753/udp # NattyServer Port nattyserver 3753/tcp # NattyServer Port # Akira Saito <admin@kobu.com> April 2003 timestenbroker 3754/udp # TimesTen Broker Port -timestenbroker 3754/tcp # TimesTen Broker Port +timestenbroker 3754/tcp # TimesTen Broker Port # David Aspinwall <aspinwall@TimesTen.com> April 2003 sas-remote-hlp 3755/udp # SAS Remote Help Server sas-remote-hlp 3755/tcp # SAS Remote Help Server @@ -9278,7 +9278,7 @@ exapt-lmgr 3759/tcp # Exapt License Manager # Christoph Kukulies <info@exapt.de> April 2003 adtempusclient 3760/udp # adTEmpus Client adtempusclient 3760/tcp # adTempus Client -# Bill Wingate <bill.wingate@arcanadev.com> May 2003 +# Bill Wingate <bill.wingate@arcanadev.com> May 2003 gsakmp 3761/udp # gsakmp port gsakmp 3761/tcp # gsakmp port # Uri Meth <umeth@sparta.com> June 2003 @@ -9343,15 +9343,15 @@ iso-tp0s 3782/tcp # Secure ISO TP0 port # 3783-3799 Unassigned pwgpsi 3800/udp # Print Services Interface pwgpsi 3800/tcp # Print Services Interface -# Harry Lewis <harryl@us.ibm.com> May 2003 +# Harry Lewis <harryl@us.ibm.com> May 2003 # 3801 Unassigned vhd 3802/udp # VHD vhd 3802/tcp # VHD -# Chris Duncombe <cdunc@intoo.com> -# 3803-3844 Unassigned +# Chris Duncombe <cdunc@intoo.com> +# 3803-3844 Unassigned v-one-spp 3845/udp # V-ONE Single Port Proxy v-one-spp 3845/tcp # V-ONE Single Port Proxy -# Daniel Becker <dbecker@v-one.com> +# Daniel Becker <dbecker@v-one.com> # 3846-3860 Unassigned winshadow-hd 3861/udp # winShadow Host Discovery winshadow-hd 3861/tcp # winShadow Host Discovery @@ -9362,7 +9362,7 @@ giga-pocket 3862/tcp # GIGA-POCKET # 3863-3874 Unassigned pnbscada 3875/udp # PNBSCADA pnbscada 3875/tcp # PNBSCADA -# Philip N. Bergstresser <phil@bergstresser.org> +# Philip N. Bergstresser <phil@bergstresser.org> # 3876-3884 Unassigned topflow-ssl 3885/udp # TopFlow SSL topflow-ssl 3885/tcp # TopFlow SSL @@ -9375,7 +9375,7 @@ udt_os 3900/tcp # Unidata UDT OS aamp 3939/udp # Anti-virus Application Management Port aamp 3939/tcp # Anti-virus Application Management Port # In-sik Choi <iscard@virusdesk.com> February 2002 -# 3940-3983 Unassigned +# 3940-3983 Unassigned mapper-nodemgr 3984/udp # MAPPER network node manager mapper-nodemgr 3984/tcp # MAPPER network node manager mapper-mapethd 3985/udp # MAPPER TCP/IP server @@ -9391,7 +9391,7 @@ terabase 4000/udp # Terabase terabase 4000/tcp # Terabase # Thor Olson <Thor@terabase.com> ####### Potential Conflict of ports ################################ -####### PORT 4000 also used by ICQ <www.icq.com> ################### +####### PORT 4000 also used by ICQ <www.icq.com> ################### newoak 4001/udp # NewOak newoak 4001/tcp # NewOak # Jim Philippou <jphilippou@newoak.com> @@ -9408,8 +9408,8 @@ pxc-spvr 4006/tcp # pxc-spvr pxc-splr 4007/udp # pxc-splr pxc-splr 4007/tcp # pxc-splr # Dave Nesbitt <nesbitt@cp10.es.xerox.com> -netcheque 4008/udp # NetCheque accounting -netcheque 4008/tcp # NetCheque accounting +netcheque 4008/udp # NetCheque accounting +netcheque 4008/tcp # NetCheque accounting # B. Clifford Neuman <bcn@isi.edu> chimera-hwm 4009/udp # Chimera HWM chimera-hwm 4009/tcp # Chimera HWM @@ -9483,13 +9483,13 @@ sanavigator 4033/udp # SANavigator Peer Port sanavigator 4033/tcp # SANavigator Peer Port # Robert J. Chansler <rchansler@SANavigator.com> ubxd 4034/udp # Ubiquinox Daemon -ubxd 4034/tcp # Ubiquinox Daemon +ubxd 4034/tcp # Ubiquinox Daemon # Kit Smithers <ksmithers@argogroup.com> wap-push-http 4035/udp # WAP Push OTA-HTTP port wap-push-http 4035/tcp # WAP Push OTA-HTTP port wap-push-https 4036/udp # WAP Push OTA-HTTP secure wap-push-https 4036/tcp # WAP Push OTA-HTTP secure -# Matthieu Lachance +# Matthieu Lachance # <matthieu.lachance@openwave.com> # 4037-4039 Unassigned yo-main 4040/udp # Yo.net main service @@ -9500,7 +9500,7 @@ houston 4041/tcp # Rocketeer-Houston # Johnny C. Norris II <jnorris@uiuc.edu> ldxp 4042/udp # LDXP ldxp 4042/tcp # LDXP -# Craig Calef <craig@katmango.com> +# Craig Calef <craig@katmango.com> # 4043-4095 Unassigned bre 4096/udp # BRE (Bridge Relay Element) bre 4096/tcp # BRE (Bridge Relay Element) @@ -9522,7 +9522,7 @@ xgrid 4111/tcp # Xgrid xgrid 4111/udp # Xgrid jomamqmonitor 4114/udp # JomaMQMonitor jomamqmonitor 4114/tcp # JomaMQMonitor -# Marcel Hofstetter <marcel.hofstetter@jomasoft.ch> January 2003 +# Marcel Hofstetter <marcel.hofstetter@jomasoft.ch> January 2003 # 4115-4131 Unassigned nuts_dem 4132/udp # NUTS Daemon nuts_dem 4132/tcp # NUTS Daemon @@ -9560,7 +9560,7 @@ jini-discovery 4160/tcp # Jini Discovery # 4161-4198 Unassigned eims-admin 4199/udp # EIMS ADMIN eims-admin 4199/tcp # EIMS ADMIN -# Glenn Anderson <glenn@qualcomm.co.nz> +# Glenn Anderson <glenn@qualcomm.co.nz> # Mitra <mitra@earth.path.net> corelccam 4300/udp # Corel CCam corelccam 4300/tcp # Corel CCam @@ -9621,7 +9621,7 @@ pharos 4443/tcp # Pharos krb524 4444/udp # KRB524 krb524 4444/tcp # KRB524 # B. Clifford Neuman <bcn@isi.edu> -# PROBLEM krb524 assigned the port, +# PROBLEM krb524 assigned the port, # PROBLEM nv used it without an assignment nv-video 4444/udp # NV Video default nv-video 4444/tcp # NV Video default @@ -9678,17 +9678,17 @@ lanner-lm 4547/tcp # Lanner License Manager # 4548-4554 Unassigned rsip 4555/udp # RSIP Port rsip 4555/tcp # RSIP Port -# RFC 3103 +# RFC 3103 # 4556-4558 Unassigned hylafax 4559/udp # HylaFAX hylafax 4559/tcp # HylaFAX -# Lee Howard <iana@hylafax.org> March 2002 +# Lee Howard <iana@hylafax.org> March 2002 # 4560-4566 Unassigned tram 4567/udp # TRAM tram 4567/tcp # TRAM # Joe Wesley <joe.wesley@east.sun.com> -bmc-reporting 4568/udp # BMC Reporting -bmc-reporting 4568/tcp # BMC Reporting +bmc-reporting 4568/udp # BMC Reporting +bmc-reporting 4568/tcp # BMC Reporting # Randall De Weerd <rdeweerd@bmc.com> # 4569-4599 Unassigned piranha1 4600/udp # Piranha1 @@ -9699,10 +9699,10 @@ piranha2 4601/tcp # Piranha2 # 4602-4659 Unassigned smaclmgr 4660/udp # smaclmgr smaclmgr 4660/tcp # smaclmgr -# Hiromi Taki <stg-togo@saint.nm.fujitsu.co.jp> +# Hiromi Taki <stg-togo@saint.nm.fujitsu.co.jp> kar2ouche 4661/udp # Kar2ouche Peer location service kar2ouche 4661/tcp # Kar2ouche Peer location service -# Andy Krouwel <andy@kar2ouche.com> +# Andy Krouwel <andy@kar2ouche.com> # 4662-4671 Unassigned rfa 4672/udp # remote file access server rfa 4672/tcp # remote file access server @@ -9723,7 +9723,7 @@ htcp 4827/udp # HTCP htcp 4827/tcp # HTCP # Paul Vixie <paul@vix.com> # 4828-4836 Unassigned -varadero-0 4837/udp # Varadero-0 +varadero-0 4837/udp # Varadero-0 varadero-0 4837/tcp # Varadero-0 varadero-1 4838/udp # Varadero-1 varadero-1 4838/tcp # Varadero-1 @@ -9817,7 +9817,7 @@ scpi-raw 5025/tcp # SCPI-RAW asnaacceler8db 5042/udp # asnaacceler8db asnaacceler8db 5042/tcp # asnaacceler8db # Walter Goodwin <wpgoodwin@asna.com> -# 5043-5049 Unassigned +# 5043-5049 Unassigned mmcc 5050/udp # multimedia conference control tool mmcc 5050/tcp # multimedia conference control tool # Steve Casner <Casner@isi.edu> @@ -9851,7 +9851,7 @@ ca-2 5065/tcp # Channel Access 2 stanag-5066 5066/udp # STANAG-5066-SUBNET-INTF stanag-5066 5066/tcp # STANAG-5066-SUBNET-INTF # Donald G. Kallgren -# <Donald.Kallgren@nc3a.nato.int> +# <Donald.Kallgren@nc3a.nato.int> # 5062-5068 Unassigned i-net-2000-npr 5069/udp # I/Net 2000-NPR i-net-2000-npr 5069/tcp # I/Net 2000-NPR @@ -9868,7 +9868,7 @@ sdl-ets 5081/tcp # SDL - Ent Trans Server sentinel-lm 5093/udp # Sentinel LM sentinel-lm 5093/tcp # Sentinel LM # Derick Snyder <dsnyder@rainbow.com> -# 5094-5098 Unassigned +# 5094-5098 Unassigned sentlm-srv2srv 5099/udp # SentLM Srv2Srv sentlm-srv2srv 5099/tcp # SentLM Srv2Srv # Derick Snyder <dsnyder@rainbow.com> @@ -9883,7 +9883,7 @@ ctsd 5137/tcp # MyCTS server port # 5138-5144 Unassigned rmonitor_secure 5145/udp # RMONITOR SECURE rmonitor_secure 5145/tcp # RMONITOR SECURE -# Kory Hamzeh <kory@ascend.com> +# Kory Hamzeh <kory@ascend.com> # 5146-5149 Unassigned atmp 5150/udp # Ascend Tunnel Management Protocol atmp 5150/tcp # Ascend Tunnel Management Protocol @@ -9892,7 +9892,7 @@ esri_sde 5151/udp # ESRI SDE Remote Start esri_sde 5151/tcp # ESRI SDE Instance sde-discovery 5152/udp # ESRI SDE Instance Discovery sde-discovery 5152/tcp # ESRI SDE Instance Discovery -# Peter Aronson <paronson@esri.com> +# Peter Aronson <paronson@esri.com> # 5153-5164 Unassigned ife_icorp 5165/udp # ife_1corp ife_icorp 5165/tcp # ife_1corp @@ -9909,19 +9909,19 @@ aol-3 5193/udp # AmericaOnline3 aol-3 5193/tcp # AmericaOnline3 # Bruce Mackey <BAMackey@aol.com> # 5194-5199 Unassigned -targus-getdata 5200/udp # TARGUS GetData -targus-getdata 5200/tcp # TARGUS GetData +targus-getdata 5200/udp # TARGUS GetData +targus-getdata 5200/tcp # TARGUS GetData targus-getdata1 5201/udp # TARGUS GetData 1 targus-getdata1 5201/tcp # TARGUS GetData 1 targus-getdata2 5202/udp # TARGUS GetData 2 targus-getdata2 5202/tcp # TARGUS GetData 2 targus-getdata3 5203/udp # TARGUS GetData 3 -targus-getdata3 5203/tcp # TARGUS GetData 3 +targus-getdata3 5203/tcp # TARGUS GetData 3 # John Keaveney <johnkeaveney@targusinfo.com> # 5204-5221 Unassigned jabber-client 5222/udp # Jabber Client Connection jabber-client 5222/tcp # Jabber Client Connection -# David Waite <mass@akuma.org> February 2002 +# David Waite <mass@akuma.org> February 2002 # 5223-5224 Unassigned hp-server 5225/udp # HP Server hp-server 5225/tcp # HP Server @@ -9937,7 +9937,7 @@ igateway 5250/tcp # iGateway # Greg Bodine <gregory.bodine@ca.com> February 2002 # 5251-5263 Unassigned 3com-njack-1 5264/udp # 3Com Network Jack Port 1 -3com-njack-1 5264/tcp # 3Com Network Jack Port 1 +3com-njack-1 5264/tcp # 3Com Network Jack Port 1 3com-njack-2 5265/udp # 3Com Network Jack Port 2 3com-njack-2 5265/tcp # 3Com Network Jack Port 2 # Abhay Rajaram <Abhay_Rajaram@3Com.com> March 2003 @@ -9962,10 +9962,10 @@ hacl-cfg 5302/udp # # HA cluster configuration hacl-cfg 5302/tcp # # HA cluster configuration hacl-probe 5303/udp # # HA cluster probing hacl-probe 5303/tcp # # HA cluster probing -hacl-local 5304/udp # +hacl-local 5304/udp # hacl-local 5304/tcp # # HA Cluster Commands -hacl-test 5305/udp # -hacl-test 5305/tcp # # HA Cluster Test +hacl-test 5305/udp # +hacl-test 5305/tcp # # HA Cluster Test # Eric Soderberg <seric@hposl102.cup.hp> # Edward Yim <eyim@hpmfas4.cup.hp.com> sun-mc-grp 5306/udp # Sun MC Group @@ -10026,7 +10026,7 @@ salient-dtasrv 5409/udp # Salient Data Server salient-dtasrv 5409/tcp # Salient Data Server salient-usrmgr 5410/udp # Salient User Manager salient-usrmgr 5410/tcp # Salient User Manager -# Richard Farnham <rfarnham@salient.com> +# Richard Farnham <rfarnham@salient.com> actnet 5411/udp # ActNet actnet 5411/tcp # ActNet # Simon Robillard <RobillardS@actresearch.com> @@ -10170,7 +10170,7 @@ jms 5673/tcp # JACL Message Server # Stuart Allen <stuart@jacl.animats.net> February 2002 hyperscsi-port 5674/udp # HyperSCSI Port hyperscsi-port 5674/tcp # HyperSCSI Port -# Data Storage Institute, Singapore +# Data Storage Institute, Singapore # <Patrick@dsi.nus.edu.sg> February 2002 v5ua 5675/udp # V5UA application port v5ua 5675/tcp # V5UA application port @@ -10181,29 +10181,29 @@ raadmin 5676/tcp # RA Administration questdb2-lnchr 5677/udp # Quest Central DB2 Launchr questdb2-lnchr 5677/tcp # Quest Central DB2 Launchr # Robert M. Mackowiak <rmackowiak@quest.com> February 2002 -rrac 5678/udp # Remote Replication Agent Connection -rrac 5678/tcp # Remote Replication Agent Connection +rrac 5678/udp # Remote Replication Agent Connection +rrac 5678/tcp # Remote Replication Agent Connection dccm 5679/udp # Direct Cable Connect Manager dccm 5679/tcp # Direct Cable Connect Manager # Mark Miller <mmiller@MICROSOFT.com> # 5680-5687 Unassigned ggz 5688/udp # GGZ Gaming Zone ggz 5688/tcp # GGZ Gaming Zone -# Josef Spillner <js177634@inf.tu-dresden.de> January 2003 +# Josef Spillner <js177634@inf.tu-dresden.de> January 2003 # 5689-5712 Unassigned proshareaudio 5713/udp # proshare conf audio proshareaudio 5713/tcp # proshare conf audio prosharevideo 5714/udp # proshare conf video prosharevideo 5714/tcp # proshare conf video -prosharedata 5715/udp # proshare conf data -prosharedata 5715/tcp # proshare conf data +prosharedata 5715/udp # proshare conf data +prosharedata 5715/tcp # proshare conf data prosharerequest 5716/udp # proshare conf request prosharerequest 5716/tcp # proshare conf request -prosharenotify 5717/udp # proshare conf notify -prosharenotify 5717/tcp # proshare conf notify +prosharenotify 5717/udp # proshare conf notify +prosharenotify 5717/tcp # proshare conf notify # <gunner@ibeam.intel.com> # 5718-5719 Unassigned -ms-licensing 5720/udp # MS-Licensing +ms-licensing 5720/udp # MS-Licensing ms-licensing 5720/tcp # MS-Licensing # Thomas Lindeman <tlinde@microsoft.com> November 2002 # 5721-5728 Unassigned @@ -10214,7 +10214,7 @@ openmail 5729/tcp # Openmail User Agent Layer unieng 5730/udp # Steltor's calendar access unieng 5730/tcp # Steltor's calendar access # Bernard Desruisseaux <bernard@steltor.com> -# 5731-5740 Unassigned +# 5731-5740 Unassigned ida-discover1 5741/udp # IDA Discover Port 1 ida-discover1 5741/tcp # IDA Discover Port 1 ida-discover2 5742/udp # IDA Discover Port 2 @@ -10246,12 +10246,12 @@ netagent 5771/tcp # NetAgent # 5772-5812 Unassigned icmpd 5813/udp # ICMPD icmpd 5813/tcp # ICMPD -# Shane O'Donnell <shane@opennms.org> -# 5814-5858 Unassigned +# Shane O'Donnell <shane@opennms.org> +# 5814-5858 Unassigned wherehoo 5859/udp # WHEREHOO wherehoo 5859/tcp # WHEREHOO # Jim Youll <jim@media.mit.edu> -# 5860-5967 Unassigned +# 5860-5967 Unassigned mppolicy-v5 5968/udp # mppolicy-v5 mppolicy-v5 5968/tcp # mppolicy-v5 mppolicy-mgr 5969/udp # mppolicy-mgr @@ -10262,7 +10262,7 @@ wbem-rmi 5987/udp # WBEM RMI wbem-rmi 5987/tcp # WBEM RMI wbem-http 5988/udp # WBEM HTTP wbem-http 5988/tcp # WBEM HTTP -# Jim Davis <james.d.davis@sun.com> +# Jim Davis <james.d.davis@sun.com> wbem-https 5989/udp # WBEM HTTPS wbem-https 5989/tcp # WBEM HTTPS # Jim Davis <james.d.davis@east.sun.com> @@ -10286,7 +10286,7 @@ ewctsp 6066/tcp # EWCTSP # Mark Bailon <mark.bailon@ericsson.com> srb 6067/udp # SRB srb 6067/tcp # SRB -# Heinz Naef <heinz.naef@nexos.com> +# Heinz Naef <heinz.naef@nexos.com> gsmp 6068/udp # GSMP gsmp 6068/tcp # GSMP # Avri Doria <avri.doria@nokia.com> @@ -10298,7 +10298,7 @@ messageasap 6070/tcp # Messageasap # Murray Freeman <murray@officedomain.com> ssdtp 6071/udp # SSDTP ssdtp 6071/tcp # SSDTP -# Michael Shearson <mikes@softsys-inc.com> +# Michael Shearson <mikes@softsys-inc.com> diagnose-proc 6072/udp # DIAGNOSE-PROC diagnose-proc 6072/tcp # DIAGNOSE-PROC # Allan Miller <amiller@handsfreenetworks.com> @@ -10316,7 +10316,7 @@ synchronet-rtc 6101/udp # SynchroNet-rtc synchronet-rtc 6101/tcp # SynchroNet-rtc synchronet-upd 6102/udp # SynchroNet-upd synchronet-upd 6102/tcp # SynchroNet-upd -# Arne Haugland <Arne.Haugland@parasoldev.com> +# Arne Haugland <Arne.Haugland@parasoldev.com> rets 6103/udp # RETS rets 6103/tcp # RETS # Bruce Toback <btoback@optc.com> @@ -10330,7 +10330,7 @@ mpsserver 6106/tcp # MPS Server # Prima Designs Systems Ltd. <info@prima.com.hk> etc-control 6107/udp # ETC Control etc-control 6107/tcp # ETC Control -# Steve Polishinski <spolishinski@etcconnect.com> +# Steve Polishinski <spolishinski@etcconnect.com> sercomm-scadmin 6108/udp # Sercomm-SCAdmin sercomm-scadmin 6108/tcp # Sercomm-SCAdmin # Melinda Tsao <melinda_tsao@mail.sercomm.com.tw> @@ -10342,7 +10342,7 @@ softcm 6110/tcp # HP SoftBench CM spc 6111/udp # HP SoftBench Sub-Process Control spc 6111/tcp # HP SoftBench Sub-Process Control # Scott A. Kramer <sk@tleilaxu.sde.hp.com> -dtspcd 6112/udp # dtspcd +dtspcd 6112/udp # dtspcd dtspcd 6112/tcp # dtspcd # Doug Royer <Doug@Royer.com> # 6113-6122 Unassigned @@ -10373,22 +10373,22 @@ montage-lm 6147/tcp # Montage License Manager ricardo-lm 6148/udp # Ricardo North America License Manager ricardo-lm 6148/tcp # Ricardo North America License Manager # M Flemming <mflemming@aol.com> -tal-pod 6149/udp # tal-pod -tal-pod 6149/tcp # tal-pod +tal-pod 6149/udp # tal-pod +tal-pod 6149/tcp # tal-pod # Steven Loomis <srl@taligent.com> -# 6150-6252 Unassigned +# 6150-6252 Unassigned crip 6253/udp # CRIP crip 6253/tcp # CRIP -# Mike Rodbell <mrodbell@ciena.com> +# Mike Rodbell <mrodbell@ciena.com> # 6254-6299 Unassigned bmc-grx 6300/udp # BMC GRX bmc-grx 6300/tcp # BMC GRX # Ed Penak <ed_penak@bmc.com> # 6301-6320 Unassigned -emp-server1 6321/udp # Empress Software Connectivity Server 1 +emp-server1 6321/udp # Empress Software Connectivity Server 1 emp-server1 6321/tcp # Empress Software Connectivity Server 1 -emp-server2 6322/udp # Empress Software Connectivity Server 2 -emp-server2 6322/tcp # Empress Software Connectivity Server 2 +emp-server2 6322/udp # Empress Software Connectivity Server 2 +emp-server2 6322/tcp # Empress Software Connectivity Server 2 # Srdjan Holovac <srdjan@empress.com> # 6323-6342 Unassigned sflow 6343/udp # sFlow traffic monitoring @@ -10403,7 +10403,7 @@ gnutella-rtr 6347/tcp # gnutella-rtr # 6348-6381 Unassigned metatude-mds 6382/udp # Metatude Dialogue Server metatude-mds 6382/tcp # Metatude Dialogue Server -# Menno Zweistra <m.zweistra@metatude.com> +# Menno Zweistra <m.zweistra@metatude.com> # 6383-6388 Unassigned clariion-evr01 6389/udp # clariion-evr01 clariion-evr01 6389/tcp # clariion-evr01 @@ -10412,7 +10412,7 @@ clariion-evr01 6389/tcp # clariion-evr01 # The following blocks are in use by Seagate Software 6400-6410 # # The previous ports are in use by Seagate Software 6400-6410 # # Contact for these ports is Wade Richards <Wade.Richards@Seagatesoftware.com> -# 6411-6454 Unassigned +# 6411-6454 Unassigned skip-cert-recv 6455/tcp # SKIP Certificate Receive skip-cert-send 6456/tcp # SKIP Certificate Send # Tom Markson <markson@osmosys.incog.com> @@ -10429,7 +10429,7 @@ boks_servm 6502/udp # BoKS Servm boks_servm 6502/tcp # BoKS Servm boks_clntd 6503/udp # BoKS Clntd boks_clntd 6503/tcp # BoKS Clntd -# Magnus Nystrom <magnus@dynas.se> +# Magnus Nystrom <magnus@dynas.se> # 6504 Unassigned badm_priv 6505/udp # BoKS Admin Private Port badm_priv 6505/tcp # BoKS Admin Private Port @@ -10476,7 +10476,7 @@ parsec-peer 6581/udp # Parsec Peer-to-Peer parsec-peer 6581/tcp # Parsec Peer-to-Peer parsec-game 6582/udp # Parsec Gameserver parsec-game 6582/tcp # Parsec Gameserver -# Andreas Varga <sid@parsec.org> +# Andreas Varga <sid@parsec.org> # 6583-6587 Unassigned # 6588 Unassigned ####Unofficial use of port 6588 by AnalogX and Microsoft#### @@ -10493,7 +10493,7 @@ mach 6631/tcp # Mitchell telecom host vocaltec-gold 6670/udp # Vocaltec Global Online Directory vocaltec-gold 6670/tcp # Vocaltec Global Online Directory # Scott Petrack <Scott_Petrack@vocaltec.com> -# 6671 Unassigned +# 6671 Unassigned vision_server 6672/udp # vision_server vision_server 6672/tcp # vision_server vision_elmd 6673/udp # vision_elmd @@ -10511,9 +10511,9 @@ ibprotocol 6714/tcp # Internet Backplane Protocol bmc-perf-agent 6767/udp # BMC PERFORM AGENT bmc-perf-agent 6767/tcp # BMC PERFORM AGENT bmc-perf-mgrd 6768/udp # BMC PERFORM MGRD -bmc-perf-mgrd 6768/tcp # BMC PERFORM MGRD +bmc-perf-mgrd 6768/tcp # BMC PERFORM MGRD # Dima Seliverstov <Dima_Seliverstov@bmc.com> -# 6769-6787 Unassigned +# 6769-6787 Unassigned smc-http 6788/udp # SMC-HTTP smc-http 6788/tcp # SMC-HTTP # Ratnadeep Bhattacharjee <ratnadeep.bhattacharjee@sun.com> November 2002 @@ -10533,7 +10533,7 @@ netmo-default 6841/tcp # Netmo Default netmo-http 6842/udp # Netmo HTTP netmo-http 6842/tcp # Netmo HTTP # Urs Bertschinger <urs@netmosphere.com> -# 6843-6849 Unassigned +# 6843-6849 Unassigned iccrushmore 6850/udp # ICCRUSHMORE iccrushmore 6850/tcp # ICCRUSHMORE # Dave Hubbard <dave@icc.net> @@ -10542,7 +10542,7 @@ muse 6888/udp # MUSE muse 6888/tcp # MUSE # Muse Communications Corporation # <howard@muse3d.com> -# 6889-6960 Unassigned +# 6889-6960 Unassigned jmact3 6961/udp # JMACT3 jmact3 6961/tcp # JMACT3 jmevt2 6962/udp # jmevt2 @@ -10631,8 +10631,8 @@ clutild 7174/udp # Clutild clutild 7174/tcp # Clutild # Cheryl Stoutenburg <cstoutenburg@vnet.ibm.com> # 7175-7199 Unassigned -fodms 7200/udp # FODMS FLIP -fodms 7200/tcp # FODMS FLIP +fodms 7200/udp # FODMS FLIP +fodms 7200/tcp # FODMS FLIP # David Anthony <anthony@power.amasd.anatcp.rockwell.com> dlip 7201/udp # DLIP dlip 7201/tcp # DLIP @@ -10649,7 +10649,7 @@ mindfilesys 7391/udp # mind-file system server mindfilesys 7391/tcp # mind-file system server mrssrendezvous 7392/udp # mrss-rendezvous server mrssrendezvous 7392/tcp # mrss-rendezvous server -# Dave Porter <porter@mango.com> +# Dave Porter <porter@mango.com> # 7393-7394 Unassigned winqedit 7395/udp # winqedit winqedit 7395/tcp # winqedit @@ -10676,7 +10676,7 @@ telops-lmd 7491/udp # telops-lmd telops-lmd 7491/tcp # telops-lmd # David Spencer <dspencer@telops.com> # 7492-7499 Unassigned -# 7500 Unassigned +# 7500 Unassigned ovbus 7501/udp # HP OpenView Bus Daemon ovbus 7501/tcp # HP OpenView Bus Daemon # David M. Rhodes <davidrho@cnd.hp.com> @@ -10759,7 +10759,7 @@ apc-7846 7846/tcp # APC 7846 # 7847-7912 Unassigned qo-secure 7913/udp # QuickObjects secure port qo-secure 7913/tcp # QuickObjects secure port -# Jonas Bovin <jonas.bovin@quickobjects.com> +# Jonas Bovin <jonas.bovin@quickobjects.com> # 7914-7931 Unassigned t2-drm 7932/udp # Tier 2 Data Resource Manager t2-drm 7932/tcp # Tier 2 Data Resource Manager @@ -10770,7 +10770,7 @@ t2-brm 7933/tcp # Tier 2 Business Rules Manager supercell 7967/udp # Supercell supercell 7967/tcp # Supercell # Kevin Nakagawa <nakagawa@sigsci.com> -# 7968-7978 Unassigned +# 7968-7978 Unassigned micromuse-ncps 7979/udp # Micromuse-ncps micromuse-ncps 7979/tcp # Micromuse-ncps # Hing Wing To <wing.to@mircromuse.com> @@ -10789,14 +10789,14 @@ vcom-tunnel 8001/tcp # VCOM Tunnel teradataordbms 8002/udp # Teradata ORDBMS teradataordbms 8002/tcp # Teradata ORDBMS # Curt Ellmann <curt.ellmann@ncr.com> -# 8003-8007 Unassigned +# 8003-8007 Unassigned http-alt 8008/udp # HTTP Alternate http-alt 8008/tcp # HTTP Alternate # James Gettys <jg@w3.org> # 8009-8021 Unassigned -oa-system 8022/udp # oa-system +oa-system 8022/udp # oa-system oa-system 8022/tcp # oa-system -# Denis Girault <Denis.Girault@evidian.com> +# Denis Girault <Denis.Girault@evidian.com> # 8023-8031 Unassigned pro-ed 8032/udp # ProEd pro-ed 8032/tcp # ProEd @@ -10834,7 +10834,7 @@ indigo-vbcp 8131/tcp # INDIGO-VBCP # Colin Caughie <cfc@indigo-avs.com> dbabble 8132/udp # dbabble dbabble 8132/tcp # dbabble -# Chris Pugmire <chrisp@netwinsite.com> +# Chris Pugmire <chrisp@netwinsite.com> # 8133-8159 Unassigned patrol 8160/udp # Patrol patrol 8160/tcp # Patrol @@ -10901,7 +10901,7 @@ pcsync-https 8443/tcp # PCsync HTTPS pcsync-http 8444/udp # PCsync HTTP pcsync-http 8444/tcp # PCsync HTTP # Katy Lynn McCullough <KatyM@LapLink.com> -# 8445-8449 Unassigned +# 8445-8449 Unassigned npmp 8450/udp # npmp npmp 8450/tcp # npmp # Ian Chard <ian@tanagra.demon.co.uk> @@ -10925,10 +10925,10 @@ ibus 8733/tcp # iBus # 8734-8762 Unassigned mc-appserver 8763/udp # MC-APPSERVER mc-appserver 8763/tcp # MC-APPSERVER -# Romeo Kasanwidjojo <romeo@microcomgroup.com> +# Romeo Kasanwidjojo <romeo@microcomgroup.com> openqueue 8764/udp # OPENQUEUE openqueue 8764/tcp # OPENQUEUE -# Matt Jensen <mattj@newsblip.com> +# Matt Jensen <mattj@newsblip.com> ultraseek-http 8765/udp # Ultraseek HTTP ultraseek-http 8765/tcp # Ultraseek HTTP # Walter Underwood <wunder@infoseek.com> @@ -10942,7 +10942,7 @@ msgsrvr 8787/tcp # Message Server truecm 8804/udp # truecm truecm 8804/tcp # truecm # Scott Kramer <scottk@truebluesoftware.com> -# 8805-8879 +# 8805-8879 cddbp-alt 8880/udp # CDDBP cddbp-alt 8880/tcp # CDDBP # Steve Scherf <steve@moonsoft.com> @@ -10962,7 +10962,7 @@ ddi-tcp-6 8893/tcp # Desktop Data TCP 5: NewsEDGE/Web application ddi-udp-7 8894/udp # Desktop Data UDP 6: COAL application ddi-tcp-7 8894/tcp # Desktop Data TCP 6: COAL application # Fred Yao <Fred_Yao@DDIGATE2.desktopdata.com> -# 8895-8899 Unassigned +# 8895-8899 Unassigned jmb-cds1 8900/udp # JMB-CDS 1 jmb-cds1 8900/tcp # JMB-CDS 1 jmb-cds2 8901/udp # JMB-CDS 2 @@ -11027,15 +11027,15 @@ xmltec-xmlmail 9091/tcp # xmltec-xmlmail hp-pdl-datastr 9100/udp # PDL Data Streaming Port hp-pdl-datastr 9100/tcp # PDL Data Streaming Port # Shivaun Albright <shivaun_albright@hp.com> April 2002 -#### The protocol name "pdl-datastream" is primarily registered for use #### +#### The protocol name "pdl-datastream" is primarily registered for use #### #### in DNS SRV records (RFC 2782). DNS SRV records allow a protocol to run on #### #### any port number, but the default port for this protocol is 9100 ####. -pdl-datastream 9100/udp # Printer PDL Data Stream -pdl-datastream 9100/tcp # Printer PDL Data Stream +pdl-datastream 9100/udp # Printer PDL Data Stream +pdl-datastream 9100/tcp # Printer PDL Data Stream bacula-dir 9101/udp # Bacula Director bacula-dir 9101/tcp # Bacula Director bacula-fd 9102/udp # Bacula File Daemon -bacula-fd 9102/tcp # Bacula File Daemon +bacula-fd 9102/tcp # Bacula File Daemon bacula-sd 9103/udp # Bacula Storage Daemon bacula-sd 9103/tcp # Bacula Storage Daemon # Kern Sibbald <kern@sibbald.com> January 2002 @@ -11089,7 +11089,7 @@ swtp-port2 9282/tcp # SofaWare transport port 2 # Amir Rapson <rapson@sofaware.com> February 2002 callwaveiam 9283/udp # CallWaveIAM callwaveiam 9283/tcp # CallWaveIAM -# Colin Kelley <cdk@callwave.com> +# Colin Kelley <cdk@callwave.com> visd 9284/udp # VERITAS Information Serve visd 9284/tcp # VERITAS Information Serve # Ravi Tavakely <ravi.tavakley@veritas.com> February 2002 @@ -11099,12 +11099,12 @@ n2h2server 9285/tcp # N2H2 Filter Service Port # 9286 Unassigned cumulus 9287/udp # Cumulus cumulus 9287/tcp # Cumulus -# Thomas Schleu <tschleu@canto.de> +# Thomas Schleu <tschleu@canto.de> # 9288-9291 Unassigned armtechdaemon 9292/udp # ArmTech Daemon armtechdaemon 9292/tcp # ArmTech Daemon # Rohan Story <rohan@aurema.com> -# 9293-9320 Unassigned +# 9293-9320 Unassigned guibase 9321/udp # guibase guibase 9321/tcp # guibase # Yutaka Ono <ono@saint.nm.fujitsu.co.jp> @@ -11114,10 +11114,10 @@ mpidcmgr 9343/tcp # MpIdcMgr mphlpdmc 9344/udp # Mphlpdmc mphlpdmc 9344/tcp # Mphlpdmc # Yutaka Ono <ono@saint.nm.fujitsu.co.jp> -# 9345 Unassigned +# 9345 Unassigned ctechlicensing 9346/udp # C Tech Licensing ctechlicensing 9346/tcp # C Tech Licensing -# Reed Copsey, Jr. <reedc@ctech.com> +# Reed Copsey, Jr. <reedc@ctech.com> # 9347-9373 Unassigned fjdmimgr 9374/udp # fjdmimgr fjdmimgr 9374/tcp # fjdmimgr @@ -11154,7 +11154,7 @@ streamcomm-ds 9612/tcp # StreamComm User Directory l5nas-parchan 9747/udp # L5NAS Parallel Channel l5nas-parchan 9747/tcp # L5NAS Parallel Channel # Lawrence J. Dickson - Land-5 Corporation -# <ldickson@land-5.com> March 2002 +# <ldickson@land-5.com> March 2002 # 9748-9752 Unassigned rasadv 9753/udp # rasadv rasadv 9753/tcp # rasadv @@ -11181,7 +11181,7 @@ monkeycom 9898/tcp # MonkeyCom # Yuji Kuwabara <HHG01200@niftyserve.or.jp> sctp-tunneling 9899/udp # SCTP TUNNELING sctp-tunneling 9899/tcp # SCTP TUNNELING -iua 9900/sctp # IUA +iua 9900/sctp # IUA iua 9900/udp # IUA iua 9900/tcp # IUA # Lyndon Ong <LyOng@ciena.com> @@ -11192,12 +11192,12 @@ domaintime 9909/tcp # domaintime # 9910 Unassigned sype-transport 9911/udp # SYPECom Transport Protocol sype-transport 9911/tcp # SYPECom Transport Protocol -# Sylvain Pedneault <sylvain@sypecom.qc.ca> March 2003 +# Sylvain Pedneault <sylvain@sypecom.qc.ca> March 2003 # 9912-9949 Unassigned apc-9950 9950/udp # APC 9950 apc-9950 9950/tcp # APC 9950 apc-9951 9951/udp # APC 9951 -apc-9951 9951/tcp # APC 9951 +apc-9951 9951/tcp # APC 9951 apc-9952 9952/udp # APC 9952 apc-9952 9952/tcp # APC 9952 # American Power Conversion <ports@apcc.com> @@ -11234,8 +11234,8 @@ octopus 10008/udp # Octopus Multiplexer octopus 10008/tcp # Octopus Multiplexer # Chris Koeritz <fred@gruntose.com> October 2002 # 10009-10079 Unassigned -amanda 10080/udp # Amanda -amanda 10080/tcp # Amanda +amanda 10080/udp # Amanda +amanda 10080/tcp # Amanda # John Jackson <jrj@gandalf.cc.purdue.edu> # <amanda-core@amanda.org> # 10081-10100 Unassigned @@ -11251,7 +11251,7 @@ netiq-endpoint 10113/udp # NetIQ Endpoint netiq-endpoint 10113/tcp # NetIQ Endpoint netiq-qcheck 10114/udp # NetIQ Qcheck netiq-qcheck 10114/tcp # NetIQ Qcheck -# John Wood <John.Wood@netiq.com> +# John Wood <John.Wood@netiq.com> netiq-endpt 10115/udp # NetIQ Endpoint netiq-endpt 10115/tcp # NetIQ Endpoint # Gary Weichinger <gary.weichinger@netiq.com> @@ -11261,7 +11261,7 @@ netiq-voipa 10116/tcp # NetIQ VoIP Assessor # 10117-10127 Unassigned bmc-perf-sd 10128/udp # BMC-PERFORM-SERVICE DAEMON bmc-perf-sd 10128/tcp # BMC-PERFORM-SERVICE DAEMON -# Dima Seliverstov <Dima_Seliverstov@bmc.com> +# Dima Seliverstov <Dima_Seliverstov@bmc.com> # 10129-10259 Unassigned axis-wimp-port 10260/udp # Axis WIMP Port axis-wimp-port 10260/tcp # Axis WIMP Port @@ -11307,7 +11307,7 @@ atm-uhas 11367/tcp # ATM UHAS # 11368-11370 Unassigned hkp 11371/udp # OpenPGP HTTP Keyserver hkp 11371/tcp # OpenPGP HTTP Keyserver -# David Shaw <dshaw@jabberwocky.com> May 2003 +# David Shaw <dshaw@jabberwocky.com> May 2003 # 11372-11599 Unassigned tempest-port 11600/udp # Tempest Protocol Port tempest-port 11600/tcp # Tempest Protocol Port @@ -11320,7 +11320,7 @@ h323callsigalt 11720/tcp # h323 Call Signal Alternate intrepid-ssl 11751/udp # Intrepid SSL intrepid-ssl 11751/tcp # Intrepid SSL # Robert Eden <reden@sieglertech.com> March 2003 -# 11752-11966 Unassigned +# 11752-11966 Unassigned sysinfo-sp 11967/udp # SysInfo Sercice Protocol sysinfo-sp 11967/tcp # SysInfo Service Protocol # Mike Cooper <mcooper@magnicomp.com> March 2003 @@ -11344,7 +11344,7 @@ dbisamserver2 12006/tcp # DBISAM Database Server - Admin # 12007-12108 Unassigned rets-ssl 12109/udp # RETS over SSL rets-ssl 12109/tcp # RETS over SSL -# Bruce Toback <btoback@optc.com> February 2003 +# Bruce Toback <btoback@optc.com> February 2003 # 12110-12171 Unassigned hivep 12172/udp # HiveP hivep 12172/tcp # HiveP @@ -11354,14 +11354,14 @@ italk 12345/udp # Italk Chat System italk 12345/tcp # Italk Chat System # Takayuki Ito <yuki@euc.jp> # 12346-12752 Unassigned -tsaf 12753/udp # tsaf port -tsaf 12753/tcp # tsaf port +tsaf 12753/udp # tsaf port +tsaf 12753/tcp # tsaf port # Andreas Fehr <100042.2070@CompuServe.COM> # 12754-13159 Unassigned i-zipqd 13160/udp # I-ZIPQD i-zipqd 13160/tcp # I-ZIPQD # Chuck Runquist <crunquist@quarterdeck.com> -# 13161-13222 Unassigned +# 13161-13222 Unassigned powwow-client 13223/udp # PowWow Client powwow-client 13223/tcp # PowWow Client powwow-server 13224/udp # PowWow Server @@ -11379,8 +11379,8 @@ bpjava-msvc 13722/tcp # BP Java MSVC Protocol # 13723 Unassigned vnetd 13724/udp # Veritas Network Utility vnetd 13724/tcp # Veritas Network Utility -# Jeff Holmbeck <Jeff.Holmbeck@veritas.com> -# 13725-13781 Unassigned +# Jeff Holmbeck <Jeff.Holmbeck@veritas.com> +# 13725-13781 Unassigned bpcd 13782/udp # VERITAS NetBackup bpcd 13782/tcp # VERITAS NetBackup vopied 13783/udp # VOPIED Protocol @@ -11410,7 +11410,7 @@ sage-best-com1 14033/tcp # sage Best! Config Server 1 sage-best-com2 14034/udp # sage Best! Config Server 2 sage-best-com2 14034/tcp # sage Best! Config Server 2 # Christian Rubach <Christian_Rubach@bestsoftware.com> -# 14035-14140 Unassigned +# 14035-14140 Unassigned vcs-app 14141/udp # VCS Application vcs-app 14141/tcp # VCS Application # Ming Xu <ming@veritas.com> @@ -11431,11 +11431,11 @@ hde-lcesrvr-2 14937/tcp # hde-lcesrvr-2 # 14938-14999 Unassigned hydap 15000/udp # Hypack Data Aquisition hydap 15000/tcp # Hypack Data Aquisition -# Mircea Neacsu <mircea@videotron.ca> +# Mircea Neacsu <mircea@videotron.ca> # 15001-15344 Unassigned xpilot 15345/udp # XPilot Contact Port xpilot 15345/tcp # XPilot Contact Port -# Bert Gijsbers <bert@xpilot.org> +# Bert Gijsbers <bert@xpilot.org> # 15346-15362 Unassigned 3link 15363/udp # 3Link Negotiation 3link 15363/tcp # 3Link Negotiation @@ -11455,14 +11455,14 @@ netserialext4 16368/tcp # netserialext4 # 16369-16990 Unassigned intel-rci-mp 16991/udp # INTEL-RCI-MP intel-rci-mp 16991/tcp # INTEL-RCI-MP -# Jane Dashevsky <jane.dashevsky@intel.com> +# Jane Dashevsky <jane.dashevsky@intel.com> # 16992-17006 Unassigned isode-dua 17007/udp # isode-dua 17007/tcp # # 17008-17184 Unassigned soundsvirtual 17185/udp # Sounds Virtual soundsvirtual 17185/tcp # Sounds Virtual -# Richard Snider <rsnider@sounds.com> +# Richard Snider <rsnider@sounds.com> # 17186-17218 Unassigned chipper 17219/udp # Chipper chipper 17219/tcp # Chipper @@ -11501,13 +11501,13 @@ ique 18769/udp # IQue Protocol ique 18769/tcp # IQue Protocol # Avi Drissman <avi_drissman@baseview.com> July 2002 # 18770-18887 Unassigned -apc-necmp 18888/udp # APCNECMP -apc-necmp 18888/tcp # APCNECMP +apc-necmp 18888/udp # APCNECMP +apc-necmp 18888/tcp # APCNECMP # Michael Yip <Michael.Yip@alcatel.com> # 18889-19190 Unassigned opsec-uaa 19191/udp # OPSEC UAA opsec-uaa 19191/tcp # OPSEC UAA -# Reuven Harrison <rnd_ana@checkpoint.com> +# Reuven Harrison <rnd_ana@checkpoint.com> # 19192-19193 Unassigned ua-secureagent 19194/udp # UserAuthority SecureAgent ua-secureagent 19194/tcp # UserAuthority SecureAgent @@ -11532,7 +11532,7 @@ hp-sca 19411/tcp # hp-sca # Larry Schwartz <lrs@cup.hp.com> hp-sessmon 19412/udp # HP-SESSMON hp-sessmon 19412/tcp # HP-SESSMON -# Gita Murthy <gita@cup.hp.com> +# Gita Murthy <gita@cup.hp.com> # 19413-19539 Unassigned sxuptp 19540/udp # SXUPTP sxuptp 19540/tcp # SXUPTP @@ -11559,7 +11559,7 @@ track 20670/tcp # Track # 20671-20998 Unassigned athand-mmp 20999/udp # AT Hand MMP athand-mmp 20999/tcp # At Hand MMP -# Stepan Riha <stepan.riha@hand.com> +# Stepan Riha <stepan.riha@hand.com> # 20300-21589 Unassigned vofr-gateway 21590/udp # VoFR Gateway vofr-gateway 21590/tcp # VoFR Gateway @@ -11580,7 +11580,7 @@ netspeak-acd 21848/tcp # NetSpeak Corp. Automatic Call Distribution netspeak-cps 21849/udp # NetSpeak Corp. Credit Processing System netspeak-cps 21849/tcp # NetSpeak Corp. Credit Processing System # Toby Hosterman <root@netspeak.com> -# 21850-21999 Unassigned +# 21850-21999 Unassigned snapenetio 22000/udp # SNAPenetIO snapenetio 22000/tcp # SNAPenetIO optocontrol 22001/udp # OptoControl @@ -11637,16 +11637,16 @@ binkp 24554/tcp # BINKP # 24554-34676 Unassigned flashfiler 24677/udp # FlashFiler flashfiler 24677/tcp # FlashFiler -# Ben Oram <beno@turbopower.com> +# Ben Oram <beno@turbopower.com> proactivate 24678/udp # Turbopower Proactivate proactivate 24678/tcp # Turbopower Proactivate # Ben Oram <beno@turbopower.com> # 24679-24921 Unassigned snip 24922/udp # Simple Net Ident Protocol snip 24922/tcp # Simple Net Ident Protocol -# Jean-Paul Moreaux +# Jean-Paul Moreaux # <jean-paul.moreaux@airbus.dasa.de> -# 24923-24999 Unassigned +# 24923-24999 Unassigned icl-twobase1 25000/udp # icl-twobase1 icl-twobase1 25000/tcp # icl-twobase1 icl-twobase2 25001/udp # icl-twobase2 @@ -11668,9 +11668,9 @@ icl-twobase9 25008/tcp # icl-twobase9 icl-twobase10 25009/udp # icl-twobase10 icl-twobase10 25009/tcp # icl-twobase10 # J. A. (Tony) Sever <J.A.Sever@bra0119.wins.icl.co.uk> -# 25010-25792 Unassigned +# 25010-25792 Unassigned vocaltec-hos 25793/udp # Vocaltec Address Server -vocaltec-hos 25793/tcp # Vocaltec Address Server +vocaltec-hos 25793/tcp # Vocaltec Address Server # Scott Petrack <Scott_Petrack@vocaltec.com> # 25794-25900 Unassigned niobserver 25901/udp # NIObserver @@ -11683,7 +11683,7 @@ niprobe 25903/tcp # NIProbe # 25904-25999 Unassigned quake 26000/udp # quake quake 26000/tcp # quake -# Yasunari Gon Yamasita <yamasita@omronsoft.co.jp> +# Yasunari Gon Yamasita <yamasita@omronsoft.co.jp> # 26001-26207 Unassigned wnn6-ds 26208/udp # wnn6-ds wnn6-ds 26208/tcp # wnn6-ds @@ -11700,8 +11700,8 @@ k3software-cli 26263/udp # K3 Software-Client k3software-cli 26263/tcp # K3 Software-Client # Jim Baldridge <jimb@rpower.com> gserver 26264/udp # Gserver -gserver 26264/tcp # Gserver -# Szanto Gabor <sgabor90@hotmail.com> +gserver 26264/tcp # Gserver +# Szanto Gabor <sgabor90@hotmail.com> # 26265-26999 Unassigned # Daniel Birns <daniel@globes.com> # 27010-27344 Unassigned @@ -11714,14 +11714,14 @@ kopek-httphead 27504/tcp # Kopek HTTP Head Port # Sten H. Danielsen <shd@kopek.net> July 2002 # 27505-27998 Unassigned tw-auth-key 27999/udp # Attribute Certificate Services -tw-auth-key 27999/tcp # TW Authentication/Key Distribution and -# Alex Duncan <Alex.Duncan@sse.ie> +tw-auth-key 27999/tcp # TW Authentication/Key Distribution and +# Alex Duncan <Alex.Duncan@sse.ie> # 28000-30000 Unassigned pago-services1 30001/udp # Pago Services 1 pago-services1 30001/tcp # Pago Services 1 pago-services2 30002/udp # Pago Services 2 pago-services2 30002/tcp # Pago Services 2 -# Balduin Mueller-Platz +# Balduin Mueller-Platz # <balduin.mueller-platz@pago.de> March 2002 # 30003-31415 Unassigned xqosd 31416/udp # XQoS network monitor @@ -11747,7 +11747,7 @@ filenet-rmi 32771/udp # FileNet RMI filenet-rmi 32771/tcp # FileNET RMI # Chris Adkins <cadkins@filenet.com> filenet-pa 32772/udp # FileNET Process Analyzer -filenet-pa 32772/tcp # FileNET Process Analyzer +filenet-pa 32772/tcp # FileNET Process Analyzer # Chris Adkins <cadkins@filenet.com> January 2003 # 32773-32895 Unassigned idmgratm 32896/udp # Attachmate ID Manager @@ -11784,7 +11784,7 @@ turbonote-1 39681/tcp # TurboNote Default Port # 39682-40840 Unassigned cscp 40841/udp # CSCP cscp 40841/tcp # CSCP -# Michael Dodge <sarge@centerspan.com> +# Michael Dodge <sarge@centerspan.com> csccredir 40842/udp # CSCCREDIR csccredir 40842/tcp # CSCCREDIR csccfirewall 40843/udp # CSCCFIREWALL @@ -11818,7 +11818,7 @@ rockwell-encap 44818/tcp # Rockwell Encapsulation # Brian Batke <babatke@ra.rockwell.com> # 44819-45053 Unassigned invision-ag 45054/udp # InVision AG -invision-ag 45054/tcp # InVision AG +invision-ag 45054/tcp # InVision AG # Matthias Schroer <matthias.schroer@invision.de> # 45055-45677 Unassigned eba 45678/udp # EBA PRISE @@ -11831,7 +11831,7 @@ ssr-servermgr 45966/tcp # SSRServerMgr # 45967-46999 Unassigned mbus 47000/udp # Message Bus mbus 47000/tcp # Message Bus -# Dirk Kutscher <dku@informatik.uni-bremen.de> +# Dirk Kutscher <dku@informatik.uni-bremen.de> # 47001-47556 Unassigned dbbrowse 47557/udp # Databeam Corporation dbbrowse 47557/tcp # Databeam Corporation @@ -11862,5 +11862,5 @@ nimgtw 48003/tcp # Nimbus Gateway com-bardac-dw 48556/udp # com-bardac-dw com-bardac-dw 48556/tcp # com-bardac-dw # Nicholas J Howes <nick@ghostwood.org> -# 48557-49150 Unassigned +# 48557-49150 Unassigned # 49151 IANA Reserved diff --git a/test/language/ast/resource_reference.rb b/test/language/ast/resource_reference.rb index 44c23fd2b..47b49d1e0 100755 --- a/test/language/ast/resource_reference.rb +++ b/test/language/ast/resource_reference.rb @@ -12,7 +12,7 @@ class TestASTResourceReference < Test::Unit::TestCase include PuppetTest include PuppetTest::ParserTesting AST = Puppet::Parser::AST - + def newref(type, title) AST::ResourceReference.new(:type => type, :title => AST::String.new(:value => title)) end diff --git a/test/language/ast/selector.rb b/test/language/ast/selector.rb index 0c9a6e675..d2b1622d2 100755 --- a/test/language/ast/selector.rb +++ b/test/language/ast/selector.rb @@ -12,26 +12,26 @@ class TestSelector < Test::Unit::TestCase include PuppetTest include PuppetTest::ParserTesting AST = Puppet::Parser::AST - + def test_evaluate scope = mkscope upperparam = nameobj("MYPARAM") lowerparam = nameobj("myparam") - + should = {"MYPARAM" => "upper", "myparam" => "lower"} - + maker = Proc.new do { :default => AST::ResourceParam.new(:param => AST::Default.new(:value => "default"), :value => FakeAST.new("default")), :lower => AST::ResourceParam.new(:param => FakeAST.new("myparam"), :value => FakeAST.new("lower")), :upper => AST::ResourceParam.new(:param => FakeAST.new("MYPARAM"), :value => FakeAST.new("upper")), } - + end - + # Start out case-sensitive Puppet[:casesensitive] = true - + %w{MYPARAM myparam}.each do |str| param = nameobj(str) params = maker.call() @@ -40,10 +40,10 @@ class TestSelector < Test::Unit::TestCase assert_nothing_raised { result = sel.evaluate(scope) } assert_equal(should[str], result, "did not case-sensitively match %s" % str) end - + # then insensitive Puppet[:casesensitive] = false - + %w{MYPARAM myparam}.each do |str| param = nameobj(str) params = maker.call() diff --git a/test/language/ast/variable.rb b/test/language/ast/variable.rb index 7aef2a8c2..17e078b32 100755 --- a/test/language/ast/variable.rb +++ b/test/language/ast/variable.rb @@ -12,7 +12,7 @@ class TestVariable < Test::Unit::TestCase include PuppetTest include PuppetTest::ParserTesting AST = Puppet::Parser::AST - + def setup super @interp = mkinterp diff --git a/test/language/functions.rb b/test/language/functions.rb index 7e153ec3d..030928618 100755 --- a/test/language/functions.rb +++ b/test/language/functions.rb @@ -388,17 +388,17 @@ class TestLangFunctions < Test::Unit::TestCase def test_realize scope = mkscope parser = scope.compiler.parser - + realize = Puppet::Parser::Functions.function(:realize) # Make a definition parser.newdefine("mytype") - + [%w{file /tmp/virtual}, %w{mytype yay}].each do |type, title| # Make a virtual resource virtual = mkresource(:type => type, :title => title, :virtual => true, :params => {}, :scope => scope) - + scope.compiler.add_resource(scope, virtual) ref = Puppet::Parser::Resource::Reference.new( @@ -442,39 +442,39 @@ class TestLangFunctions < Test::Unit::TestCase assert_equal([none.to_s], scope.compiler.collections[0].resources, "Did not set resources in collection") end - + def test_defined scope = mkscope parser = scope.compiler.parser defined = Puppet::Parser::Functions.function(:defined) - + parser.newclass("yayness") parser.newdefine("rahness") - + assert_nothing_raised do assert(scope.function_defined("yayness"), "yayness class was not considered defined") assert(scope.function_defined("rahness"), "rahness definition was not considered defined") assert(scope.function_defined("service"), "service type was not considered defined") assert(! scope.function_defined("fakness"), "fakeness was considered defined") end - + # Now make sure any match in a list will work assert(scope.function_defined(["booness", "yayness", "fakeness"]), "A single answer was not sufficient to return true") - + # and make sure multiple falses are still false assert(! scope.function_defined(%w{no otherno stillno}), "Multiple falses were somehow true") - + # Now make sure we can test resources scope.compiler.add_resource(scope, mkresource(:type => "file", :title => "/tmp/rahness", :scope => scope, :source => scope.source, :params => {:owner => "root"})) - + yep = Puppet::Parser::Resource::Reference.new(:type => "file", :title => "/tmp/rahness") nope = Puppet::Parser::Resource::Reference.new(:type => "file", :title => "/tmp/fooness") - + assert(scope.function_defined([yep]), "valid resource was not considered defined") assert(! scope.function_defined([nope]), "invalid resource was considered defined") end @@ -482,7 +482,7 @@ class TestLangFunctions < Test::Unit::TestCase def test_search parser = mkparser scope = mkscope(:parser => parser) - + fun = parser.newdefine("yay::ness") foo = parser.newdefine("foo::bar") diff --git a/test/language/parser.rb b/test/language/parser.rb index 01b18acd9..acb20c985 100755 --- a/test/language/parser.rb +++ b/test/language/parser.rb @@ -308,7 +308,7 @@ class TestParser < Test::Unit::TestCase f.puts %{ node nodeA, nodeB { file { "#{other}": ensure => file } - + } } end @@ -403,7 +403,7 @@ file { "/tmp/yayness": } sub = parser.classes["container::deep::sub"] assert(sub, "Could not find sub") - + # Now try it with a parent class being a fq class assert_nothing_raised { parser.parse "class container::one inherits container::deep::sub {}" @@ -411,7 +411,7 @@ file { "/tmp/yayness": sub = parser.classes["container::one"] assert(sub, "Could not find one") assert_equal("container::deep::sub", sub.parentclass) - + # Finally, try including a qualified class assert_nothing_raised("Could not include fully qualified class") { parser.parse "include container::deep::sub" @@ -635,7 +635,7 @@ file { "/tmp/yayness": assert(code.length == 1, "Did not get the file") assert_instance_of(Puppet::TransObject, code[0]) end - + def test_fully_qualified_definitions parser = mkparser @@ -643,7 +643,7 @@ file { "/tmp/yayness": parser.parse %{define one::two { }} } assert(parser.definitions["one::two"], "Could not find one::two with no namespace") - + # Now try using the definition assert_nothing_raised("Could not parse fully-qualified definition usage") { parser.parse %{one::two { yayness: }} @@ -792,7 +792,7 @@ file { "/tmp/yayness": def test_parse parser = mkparser - str = "file { '/tmp/yay': ensure => file }\nclass yay {}\nnode foo {}\ndefine bar {}\n" + str = "file { '/tmp/yay': ensure => file }\nclass yay {}\nnode foo {}\ndefine bar {}\n" result = nil assert_nothing_raised("Could not parse") do result = parser.parse(str) @@ -1004,7 +1004,7 @@ file { "/tmp/yayness": end end end - + # Now make sure we get appropriate behaviour with parent class conflicts. def test_newclass_parentage parser = mkparser @@ -1199,17 +1199,17 @@ file { "/tmp/yayness": assert_instance_of(AST::Definition, klass, "Did not autoload definition from its own file") assert_equal("mymod::mydefine", klass.classname, "Incorrect definition was returned") end - + # Make sure class, node, and define methods are case-insensitive def test_structure_case_insensitivity parser = mkparser - + result = nil assert_nothing_raised do result = parser.newclass "Yayness" end assert_equal(result, parser.findclass("", "yayNess")) - + assert_nothing_raised do result = parser.newdefine "FunTest" end @@ -1225,7 +1225,7 @@ file { "/tmp/yayness": Puppet::Parser::Files.expects(:find_manifests).with("test", {:cwd => ".", :environment => "something"}).returns([]) assert_raise(Puppet::ImportError) do - parser.import("test") + parser.import("test") end end diff --git a/test/language/scope.rb b/test/language/scope.rb index 32e1802a8..debef44bf 100755 --- a/test/language/scope.rb +++ b/test/language/scope.rb @@ -96,7 +96,7 @@ class TestScope < Test::Unit::TestCase scope.setvar("var", "yep") assert_equal("yep", scope.lookupvar("var"), "did not retrieve value correctly") - # Now test the parent lookups + # Now test the parent lookups subscope = mkscope :parser => parser subscope.parent = scope assert_equal("", subscope.lookupvar("nope"), "scope did not default to string with parent") @@ -216,7 +216,7 @@ class TestScope < Test::Unit::TestCase assert_equal(top, sub.parent, "Did not find parent scope correctly") assert_equal(top, sub.parent, "Did not find parent scope on second call") end - + def test_strinterp # Make and evaluate our classes so the qualified lookups work parser = mkparser diff --git a/test/language/snippets.rb b/test/language/snippets.rb index 64681d6f9..87ad9e770 100755 --- a/test/language/snippets.rb +++ b/test/language/snippets.rb @@ -50,7 +50,7 @@ class TestSnippets < Test::Unit::TestCase def snippet(name) File.join(self.class.snippetdir, name) end - + def file2ast(file) parser = Puppet::Parser::Parser.new() parser.file = file @@ -142,7 +142,7 @@ class TestSnippets < Test::Unit::TestCase def disabled_test_defaults Puppet::Type.eachtype { |type| next if type.name == :puppet or type.name == :component - + rands = randeach(type) name = type.name.to_s.capitalize @@ -417,7 +417,7 @@ class TestSnippets < Test::Unit::TestCase assert_file("/tmp/virtualtest#{num}") end end - + def snippet_componentrequire %w{1 2}.each do |num| assert_file("/tmp/testing_component_requires#{num}", @@ -470,7 +470,7 @@ class TestSnippets < Test::Unit::TestCase assert_file("/tmp/multipleclassone", "one") assert_file("/tmp/multipleclasstwo", "two") end - + def snippet_multilinecomments assert_not_file("/tmp/multilinecomments","Did create a commented resource"); end diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb index 8c1eed910..786c37074 100755 --- a/test/lib/puppettest.rb +++ b/test/lib/puppettest.rb @@ -8,7 +8,7 @@ $LOAD_PATH.unshift(mainlib) unless $LOAD_PATH.include?(mainlib) require 'puppet' # include any gems in vendor/gems -Dir["#{mainlib}/../vendor/gems/**"].each do |path| +Dir["#{mainlib}/../vendor/gems/**"].each do |path| libpath = File.join(path, "lib") if File.directory?(libpath) $LOAD_PATH.unshift(libpath) @@ -138,7 +138,7 @@ module PuppetTest ENV["RUBYLIB"] = curlibs.join(":") end - + def logcollector collector = [] Puppet::Util::Log.newdestination(collector) @@ -217,7 +217,7 @@ module PuppetTest end Puppet::Util::Log.level = :debug #$VERBOSE = 1 - #else + #else # Puppet::Util::Log.close # Puppet::Util::Log.newdestination(@logs) # Puppet[:httplog] = tempfile() @@ -240,7 +240,7 @@ module PuppetTest @@tmpfiles << f return f end - + def textmate? if ENV["TM_FILENAME"] return true diff --git a/test/lib/puppettest/certificates.rb b/test/lib/puppettest/certificates.rb index fbd18e997..3ba052505 100644 --- a/test/lib/puppettest/certificates.rb +++ b/test/lib/puppettest/certificates.rb @@ -42,9 +42,9 @@ module PuppetTest::Certificates cert = Puppet::SSLCertificates::Certificate.new(:name => hostname) cert.mkcsr } - + return cert - end + end def mksignedcert(ca = nil, hostname = nil) ca ||= mkCA() diff --git a/test/lib/puppettest/fakes.rb b/test/lib/puppettest/fakes.rb index 739b098bc..db6ca4d80 100644 --- a/test/lib/puppettest/fakes.rb +++ b/test/lib/puppettest/fakes.rb @@ -153,7 +153,7 @@ module PuppetTest end return ret - end + end def store(hash) hash.each do |n, v| diff --git a/test/lib/puppettest/parsertesting.rb b/test/lib/puppettest/parsertesting.rb index 1a08ecbae..666de076a 100644 --- a/test/lib/puppettest/parsertesting.rb +++ b/test/lib/puppettest/parsertesting.rb @@ -14,7 +14,7 @@ module PuppetTest::ParserTesting def evaluated? defined? @evaluated and @evaluated end - + def evaluate(*args) @evaluated = true return @evaluate @@ -25,7 +25,7 @@ module PuppetTest::ParserTesting @evaluate = val end end - + def reset @evaluated = nil end @@ -34,7 +34,7 @@ module PuppetTest::ParserTesting evaluate() end end - + def astarray(*args) AST::ASTArray.new( :children => args diff --git a/test/lib/puppettest/railstesting.rb b/test/lib/puppettest/railstesting.rb index a9d8601f3..fb5c15f51 100644 --- a/test/lib/puppettest/railstesting.rb +++ b/test/lib/puppettest/railstesting.rb @@ -26,7 +26,7 @@ module PuppetTest::RailsTesting def railsresource(type = "file", title = "/tmp/testing", params = {}) railsteardown railsinit - + # We need a host for resources #host = Puppet::Rails::Host.new(:name => Facter.value("hostname")) @@ -39,12 +39,12 @@ module PuppetTest::RailsTesting facts = Facter.to_hash # Now try storing our crap - host = nil + host = nil node = mknode(facts["hostname"]) node.parameters = facts assert_nothing_raised { host = Puppet::Rails::Host.store(node, resources) - } + } # Now save the whole thing host.save diff --git a/test/lib/puppettest/servertest.rb b/test/lib/puppettest/servertest.rb index 11c24f5b4..d658ddba7 100644 --- a/test/lib/puppettest/servertest.rb +++ b/test/lib/puppettest/servertest.rb @@ -63,7 +63,7 @@ module PuppetTest::ServerTest @@tmppids << spid # give the server a chance to do its thing - sleep 1 + sleep 1 return spid end diff --git a/test/lib/puppettest/support/assertions.rb b/test/lib/puppettest/support/assertions.rb index 2159c8d3e..052c6b42d 100644 --- a/test/lib/puppettest/support/assertions.rb +++ b/test/lib/puppettest/support/assertions.rb @@ -15,7 +15,7 @@ module PuppetTest def assert_uid_gid(uid, gid, filename) flunk "Must be uid 0 to run these tests" unless Process.uid == 0 - fork do + fork do Puppet::Util::SUIDManager.gid = gid Puppet::Util::SUIDManager.uid = uid # FIXME: use the tempfile method from puppettest.rb @@ -30,7 +30,7 @@ module PuppetTest f = File.open(filename, "r") - a = f.readlines + a = f.readlines assert_equal(uid, a[0].chomp.to_i, "UID was incorrect") assert_equal(gid, a[1].chomp.to_i, "GID was incorrect") FileUtils.rm(filename) diff --git a/test/lib/puppettest/support/resources.rb b/test/lib/puppettest/support/resources.rb index a2beee98d..865995507 100755 --- a/test/lib/puppettest/support/resources.rb +++ b/test/lib/puppettest/support/resources.rb @@ -7,14 +7,14 @@ module PuppetTest::Support::Resources def tree_resource(name) Puppet::Type.type(:file).new :title => name, :path => "/tmp/#{name}", :mode => 0755 end - + def tree_container(name) Puppet::Type::Component.create :name => name, :type => "yay" end - + def treenode(config, name, *resources) comp = tree_container name - resources.each do |resource| + resources.each do |resource| if resource.is_a?(String) resource = tree_resource(resource) end @@ -23,7 +23,7 @@ module PuppetTest::Support::Resources end return comp end - + def mktree catalog = Puppet::Resource::Catalog.new do |config| one = treenode(config, "one", "a", "b") @@ -31,7 +31,7 @@ module PuppetTest::Support::Resources middle = treenode(config, "middle", "e", "f", two) top = treenode(config, "top", "g", "h", middle, one) end - + return catalog end end diff --git a/test/network/handler/bucket.rb b/test/network/handler/bucket.rb index 1a7063366..24e70cf01 100755 --- a/test/network/handler/bucket.rb +++ b/test/network/handler/bucket.rb @@ -106,7 +106,7 @@ class TestBucket < Test::Unit::TestCase end %w{ - who bash sh uname /etc/passwd /etc/syslog.conf /etc/hosts + who bash sh uname /etc/passwd /etc/syslog.conf /etc/hosts }.each { |file| # if it's fully qualified, just add it if file =~ /^\// @@ -251,7 +251,7 @@ class TestBucket < Test::Unit::TestCase dir = File.join(@bucket, dirs, md5) filedir, contents, paths = bucket.class.paths(@bucket, md5) - assert_equal(dir, filedir, "did not use a deeper file structure") + assert_equal(dir, filedir, "did not use a deeper file structure") assert_equal(File.join(dir, "contents"), contents, "content path is not the deeper version") assert_equal(File.join(dir, "paths"), paths, diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb index 47f848ed2..a6c678683 100755 --- a/test/network/handler/fileserver.rb +++ b/test/network/handler/fileserver.rb @@ -50,7 +50,7 @@ class TestFileServer < Test::Unit::TestCase File.open(name, "w") { |f| f.puts rand(100) } - + name } @@ -463,7 +463,7 @@ class TestFileServer < Test::Unit::TestCase File.open(conffile, "w") { |f| f.print "# a test config file - + [thing] path #{basedir}/thing allow 192.168.0.* @@ -481,7 +481,7 @@ class TestFileServer < Test::Unit::TestCase " } - + # create a server with the file assert_nothing_raised { @@ -593,7 +593,7 @@ class TestFileServer < Test::Unit::TestCase File.open(conffile, "w") { |f| f.print text } - + # create a server with the file server = nil @@ -614,7 +614,7 @@ class TestFileServer < Test::Unit::TestCase File.open(conffile, "w") { |f| f.print text } - + # create a server with the file server = nil @@ -638,13 +638,13 @@ class TestFileServer < Test::Unit::TestCase files = mktestfiles(dir) File.open(conffile, "w") { |f| f.print "# a test config file - + [thing] path #{dir} allow test1.domain.com " } - + # Reset the timeout, so we reload faster Puppet[:filetimeout] = 0.5 @@ -671,13 +671,13 @@ class TestFileServer < Test::Unit::TestCase sleep 1 File.open(conffile, "w") { |f| f.print "# a test config file - + [thing] path #{dir} allow test2.domain.com " } - + assert_raise(Puppet::AuthorizationError, "List allowed invalid host") { list = server.list("/thing/", :manage, false, false, "test1.domain.com", "127.0.0.1") @@ -773,12 +773,12 @@ class TestFileServer < Test::Unit::TestCase client1_hostdir => "client1\n", client2_fqdndir => client2 + "\n" } - [fsdir, hostdir, fqdndir, + [fsdir, hostdir, fqdndir, client1_hostdir, client2_fqdndir].each { |d| Dir.mkdir(d) } - + [client1_hostdir, client2_fqdndir].each do |d| - File.open(File.join(d, "file.txt"), "w") do |f| - f.print contents[d] + File.open(File.join(d, "file.txt"), "w") do |f| + f.print contents[d] end end conffile = tempfile() @@ -946,7 +946,7 @@ allow * result = check.call(client, pat, repl) end - # Now, check that they use Facter info + # Now, check that they use Facter info Puppet.notice "The following messages are normal" client = nil Facter.stubs(:value).with(:ipaddress).returns("127.0.0.1") diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb index 8b637c39f..5a930848d 100755 --- a/test/network/server/webrick.rb +++ b/test/network/server/webrick.rb @@ -65,7 +65,7 @@ class TestWebrickServer < Test::Unit::TestCase } assert_equal(1, retval) end - + def mk_status_client client = nil diff --git a/test/other/dsl.rb b/test/other/dsl.rb index 3ef21a372..deafca791 100755 --- a/test/other/dsl.rb +++ b/test/other/dsl.rb @@ -75,7 +75,7 @@ class TestDSL < Test::Unit::TestCase def test_evaluate parent = child = nil parenteval = childeval = nil - + assert_nothing_raised do parent = aspect :parent do if parenteval diff --git a/test/other/events.rb b/test/other/events.rb index a954cd7f6..052afc0c9 100755 --- a/test/other/events.rb +++ b/test/other/events.rb @@ -107,14 +107,14 @@ class TestEvents < Test::Unit::TestCase execs = [exec1, exec2, exec3] config = mk_catalog(exec1,exec2,exec3) - + trans = Puppet::Transaction.new(config) execs.each do |e| assert(config.vertex?(e), "%s is not in graph" % e.title) end trans.prepare execs.each do |e| assert(config.vertex?(e), "%s is not in relgraph" % e.title) end reverse = trans.relationship_graph.reversal execs.each do |e| assert(reverse.vertex?(e), "%s is not in reversed graph" % e.title) end - + config.apply assert(FileTest.exists?(file), "File does not exist") diff --git a/test/other/puppet.rb b/test/other/puppet.rb index 2dcd7e576..1839333e5 100755 --- a/test/other/puppet.rb +++ b/test/other/puppet.rb @@ -9,7 +9,7 @@ require 'puppettest' class TestPuppetModule < Test::Unit::TestCase include PuppetTest include SignalObserver - + def mkfakeclient Class.new(Puppet::Network::Client) do def initialize diff --git a/test/other/relationships.rb b/test/other/relationships.rb index 976d6d894..b15ff5062 100755 --- a/test/other/relationships.rb +++ b/test/other/relationships.rb @@ -11,7 +11,7 @@ class TestRelationships < Test::Unit::TestCase super Puppet::Type.type(:exec) end - + def newfile assert_nothing_raised() { return Puppet::Type.type(:file).new( @@ -20,7 +20,7 @@ class TestRelationships < Test::Unit::TestCase ) } end - + def check_relationship(sources, targets, out, refresher) if out deps = sources.builddepends @@ -31,17 +31,17 @@ class TestRelationships < Test::Unit::TestCase end assert_instance_of(Array, deps) assert(! deps.empty?, "Did not receive any relationships") - + deps.each do |edge| assert_instance_of(Puppet::Relationship, edge) end - + sources.each do |source| targets.each do |target| edge = deps.find { |e| e.source == source and e.target == target } assert(edge, "Could not find edge for %s => %s" % [source.ref, target.ref]) - + if refresher assert_equal(:ALL_EVENTS, edge.event) assert_equal(:refresh, edge.callback) @@ -56,12 +56,12 @@ class TestRelationships < Test::Unit::TestCase def test_autorequire # We know that execs autorequire their cwd, so we'll use that path = tempfile() - + file = Puppet::Type.type(:file).new(:title => "myfile", :path => path, :ensure => :directory) exec = Puppet::Type.newexec(:title => "myexec", :cwd => path, :command => "/bin/echo") - + catalog = mk_catalog(file, exec) reqs = nil assert_nothing_raised do @@ -70,18 +70,18 @@ class TestRelationships < Test::Unit::TestCase assert_instance_of(Puppet::Relationship, reqs[0], "Did not return a relationship edge") assert_equal(file, reqs[0].source, "Did not set the autorequire source correctly") assert_equal(exec, reqs[0].target, "Did not set the autorequire target correctly") - - # Now make sure that these relationships are added to the + + # Now make sure that these relationships are added to the # relationship graph catalog.apply do |trans| assert(catalog.relationship_graph.edge?(file, exec), "autorequire edge was not created") end end - + # Testing #411. It was a problem with builddepends. def test_missing_deps file = Puppet::Type.type(:file).new :path => tempfile, :require => Puppet::Resource::Reference.new("file", "/no/such/file") - + assert_raise(Puppet::Error) do file.builddepends end diff --git a/test/other/report.rb b/test/other/report.rb index a77c48362..692ed54b6 100755 --- a/test/other/report.rb +++ b/test/other/report.rb @@ -80,7 +80,7 @@ class TestReports < Test::Unit::TestCase def test_store_report # Create a bunch of log messages in an array. report = Puppet::Transaction::Report.new - + # We have to reuse reporting here because of something going on in the # server/report.rb file Puppet.settings.use(:main, :puppetmasterd) @@ -143,31 +143,31 @@ class TestReports < Test::Unit::TestCase else $stderr.puts "Install RRD for metric reporting tests" end - + def test_tagmail_parsing report = Object.new report.extend(Puppet::Reports.report(:tagmail)) - + passers = File.join(datadir, "reports", "tagmail_passers.conf") assert(FileTest.exists?(passers), "no passers file %s" % passers) - + File.readlines(passers).each do |line| assert_nothing_raised("Could not parse %s" % line.inspect) do report.parse(line) end end - + # Now make sure the failers fail failers = File.join(datadir, "reports", "tagmail_failers.conf") assert(FileTest.exists?(failers), "no failers file %s" % failers) - + File.readlines(failers).each do |line| assert_raise(ArgumentError, "Parsed %s" % line.inspect) do report.parse(line) end end end - + def test_tagmail_parsing_results report = Object.new report.extend(Puppet::Reports.report(:tagmail)) @@ -179,27 +179,27 @@ class TestReports < Test::Unit::TestCase "tag, !other: abuse@domain.com" => [%w{abuse@domain.com}, %w{tag}, %w{other}], "tag, !other, one, !two: abuse@domain.com" => [%w{abuse@domain.com}, %w{tag one}, %w{other two}], "tag: abuse@domain.com, other@domain.com" => [%w{abuse@domain.com other@domain.com}, %w{tag}, []] - + }.each do |line, results| assert_nothing_raised("Failed to parse %s" % line.inspect) do assert_equal(results, report.parse(line).shift, "line %s returned incorrect results %s" % [line.inspect, results.inspect]) end end end - + def test_tagmail_matching report = Puppet::Transaction::Report.new Puppet::Util::Log.close [%w{one}, %w{one two}, %w{one two three}, %w{one two three four}].each do |tags| log = Puppet::Util::Log.new(:level => :notice, :message => tags.join(" "), :tags => tags) - + report << log end - + list = report.logs.collect { |l| l.to_report } - + report.extend(Puppet::Reports.report(:tagmail)) - + { [%w{abuse@domain.com}, %w{all}, []] => list, [%w{abuse@domain.com}, %w{all}, %w{three}] => list[0..1], @@ -212,7 +212,7 @@ class TestReports < Test::Unit::TestCase assert_nothing_raised("Could not match with %s" % args.inspect) do results = report.match([args]) end - + if expected assert_equal([args[0], expected.join("\n")], results[0], "did get correct results for %s" % args.inspect) else diff --git a/test/other/transactions.rb b/test/other/transactions.rb index 8375145f9..6cb772d88 100755 --- a/test/other/transactions.rb +++ b/test/other/transactions.rb @@ -33,12 +33,12 @@ class TestTransactions < Test::Unit::TestCase def log(msg) end end - - + + def mkgenerator(&block) $finished = [] cleanup { $finished = nil } - + # Create a bogus type that generates new instances with shorter type = Puppet::Type.newtype(:generator) do newparam(:name, :namevar => true) @@ -52,10 +52,10 @@ class TestTransactions < Test::Unit::TestCase cleanup do Puppet::Type.rmtype(:generator) end - + return type end - + # Create a new type that generates instances with shorter names. def mkreducer(&block) type = mkgenerator() do @@ -69,11 +69,11 @@ class TestTransactions < Test::Unit::TestCase ret end end - + if block type.class_eval(&block) end - + return type end @@ -126,7 +126,7 @@ class TestTransactions < Test::Unit::TestCase type = Puppet::Type.newtype(name) do newparam(:name) {} end - + cleanup do Puppet::Type.rmtype(name) end @@ -140,7 +140,7 @@ class TestTransactions < Test::Unit::TestCase # Now create an instance inst = type.new :name => "yay" - + # Create a transaction trans = Puppet::Transaction.new(mk_catalog(inst)) @@ -545,17 +545,17 @@ class TestTransactions < Test::Unit::TestCase config = mk_catalog(yay, rah) trans = Puppet::Transaction.new(config) - + assert_nothing_raised do trans.generate end - + %w{ya ra y r}.each do |name| assert(trans.catalog.vertex?(Puppet::Type.type(:generator)[name]), "Generated %s was not a vertex" % name) assert($finished.include?(name), "%s was not finished" % name) end - + # Now make sure that cleanup gets rid of those generated types. assert_nothing_raised do trans.cleanup @@ -572,7 +572,7 @@ class TestTransactions < Test::Unit::TestCase transaction = Puppet::Transaction.new(config) assert(transaction.ignore_tags?, "Not ignoring tags when applying a non-host catalog") end - + def test_missing_tags? resource = stub 'resource', :tagged? => true config = Puppet::Resource::Catalog.new @@ -588,7 +588,7 @@ class TestTransactions < Test::Unit::TestCase transaction = Puppet::Transaction.new(config) assert(! transaction.missing_tags?(resource), "Considered a resource to be missing tags when not running a host catalog") - # + # config.host_config = true transaction = Puppet::Transaction.new(config) assert(! transaction.missing_tags?(resource), "Considered a resource to be missing tags when running a host catalog and all tags are present") @@ -597,7 +597,7 @@ class TestTransactions < Test::Unit::TestCase resource.stubs :tagged? => false assert(transaction.missing_tags?(resource), "Considered a resource not to be missing tags when running a host catalog and tags are missing") end - + # Make sure changes generated by eval_generated resources have proxies # set to the top-level resource. def test_proxy_resources @@ -607,7 +607,7 @@ class TestTransactions < Test::Unit::TestCase :path => :path, :is => "start_value", :should => "desired_value", :name => self.name, :resource => "fake_parent"), :is) end end - + resource = type.new :name => "test" config = mk_catalog(resource) trans = Puppet::Transaction.new(config) @@ -618,14 +618,14 @@ class TestTransactions < Test::Unit::TestCase end changes = trans.instance_variable_get("@changes") - + assert(changes.length > 0, "did not get any changes") - + changes.each do |change| assert_equal(resource.object_id, change.resource.object_id, "change did not get proxy set correctly") end end - + # Make sure changes in contained files still generate callback events. def test_generated_callbacks dir = tempfile() @@ -635,12 +635,12 @@ class TestTransactions < Test::Unit::TestCase File.open(file, "w") { |f| f.puts "" } File.chmod(0644, file) File.chmod(0755, dir) # So only the child file causes a change - + dirobj = Puppet::Type.type(:file).new :mode => "755", :recurse => true, :path => dir exec = Puppet::Type.type(:exec).new :title => "make", :command => "touch #{maker}", :path => ENV['PATH'], :refreshonly => true, :subscribe => dirobj - + assert_apply(dirobj, exec) assert(FileTest.exists?(maker), "Did not make callback file") end @@ -719,29 +719,29 @@ class TestTransactions < Test::Unit::TestCase assert(trans.triggered?(c, :refresh), "Transaction did not store the trigger") end - + def test_set_target file = Puppet::Type.type(:file).new(:path => tempfile(), :content => "yay") exec1 = Puppet::Type.type(:exec).new :command => "/bin/echo exec1" exec2 = Puppet::Type.type(:exec).new :command => "/bin/echo exec2" trans = Puppet::Transaction.new(mk_catalog(file, exec1, exec2)) - + # First try it with an edge that has no callback edge = Puppet::Relationship.new(file, exec1) assert_nothing_raised { trans.set_trigger(edge) } assert(! trans.targeted?(exec1), "edge with no callback resulted in a target") - + # Now with an edge that has an unsupported callback edge = Puppet::Relationship.new(file, exec1, :callback => :nosuchmethod, :event => :ALL_EVENTS) assert_nothing_raised { trans.set_trigger(edge) } assert(! trans.targeted?(exec1), "edge with invalid callback resulted in a target") - + # Lastly, with an edge with a supported callback edge = Puppet::Relationship.new(file, exec1, :callback => :refresh, :event => :ALL_EVENTS) assert_nothing_raised { trans.set_trigger(edge) } assert(trans.targeted?(exec1), "edge with valid callback did not result in a target") end - + # Testing #401 -- transactions are calling refresh() on classes that don't support it. def test_callback_availability $called = [] @@ -758,9 +758,9 @@ class TestTransactions < Test::Unit::TestCase file = Puppet::Type.type(:file).new :path => tempfile(), :content => "yay" one = klass.new :name => "one", :subscribe => file - + assert_apply(file, one) - + assert(! $called.include?(:refresh), "Called refresh when it wasn't set as a method") end @@ -794,7 +794,7 @@ class TestTransactions < Test::Unit::TestCase assert_apply(obj) end - + def test_self_refresh_causes_triggering type = Puppet::Type.newtype(:refresher, :self_refresh => true) do attr_accessor :refreshed, :testing @@ -814,16 +814,16 @@ class TestTransactions < Test::Unit::TestCase end end cleanup { Puppet::Type.rmtype(:refresher)} - + obj = type.new(:name => "yay", :testing => "cool") - + assert(! obj.insync?(obj.retrieve), "fake object is already in sync") - + # Now make sure it gets refreshed when the change happens assert_apply(obj) assert(obj.refreshed, "object was not refreshed during transaction") end - + # Testing #433 def test_explicit_dependencies_beat_automatic # Create a couple of different resource sets that have automatic relationships and make sure the manual relationships win @@ -831,7 +831,7 @@ class TestTransactions < Test::Unit::TestCase # First users and groups group = Puppet::Type.type(:group).new(:name => nonrootgroup.name, :ensure => :present) user = Puppet::Type.type(:user).new(:name => nonrootuser.name, :ensure => :present, :gid => group.title) - + # Now add the explicit relationship group[:require] = user rels[group] = user @@ -840,17 +840,17 @@ class TestTransactions < Test::Unit::TestCase f = File.join(d, "file") file = Puppet::Type.type(:file).new(:path => f, :content => "yay") dir = Puppet::Type.type(:file).new(:path => d, :ensure => :directory, :require => file) - + rels[dir] = file rels.each do |after, before| config = mk_catalog(before, after) trans = Puppet::Transaction.new(config) str = "from %s to %s" % [before, after] - + assert_nothing_raised("Failed to create graph %s" % str) do trans.prepare end - + graph = trans.relationship_graph assert(graph.edge?(before, after), "did not create manual relationship %s" % str) assert(! graph.edge?(after, before), "created automatic relationship %s" % str) diff --git a/test/puppet/tc_suidmanager.rb b/test/puppet/tc_suidmanager.rb index 08d957cc0..2e4a13c72 100755 --- a/test/puppet/tc_suidmanager.rb +++ b/test/puppet/tc_suidmanager.rb @@ -84,7 +84,7 @@ class TestSUIDManager < Test::Unit::TestCase ).returns('output') - output = Puppet::Util::SUIDManager.run_and_capture 'yay', + output = Puppet::Util::SUIDManager.run_and_capture 'yay', @user.uid, @user.gid diff --git a/test/rails/railsparameter.rb b/test/rails/railsparameter.rb index aaa88e505..60bbdc06c 100755 --- a/test/rails/railsparameter.rb +++ b/test/rails/railsparameter.rb @@ -11,7 +11,7 @@ require 'puppettest/railstesting' if defined? ::ActiveRecord::Base class TestRailsParameter < Test::Unit::TestCase include PuppetTest::RailsTesting - + def params {"myname" => "myval", "multiple" => %w{one two three}} end @@ -27,9 +27,9 @@ class TestRailsParameter < Test::Unit::TestCase host = Puppet::Rails::Host.new(:name => "myhost") host.save - + resource = host.resources.create( - :title => "/tmp/to_resource", + :title => "/tmp/to_resource", :restype => "file", :exported => true) diff --git a/test/ral/manager/attributes.rb b/test/ral/manager/attributes.rb index ab5ba85d1..cf8f2f9ae 100755 --- a/test/ral/manager/attributes.rb +++ b/test/ral/manager/attributes.rb @@ -144,7 +144,7 @@ class TestTypeAttributes < Test::Unit::TestCase type.newparam(:name) {} type.newparam(:one) {} type.newproperty(:two) {} - + aliases = { :three => :one, :four => :two diff --git a/test/ral/manager/manager.rb b/test/ral/manager/manager.rb index 8f7e74d4d..8efea128d 100755 --- a/test/ral/manager/manager.rb +++ b/test/ral/manager/manager.rb @@ -9,19 +9,19 @@ require 'puppettest' class TestTypeManager < Test::Unit::TestCase include PuppetTest - + class FakeManager extend Puppet::MetaType::Manager def self.clear @types = {} end end - + def teardown super FakeManager.clear end - + # Make sure we can remove defined types def test_rmtype assert_nothing_raised { @@ -30,22 +30,22 @@ class TestTypeManager < Test::Unit::TestCase end } assert(FakeManager.type(:testing), "Did not get fake type") - + assert_nothing_raised do FakeManager.rmtype(:testing) end - + assert_nil(FakeManager.type(:testing), "Type was not removed") assert(! defined?(FakeManager::Testing), "Constant was not removed") end - + def test_newtype assert_nothing_raised do FakeManager.newtype(:testing, :self_refresh => true) do newparam(:name, :namevar => true) end end - + test = FakeManager.type(:testing) assert(test, "did not get type") assert(test.self_refresh, "did not set attribute") diff --git a/test/ral/manager/type.rb b/test/ral/manager/type.rb index 7923610b3..2624e26ea 100755 --- a/test/ral/manager/type.rb +++ b/test/ral/manager/type.rb @@ -278,7 +278,7 @@ class TestType < Test::Unit::TestCase # Make sure the title is sufficiently differentiated from the namevar. def test_title_at_creation_with_hash file = nil - fileclass = Puppet::Type.type(:file) + fileclass = Puppet::Type.type(:file) path = tempfile() assert_nothing_raised do @@ -415,7 +415,7 @@ class TestType < Test::Unit::TestCase exec = Puppet::Type.newexec(:title => "yay", :command => "/bin/echo yay") assert_equal("Exec[yay]", exec.ref) end - + def test_path config = mk_catalog @@ -434,33 +434,33 @@ class TestType < Test::Unit::TestCase end res end - + exec = mk.call(1, {}) - + assert_equal("/Exec[exec1]", exec.path) - + comp = Puppet::Type.newcomponent :title => "My[component]", :type => "Yay" config.add_resource comp - + exec = mk.call(2, :parent => comp) - + assert_equal("/My[component]/Exec[exec2]", exec.path) - + comp = Puppet::Type.newcomponent :name => "Other[thing]" config.add_resource comp exec = mk.call(3, :parent => comp) assert_equal("/Other[thing]/Exec[exec3]", exec.path) - + comp = Puppet::Type.newcomponent :type => "server", :name => "server" config.add_resource comp exec = mk.call(4, :parent => comp) assert_equal("/server/Exec[exec4]", exec.path) - + comp = Puppet::Type.newcomponent :type => "whatever", :name => "class[main]" config.add_resource comp exec = mk.call(5, :parent => comp) assert_equal("//Exec[exec5]", exec.path) - + newcomp = Puppet::Type.newcomponent :type => "yay", :name => "Good[bad]" config.add_resource newcomp config.add_edge comp, newcomp diff --git a/test/ral/providers/cron/crontab.rb b/test/ral/providers/cron/crontab.rb index d52105ce3..6a745a10c 100755 --- a/test/ral/providers/cron/crontab.rb +++ b/test/ral/providers/cron/crontab.rb @@ -21,7 +21,7 @@ class TestCronParsedProvider < Test::Unit::TestCase # These are potentially multi-line records; there's no one-to-one map, but they model # a full cron job. These tests assume individual record types will always be correctly - # parsed, so all they + # parsed, so all they def sample_crons unless defined? @sample_crons @sample_crons = YAML.load(File.read(File.join(@crondir, "crontab_collections.yaml"))) @@ -221,7 +221,7 @@ class TestCronParsedProvider < Test::Unit::TestCase assert_nothing_raised("could not load %s" % file) do str, args = YAML.load(File.read(file)) end - + # Stupid old yaml args.each do |hash| hash.each do |param, value| @@ -298,7 +298,7 @@ class TestCronParsedProvider < Test::Unit::TestCase assert_equal("# Puppet Name: #{name}\n30 * * * * date > /dev/null", str, "Cron did not generate correctly") end - + # Test that comments are correctly retained def test_retain_comments str = "# this is a comment\n#and another comment\n" @@ -380,7 +380,7 @@ class TestCronParsedProvider < Test::Unit::TestCase setme target = @provider.target_object(@me) - + [ "* * * * * /some/command", "0,30 * * * * /some/command", @@ -522,7 +522,7 @@ class TestCronParsedProvider < Test::Unit::TestCase setme target = @provider.target_object(@me) - + [ "@daily /some/command", "@daily /some/command more" diff --git a/test/ral/providers/group.rb b/test/ral/providers/group.rb index c5956bd78..8e62d7b1e 100755 --- a/test/ral/providers/group.rb +++ b/test/ral/providers/group.rb @@ -237,7 +237,7 @@ class TestGroupProvider < Test::Unit::TestCase else $stderr.puts "Not running as root; skipping group creation tests." end - + def test_autogen provider = nil group = Puppet::Type.type(:group).new(:name => nonrootgroup.name) diff --git a/test/ral/providers/host/netinfo.rb b/test/ral/providers/host/netinfo.rb index 131b32eec..0329edcd9 100755 --- a/test/ral/providers/host/netinfo.rb +++ b/test/ral/providers/host/netinfo.rb @@ -31,20 +31,20 @@ class TestNetinfoHostProvider < Test::Unit::TestCase assert(list.detect { |provider| provider.name == "localhost"}, "Could not find localhost") end - + if Process.uid == 0 def test_simple localhost = nil assert_nothing_raised do localhost = @host.create :name => "localhost", :check => [:ip], :provider => :netinfo end - + assert_nothing_raised do localhost.retrieve end - + prov = localhost.provider - + assert_nothing_raised do assert(prov.ip, "Did not find value for ip") assert(prov.ip != :absent, "Netinfo thinks the localhost is missing") diff --git a/test/ral/providers/mailalias/aliases.rb b/test/ral/providers/mailalias/aliases.rb index d938fbeef..6406e83e9 100755 --- a/test/ral/providers/mailalias/aliases.rb +++ b/test/ral/providers/mailalias/aliases.rb @@ -24,7 +24,7 @@ class TestMailaliasAliasesProvider < Test::Unit::TestCase @provider.clear super end - + def mkalias(name = "me") if defined? @pcount @pcount += 1 diff --git a/test/ral/providers/mount/netinfo.rb b/test/ral/providers/mount/netinfo.rb index 7a9703c1b..2474cbdf7 100755 --- a/test/ral/providers/mount/netinfo.rb +++ b/test/ral/providers/mount/netinfo.rb @@ -6,7 +6,7 @@ require File.dirname(__FILE__) + '/../../../lib/puppettest' require 'puppettest' -# +# # if Puppet::Type.type(:mount).provider(:netinfo).suitable? # class TestNetinfoMountProvider < Test::Unit::TestCase # include PuppetTest @@ -15,7 +15,7 @@ require 'puppettest' # super # @mount = Puppet::Type.type(:mount) # end -# +# # if Process.uid == 0 and Facter.value(:hostname) == "midden" # def test_mount_nfs # culain = nil @@ -23,36 +23,36 @@ require 'puppettest' # culain = @mount.create :name => "/mnt", :device => "culain:/home/luke", :options => "-o -P", :ensure => :present, # :fstype => "nfs" # end -# +# # assert(culain, "Did not create fs") -# +# # assert_apply(culain) -# +# # assert_nothing_raised do # culain.provider.mount # end -# +# # assert(culain.provider.mounted?, "fs is not considered mounted") # assert_nothing_raised() { culain.provider.unmount } -# +# # culain[:ensure] = :absent -# +# # assert_apply(culain) # end # end -# +# # def test_simple # root = nil # assert_nothing_raised do # root = @mount.create :name => "/", :check => @mount.validproperties # end -# +# # assert_nothing_raised do # root.retrieve # end -# +# # prov = root.provider -# +# # assert_nothing_raised do # assert(prov.device, "Did not value for device") # assert(prov.device != :absent, "Netinfo thinks the root device is missing") @@ -71,7 +71,7 @@ require 'puppettest' # p obj # assert(obj.is(:device), "Did not get value for device in %s" % obj[:name]) # end -# +# # assert(list.detect { |m| m[:name] == "/"}, "Could not find root fs") # end # end diff --git a/test/ral/providers/package.rb b/test/ral/providers/package.rb index 8af5108cc..e7f930096 100755 --- a/test/ral/providers/package.rb +++ b/test/ral/providers/package.rb @@ -127,7 +127,7 @@ class TestPackageProvider < Test::Unit::TestCase return end end - + if cleancmd = hash[:cleanup] hash.delete(:cleanup) end diff --git a/test/ral/providers/package/aptitude.rb b/test/ral/providers/package/aptitude.rb index 5e4749333..6e94f0ab8 100755 --- a/test/ral/providers/package/aptitude.rb +++ b/test/ral/providers/package/aptitude.rb @@ -41,7 +41,7 @@ class AptitudePackageProviderTest < PuppetTest::TestCase ).returns(0) pkg.evaluate.each { |state| - state.forward + state.forward } end diff --git a/test/ral/providers/package/aptrpm.rb b/test/ral/providers/package/aptrpm.rb index 8a107c4d7..a3010cc92 100755 --- a/test/ral/providers/package/aptrpm.rb +++ b/test/ral/providers/package/aptrpm.rb @@ -12,7 +12,7 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase super @type = Puppet::Type.type(:package) end - + def test_install pkg = @type.new :name => 'faff', :provider => :aptrpm, @@ -38,10 +38,10 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase "install", 'faff' ).returns(0) - + pkg.evaluate.each { |state| state.forward } end - + def test_uninstall pkg = @type.new :name => 'faff', :provider => :aptrpm, :ensure => :absent @@ -65,7 +65,7 @@ class AptrpmPackageProviderTest < PuppetTest::TestCase 'remove', 'faff' ).returns(0) - + pkg.evaluate.each { |state| state.forward } end diff --git a/test/ral/providers/parsedfile.rb b/test/ral/providers/parsedfile.rb index 8a9fa89d2..f0f47dc1f 100755 --- a/test/ral/providers/parsedfile.rb +++ b/test/ral/providers/parsedfile.rb @@ -587,14 +587,14 @@ class TestParsedFile < Test::Unit::TestCase bills_values = bill.retrieve end - assert(bills_values[bill.property(:one)], + assert(bills_values[bill.property(:one)], "Bill does not have a value for 'one'") - assert(bills_values[bill.property(:one)], + assert(bills_values[bill.property(:one)], "Bill does not have a value for 'one' on second try") assert_nothing_raised do bill.retrieve end - assert(bills_values[bill.property(:one)], + assert(bills_values[bill.property(:one)], "bill's value for 'one' disappeared") end diff --git a/test/ral/providers/port/parsed.rb b/test/ral/providers/port/parsed.rb index 41da17993..154d21260 100755 --- a/test/ral/providers/port/parsed.rb +++ b/test/ral/providers/port/parsed.rb @@ -24,7 +24,7 @@ require 'puppettest' # @provider.clear # super # end -# +# # # Generate a line from a hash. The line might include '\n'. # def genline(hash) # line = [hash[:name], "#{hash[:number]}/%s"].join("\t\t") @@ -60,7 +60,7 @@ require 'puppettest' # assert_equal("53", dns[:number], "dns number is wrong") # # text = nil -# assert_nothing_raised("failed to generate %s" % file) do +# assert_nothing_raised("failed to generate %s" % file) do # text = @provider.to_file(@provider.target_records(file)) # end # @@ -68,7 +68,7 @@ require 'puppettest' # newlines = text.chomp.split "\n" # regex = /^(\S+)\s+(\d+)\/(\w+)/ # oldlines.zip(newlines).each do |old, new| -# if omatch = regex.match(old) +# if omatch = regex.match(old) # assert(newmatch = regex.match(new), # "Lines were not equivalent: %s vs %s" % # [old.inspect, new.inspect] diff --git a/test/ral/providers/provider.rb b/test/ral/providers/provider.rb index 9e5e585dc..79535bef2 100755 --- a/test/ral/providers/provider.rb +++ b/test/ral/providers/provider.rb @@ -453,7 +453,7 @@ class TestProviderFeatures < Test::Unit::TestCase define_method(:one) {} define_method(:two) {} end - + # Another with the numbers and a declaration @type.provide(:both) do define_method(:one) {} @@ -461,7 +461,7 @@ class TestProviderFeatures < Test::Unit::TestCase has_feature :alpha end - + # And just the declaration @type.provide(:letters) do has_feature :alpha @@ -484,7 +484,7 @@ class TestProviderFeatures < Test::Unit::TestCase features.sort! { |a,b| a.to_s <=> b.to_s } assert_equal(features, provider.features, "Got incorrect feature list for provider instance %s" % name) assert_equal(features, provider_class.features, "Got incorrect feature list for provider class %s" % name) - features.each do |feat| + features.each do |feat| assert(provider.feature?(feat), "Provider instance %s did not have feature %s" % [name, feat]) assert(provider_class.feature?(feat), "Provider class %s did not have feature %s" % [name, feat]) end diff --git a/test/ral/providers/service/base.rb b/test/ral/providers/service/base.rb index 03ecca59d..e23e2fd11 100755 --- a/test/ral/providers/service/base.rb +++ b/test/ral/providers/service/base.rb @@ -47,7 +47,7 @@ class TestBaseServiceProvider < Test::Unit::TestCase assert_equal(:stopped, provider.status, "status was not returned correctly") end end - + # Testing #454 def test_that_failures_propagate nope = "/no/such/command" diff --git a/test/ral/providers/sshkey/parsed.rb b/test/ral/providers/sshkey/parsed.rb index f2992386d..868640a10 100755 --- a/test/ral/providers/sshkey/parsed.rb +++ b/test/ral/providers/sshkey/parsed.rb @@ -22,7 +22,7 @@ class TestParsedSSHKey < Test::Unit::TestCase @provider.clear super end - + def mkkey(name = "host.domain.com") if defined? @pcount @pcount += 1 @@ -52,39 +52,39 @@ class TestParsedSSHKey < Test::Unit::TestCase fakedataparse(file) } end - + def test_simplekey @provider.filetype = :ram file = @provider.default_target - + key = nil assert_nothing_raised do key = mkkey end - + assert(key, "did not create key") - + assert_nothing_raised do key.flush end - + assert(key.alias, "No alias set for key") - + hash = key.property_hash.dup text = @provider.target_object(file).read names = [key.name, key.alias].flatten.join(",") - + assert_equal("#{names} #{key.type} #{key.key}\n", text) - + assert_nothing_raised do @provider.prefetch end - + hash.each do |p, v| next unless key.respond_to?(p) assert_equal(v, key.send(p), "%s did not match" % p) end - + assert(key.name !~ /,/, "Aliases were not split out during parsing") end diff --git a/test/ral/providers/user.rb b/test/ral/providers/user.rb index 3f68469c1..a5d8e9210 100755 --- a/test/ral/providers/user.rb +++ b/test/ral/providers/user.rb @@ -535,16 +535,16 @@ class TestUserProvider < Test::Unit::TestCase assert_equal("-s", user.send(:flag, :shell), "Incorrect shell flag") end - + def test_autogen provider = nil user = Puppet::Type.type(:user).new(:name => nonrootuser.name) provider = user.provider assert(provider, "did not get provider") - + # Everyone should be able to autogenerate a uid assert_instance_of(Fixnum, provider.autogen(:uid)) - + # If we're Darwin, then we should get results, but everyone else should # get nil darwin = (Facter.value(:operatingsystem) == "Darwin") @@ -554,7 +554,7 @@ class TestUserProvider < Test::Unit::TestCase :home => "/var/empty", :shell => "/usr/bin/false" } - + should.each do |param, value| if darwin assert_equal(value, provider.autogen(param), "did not autogen %s for darwin correctly" % param) diff --git a/test/ral/type/cron.rb b/test/ral/type/cron.rb index 2e25d82df..89c5583e0 100755 --- a/test/ral/type/cron.rb +++ b/test/ral/type/cron.rb @@ -152,7 +152,7 @@ class TestCron < Test::Unit::TestCase cron = mkcron(name) catalog = mk_catalog(name, cron) trans = assert_events([:cron_created], catalog, name) - + cron.provider.class.prefetch cron = nil @@ -342,7 +342,7 @@ class TestCron < Test::Unit::TestCase unless param =~ /=$/ param = "%s=" % param end - + cron.provider.send(param, value) end diff --git a/test/ral/type/exec.rb b/test/ral/type/exec.rb index 9384d09db..6c1a82a20 100755 --- a/test/ral/type/exec.rb +++ b/test/ral/type/exec.rb @@ -240,7 +240,7 @@ class TestExec < Test::Unit::TestCase ) catalog = mk_catalog(file, baseobj, ofile, exec, cat) - + rels = nil assert_nothing_raised do rels = exec.autorequire @@ -312,7 +312,7 @@ class TestExec < Test::Unit::TestCase # Verify that we can execute commands as a special user def mknverify(file, user, group = nil, id = true) File.umask(0022) - + args = { :command => "touch %s" % file, :path => "/usr/bin:/bin:/usr/sbin:/sbin", @@ -541,7 +541,7 @@ class TestExec < Test::Unit::TestCase assert_raise(ArgumentError, "Missing command did not raise error") { exec.run("/bin/nosuchthingexists") - } + } end def test_envparam @@ -583,7 +583,7 @@ and stuff" } assert_equal("A B\n", output) end - + def test_environmentparam exec = Puppet::Type.newexec( :command => "echo $environmenttest", @@ -627,13 +627,13 @@ and stuff" def test_timeout exec = Puppet::Type.type(:exec).new(:command => "sleep 1", :path => ENV["PATH"], :timeout => "0.2") time = Time.now - + assert_raise(Timeout::Error) { exec.run("sleep 1") } Puppet.info "%s seconds, vs a timeout of %s" % [Time.now.to_f - time.to_f, exec[:timeout]] - - + + assert_apply(exec) end diff --git a/test/ral/type/file.rb b/test/ral/type/file.rb index 63d2a5270..8db306c32 100755 --- a/test/ral/type/file.rb +++ b/test/ral/type/file.rb @@ -385,24 +385,24 @@ class TestFile < Test::Unit::TestCase Puppet::Type.allclear } end - + def test_recurse? file = Puppet::Type.type(:file).new :path => tempfile - + # Make sure we default to false assert(! file.recurse?, "Recurse defaulted to true") - + [true, "true", 10, "inf", "remote"].each do |value| file[:recurse] = value assert(file.recurse?, "%s did not cause recursion" % value) end - + [false, "false", 0].each do |value| file[:recurse] = value assert(! file.recurse?, "%s caused recursion" % value) end end - + def test_recursion basedir = tempfile() subdir = File.join(basedir, "subdir") @@ -420,23 +420,23 @@ class TestFile < Test::Unit::TestCase } config = mk_catalog dir transaction = Puppet::Transaction.new(config) - + children = nil assert_nothing_raised { children = transaction.eval_generate(dir) } - + assert_equal([subdir], children.collect {|c| c.title }, "Incorrect generated children") - - # Remove our subdir resource, + + # Remove our subdir resource, subdir_resource = config.resource(:file, subdir) config.remove_resource(subdir_resource) # Create the test file File.open(tmpfile, "w") { |f| f.puts "yayness" } - + assert_nothing_raised { children = transaction.eval_generate(dir) } @@ -444,7 +444,7 @@ class TestFile < Test::Unit::TestCase # And make sure we get both resources back. assert_equal([subdir, tmpfile].sort, children.collect {|c| c.title }.sort, "Incorrect generated children when recurse == %s" % value.inspect) - + File.unlink(tmpfile) end end @@ -678,7 +678,7 @@ class TestFile < Test::Unit::TestCase def test_backupmodes File.umask(0022) - + file = tempfile() newfile = tempfile() @@ -793,7 +793,7 @@ class TestFile < Test::Unit::TestCase ) comp = mk_catalog(user, group, home) } - + # Now make sure we get a relationship for each of these rels = nil assert_nothing_raised { rels = home.autorequire } @@ -932,23 +932,23 @@ class TestFile < Test::Unit::TestCase end end end - + if Process.uid == 0 # Testing #364. def test_writing_in_directories_with_no_write_access # Make a directory that our user does not have access to dir = tempfile() Dir.mkdir(dir) - + # Get a fake user user = nonrootuser # and group group = nonrootgroup - + # First try putting a file in there path = File.join(dir, "file") file = Puppet::Type.newfile :path => path, :owner => user.name, :group => group.name, :content => "testing" - + # Make sure we can create it assert_apply(file) assert(FileTest.exists?(path), "File did not get created") @@ -957,7 +957,7 @@ class TestFile < Test::Unit::TestCase assert_equal(group.gid, File.stat(path).gid, "File has the wrong group") assert_equal("testing", File.read(path), "file has the wrong content") - + # Now make a dir subpath = File.join(dir, "subdir") subdir = Puppet::Type.newfile :path => subpath, :owner => user.name, :group => group.name, :ensure => :directory @@ -971,7 +971,7 @@ class TestFile < Test::Unit::TestCase assert_equal("testing", File.read(path), "file has the wrong content") end end - + # #366 def test_replace_aliases file = Puppet::Type.newfile :path => tempfile() @@ -980,14 +980,14 @@ class TestFile < Test::Unit::TestCase file[:replace] = :no assert_equal(:false, file[:replace], ":replace did not alias :false to :no") end - + def test_backup path = tempfile() file = Puppet::Type.newfile :path => path, :content => "yay" catalog = mk_catalog(file) catalog.finalize # adds the default resources. - + [false, :false, "false"].each do |val| assert_nothing_raised do file[:backup] = val @@ -1000,32 +1000,32 @@ class TestFile < Test::Unit::TestCase end assert_equal(".puppet-bak", file[:backup], "%s did not translate" % val.inspect) end - + # Now try a non-bucket string assert_nothing_raised do file[:backup] = ".bak" end assert_equal(".bak", file[:backup], ".bak did not translate") - + # Now try a non-existent bucket assert_nothing_raised do file[:backup] = "main" end assert_equal("main", file[:backup], "bucket name was not retained") assert_equal("main", file.bucket, "file's bucket was not set") - + # And then an existing bucket obj = Puppet::Type.type(:filebucket).new :name => "testing" catalog.add_resource(obj) bucket = obj.bucket - + assert_nothing_raised do file[:backup] = "testing" end assert_equal("testing", file[:backup], "backup value was reset") assert_equal(obj.bucket, file.bucket, "file's bucket was not set") end - + def test_pathbuilder dir = tempfile() Dir.mkdir(dir) @@ -1034,25 +1034,25 @@ class TestFile < Test::Unit::TestCase obj = Puppet::Type.newfile :path => dir, :recurse => true, :mode => 0755 catalog = mk_catalog obj transaction = Puppet::Transaction.new(catalog) - + assert_equal("/%s" % obj.ref, obj.path) - + list = transaction.eval_generate(obj) fileobj = catalog.resource(:file, file) assert(fileobj, "did not generate file object") assert_equal("/%s" % fileobj.ref, fileobj.path, "did not generate correct subfile path") end - + # Testing #403 def test_removal_with_content_set path = tempfile() File.open(path, "w") { |f| f.puts "yay" } file = Puppet::Type.newfile(:name => path, :ensure => :absent, :content => "foo") - + assert_apply(file) assert(! FileTest.exists?(path), "File was not removed") end - + # Testing #438 def test_creating_properties_conflict file = tempfile() @@ -1114,7 +1114,7 @@ class TestFile < Test::Unit::TestCase else raise "invalid attr %s" % attr end - + # Run it again run.call(file, "after modification with %s" % attr) diff --git a/test/ral/type/fileignoresource.rb b/test/ral/type/fileignoresource.rb index 2c36bd3c6..ad68f703c 100755 --- a/test/ral/type/fileignoresource.rb +++ b/test/ral/type/fileignoresource.rb @@ -10,7 +10,7 @@ require 'fileutils' class TestFileIgnoreSources < Test::Unit::TestCase include PuppetTest::Support::Utils include PuppetTest::FileTesting - + def setup super begin @@ -56,33 +56,33 @@ class TestFileIgnoreSources < Test::Unit::TestCase #create source files - File.open(File.join(frompath,sourcefile1), + File.open(File.join(frompath,sourcefile1), File::WRONLY|File::CREAT|File::APPEND) { |of| of.puts "yayness" } - - File.open(File.join(frompath,sourcefile2), + + File.open(File.join(frompath,sourcefile2), File::WRONLY|File::CREAT|File::APPEND) { |of| of.puts "even yayer" } - + #makes Puppet file Object assert_nothing_raised { tofile = Puppet::Type.type(:file).new( :name => topath, :source => frompath, - :recurse => true, - :ignore => "sourcefile2" + :recurse => true, + :ignore => "sourcefile2" ) } config = mk_catalog(tofile) config.apply - - + + #topath should exist as a directory with sourcedir as a directory - + #This file should exist assert(FileTest.exists?(File.join(topath,sourcefile1))) @@ -104,7 +104,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase frompath = File.join(path,sourcedir) FileUtils.mkdir_p frompath - + FileUtils.mkdir_p(File.join(frompath, subdir)) FileUtils.mkdir_p(File.join(frompath, subdir2)) dir = Dir.glob(File.join(path,"**/*")) @@ -117,18 +117,18 @@ class TestFileIgnoreSources < Test::Unit::TestCase trans = nil #create source files - - dir.each { |dir| - File.open(File.join(dir,sourcefile1), + + dir.each { |dir| + File.open(File.join(dir,sourcefile1), File::WRONLY|File::CREAT|File::APPEND) { |of| of.puts "yayness" } - - File.open(File.join(dir,sourcefile2), + + File.open(File.join(dir,sourcefile2), File::WRONLY|File::CREAT|File::APPEND) { |of| of.puts "even yayer" } - + } #makes Puppet file Object @@ -136,16 +136,16 @@ class TestFileIgnoreSources < Test::Unit::TestCase tofile = Puppet::Type.type(:file).new( :name => topath, :source => frompath, - :recurse => true, - :ignore => "*2" + :recurse => true, + :ignore => "*2" ) } config = mk_catalog(tofile) config.apply - + #topath should exist as a directory with sourcedir as a directory - + #This file should exist assert(FileTest.exists?(File.join(topath,sourcefile1))) assert(FileTest.exists?(File.join(topath,subdir))) @@ -172,7 +172,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase frompath = File.join(path,sourcedir) FileUtils.mkdir_p frompath - + FileUtils.mkdir_p(File.join(frompath, subdir)) FileUtils.mkdir_p(File.join(frompath, subdir2)) FileUtils.mkdir_p(File.join(frompath, subdir3)) @@ -186,20 +186,20 @@ class TestFileIgnoreSources < Test::Unit::TestCase trans = nil #create source files - - - sourcedir.each { |dir| - File.open(File.join(dir,sourcefile1), + + + sourcedir.each { |dir| + File.open(File.join(dir,sourcefile1), File::WRONLY|File::CREAT|File::APPEND) { |of| of.puts "yayness" } - - File.open(File.join(dir,sourcefile2), + + File.open(File.join(dir,sourcefile2), File::WRONLY|File::CREAT|File::APPEND) { |of| of.puts "even yayer" } - + } @@ -209,8 +209,8 @@ class TestFileIgnoreSources < Test::Unit::TestCase :name => topath, :source => frompath, :recurse => true, - :ignore => ["*2", "an*"] - # :ignore => ["*2", "an*", "nomatch"] + :ignore => ["*2", "an*"] + # :ignore => ["*2", "an*", "nomatch"] ) } @@ -224,7 +224,7 @@ class TestFileIgnoreSources < Test::Unit::TestCase assert(FileTest.exists?(File.join(topath,sourcefile1)), "file1 not in destdir") assert(FileTest.exists?(File.join(topath,subdir)), "subdir1 not in destdir") assert(FileTest.exists?(File.join(File.join(topath,subdir),sourcefile1)), "file1 not in subdir") - # proper files in source + # proper files in source assert(FileTest.exists?(File.join(frompath,subdir)), "subdir not in source") assert(FileTest.exists?(File.join(frompath,subdir2)), "subdir2 not in source") assert(FileTest.exists?(File.join(frompath,subdir3)), "subdir3 not in source") diff --git a/test/ral/type/filesources.rb b/test/ral/type/filesources.rb index 573bcb2ce..a39176121 100755 --- a/test/ral/type/filesources.rb +++ b/test/ral/type/filesources.rb @@ -20,7 +20,7 @@ class TestFileSources < Test::Unit::TestCase end @file = Puppet::Type.type(:file) Puppet[:filetimeout] = -1 - Puppet::Util::SUIDManager.stubs(:asuser).yields + Puppet::Util::SUIDManager.stubs(:asuser).yields Facter.stubs(:to_hash).returns({}) end @@ -28,7 +28,7 @@ class TestFileSources < Test::Unit::TestCase super Puppet::Network::HttpPool.clear_http_instances end - + def use_storage begin initstorage @@ -41,14 +41,14 @@ class TestFileSources < Test::Unit::TestCase Puppet::Util::Storage.init Puppet::Util::Storage.load end - + # Make a simple recursive tree. def mk_sourcetree source = tempfile() sourcefile = File.join(source, "file") Dir.mkdir source File.open(sourcefile, "w") { |f| f.puts "yay" } - + dest = tempfile() destfile = File.join(dest, "file") return source, dest, sourcefile, destfile @@ -131,7 +131,7 @@ class TestFileSources < Test::Unit::TestCase # and make sure they're still equal assert_trees_equal(fromdir,todir) - + # Now try it with the directory being read-only File.chmod(0111, todir) recursive_source_test(fromdir, todir) @@ -144,7 +144,7 @@ class TestFileSources < Test::Unit::TestCase fromdir, todir, one, two = run_complex_sources assert(FileTest.exists?(todir)) - + # Modify a dest file File.open(two, "w") { |f| f.puts "something else" } @@ -199,7 +199,7 @@ class TestFileSources < Test::Unit::TestCase :mode => 0755 ) } - + assert_apply(rootobj) assert_equal(0755, filemode(file1)) @@ -269,9 +269,9 @@ class TestFileSources < Test::Unit::TestCase :name => name ) - assert_raise Puppet::Error do + assert_raise Puppet::Error do file.retrieve - end + end comp = mk_catalog(file) comp.apply @@ -299,7 +299,7 @@ class TestFileSources < Test::Unit::TestCase currentvalue = file.retrieve - assert(currentvalue[file.property(:checksum)], + assert(currentvalue[file.property(:checksum)], "File does not have a checksum property") assert_equal(0, file.evaluate.length, "File produced changes") @@ -307,7 +307,7 @@ class TestFileSources < Test::Unit::TestCase def test_sourcepaths files = [] - 3.times { + 3.times { files << tempfile() } @@ -489,7 +489,7 @@ class TestFileSources < Test::Unit::TestCase assert(FileTest.exists?(file3), "File from source 1 was not copied") assert_equal("0", File.read(file3), "file3 got wrong contents") end - + def test_recursive_sourceselect dest = tempfile() source1 = tempfile() @@ -506,15 +506,15 @@ class TestFileSources < Test::Unit::TestCase File.open(file, "w") { |f| f.puts "yaysecond-%s" % i} files << file end - + obj = Puppet::Type.newfile(:path => dest, :source => [source1, source2], :sourceselect => :all, :recurse => true) - + assert_apply(obj) - + ["file0", "file1", "second-file0", "second-file1", "subdir/file2", "subdir/second-file2", "subdir/file3", "subdir/second-file3"].each do |file| path = File.join(dest, file) assert(FileTest.exists?(path), "did not create %s" % file) - + assert_equal("yay%s\n" % File.basename(file).sub("file", ''), File.read(path), "file was not copied correctly") end end diff --git a/test/ral/type/group.rb b/test/ral/type/group.rb index c6d6c5ee6..f1264116f 100755 --- a/test/ral/type/group.rb +++ b/test/ral/type/group.rb @@ -129,7 +129,7 @@ class TestGroup < Test::Unit::TestCase current_values = gobj.retrieve } - assert(current_values[gobj.property(:gid)], + assert(current_values[gobj.property(:gid)], "Failed to retrieve gid") } end diff --git a/test/ral/type/host.rb b/test/ral/type/host.rb index 95f698157..ef5472030 100755 --- a/test/ral/type/host.rb +++ b/test/ral/type/host.rb @@ -112,7 +112,7 @@ class TestHost < Test::Unit::TestCase assert_events([:host_created], host) - current_values = nil + current_values = nil assert_nothing_raised { current_values = host.retrieve } @@ -128,13 +128,13 @@ class TestHost < Test::Unit::TestCase current_values = host.retrieve } - assert_equal(%w{madstop kirby yayness}, + assert_equal(%w{madstop kirby yayness}, current_values[host.property(:alias)]) - + host[:ensure] = :absent assert_events([:host_removed], host) end - + def test_invalid_ipaddress host = mkhost() @@ -195,7 +195,7 @@ class TestHost < Test::Unit::TestCase } end - end + end def test_aliasisproperty assert_equal(:property, @hosttype.attrtype(:alias)) end diff --git a/test/ral/type/resources.rb b/test/ral/type/resources.rb index 426e76b0e..8d9f09204 100755 --- a/test/ral/type/resources.rb +++ b/test/ral/type/resources.rb @@ -18,7 +18,7 @@ class TestResources < Test::Unit::TestCase end end end - + def mk_purger(managed = false) @purgenum ||= 0 @purgenum += 1 @@ -62,35 +62,35 @@ class TestResources < Test::Unit::TestCase def test_purge # Create a purgeable type mkpurgertype - + purger = nil assert_nothing_raised do purger = @type.new :name => "purgetest", :noop => true, :loglevel => :warning end assert(purger, "did not get purger manager") add_purge_lister() - + assert_equal($purgemembers.values.sort, @purgetype.instances.sort) - + # and it should now succeed assert_nothing_raised do purger[:purge] = true end assert(purger.purge?, "purge boolean was not enabled") - + # Okay, now let's try doing some purging, yo managed = [] unmanned = [] 3.times { managed << mk_purger(true) } # 3 managed 3.times { unmanned << mk_purger(false) } # 3 unmanaged - + managed.each do |m| assert(m.managed?, "managed resource was not considered managed") end unmanned.each do |u| assert(! u.managed?, "unmanaged resource was considered managed") end - + # First make sure we get nothing back when purge is false genned = nil purger[:purge] = false @@ -98,7 +98,7 @@ class TestResources < Test::Unit::TestCase genned = purger.generate end assert_equal([], genned, "Purged even when purge is false") - + # Now make sure we can purge purger[:purge] = true assert_nothing_raised do @@ -110,11 +110,11 @@ class TestResources < Test::Unit::TestCase assert(res.purging, "did not mark resource for purging") end assert(! genned.empty?, "generated resource list was empty") - + # Now make sure the generate method only finds the unmanaged resources assert_equal(unmanned.collect { |r| r.title }.sort, genned.collect { |r| r.title }, "Did not return correct purge list") - + # Now make sure our metaparams carried over genned.each do |res| [:noop, :loglevel].each do |param| @@ -122,33 +122,33 @@ class TestResources < Test::Unit::TestCase end end end - + # Part of #408. def test_check # First check a non-user res = Puppet::Type.type(:resources).new :name => :package assert_nil(res[:unless_system_user], "got bad default for package") - - + + assert_nothing_raised { assert(res.check("A String"), "String failed check") assert(res.check(Puppet::Type.type(:file).new(:path => tempfile())), "File failed check") assert(res.check(Puppet::Type.type(:user).new(:name => "yayness")), "User failed check in package") } - + # Now create a user manager res = Puppet::Type.type(:resources).new :name => :user - + # Make sure the default is 500 assert_equal(500, res[:unless_system_user], "got bad default") - + # Now make sure root fails the test @user = Puppet::Type.type(:user) assert_nothing_raised { assert(! res.check(@user.create(:name => "root")), "root passed check") assert(! res.check(@user.create(:name => "nobody")), "nobody passed check") } - + # Now find a user between 0 and the limit low = high = nil Etc.passwd { |entry| @@ -163,7 +163,7 @@ class TestResources < Test::Unit::TestCase end end } - + if low assert(! res.check(@user.create(:name => low)), "low user %s passed check" % low) end @@ -172,16 +172,16 @@ class TestResources < Test::Unit::TestCase assert(res.check(@user.create(:name => high)), "high user %s failed check" % high) end end - + # The other half of #408. def test_check_is_called res = Puppet::Type.type(:resources).new :name => :user, :purge => true - + list = nil assert_nothing_raised { list = res.generate } - + assert(! list.empty?, "did not get any users") - + bad = list.find_all { |u| %w{root bin nobody}.include?(u[:name]) or (cv = u.retrieve and cv[u.property(:uid)] < 500) } diff --git a/test/ral/type/sshkey.rb b/test/ral/type/sshkey.rb index 981079e92..a3d7cb656 100755 --- a/test/ral/type/sshkey.rb +++ b/test/ral/type/sshkey.rb @@ -82,20 +82,20 @@ class TestSSHKey < Test::Unit::TestCase key[:provider] = :parsed assert_apply(key) - + assert_events([], key, "created events on in-sync key") - + assert(key.provider.exists?, "Key did not get created") - + # Now create a new key object name = key.name key = nil - + key = @sshkeytype.new :name => name, :target => file, :provider => :parsed key.retrieve - + assert(key.provider.exists?, "key thinks it does not exist") - + end def test_moddingkey diff --git a/test/ral/type/user.rb b/test/ral/type/user.rb index 7cceef710..611201a64 100755 --- a/test/ral/type/user.rb +++ b/test/ral/type/user.rb @@ -345,7 +345,7 @@ class TestUser < Test::Unit::TestCase ) comp = mk_catalog(user, group, home, ogroup) } - + rels = nil assert_nothing_raised() { rels = user.autorequire } @@ -401,12 +401,12 @@ class TestUser < Test::Unit::TestCase user[:ensure] = :absent assert_apply(user) end - + # Testing #455 def test_autorequire_with_no_group_should user = Puppet::Type.type(:user).new(:name => "yaytest", :check => :all) catalog = mk_catalog(user) - + assert_nothing_raised do user.autorequire end diff --git a/test/ral/type/yumrepo.rb b/test/ral/type/yumrepo.rb index f3221fb84..e1ac53820 100755 --- a/test/ral/type/yumrepo.rb +++ b/test/ral/type/yumrepo.rb @@ -67,7 +67,7 @@ class TestYumRepo < Test::Unit::TestCase def test_absent copy_datafiles baseurl = 'http://example.com/' - devel = make_repo("development", + devel = make_repo("development", { :mirrorlist => 'absent', :baseurl => baseurl }) devel.retrieve @@ -97,7 +97,7 @@ class TestYumRepo < Test::Unit::TestCase FileUtils::copy(src, dst) } end - + CREATE_EXP = <<'EOF' [base] name=Fedora Core $releasever - $basearch - Base @@ -110,4 +110,4 @@ proxy_username=username proxy_password=password EOF -end +end diff --git a/test/ral/type/zone.rb b/test/ral/type/zone.rb index 59447d74b..a784b8bcf 100755 --- a/test/ral/type/zone.rb +++ b/test/ral/type/zone.rb @@ -344,7 +344,7 @@ end currentvalues = zone.retrieve - assert_equal(:absent, currentvalues[zone.property(:ensure)], + assert_equal(:absent, currentvalues[zone.property(:ensure)], "Zone is not absent") end @@ -411,7 +411,7 @@ end currentvalues = zone.retrieve - assert_equal(:absent, currentvalues[zone.property(:ensure)], + assert_equal(:absent, currentvalues[zone.property(:ensure)], "Zone is not absent") end end @@ -132,7 +132,7 @@ def resolve(dir) if dir.include?(File::SEPARATOR) basedir = dir.split(File::SEPARATOR)[0] if dirs.include?(basedir) - dirs.delete(basedir) + dirs.delete(basedir) dirs << basedir end end @@ -236,6 +236,6 @@ end # load file unless file =~ /^-/ #end # -#runner = Test::Unit::AutoRunner.new(false) +#runner = Test::Unit::AutoRunner.new(false) #runner.process_args #runner.run diff --git a/test/util/features.rb b/test/util/features.rb index ef69ad72b..8788599ce 100755 --- a/test/util/features.rb +++ b/test/util/features.rb @@ -26,12 +26,12 @@ class TestFeatures < Test::Unit::TestCase raise ArgumentError, "nopes" end end - + assert(@features.respond_to?(:failer?), "Feature method did not get added") assert_nothing_raised("failure propagated outside of feature") do assert(! @features.failer?, "failure was considered true") end - + # Now make one that succeeds $succeeds = nil assert_nothing_raised("Failed to add normal feature") do @@ -40,22 +40,22 @@ class TestFeatures < Test::Unit::TestCase end end assert($succeeds, "Block was not called on initialization") - + assert(@features.respond_to?(:succeeds?), "Did not add succeeding feature") assert_nothing_raised("Failed to call succeeds") { assert(@features.succeeds?, "Feature was not true") } end - + def test_libs assert_nothing_raised do @features.add(:puppet, :libs => %w{puppet}) end - + assert(@features.puppet?) - + assert_nothing_raised do @features.add(:missing, :libs => %w{puppet no/such/library/okay}) end - + assert(! @features.missing?, "Missing lib was considered true") end diff --git a/test/util/fileparsing.rb b/test/util/fileparsing.rb index d7c196cdb..c88bcb23a 100755 --- a/test/util/fileparsing.rb +++ b/test/util/fileparsing.rb @@ -72,7 +72,7 @@ class TestUtilFileParsing < Test::Unit::TestCase # Make sure it matches assert_nothing_raised do - assert_equal({:record_type => :comment, :line => comment}, + assert_equal({:record_type => :comment, :line => comment}, @parser.parse_line(comment)) end @@ -88,13 +88,13 @@ class TestUtilFileParsing < Test::Unit::TestCase # The comment should still match assert_nothing_raised do - assert_equal({:record_type => :comment, :line => comment}, + assert_equal({:record_type => :comment, :line => comment}, @parser.parse_line(comment)) end # As should our new line type assert_nothing_raised do - assert_equal({:record_type => :blank, :line => ""}, + assert_equal({:record_type => :blank, :line => ""}, @parser.parse_line("")) end @@ -141,12 +141,12 @@ class TestUtilFileParsing < Test::Unit::TestCase end assert_nothing_raised("Did not parse old comment") do - assert_equal({:record_type => :comment, :line => comment}, + assert_equal({:record_type => :comment, :line => comment}, @parser.parse_line(comment)) end comment = '" another type of comment' assert_nothing_raised("Did not parse new comment") do - assert_equal({:record_type => :comment2, :line => comment}, + assert_equal({:record_type => :comment2, :line => comment}, @parser.parse_line(comment)) end @@ -318,7 +318,7 @@ class TestUtilFileParsing < Test::Unit::TestCase # Check parsing first result = @parser.parse_line(start) [:one, :two].each do |param| - assert_equal(record[param], result[param], + assert_equal(record[param], result[param], "Did not correctly parse %s" % start.inspect) end diff --git a/test/util/inifile.rb b/test/util/inifile.rb index 50075fa92..8ce52ee8d 100755 --- a/test/util/inifile.rb +++ b/test/util/inifile.rb @@ -13,7 +13,7 @@ class TestFileType < Test::Unit::TestCase super @file = Puppet::Util::IniConfig::File.new end - + def teardown @file = nil super @@ -43,7 +43,7 @@ class TestFileType < Test::Unit::TestCase @file.read(fsub) } main = get_section('main') - assert_entries(main, + assert_entries(main, { 'key1' => 'main.value1', 'key2' => 'main.value2' }) sub1 = get_section('sub1') assert_entries(sub1, { 'key1' => 'sub1 value1' }) @@ -106,9 +106,9 @@ class TestFileType < Test::Unit::TestCase end def assert_entries(section, hash) - hash.each do |k, v| - assert_equal(v, section[k], - "Expected <#{v}> for #{section.name}[#{k}] " + + hash.each do |k, v| + assert_equal(v, section[k], + "Expected <#{v}> for #{section.name}[#{k}] " + "but got <#{section[k]}>") end end diff --git a/test/util/log.rb b/test/util/log.rb index 74bb1faa1..00db10e61 100755 --- a/test/util/log.rb +++ b/test/util/log.rb @@ -195,7 +195,7 @@ class TestLog < Test::Unit::TestCase Puppet.warning "A test" assert(File.read(file) =~ /A test/, "File did not flush") - # Rename the file + # Rename the file newfile = file + ".old" File.rename(file, newfile) diff --git a/test/util/package.rb b/test/util/package.rb index 8d4fbc8e8..b77850d4b 100755 --- a/test/util/package.rb +++ b/test/util/package.rb @@ -11,7 +11,7 @@ class TestPuppetUtilPackage < Test::Unit::TestCase include Puppet::Util::Package def test_versioncmp - ary = %w{ 1.1.6 2.3 1.1a 3.0 1.5 1 2.4 1.1-4 + ary = %w{ 1.1.6 2.3 1.1a 3.0 1.5 1 2.4 1.1-4 2.3.1 1.2 2.3.0 1.1-3 2.4b 2.4 2.40.2 2.3a.1 3.1 0002 1.1-5 1.1.a 1.06} newary = nil diff --git a/test/util/settings.rb b/test/util/settings.rb index 1fdd425e6..6d5f6382a 100755 --- a/test/util/settings.rb +++ b/test/util/settings.rb @@ -205,7 +205,7 @@ yay = /a/path file = tempfile() File.open(file, "w") { |f| f.puts text } - + result = nil assert_nothing_raised { result = @config.send(:parse_file, file) @@ -348,7 +348,7 @@ yay = /a/path # already stored in a config def test_writingfiles File.umask(0022) - + path = tempfile() mode = 0644 @@ -374,7 +374,7 @@ yay = /a/path assert_equal(mode, filemode(path), "Modes are not equal") - # OS X is broken in how it chgrps files + # OS X is broken in how it chgrps files if Puppet::Util::SUIDManager.uid == 0 assert_equal(user.uid, File.stat(path).uid, "UIDS are not equal") @@ -388,7 +388,7 @@ yay = /a/path def test_mkdir File.umask(0022) - + path = tempfile() mode = 0755 @@ -413,7 +413,7 @@ yay = /a/path assert_equal(mode, filemode(path), "Modes are not equal") - # OS X and *BSD is broken in how it chgrps files + # OS X and *BSD is broken in how it chgrps files if Puppet::Util::SUIDManager.uid == 0 assert_equal(user.uid, File.stat(path).uid, "UIDS are not equal") @@ -448,7 +448,7 @@ yay = /a/path def test_configs_replace_in_url config = mkconfig - + config.setdefaults(:mysection, :name => ["yayness", "yay"]) config.setdefaults(:mysection, :url => ["http://$name/rahness", "yay"]) @@ -610,15 +610,15 @@ yay = /a/path # assert(! yay.find { |o| o.class.name == :group and o.name == "root" }, # "Found root group") end - + # #415 def test_remove_trailing_spaces config = mkconfig() file = tempfile() File.open(file, "w") { |f| f.puts "rah = something " } - + config.setdefaults(:yay, :config => [file, "eh"], :rah => ["testing", "a desc"]) - + assert_nothing_raised { config.parse } assert_equal("something", config[:rah], "did not remove trailing whitespace in parsing") end @@ -701,7 +701,7 @@ yay = /a/path def test_get_getopt_args element = CElement.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args") - + element.short = "n" assert_equal([["--foo", "-n", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args") diff --git a/test/util/storage.rb b/test/util/storage.rb index 89c3b13f8..e2c4dce59 100755 --- a/test/util/storage.rb +++ b/test/util/storage.rb @@ -74,7 +74,7 @@ class TestStorage < Test::Unit::TestCase assert_same Hash, state.class assert_equal 0, state.size end - + def test_caching hash = nil one = Puppet::Type.type(:exec).new :title => "/bin/echo one" @@ -83,7 +83,7 @@ class TestStorage < Test::Unit::TestCase hash = Puppet::Util::Storage.cache(object) end assert_equal({}, hash, "Did not get empty hash back for %s" % object) - + hash[:testing] = true assert_nothing_raised do hash = Puppet::Util::Storage.cache(object) diff --git a/test/util/utiltest.rb b/test/util/utiltest.rb index 41c9b517a..62179084f 100755 --- a/test/util/utiltest.rb +++ b/test/util/utiltest.rb @@ -119,7 +119,7 @@ class TestPuppetUtil < Test::Unit::TestCase assert_equal(nil, ret) end - + def test_execute command = tempfile() File.open(command, "w") { |f| @@ -131,13 +131,13 @@ class TestPuppetUtil < Test::Unit::TestCase output = Puppet::Util.execute([command, "yaytest", "funtest"]) end assert_equal("yaytest\nfuntest\n", output) - + # Now try it with a single quote assert_nothing_raised do output = Puppet::Util.execute([command, "yay'test", "funtest"]) end assert_equal("yay'test\nfuntest\n", output) - + # Now make sure we can squelch output (#565) assert_nothing_raised do output = Puppet::Util.execute([command, "yay'test", "funtest"], :squelch => true) @@ -148,12 +148,12 @@ class TestPuppetUtil < Test::Unit::TestCase assert_raise(Puppet::ExecutionFailure) do out = Puppet::Util.execute(["touch", "/no/such/file/could/exist"]) end - + # And that we can tell it not to fail assert_nothing_raised() do out = Puppet::Util.execute(["touch", "/no/such/file/could/exist"], :failonfail => false) end - + if Process.uid == 0 # Make sure we correctly set our uid and gid user = nonrootuser @@ -164,13 +164,13 @@ class TestPuppetUtil < Test::Unit::TestCase end assert(FileTest.exists?(file), "file was not created") assert_equal(user.uid, File.stat(file).uid, "uid was not set correctly") - + # We can't really check the gid, because it just behaves too # inconsistently everywhere. # assert_equal(group.gid, File.stat(file).gid, # "gid was not set correctly") end - + # (#565) Test the case of patricide. patricidecommand = tempfile() File.open(patricidecommand, "w") { |f| @@ -202,7 +202,7 @@ class TestPuppetUtil < Test::Unit::TestCase ENV["LC_MESSAGES"] = orig_lc_messages ENV["LANGUAGE"] = orig_lc_messages end - + # Mmm, we love gettext(3) ENV["LANG"] = "en_US" ENV["LC_ALL"] = "en_US" @@ -213,12 +213,12 @@ class TestPuppetUtil < Test::Unit::TestCase assert_equal('C', Puppet::Util.execute(['ruby', '-e', "print ENV['#{env}']"]), "Environment var #{env} wasn't set to 'C'") - + assert_equal 'en_US', ENV[env], "Environment var #{env} not set back correctly" end end - + # Check whether execute() accepts strings in addition to arrays. def test_string_exec cmd = "/bin/echo howdy" |