From 30217d2c04d52179aca6d0dc1dd07fdee7d56ed2 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 29 Nov 2016 20:14:19 -0800
Subject: [PATCH] Change how config options are passed to Thor. Removes new
 Thor warnings from #2017

---
 CHANGELOG.md                                        | 4 ++++
 middleman-cli/bin/middleman                         | 2 --
 middleman-cli/lib/middleman-cli/build.rb            | 4 ++--
 middleman-cli/lib/middleman-cli/server.rb           | 2 +-
 middleman-core/lib/middleman-core/application.rb    | 1 +
 middleman-core/lib/middleman-core/preview_server.rb | 6 +++---
 middleman-core/lib/middleman-core/version.rb        | 2 +-
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccfc2272..148aa2e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 master
 ===
 
+# 4.1.13
+
+* Change how config options are passed to Thor. Removes new Thor warnings from #2017
+
 # 4.1.12
 
 * Fix broken `ignore { |p| true }` form.
diff --git a/middleman-cli/bin/middleman b/middleman-cli/bin/middleman
index 46fa5889..8b381a08 100755
--- a/middleman-cli/bin/middleman
+++ b/middleman-cli/bin/middleman
@@ -25,12 +25,10 @@ module Middleman::Cli
       if setting.default.is_a?(String) || setting.default.is_a?(NilClass)
         base.class_option setting.key,
                           type: :string,
-                          default: :undefined,
                           desc: setting.description
       elsif setting.default.is_a?(TrueClass) || setting.default.is_a?(FalseClass)
         base.class_option setting.key,
                           type: :boolean,
-                          default: :undefined,
                           desc: setting.description
       end
     end
diff --git a/middleman-cli/lib/middleman-cli/build.rb b/middleman-cli/lib/middleman-cli/build.rb
index df871ce2..9e521dde 100644
--- a/middleman-cli/lib/middleman-cli/build.rb
+++ b/middleman-cli/lib/middleman-cli/build.rb
@@ -29,7 +29,7 @@ module Middleman::Cli
                  default: false,
                  desc: 'Print debug messages'
     class_option :instrument,
-                 type: :string,
+                 type: :boolean,
                  default: false,
                  desc: 'Print instrument messages'
     class_option :profile,
@@ -64,7 +64,7 @@ module Middleman::Cli
           config[:mode] = :build
           config[:show_exceptions] = false
           config[:cli_options] = cli_options.each_with_object({}) do |(k, v), sum|
-            sum[k] = v unless v == :undefined
+            sum[k] = v
           end
         end
 
diff --git a/middleman-cli/lib/middleman-cli/server.rb b/middleman-cli/lib/middleman-cli/server.rb
index 479f53bd..85e75a9f 100644
--- a/middleman-cli/lib/middleman-cli/server.rb
+++ b/middleman-cli/lib/middleman-cli/server.rb
@@ -17,7 +17,7 @@ module Middleman::Cli
                  default: false,
                  desc: 'Print debug messages'
     class_option :instrument,
-                 type: :string,
+                 type: :boolean,
                  default: false,
                  desc: 'Print instrument messages'
     class_option :profile,
diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb
index 52b31c92..eb819433 100644
--- a/middleman-core/lib/middleman-core/application.rb
+++ b/middleman-core/lib/middleman-core/application.rb
@@ -306,6 +306,7 @@ module Middleman
       execute_callbacks(:after_configuration)
 
       # Everything is stable
+      $stderr.puts config[:exit_before_ready].inspect
       execute_callbacks(:ready) unless config[:exit_before_ready]
     end
 
diff --git a/middleman-core/lib/middleman-core/preview_server.rb b/middleman-core/lib/middleman-core/preview_server.rb
index 4b2b713b..1a3d220e 100644
--- a/middleman-core/lib/middleman-core/preview_server.rb
+++ b/middleman-core/lib/middleman-core/preview_server.rb
@@ -143,7 +143,7 @@ module Middleman
 
         app = ::Middleman::Application.new do
           config[:cli_options] = cli_options.each_with_object({}) do |(k, v), sum|
-            sum[k] = v unless v == :undefined
+            sum[k] = v
           end
 
           ready do
@@ -162,7 +162,7 @@ module Middleman
 
               # Hack around bower_components in root.
               watcher.listener.ignore(/^bower_components/)
-              
+
               # Hack around node_modules in root.
               watcher.listener.ignore(/^node_modules/)
 
@@ -207,7 +207,7 @@ module Middleman
       end
 
       def possible_from_cli(key, config)
-        if @cli_options[key] && @cli_options[key] != :undefined
+        if @cli_options[key]
           @cli_options[key]
         else
           config[key]
diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb
index 2519db9e..94753eef 100644
--- a/middleman-core/lib/middleman-core/version.rb
+++ b/middleman-core/lib/middleman-core/version.rb
@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.1.12'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.1.13'.freeze unless const_defined?(:VERSION)
 end