middleman-cli 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fed9518959072b4a62e74bdf73780bb7857797a9
-  data.tar.gz: 289871a45b98888bdbbb493b65c07e215e1571ca
+  metadata.gz: 12273d205f2bf08d0212180889ac23701ac1fe96
+  data.tar.gz: 2b8a404ea8856f2bc7a35f15c291d8281374d034
 SHA512:
-  metadata.gz: 9a273dae52c2600586a9ac25944eb1f0b7e012af1e3bb34ed4c080601965b6dbb9070de7d889d4a1abec6cb218036dc1e1bd7381f9ae206c10badac0df36569e
-  data.tar.gz: 72359626b79a6b01950f759b6c9a48559c8b41ad3a0b272c173639723fe6cfe1266d0395678f0f235129494543df75a27e2764490af9d03c186530df57afa247
+  metadata.gz: 0e4f85045bb88f0c4db58527cbd0a39db84bfb725477a398c9cdc2e4cb8e12cb9e3e9ce336033a91d89a4f9bb5da5220336d6976576569847cf67e486edfa46f
+  data.tar.gz: 40de4da70b54e10eae959a86a5ef75faee7edd4fbe73544a1cb16c2b48e64885aaab042aa99db15772fe21e98eef41a1624a445337bc04ad166e2ee8731d9cce

data/bin/middleman

@@ -9,6 +9,31 @@ end
 require "middleman-core/load_paths"
 Middleman.setup_load_paths
 
+require 'middleman-core'
+require 'middleman-core/logger'
+
+module Middleman::Cli
+  class << self
+    attr_accessor :config
+  end
+
+  def self.import_config(base)
+    ::Middleman::Cli.config.all_settings.each do |setting|
+      if setting.default.is_a?(String) || setting.default.is_a?(NilClass)
+        base.class_option setting.key,
+                          type: :string,
+                          default: setting.default,
+                          desc: setting.description
+      elsif setting.default.is_a?(TrueClass) || setting.default.is_a?(FalseClass)
+        base.class_option setting.key,
+                          type: :boolean,
+                          default: setting.default,
+                          desc: setting.description
+      end
+    end
+  end
+end
+
 require "middleman-cli"
 
 # Change directory to the root
@@ -19,5 +44,23 @@ if ARGV[0] != 'help' && (ARGV.length < 1 || ARGV.first.include?('-'))
   ARGV.unshift('server')
 end
 
+::Middleman::Logger.singleton(3)
+::Middleman::Cli.config = ::Middleman::Application.new do
+  config[:exit_before_ready] = true
+  config[:watcher_disable] = true
+  config[:disable_sitemap] = true
+end.config
+
+# Require the Middleman version
+require 'middleman-core/version'
+
+# Include the core CLI items
+require 'middleman-cli/init'
+require 'middleman-cli/extension'
+require 'middleman-cli/server'
+require 'middleman-cli/build'
+require 'middleman-cli/console'
+require 'middleman-cli/config'
+
 # Start the CLI
 Middleman::Cli::Base.start(ARGV)

data/lib/middleman-cli.rb

@@ -21,14 +21,3 @@ module Middleman::Cli
     end
   end
 end
-
-# Require the Middleman version
-require 'middleman-core/version'
-
-# Include the core CLI items
-require 'middleman-cli/init'
-require 'middleman-cli/extension'
-require 'middleman-cli/server'
-require 'middleman-cli/build'
-require 'middleman-cli/console'
-require 'middleman-cli/config'

data/lib/middleman-cli/build.rb

@@ -1,3 +1,5 @@
+require 'middleman-core/application'
+
 # CLI Module
 module Middleman::Cli
   # The CLI Build class
@@ -8,8 +10,7 @@ module Middleman::Cli
 
     class_option :environment,
                  aliases: '-e',
-                 default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'production',
-                 desc: 'The environment Middleman will run under'
+                 default: :production
     class_option :clean,
                  type: :boolean,
                  default: true,
@@ -36,6 +37,8 @@ module Middleman::Cli
                  default: false,
                  desc: 'Generate profiling report for the build'
 
