Make preview host and port configurable in config.rb and also expose …

…those variables to extensions which are curious. Closes middleman#1477
nhemsley · Mar 2, 2015 · a71589b · a71589b
1 parent d60cd3a
commit a71589b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/middleman-core/fixtures/large-build-app/config.rb b/middleman-core/fixtures/large-build-app/config.rb
@@ -1,3 +1,5 @@
 with_layout false do
   page "/spaces in file.html"
 end
+
+config[:port] = 5555
diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
@@ -67,6 +67,14 @@ def self.root_path
     end
     delegate :root_path, to: :"self.class"
 
+    # Which host preview should start on.
+    # @return [Fixnum]
+    config.define_setting :host, '0.0.0.0', 'The preview server host'
+
+    # Which port preview should start on.
+    # @return [Fixnum]
+    config.define_setting :port, 4567, 'The preview server port'
+
     # Name of the source directory
     # @return [String]
     config.define_setting :source,      'source', 'Name of the source directory'

diff --git a/middleman-core/lib/middleman-core/cli/server.rb b/middleman-core/lib/middleman-core/cli/server.rb
@@ -14,11 +14,9 @@ class Server < Thor
     method_option :host,
                   type: :string,
                   aliases: '-h',
-                  default: '0.0.0.0',
                   desc: 'Bind to HOST address'
     method_option :port,
                   aliases: '-p',
-                  default: '4567',
                   desc: 'The port Middleman will listen on'
     method_option :verbose,
                   type: :boolean,

diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb
@@ -5,8 +5,6 @@
 # rubocop:disable GlobalVars
 module Middleman
   module PreviewServer
-    DEFAULT_PORT = 4567
-
     class << self
       attr_reader :app, :host, :port
       delegate :logger, to: :app
@@ -15,8 +13,6 @@ class << self
       # @return [void]
       def start(opts={})
         @options = opts
-        @host = @options[:host] || '0.0.0.0'
-        @port = @options[:port] || DEFAULT_PORT
 
         mount_instance(new_app)
         logger.info "== The Middleman is standing watch at http://#{host}:#{port}"
@@ -92,6 +88,7 @@ def shutdown
 
       def new_app
         opts = @options.dup
+
         server = ::Middleman::Application.server
 
         # Add in the meta pages application
@@ -107,7 +104,14 @@ def new_app
           )
 
           config[:environment] = opts[:environment].to_sym if opts[:environment]
+          config[:host] = opts[:host] if opts[:host]
+          config[:port] = opts[:port] if opts[:port]
         end
+
+        @host = @app.config[:host]
+        @port = @app.config[:port]
+
+        @app
       end
 
       def start_file_watcher