Merge pull request #665 from techthumb/master

Changed log message when middleman starts.

middleman-core/lib/middleman-core/preview_server.rb

@@ -6,17 +6,18 @@ module Middleman
     DEFAULT_PORT = 4567
 
     class << self
-      attr_reader :app, :port
+      attr_reader :app, :host, :port
       delegate :logger, :to => :app
 
       # Start an instance of Middleman::Application
       # @return [void]
       def start(opts={})
         @options = opts
+        @host = @options[:host] || Socket.gethostname
         @port = @options[:port] || DEFAULT_PORT
 
         mount_instance
-        logger.info "== The Middleman is standing watch on port #{port}"
+        logger.info "== The Middleman is standing watch at http://#{host}:#{port}"
 
         @initialized ||= false
         unless @initialized
@@ -52,11 +53,11 @@ module Middleman
       # @return [void]
       def reload
         logger.info "== The Middleman is reloading"
-        
+
         unmount_instance
         mount_instance
-        
-        logger.info "== The Middleman is standing watch on port #{port}"
+
+        logger.info "== The Middleman is standing watch at http://#{host}:#{port}"
       end
 
       # Stop the current instance, exit Webrick
@@ -73,22 +74,22 @@ module Middleman
           if opts[:environment]
             config[:environment] = opts[:environment].to_sym
           end
-          
+
           logger(opts[:debug] ? 0 : 1, opts[:instrumenting] || false)
         end
       end
 
       def start_file_watcher
         return if @options[:"disable-watcher"]
-        
+
         first_run = !@listener
-        
+
         if first_run
           # Watcher Library
           require "listen"
           @listener = Listen.to(Dir.pwd, :relative_paths => true)
         end
-        
+
         @listener.change do |modified, added, removed|
           added_and_modified = (modified + added)
 
@@ -125,11 +126,9 @@ module Middleman
 
       # Initialize webrick
       # @return [void]
-      def setup_webrick(host, is_logging)
-        @host = host
-
+      def setup_webrick(is_logging)
         http_opts = {
-          :BindAddress => @host,
+          :BindAddress => host,
           :Port        => port,
           :AccessLog   => []
         }
@@ -154,13 +153,10 @@ module Middleman
       def mount_instance
         @app = new_app
 
-        @webrick ||= setup_webrick(
-          @options[:host]  || "0.0.0.0",
-          @options[:debug] || false
-        )
-        
+        @webrick ||= setup_webrick(@options[:debug] || false)
+
         start_file_watcher
-          
+
         @webrick.mount "/", ::Rack::Handler::WEBrick, app.class.to_rack_app
       end
 
@@ -180,13 +176,13 @@ module Middleman
           %r{^lib/^[^\.](.*)\.rb$},
           %r{^helpers/^[^\.](.*)_helper\.rb$}
         ]
-        
+
         if @options[:reload_paths]
           @options[:reload_paths].split(',').each do |part|
             match_against << %r{^#{part}}
           end
         end
-        
+
         paths.any? do |path|
           match_against.any? do |matcher|
             path.match(matcher)