Code smell: Use string interpolation

* Replaced 83 occurances of

      (.*)" *[+] *([$@]?[\w_0-9.:]+?)(.to_s\b)?(?! *[*(%\w_0-9.:{\[])

  with

      \1#{\2}"

  3 Examples:

      The code:
          puts "PUPPET " + status + ": " + process + ", " + state
      becomes:
          puts "PUPPET " + status + ": " + process + ", #{state}"
      The code:
          puts "PUPPET " + status + ": #{process}" + ", #{state}"
      becomes:
          puts "PUPPET #{status}" + ": #{process}" + ", #{state}"
      The code:
          }.compact.join( "\n" ) + "\n" + t + "]\n"
      becomes:
          }.compact.join( "\n" ) + "\n#{t}" + "]\n"

* Replaced 21 occurances of (.*)" *[+] *" with \1

  3 Examples:

      The code:
          puts "PUPPET #{status}" + ": #{process}" + ", #{state}"
      becomes:
          puts "PUPPET #{status}" + ": #{process}, #{state}"
      The code:
          puts "PUPPET #{status}" + ": #{process}, #{state}"
      becomes:
          puts "PUPPET #{status}: #{process}, #{state}"
      The code:
          res = self.class.name + ": #{@name}" + "\n"
      becomes:
          res = self.class.name + ": #{@name}\n"