+    Middleman::Cli.import_config(self)
+
     # Core build Thor command
     # @return [void]
     def build
@@ -48,19 +51,27 @@ module Middleman::Cli
       require 'middleman-core/builder'
       require 'fileutils'
 
-      env = options['environment'].to_sym
       verbose = options['verbose'] ? 0 : 1
       instrument = options['instrument']
 
       builder = nil
+      cli_options = options
 
       ::Middleman::Logger.singleton(verbose, instrument)
 
       ::Middleman::Util.instrument 'builder.setup' do
         @app = ::Middleman::Application.new do
           config[:mode] = :build
-          config[:environment] = env
           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
+          end
         end
 
         builder = Middleman::Builder.new(@app,

data/lib/middleman-cli/config.rb

@@ -23,6 +23,8 @@ module Middleman::Cli
       ::Middleman::Logger.singleton(2, false)
 
       app = ::Middleman::Application.new do
+        config[:disable_sitemap] = true
+        config[:watcher_disable] = true
         config[:exit_before_ready] = true
         config[:environment] = opts[:environment].to_sym if opts[:environment]
       end

data/lib/middleman-cli/server.rb

@@ -5,25 +5,13 @@ module Middleman::Cli
     check_unknown_options!
 
     class_option :environment,
-                 aliases: '-e',
-                 default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development',
-                 desc: 'The environment Middleman will run under'
+                 aliases: '-e'
     class_option :port,
-                 aliases: '-p',
-                 desc: 'The port Middleman will listen on'
+                 aliases: '-p'
     class_option :server_name,
-                 aliases: '-s',
-                 desc: 'The server name Middleman will use'
+                 aliases: '-s'
     class_option :bind_address,
-                 aliases: '-b',
-                 desc: 'The bind address Middleman will listen on'
-    class_option :https,
-                 type: :boolean,
-                 desc: 'Serve the preview server over SSL/TLS'
-    class_option :ssl_certificate,
-                 desc: 'Path to an X.509 certificate to use for the preview server'
-    class_option :ssl_private_key,
-                 desc: "Path to an RSA private key for the preview server's certificate"
+                 aliases: '-b'
     class_option :verbose,
                  type: :boolean,
                  default: false,
@@ -32,29 +20,18 @@ module Middleman::Cli
                  type: :string,
                  default: false,
                  desc: 'Print instrument messages'
-    class_option :disable_watcher,
-                 type: :boolean,
-                 default: false,
-                 desc: 'Disable the file change and delete watcher process'
     class_option :profile,
                  type: :boolean,
                  default: false,
                  desc: 'Generate profiling report for server startup'
-    class_option :force_polling,
-                 type: :boolean,
-                 default: false,
-                 desc: 'Force file watcher into polling mode'
-    class_option :latency,
-                 type: :numeric,
-                 aliases: '-l',
-                 default: 0.5,
-                 desc: 'Set file watcher latency, in seconds'
     class_option :daemon,
                  type: :boolean,
                  aliases: '-d',
                  default: false,
                  desc: 'Daemonize preview server'
 
+    Middleman::Cli.import_config(self)
+
     # Start the server
     def server
       require 'middleman-core'
@@ -66,24 +43,14 @@ module Middleman::Cli
       end
 
       params = {
-        port: options['port'],
-        bind_address: options['bind_address'],
-        https: options['https'],
-        server_name: options['server_name'],
-        ssl_certificate: options['ssl_certificate'],
-        ssl_private_key: options['ssl_private_key'],
-        environment: options['environment'],
         debug: options['verbose'],
         instrumenting: options['instrument'],
-        disable_watcher: options['disable_watcher'],
         reload_paths: options['reload_paths'],
-        force_polling: options['force_polling'],
-        latency: options['latency'],
         daemon: options['daemon']
       }
 
       puts '== The Middleman is loading'
-      ::Middleman::PreviewServer.start(params)
+      ::Middleman::PreviewServer.start(params, options)
     end
 
     # Add to CLI

metadata

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