3 files changed, 9 insertions, 9 deletions
diff --git a/lib/puppet/external/dot.rb b/lib/puppet/external/dot.rb
index b0d542891..77d66e92e 100644
--- a/lib/puppet/external/dot.rb
+++ b/lib/puppet/external/dot.rb
@@ -311,7 +311,7 @@ module DOT
                     i[1] && i[0] != 'label' ?
                         t + $tab + "#{i[0]} = #{i[1]}" :
                         i[1] ? t + $tab + "#{i[0]} = \"#{i[1]}\"" : nil
-                }.compact.join( "\n" ) + "\n" + t + "]\n"
+                }.compact.join( "\n" ) + "\n#{t}]\n"
         end
 
     end # class DOTEdge
diff --git a/lib/puppet/external/nagios/base.rb b/lib/puppet/external/nagios/base.rb
index 1b49459a4..d3766e6f5 100755
--- a/lib/puppet/external/nagios/base.rb
+++ b/lib/puppet/external/nagios/base.rb
@@ -32,7 +32,7 @@ class Nagios::Base
     # Uncamelcase a parameter.
     def self.decamelcase(param)
         param.gsub(/[A-Z]/) do |match|
-            "_" + match.downcase
+            "_#{match.downcase}"
         end
     end
 
@@ -43,7 +43,7 @@ class Nagios::Base
         if @types.include?(name)
             @types[name].new(args)
         else
-            raise UnknownNagiosType, "Unknown type %s" % name
+            raise UnknownNagiosType, "Unknown type #{name}"
         end
     end
 
@@ -81,7 +81,7 @@ class Nagios::Base
                 @namevar = tmp
                 return @namevar
             else
-                raise "Type %s has no name var" % self.name
+                raise "Type #{self.name} has no name var"
             end
         end
     end
@@ -287,14 +287,14 @@ class Nagios::Base
         oc.sub!(/::/,'')
         ocs.push oc
         ocs.each { |oc|
-            str += "objectclass: " + oc + "\n"
+            str += "objectclass: #{oc}\n"
         }
         @parameters.each { |name,value|
             if self.class.suppress.include?(name)
                 next
             end
             ldapname = self.parammap(name)
-            str += ldapname + ": " + value + "\n"
+            str += ldapname + ": #{value}\n"
         }
         str += "\n"
         str
diff --git a/lib/puppet/external/nagios/parser.rb b/lib/puppet/external/nagios/parser.rb
index 4a1f4c98d..80b912bc0 100644
--- a/lib/puppet/external/nagios/parser.rb
+++ b/lib/puppet/external/nagios/parser.rb
@@ -537,10 +537,10 @@ def token
                     if yytext =~ /\W/
                         giveback = yytext.dup
                         giveback.sub!(/^\w+/,'')
-                        #puts "giveback " + giveback
-                        #puts "yytext " + yytext
+                        #puts "giveback #{giveback}"
+                        #puts "yytext #{yytext}"
                         yytext.sub!(/\W.*$/,'')
-                        #puts "yytext " + yytext
+                        #puts "yytext #{yytext}"
                         #puts "all [#{giveback} #{yytext} #{orig}]"
                         @src = giveback + @src
                     end