* Don't use string concatenation to split lines unless they would be very long.

  Replaced 11 occurances of

      (.*)(['"]) *[+]
       *(['"])(.*)

  with

  3 Examples:

      The code:
          o.define_head "The check_puppet Nagios plug-in checks that specified " +
              "Puppet process is running and the state file is no " +
      becomes:
          o.define_head "The check_puppet Nagios plug-in checks that specified Puppet process is running and the state file is no " +
      The code:
          o.separator   "Mandatory arguments to long options are mandatory for " +
          "short options too."
      becomes:
          o.separator   "Mandatory arguments to long options are mandatory for short options too."
      The code:
          o.define_head "The check_puppet Nagios plug-in checks that specified Puppet process is running and the state file is no " +
              "older than specified interval."
      becomes:
          o.define_head "The check_puppet Nagios plug-in checks that specified Puppet process is running and the state file is no older than specified interval."

* Replaced no occurances of do (.*?) end with {\1}

* Replaced 1488 occurances of

      "([^"\n]*%s[^"\n]*)" *% *(.+?)(?=$| *\b(do|if|while|until|unless|#)\b)

  with

  20 Examples:

      The code:
          args[0].split(/\./).map do |s| "dc=%s"%[s] end.join(",")
      becomes:
          args[0].split(/\./).map do |s| "dc=#{s}" end.join(",")
      The code:
          puts "%s" % Puppet.version
      becomes:
          puts "#{Puppet.version}"
      The code:
          raise "Could not find information for %s" % node
      becomes:
          raise "Could not find information for #{node}"
      The code:
          raise Puppet::Error, "Cannot create %s: basedir %s is a file" % [dir, File.join(path)]
      becomes:
          raise Puppet::Error, "Cannot create #{dir}: basedir #{File.join(path)} is a file"
      The code:
          Puppet.err "Could not run %s: %s" % [client_class, detail]
      becomes:
          Puppet.err "Could not run #{client_class}: #{detail}"
      The code:
          raise "Could not find handler for %s" % arg
      becomes:
          raise "Could not find handler for #{arg}"
      The code:
          Puppet.err "Will not start without authorization file %s" % Puppet[:authconfig]
      becomes:
          Puppet.err "Will not start without authorization file #{Puppet[:authconfig]}"
      The code:
          raise Puppet::Error, "Could not deserialize catalog from pson: %s" % detail
      becomes:
          raise Puppet::Error, "Could not deserialize catalog from pson: #{detail}"
      The code:
          raise "Could not find facts for %s" % Puppet[:certname]
      becomes:
          raise "Could not find facts for #{Puppet[:certname]}"
      The code:
          raise ArgumentError, "%s is not readable" % path
      becomes:
          raise ArgumentError, "#{path} is not readable"
      The code:
          raise ArgumentError, "Invalid handler %s" % name
      becomes:
          raise ArgumentError, "Invalid handler #{name}"
      The code:
          debug "Executing '%s' in zone %s with '%s'" % [command, @resource[:name], str]
      becomes:
          debug "Executing '#{command}' in zone #{@resource[:name]} with '#{str}'"
      The code:
          raise Puppet::Error, "unknown cert type '%s'" % hash[:type]
      becomes:
          raise Puppet::Error, "unknown cert type '#{hash[:type]}'"
      The code:
          Puppet.info "Creating a new certificate request for %s" % Puppet[:certname]
      becomes:
          Puppet.info "Creating a new certificate request for #{Puppet[:certname]}"
      The code:
          "Cannot create alias %s: object already exists" % [name]
      becomes:
          "Cannot create alias #{name}: object already exists"
      The code:
          return "replacing from source %s with contents %s" % [metadata.source, metadata.checksum]
      becomes:
          return "replacing from source #{metadata.source} with contents #{metadata.checksum}"
      The code:
          it "should have a %s parameter" % param do
      becomes:
          it "should have a #{param} parameter" do
      The code:
          describe "when registring '%s' messages" % log do
      becomes:
          describe "when registring '#{log}' messages" do
      The code:
          paths = %w{a b c d e f g h}.collect { |l| "/tmp/iteration%stest" % l }
      becomes:
          paths = %w{a b c d e f g h}.collect { |l| "/tmp/iteration#{l}test" }
      The code:
          assert_raise(Puppet::Error, "Check '%s' did not fail on false" % check) do
      becomes:
          assert_raise(Puppet::Error, "Check '#{check}' did not fail on false") do

1 files changed, 11 insertions, 11 deletions

diff --git a/test/util/fileparsing.rb b/test/util/fileparsing.rb
index 097254a50..fac5f3e83 100755
--- a/test/util/fileparsing.rb
+++ b/test/util/fileparsing.rb
@@ -36,7 +36,7 @@ class TestUtilFileParsing < Test::Unit::TestCase
                     "Did not set separator")
 
             tests.each do |test|
-                assert_equal(["one two", "three four"], @parser.lines(test), "Incorrectly parsed %s" % test.inspect)
+                assert_equal(["one two", "three four"], @parser.lines(test), "Incorrectly parsed #{test.inspect}")
             end
         end
     end
@@ -177,7 +177,7 @@ class TestUtilFileParsing < Test::Unit::TestCase
 
         # Make sure we always require an appropriate set of options
         [{:separator => "\t"}, {}, {:fields => %w{record_type}}].each do |opts|
-            assert_raise(ArgumentError, "Accepted %s" % opts.inspect) do
+            assert_raise(ArgumentError, "Accepted #{opts.inspect}") do
                 @parser.record_line :record, opts
             end
         end
@@ -334,11 +334,11 @@ class TestUtilFileParsing < Test::Unit::TestCase
                 assert_equal(
                     record[param], result[param],
 
-                    "Did not correctly parse %s" % start.inspect)
+                    "Did not correctly parse #{start.inspect}")
             end
 
             # And generating
-            assert_equal(final, @parser.to_line(result), "Did not correctly generate %s from %s" % [final.inspect, record.inspect])
+            assert_equal(final, @parser.to_line(result), "Did not correctly generate #{final.inspect} from #{record.inspect}")
         end
 
         # First try it with symmetric characters
@@ -452,12 +452,12 @@ assert_nothing_raised do
             assert_nothing_raised do
                 result = @parser.handle_record_line(line, options)
             end
-            assert(result, "Did not get a result back for '%s'" % line)
+            assert(result, "Did not get a result back for '#{line}'")
             should.each do |field|
                 if field == :alias and line =~ /null/
-                    assert_equal(%w{sink null}, result[field], "Field %s was not right in '%s'" % [field, line])
+                    assert_equal(%w{sink null}, result[field], "Field #{field} was not right in '#{line}'")
                 else
-                    assert_equal(values[field], result[field], "Field %s was not right in '%s'" % [field, line])
+                    assert_equal(values[field], result[field], "Field #{field} was not right in '#{line}'")
                 end
             end
         end
@@ -644,7 +644,7 @@ class TestUtilFileRecord < Test::Unit::TestCase
         [   [:fake, {}],
             [nil, ]
         ].each do |args|
-            assert_raise(ArgumentError, "Did not fail on %s" % args.inspect) do
+            assert_raise(ArgumentError, "Did not fail on #{args.inspect}") do
                 Record.new(*args)
             end
         end
@@ -658,7 +658,7 @@ class TestUtilFileRecord < Test::Unit::TestCase
 
         # Make sure we fail on invalid fields
         [:record_type, :target, :on_disk].each do |field|
-            assert_raise(ArgumentError, "Did not fail on invalid field %s" % field) {
+            assert_raise(ArgumentError, "Did not fail on invalid field #{field}") {
                 Record.new(:record, :fields => [field])
             }
         end
@@ -667,12 +667,12 @@ class TestUtilFileRecord < Test::Unit::TestCase
     def test_defaults
         record = Record.new(:text, :match => %r{^#})
         [:absent, :separator, :joiner, :optional].each do |field|
-            assert_nil(record.send(field), "%s was not nil" % field)
+            assert_nil(record.send(field), "#{field} was not nil")
         end
 
         record = Record.new(:record, :fields => %w{fields})
         {:absent => "", :separator => /\s+/, :joiner => " ", :optional => []}.each do |field, default|
-            assert_equal(default, record.send(field), "%s was not default" % field)
+            assert_equal(default, record.send(field), "#{field} was not default")
         end
     end