Reinstate existing code

lib/puma/cli.rb

@@ -49,16 +49,16 @@ def initialize(argv, events=Events.stdio)
       begin
         @parser.parse! @argv
 
-        if (file = @argv.shift)
-          @conf.configure do |_user_config, file_config|
+        if file = @argv.shift
+          @conf.configure do |user_config, file_config|
             file_config.rackup file
           end
         end
       rescue UnsupportedOption
         exit 1
       end
 
-      @conf.configure do |user_config, _file_config|
+      @conf.configure do |user_config, file_config|
         if @stdout || @stderr
           user_config.stdout_redirect @stdout, @stderr, @append
         end
@@ -68,7 +68,7 @@ def initialize(argv, events=Events.stdio)
         end
       end
 
-      @launcher = Puma::Launcher.new(@conf, events: @events, argv: argv)
+      @launcher = Puma::Launcher.new(@conf, :events => @events, :argv => argv)
     end
 
     attr_reader :launcher
@@ -98,7 +98,7 @@ def configure_control_url(command_line_arg)
     #
 
     def setup_options
-      @conf = Configuration.new do |user_config, file_config, _default_dsl|
+      @conf = Configuration.new do |user_config, file_config|
         @parser = OptionParser.new do |o|
           o.on "-b", "--bind URI", "URI to bind to (tcp://, unix://, ssl://)" do |arg|
             user_config.bind arg