lib/jekyll/commands/serve.rb in jekyll-3.4.5 vs lib/jekyll/commands/serve.rb in jekyll-3.5.0

@@ -30,15 +30,16 @@
             end
 
             cmd.action do |_, opts|
               opts["serving"] = true
               opts["watch"  ] = true unless opts.key?("watch")
-              config = opts["config"]
-              opts["url"] = default_url(opts) if Jekyll.env == "development"
-              Build.process(opts)
-              opts["config"] = config
-              Serve.process(opts)
+
+              config = configuration_from_options(opts)
+              if Jekyll.env == "development"
+                config["url"] = default_url(config)
+              end
+              [Build, Serve].each { |klass| klass.process(config) }
             end
           end
         end
 
         #
@@ -133,10 +134,10 @@
           )
         end
 
         private
         def format_url(ssl_enabled, address, port, baseurl = nil)
-          format("%{prefix}://%{address}:%{port}%{baseurl}", {
+          format("%<prefix>s://%<address>s:%<port>i%<baseurl>s", {
             :prefix  => ssl_enabled ? "https" : "http",
             :address => address,
             :port    => port,
             :baseurl => baseurl ? "#{baseurl}/" : "",
           })