middleman-cli 4.1.3 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12273d205f2bf08d0212180889ac23701ac1fe96
-  data.tar.gz: 2b8a404ea8856f2bc7a35f15c291d8281374d034
+  metadata.gz: 533e085d69bc99e95e9b4e9fad2e337ccffa076d
+  data.tar.gz: 46672cf498c58bf641799b4c6fa58e547d8a8e98
 SHA512:
-  metadata.gz: 0e4f85045bb88f0c4db58527cbd0a39db84bfb725477a398c9cdc2e4cb8e12cb9e3e9ce336033a91d89a4f9bb5da5220336d6976576569847cf67e486edfa46f
-  data.tar.gz: 40de4da70b54e10eae959a86a5ef75faee7edd4fbe73544a1cb16c2b48e64885aaab042aa99db15772fe21e98eef41a1624a445337bc04ad166e2ee8731d9cce
+  metadata.gz: 22a0a8d0a5ca9e950c528ab5116dfca41dc5cec19af69ac2f31275cc3c814e8865986310544271918efa235c7d6b8c3bad7f01266780513406cecb200a284907
+  data.tar.gz: 45023c60c75f636fe55516b94c5e81cec61877cd721c9e27a7c55be058e20636d30b49513637078cb6a65ac9bec7ece8e5ebe33fa4b6cd1d532f1241ddf9cc41

data/bin/middleman

@@ -22,12 +22,12 @@ module Middleman::Cli
       if setting.default.is_a?(String) || setting.default.is_a?(NilClass)
         base.class_option setting.key,
                           type: :string,
-                          default: setting.default,
+                          default: :undefined,
                           desc: setting.description
       elsif setting.default.is_a?(TrueClass) || setting.default.is_a?(FalseClass)
         base.class_option setting.key,
                           type: :boolean,
-                          default: setting.default,
+                          default: :undefined,
                           desc: setting.description
       end
     end
@@ -46,6 +46,7 @@ end
 
 ::Middleman::Logger.singleton(3)
 ::Middleman::Cli.config = ::Middleman::Application.new do
+  config[:mode] = :config
   config[:exit_before_ready] = true
   config[:watcher_disable] = true
   config[:disable_sitemap] = true

data/lib/middleman-cli/build.rb

@@ -63,14 +63,8 @@ module Middleman::Cli
         @app = ::Middleman::Application.new do
           config[:mode] = :build
           config[:show_exceptions] = false
-
-          cli_options.each do |k, v|
-            setting = config.setting(k.to_sym)
-            next unless setting
-
-            v = setting.options[:import].call(v) if setting.options[:import]
-
-            config[k.to_sym] = v
+          config[:cli_options] = cli_options.each_with_object({}) do |(k, v), sum|
+            sum[k] = v unless v == :undefined
           end
         end
 

data/lib/middleman-cli/config.rb

@@ -23,6 +23,7 @@ module Middleman::Cli
       ::Middleman::Logger.singleton(2, false)
 
       app = ::Middleman::Application.new do
+        config[:mode] = :config
         config[:disable_sitemap] = true
         config[:watcher_disable] = true
         config[:exit_before_ready] = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cli
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.5
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor