middleman-cli 4.5.1 → 5.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64d539f5b6ac020613f485f415b05f410c47d6c34659846417c4cd282a3ef32c
-  data.tar.gz: 65827c5584f6328b86b1d050887b6a5225633d11a893c34f66ac302a4e12ca04
+  metadata.gz: 19953457367b99c42c2eabb63a759d447fd652b18baef40c0b1f85b37bca20ca
+  data.tar.gz: 62e4b6c8ab48aa2e560f43441cbd9cfc7c82d020d017628f6f7ecd1a8fd73457
 SHA512:
-  metadata.gz: 0c215811b72280cce30ec62e37c85e964067e773c9ae564b7efb2e4d00b1ae09f4993b3d9de40c75537901b165dd8457157b9a9cb01cc0bb85ca55f39142d927
-  data.tar.gz: fe1d522c15390c53f4ccb8223406f1a259b39f7afe3fc95d479f5a6e8ab12baa66a4ded9860d2a56d37a4b6ac20ff82ced77e112027da2b988ba561ced23954e
+  metadata.gz: 77c8d219e000a0239f8af2ae6447c11e8636e0907116a563a82a36c301a18f7f140e1fa55e494c44a6f004208c3ff300c6feb0e1e01293ff6a9fa5a8cec0a5ec
+  data.tar.gz: d88dcf0a57b1ddb76d5af0735f18b951b52926d61f8d875770b6b4f785deef449ab64eb014eb58c17f85f0b76dd781c4cca85153b50e97c66b956c2548560dc9

data/.simplecov

@@ -1,7 +1,7 @@
-SimpleCov.configure do
+SimpleCov.start do
   add_filter '/fixtures/'
   add_filter '/features/'
   add_filter '/spec/'
   add_filter '/step_definitions/'
   add_filter '/lib/vendored-middleman-deps/'
-end
+end

data/bin/middleman

@@ -1,12 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'middleman-core/profiling'
-if ARGV.include? '--profile'
-  Middleman::Profiling.profiler = Middleman::Profiling::RubyProfProfiler.new
-end
-# Middleman::Profiling.start
+Middleman::Profiling.profiler = Middleman::Profiling::RubyProfProfiler.new if ARGV.include? '--profile'
 
-require "middleman-core/load_paths"
+require 'middleman-core/load_paths'
 Middleman.setup_load_paths
 
 require 'dotenv'
@@ -35,19 +32,16 @@ module Middleman::Cli
   end
 end
 
-require "middleman-cli"
+require 'middleman-cli'
 
 # Change directory to the root
-Dir.chdir(ENV["MM_ROOT"]) if ENV["MM_ROOT"]
+Dir.chdir(ENV['MM_ROOT']) if ENV['MM_ROOT']
 
 # Default command is server
-if ARGV[0] != 'help' && (ARGV.length < 1 || ARGV.first.include?('-'))
-  ARGV.unshift('server')
-end
+ARGV.unshift('server') if ARGV[0] != 'help' && (ARGV.empty? || ARGV.first.include?('-'))
 
 ::Middleman::Logger.singleton(3)
 ::Middleman::Cli.config = ::Middleman::Application.new do
-  #
   config[:environment] = (ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development').to_sym
   config[:mode] = :config
   config[:exit_before_ready] = true
@@ -66,5 +60,8 @@ require 'middleman-cli/build'
 require 'middleman-cli/console'
 require 'middleman-cli/config'
 
+# Support NO_COLOR: https://no-color.org
+ENV['THOR_SHELL'] = 'Basic' if ENV['NO_COLOR']
+
 # Start the CLI
 Middleman::Cli::Base.start(ARGV)

data/lib/middleman-cli/build.rb

@@ -40,15 +40,39 @@ module Middleman::Cli
                  type: :boolean,
                  default: false,
                  desc: 'Generate profiling report for the build'
+    class_option :dry_run,
+                 type: :boolean,
+                 default: false,
+                 desc: 'Skip writing output files'
+    class_option :track_dependencies,
+                 type: :boolean,
+                 default: false,
+                 desc: 'Track file dependencies'
+    class_option :data_collection_depth,
+                 type: :numeric,
+                 default: ::Float::INFINITY,
+                 desc: 'How deep to recurse into data structures when tracking changes.'
+    class_option :visualize_graph,
+                 type: :boolean,
+                 default: false,
+                 desc: 'Generate a visual of the dependency graph'
+    class_option :only_changed,
+                 type: :boolean,
+                 default: false,
+                 desc: 'Only build changed files'
+    class_option :missing_and_changed,
+                 type: :boolean,
+                 default: false,
+                 desc: 'Only build changed files or files missing from build folder'
 
     Middleman::Cli.import_config(self)
 
     # Core build Thor command
     # @return [void]
     def build
-      unless ENV['MM_ROOT']
-        raise Thor::Error, 'Error: Could not find a Middleman project config, perhaps you are in the wrong folder?'
-      end
+      root = ENV['MM_ROOT'] || Dir.pwd
+
+      raise Thor::Error, 'Error: Could not find a Middleman project config, perhaps you are in the wrong folder?' unless File.exist?(File.join(root, 'config.rb'))
 
       require 'middleman-core'
       require 'middleman-core/logger'
@@ -64,18 +88,29 @@ module Middleman::Cli
       ::Middleman::Logger.singleton(verbose, instrument)
 
       ::Middleman::Util.instrument 'builder.setup' do
+        missing_and_changed = !options['only_changed'] && options['missing_and_changed']
+        should_track_dependencies = options['only_changed'] || missing_and_changed || options['track_dependencies']
+        data_collection_depth = options['data_collection_depth']
+
         @app = ::Middleman::Application.new do
           config[:mode] = :build
           config[:show_exceptions] = false
           config[:cli_options] = cli_options.each_with_object({}) do |(k, v), sum|
             sum[k] = v
           end
+          config[:track_data_access] = should_track_dependencies
+          config[:data_collection_depth] = data_collection_depth
         end
 
         builder = Middleman::Builder.new(@app,
                                          glob: options['glob'],
+                                         dry_run: options['dry_run'],
                                          clean: options['clean'],
-                                         parallel: options['parallel'])
+                                         parallel: options['parallel'],
+                                         only_changed: options['only_changed'],
+                                         missing_and_changed: missing_and_changed,
+                                         track_dependencies: should_track_dependencies,
+                                         visualize_graph: options['visualize_graph'])
         builder.thor = self
         builder.on_build_event(&method(:on_event))
       end
@@ -83,12 +118,10 @@ module Middleman::Cli
       ::Middleman::Util.instrument 'builder.run' do
         if builder.run!
           clean_directories! if options['clean']
-          shell.say 'Project built successfully.'
+          puts 'Project built successfully.'
         else
           msg = 'There were errors during this build'
-          unless options['verbose']
-            msg << ', re-run with `middleman build --verbose` to see the full exception.'
-          end
+          msg << ', re-run with `middleman build --verbose` to see the full exception.' unless options['verbose']
           shell.say msg, :red
 
           exit(1)
@@ -100,10 +133,10 @@ module Middleman::Cli
 
     # Handles incoming events from the builder.
     # @param [Symbol] event_type The type of event.
-    # @param [String] contents The event contents.
+    # @param [String] target The event contents.
     # @param [String] extra The extra information.
     # @return [void]
-    def on_event(event_type, target, extra=nil)
+    def on_event(event_type, target, extra = nil)
       case event_type
       when :error
         say_status :error, target, :red
@@ -116,6 +149,8 @@ module Middleman::Cli
         say_status :create, target, :green
       when :identical
         say_status :identical, target, :blue
+      when :skipped
+        say_status :skipped, target, :blue
       when :updated
         say_status :updated, target, :yellow
       else

data/lib/middleman-cli/extension.rb

@@ -24,7 +24,6 @@ module Middleman::Cli
     class_option :git, type: :boolean, default: true
 
     # The extension task
-    # @param [String] name
     def extension
       copy_file 'extension/gitignore', File.join(name, '.gitignore') unless options[:'skip-git']
       template 'extension/Rakefile', File.join(name, 'Rakefile')

data/lib/middleman-cli/init.rb

@@ -22,6 +22,10 @@ module Middleman::Cli
                  default: false,
                  desc: 'Skip bundle install'
 
+    class_option 'bundle-path',
+                 type: :string,
+                 desc: 'Use specified bundle path'
+
     # The init task
     def init
       require 'fileutils'
@@ -35,38 +39,29 @@ module Middleman::Cli
       end
 
       repo_path, repo_branch = if shortname?(options[:template])
-        require 'open-uri'
-        require 'json'
-
-        api = 'https://directory.middlemanapp.com/api'
-        uri = ::URI.parse("#{api}/#{options[:template]}.json")
-
-        begin
-          data = ::JSON.parse(uri.read)
-          data['links']['github']
-          data['links']['github'].split('#')
-        rescue ::OpenURI::HTTPError
-          say "Template `#{options[:template]}` not found in Middleman Directory."
-          say 'Did you mean to use a full `user/repo` path?'
-          exit 1
-        end
-      else
-        repo_name, repo_branch = options[:template].split('#')
-        [repository_path(repo_name), repo_branch]
-      end
-
-      dir = Dir.mktmpdir
+                                 require 'open-uri'
+                                 require 'json'
+
+                                 api = 'https://directory.middlemanapp.com/api'
+                                 uri = ::URI.parse("#{api}/#{options[:template]}.json")
+
+                                 begin
+                                   data = ::JSON.parse(uri.read)
+                                   is_local_dir = false
+                                   data['links']['github'].split('#')
+                                 rescue ::OpenURI::HTTPError
+                                   say "Template `#{options[:template]}` not found in Middleman Directory."
+                                   say 'Did you mean to use a full `user/repo` path?'
+                                   exit 1
+                                 end
+                               else
+                                 repo_name, repo_branch = options[:template].split('#')
+                                 repo_path, is_local_dir = repository_path(repo_name)
+                                 [repo_path, repo_branch]
+                               end
 
       begin
-        branch_cmd = repo_branch ? "-b #{repo_branch} " : ''
-
-        git_path = "#{branch_cmd}#{repo_path}"
-        run("#{GIT_CMD} clone --depth 1 #{branch_cmd}#{repo_path} #{dir}")
-
-        unless $?.success?
-          say "Git clone command failed. Make sure git repository exists: #{git_path}", :red
-          exit 1
-        end
+        dir = is_local_dir ? repo_path : clone_repository(repo_path, repo_branch)
 
         inside(target) do
           thorfile = File.join(dir, 'Thorfile')
@@ -80,10 +75,11 @@ module Middleman::Cli
             directory dir, '.', exclude_pattern: /\.git\/|\.gitignore$/
           end
 
-          run('bundle install') unless ENV['TEST'] || options[:'skip-bundle']
+          bundle_args = options[:'bundle-path'] ? " --path=#{options[:'bundle-path']}" : ''
+          run("bundle install#{bundle_args}") unless ENV['TEST'] || options[:'skip-bundle']
         end
       ensure
-        FileUtils.remove_entry(dir) if File.directory?(dir)
+        FileUtils.remove_entry(dir) if !is_local_dir && File.directory?(dir)
       end
     end
 
@@ -92,6 +88,7 @@ module Middleman::Cli
     # Copied from Bundler
     def git_present?
       return @git_present if defined?(@git_present)
+
       @git_present = which(GIT_CMD) || which('git.exe')
     end
 
@@ -112,8 +109,30 @@ module Middleman::Cli
       repo.split('/').length == 1
     end
 
-    def repository_path(repo)
-      repo.include?('://') || repo.include?('git@') ? repo : "https://github.com/#{repo}.git"
+    def repository_path(repo_name)
+      if repo_name.include?('://') || /^[^@]+@[^:]+:.+/ =~ repo_name
+        repo_name
+      elsif (repo_path = Pathname(repo_name)).directory? && repo_path.absolute?
+        [repo_name, true]
+      else
+        "https://github.com/#{repo_name}.git"
+      end
+    end
+
+    def clone_repository(repo_path, repo_branch)
+      dir = Dir.mktmpdir
+
+      branch_cmd = repo_branch ? "-b #{repo_branch} " : ''
+
+      git_path = "#{branch_cmd}#{repo_path}"
+      run("#{GIT_CMD} clone --depth 1 #{branch_cmd}#{repo_path} #{dir}")
+
+      unless $CHILD_STATUS.success?
+        say "Git clone command failed. Make sure git repository exists: #{git_path}", :red
+        exit 1
+      end
+
+      dir
     end
 
     # Add to CLI

data/lib/middleman-cli/templates/extension/Gemfile

@@ -12,7 +12,7 @@ group :development do
 end
 
 group :test do
-  gem 'cucumber'
   gem 'aruba'
+  gem 'cucumber'
   gem 'rspec'
 end

data/lib/middleman-cli/templates/extension/Rakefile

@@ -4,7 +4,7 @@ Bundler::GemHelper.install_tasks
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  t.cucumber_opts = '--color --tags ~@wip --strict'
+  t.cucumber_opts = '--fail-fast --color --tags "not @wip" --strict'
 end
 
 require 'rake/clean'

data/lib/middleman-cli/templates/extension/gemspec

@@ -11,8 +11,7 @@ Gem::Specification.new do |s|
   # s.summary     = %q{A short summary of your extension}
   # s.description = %q{A longer description of your extension}
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(fixtures|features|spec)/}) }
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   

data/lib/middleman-cli/templates/extension/lib/lib/extension.rb

@@ -5,7 +5,7 @@ require 'middleman-core'
 class MyExtension < ::Middleman::Extension
   option :my_option, 'default', 'An example option'
 
-  def initialize(app, options_hash={}, &block)
+  def initialize(app, _options_hash = ::Middleman::EMPTY_HASH, &block)
     # Call super to build options from the options_hash
     super
 

data/lib/middleman-cli/templates/extension/lib/lib.rb

@@ -1,6 +1,6 @@
 require "middleman-core"
 
 Middleman::Extensions.register :<%= name %> do
-  require "my-extension/extension"
+  require "<%= name %>/extension"
   MyExtension
 end

data/lib/middleman-cli.rb

@@ -1,7 +1,5 @@
-# rubocop:disable FileName
-
 # Setup our load paths
-libdir = File.expand_path(File.dirname(__FILE__))
+libdir = __dir__
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 # Require Thor since that's what the whole CLI is built around

data/middleman-cli.gemspec

@@ -11,14 +11,13 @@ Gem::Specification.new do |s|
   s.email       = ['me@tdreyno.com', 'ben@benhollis.net']
   s.homepage    = 'http://middlemanapp.com'
   s.summary     = 'Hand-crafted frontend development'
-  s.description = 'A static site generator. Provides dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.'
+  s.description = 'A static site generator. Provides dozens of templating languages (Haml, Sass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.'
 
-  s.files        = `git ls-files -z`.split("\0")
-  s.test_files   = `git ls-files -z -- {fixtures,features}/*`.split("\0")
+  s.files       = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(fixtures|features|spec)/}) }
   s.executable   = 'middleman'
   s.require_path = 'lib'
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.3.0'
 
   # CLI
-  s.add_dependency('thor', ['>= 0.17.0', '< 1.3.0'])
+  s.add_dependency('thor', ['>= 0.17.0', '< 2.0'])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cli
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 5.0.0.rc.1
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -20,7 +20,7 @@ dependencies:
         version: 0.17.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,10 +30,10 @@ dependencies:
         version: 0.17.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '2.0'
 description: A static site generator. Provides dozens of templating languages (Haml,
-  Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache
-  busting, Yaml data (and more) an easy part of your development cycle.
+  Sass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting,
+  Yaml data (and more) an easy part of your development cycle.
 email:
 - me@tdreyno.com
 - ben@benhollis.net
@@ -47,24 +47,6 @@ files:
 - ".yardopts"
 - Rakefile
 - bin/middleman
-- features/cli_extension.feature
-- features/cli_init.feature
-- features/preview_server-hook.feature
-- features/preview_server.feature
-- features/support/env.rb
-- fixtures/preview-server-app/bin/dns_server.rb
-- fixtures/preview-server-app/config.rb
-- fixtures/preview-server-app/source/index.html.erb
-- fixtures/preview-server-app/source/layout.erb
-- fixtures/preview-server-app/source/layouts/custom.erb
-- fixtures/preview-server-app/source/real.html
-- fixtures/preview-server-app/source/real/index.html.erb
-- fixtures/preview-server-app/source/should_be_ignored.html
-- fixtures/preview-server-app/source/should_be_ignored2.html
-- fixtures/preview-server-app/source/should_be_ignored3.html
-- fixtures/preview-server-app/source/static.html
-- fixtures/preview-server-hook-app/config.rb
-- fixtures/preview-server-hook-app/source/index.html.erb
 - lib/middleman-cli.rb
 - lib/middleman-cli/build.rb
 - lib/middleman-cli/config.rb
@@ -81,8 +63,6 @@ files:
 - lib/middleman-cli/templates/extension/lib/lib/extension.rb
 - lib/middleman-core/cli.rb
 - middleman-cli.gemspec
-- spec/middleman/.gitkeep
-- spec/spec_helper.rb
 homepage: http://middlemanapp.com
 licenses:
 - MIT
@@ -95,14 +75,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development

data/features/cli_extension.feature

@@ -1,14 +0,0 @@
-Feature: Middleman New Extension CLI
-
-  Scenario: Create a new extension scaffold
-    Given I run `middleman extension my-extension-library`
-    Then the exit status should be 0
-    When I cd to "my-extension-library"
-    Then the following files should exist:
-      | Gemfile                                       |
-      | Rakefile                                      |
-      | my-extension-library.gemspec                  |
-      | features/support/env.rb                       |
-      | lib/my-extension-library/extension.rb         |
-      | lib/my-extension-library.rb                   |
-      | .gitignore                                    |

data/features/cli_init.feature

@@ -1,92 +0,0 @@
-Feature: Middleman CLI
-
-  Scenario: Create a new project
-    When I run `middleman init MY_PROJECT` interactively
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    Then the exit status should be 0
-    When I cd to "MY_PROJECT"
-    Then the following files should exist:
-      | Gemfile                                       |
-      | .gitignore                                    |
-      | config.rb                                     |
-      | source/index.html.erb                         |
-      | source/layouts/layout.erb                     |
-      | source/javascripts/site.js                     |
-      | source/stylesheets/site.css.scss              |
-
-  Scenario: Create a new project in the current directory
-    Given a directory named "MY_PROJECT"
-    When I cd to "MY_PROJECT"
-    And I run `middleman init` interactively
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    Then the exit status should be 0
-    And the following files should exist:
-      | Gemfile                                       |
-      | config.rb                                     |
-      | source/index.html.erb                         |
-
-  Scenario: Create a new project (alias i)
-    When I run `middleman i MY_PROJECT` interactively
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    Then a directory named "MY_PROJECT" should exist
-
-  Scenario: Create a new project (alias new)
-    When I run `middleman new MY_PROJECT` interactively
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    Then a directory named "MY_PROJECT" should exist
-
-  Scenario: Create a new project (alias n)
-    When I run `middleman n MY_PROJECT` interactively
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    Then a directory named "MY_PROJECT" should exist
-
-  Scenario: Create a new project using Middleman directory
-    When I run `middleman init MY_PROJECT -T blog`
-    Then a directory named "MY_PROJECT" should exist
-    When I cd to "MY_PROJECT"
-    And the file "Gemfile" should contain "middleman-blog"
-    And the file ".gitignore" should exist
-
-  Scenario: Create an invalid project using Middleman directory
-    When I run `middleman init MY_PROJECT -T does-not-exist-for-reals`
-    Then the exit status should be 1
-
-  Scenario: Create a new project using github(user/repository)
-    When I run `middleman init MY_PROJECT -T middleman/middleman-templates-default` interactively
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    Then a directory named "MY_PROJECT" should exist
-
-  Scenario: Create a new project using github(user/repository#branch)
-    When I run `middleman init MY_PROJECT -T middleman/middleman-templates-default#master` interactively
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    Then a directory named "MY_PROJECT" should exist
-    And the output should contain "-b master"
-
-  Scenario: Create a new project using full path(://)
-    When I run `middleman init MY_PROJECT -T https://github.com/middleman/middleman-templates-default.git` interactively
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    And I type "y"
-    Then a directory named "MY_PROJECT" should exist

data/features/preview_server-hook.feature

@@ -1,17 +0,0 @@
-Feature: Run preview server before hook
-
-  Scenario: When run
-    Given a fixture app "preview-server-hook-app"
-    And the default aruba timeout is 30 seconds
-    When I run `middleman server --server-name localhost --bind-address 127.0.0.1` interactively
-    And I stop middleman if the output contains:
-    """
-    ### END ###
-    """
-    Then the output should contain:
-    """
-    /// 127.0.0.1:4567 ///
-    /// 4567 ///
-    /// localhost ///
-    /// http://localhost:4567 ///
-    """

data/features/preview_server.feature

@@ -1,535 +0,0 @@
-Feature: Run the preview server
-
-  As a software developer
-  I want to start the preview server
-  In order to view my changes immediately in the browser
-
-  Background:
-    Given a fixture app "preview-server-app"
-    And the default aruba timeout is 30 seconds
-
-  Scenario: Start the server with defaults
-    When I run `middleman server` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    And the output should contain:
-      """
-      View your site at "http://
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://
-      """
-
-  Scenario: Start the server with defaults in verbose mode
-    When I run `middleman server --verbose` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to ":::4567", "0.0.0.0:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://
-      """
-
-  @wip
-  Scenario: Start the server with defaults in verbose mode, when a local mdns server resolves the local hostname
-    Given I start a mdns server for the local hostname
-    When I run `middleman server --verbose` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to ":::4567", "0.0.0.0:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://
-      """
-
-  Scenario: Start the server with bind address 127.0.0.1
-    Given I have a local hosts file with:
-      """
-      # <ip-address> <hostname.domain.org> <hostname>
-      127.0.0.1 localhost.localdomain localhost
-      """
-    When I run `middleman server --verbose --bind-address 127.0.0.1` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to "127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://127.0.0.1:4567/__middleman"
-      """
-
-  Scenario: Start the server with bind address 127.0.0.1 configured via config.rb
-    Given I have a local hosts file with:
-      """
-      # <ip-address> <hostname.domain.org> <hostname>
-      127.0.0.1 localhost.localdomain localhost
-      """
-    And a file named "config.rb" with:
-      """
-      set :bind_address, '127.0.0.1'
-      """
-    When I run `middleman server --verbose` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to "127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://127.0.0.1:4567/__middleman"
-      """
-
-  @wip
-  Scenario: Start the server with bind address 127.0.0.5
-
-    This will have no hostname attached because the hosts file, the DNS server
-    and the MDNS-server do not know anything about 127.0.0.5
-
-    When I run `middleman server --verbose --bind-address 127.0.0.5` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to "127.0.0.5:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://127.0.0.5:4567"
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://127.0.0.5:4567/__middleman"
-      """
-
-  @wip
-  Scenario: Start the server with bind address ::1
-    Given a file named ".hosts" with:
-      """
-      # <ip-address> <hostname.domain.org> <hostname>
-      ::1 localhost.localdomain localhost
-      """
-    When I run `middleman server --verbose --bind-address ::1` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to "::1:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://[::1]:4567"
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://[::1]:4567/__middleman"
-      """
-
-  Scenario: Start the server with bind address 0.0.0.0
-    When I run `middleman server --verbose --bind-address 0.0.0.0` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to "0.0.0.0:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://
-      """
-
-  Scenario: Start the server with bind address ::
-    When I run `middleman server --verbose --bind-address ::` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to ":::4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://
-      """
-
-  Scenario: Start the server with server name "localhost"
-    Given I have a local hosts file with:
-      """
-      # <ip-address> <hostname.domain.org> <hostname>
-      127.0.0.1 localhost.localdomain localhost
-      """
-    When I run `middleman server --verbose --server-name localhost` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to "127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://localhost:4567", "http://127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://localhost:4567/__middleman", "http://127.0.0.1:4567/__middleman"
-      """
-
-  Scenario: Start the server with server name "localhost" configured via config.rb
-    Given I have a local hosts file with:
-      """
-      # <ip-address> <hostname.domain.org> <hostname>
-      127.0.0.1 localhost.localdomain localhost
-      """
-    And a file named "config.rb" with:
-      """
-      set :server_name, 'localhost'
-      """
-    When I run `middleman server --verbose` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to "127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://localhost:4567", "http://127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://localhost:4567/__middleman", "http://127.0.0.1:4567/__middleman"
-      """
-
-  Scenario: Start the server with server name "localhost" and bind address "127.0.0.1"
-    Given I have a local hosts file with:
-      """
-      # <ip-address> <hostname.domain.org> <hostname>
-      127.0.0.1 localhost.localdomain localhost
-      """
-    When I run `middleman server --verbose --server-name localhost --bind-address 127.0.0.1` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to "127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://localhost:4567", "http://127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://localhost:4567/__middleman", "http://127.0.0.1:4567/__middleman"
-      """
-
-  Scenario: Start the server with server name "127.0.0.1"
-    When I run `middleman server --verbose --server-name 127.0.0.1` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to "127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://127.0.0.1:4567/__middleman"
-      """
-
-  Scenario: Start the server with server name "::1"
-    When I run `middleman server --verbose --server-name ::1` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to "::1:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://[::1]:4567"
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://[::1]:4567/__middleman"
-      """
-
-  Scenario: Start the server with https
-    When I run `middleman server --verbose --https` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to ":::4567", "0.0.0.0:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "https://
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "https://
-      """
-
-  Scenario: Start the server with port 65432
-    When I run `middleman server --verbose --port 65432` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to ":::65432", "0.0.0.0:65432"
-      """
-
-  Scenario: Start the server with port 65432 configured via config.rb
-    Given a file named "config.rb" with:
-      """
-      set :port, 65432
-      """
-    When I run `middleman server --verbose` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to ":::65432", "0.0.0.0:65432"
-      """
-
-  @wip
-  Scenario: Start the server when port is blocked by other middleman instance
-    Given `middleman server` is running in background
-    When I run `middleman server --verbose` interactively
-    And I stop all commands if the output of the last command contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman uses a different port
-      """
-
-  Scenario: Start the server with bind address 1.1.1.1
-
-    This should fail, because "1.1.1.1" is not an interface available on this computer.
-
-    Given a file named ".hosts" with:
-      """
-      1.1.1.1  www.example.com www
-      """
-    When I run `middleman server --verbose --bind-address 1.1.1.1` interactively
-    And I stop middleman if the output contains:
-      """
-      Running Middleman failed:
-      """
-    Then the output should contain:
-      """
-      Bind address "1.1.1.1" is not available on your system
-      """
-
-  Scenario: Start the server with server name www.example.com and bind address 0.0.0.0
-
-    This should fail, because the user can just use `--server-name`. It does
-    not make sense for `middleman` to only listen on `0.0.0.0` (IPv4 all
-    interfaces), but not on `::` (IPv6 all interfaces). There are other tools
-    like `iptables` (Linux-only) or better some `kernel`-configurations to make
-    this possible.
-
-    When I run `middleman server --verbose --server-name www.example.com --bind-address 0.0.0.0` interactively
-    And I stop middleman if the output contains:
-      """
-      Running Middleman failed:
-      """
-    Then the output should contain:
-      """
-      Undefined combination of options "--server-name" and "--bind-address".
-      """
-
-  Scenario: Start the server with server name "www.example.com" and bind address "127.0.0.1"
-
-    This should fail because the server name does not resolve to the ip address.
-
-    Given a file named ".hosts" with:
-      """
-      1.1.1.1  www.example.com www
-      """
-    When I run `middleman server --verbose --server-name www.example.com --bind-address 127.0.0.1` interactively
-    And I stop middleman if the output contains:
-      """
-      Running Middleman failed:
-      """
-    Then the output should contain:
-      """
-      Server name "www.example.com" does not resolve to bind address "127.0.0.1". Please fix that and try again.
-      """
-
-  Scenario: Start the server with server name "garbage.example.com"
-    When I run `middleman server --verbose --server-name garbage.example.com` interactively
-    And I stop middleman if the output contains:
-      """
-      Running Middleman failed:
-      """
-    Then the output should contain:
-      """
-      Server name "garbage.example.com" does not resolve to an ip address. Please fix that and try again.
-      """
-
-  Scenario: Start the server with server name "www.example.com" and the network name server is used to resolve the server name
-    Given I have a local hosts file with:
-      """
-      # empty
-      """
-    And I start a mdns server with:
-      """
-      # empty
-      """
-    And I start a dns server with:
-      """
-      www.example.com: 127.0.0.1
-      """
-    When I run `middleman server --verbose --server-name www.example.com` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to "127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://www.example.com:4567", "http://127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://www.example.com:4567/__middleman", "http://127.0.0.1:4567/__middleman"
-      """
-
-  @wip
-  Scenario: Start the server with server name "host.local" and the link local name server is used to resolve the server name
-
-    To make the mdns resolver resolve a name, it needs to end with ".local".
-    Otherwise the resolver returns [].
-
-    Given I have a local hosts file with:
-      """
-      # empty
-      """
-    And I start a mdns server with:
-      """
-      host.local: 127.0.0.1
-      """
-    When I run `middleman server --verbose --server-name host.local` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to "127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://host.local:4567", "http://127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://host.local:4567/__middleman", "http://127.0.0.1:4567/__middleman"
-      """
-
-  @wip
-  Scenario: Start the server with server name "host" and the link local name server is used to resolve the server name
-
-    To make the mdns resolver resolve a name, it needs to end with ".local". If
-    a plain hostname is given `middleman` appends ".local" automatically.
-
-    Given I have a local hosts file with:
-      """
-      # empty
-      """
-    And I start a mdns server with:
-      """
-      host.local: 127.0.0.1
-      """
-    When I run `middleman server --verbose --server-name host` interactively
-    And I stop middleman if the output contains:
-      """
-      Inspect your site configuration
-      """
-    Then the output should contain:
-      """
-      The Middleman preview server is bound to "127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      View your site at "http://host.local:4567", "http://127.0.0.1:4567"
-      """
-    And the output should contain:
-      """
-      Inspect your site configuration at "http://host.local:4567/__middleman", "http://127.0.0.1:4567/__middleman"
-      """

data/features/support/env.rb

@@ -1,12 +0,0 @@
-ENV["TEST"] = "true"
-
-require 'sassc'
-
-require 'simplecov'
-SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
-
-SimpleCov.start
-
-PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
-require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-cli')
-require File.join(File.dirname(PROJECT_ROOT_PATH), 'middleman-core', 'lib', 'middleman-core', 'step_definitions')

data/fixtures/preview-server-app/bin/dns_server.rb

@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubydns'
-require 'psych'
-
-db_file = ARGV[0]
-port = ARGV[1] || 5300
-
-db =  if File.file? db_file
-        $stderr.puts 'Found dns db'
-        Psych.load_file(db_file)
-      else
-        $stderr.puts 'Found no dns db. Use default db.'
-
-        {
-          /www\.example\.org/ => '1.1.1.1'
-        }
-      end
-
-interfaces = [
-    [:udp, "127.0.0.1", port],
-    [:tcp, "127.0.0.1", port]
-]
-
-
-# Start the RubyDNS server
-RubyDNS::run_server(listen: interfaces) do
-  db.each do |matcher, result|
-    match(matcher, Resolv::DNS::Resource::IN::A) do |transaction|
-      transaction.respond!(result)
-    end
-  end
-end

data/fixtures/preview-server-app/source/index.html.erb

@@ -1 +0,0 @@
-<h1>Welcome</h1>

data/fixtures/preview-server-app/source/layout.erb

@@ -1,9 +0,0 @@
-<html>
-  <head>
-    <title>My Sample Site</title>
-    <!-- Comment in layout -->
-  </head>
-  <body>
-    <%= yield %>
-  </body>
-</html>

data/fixtures/preview-server-app/source/layouts/custom.erb

@@ -1,8 +0,0 @@
-<html>
-  <head>
-    <title>Custom Layout</title>
-  </head>
-  <body>
-    <%= yield %>
-  </body>
-</html>

data/fixtures/preview-server-app/source/real/index.html.erb

@@ -1,5 +0,0 @@
----
-layout: false
----
-
-I am real: <%= @num %>

data/fixtures/preview-server-app/source/real.html

@@ -1 +0,0 @@
-I am real

data/fixtures/preview-server-app/source/should_be_ignored.html

@@ -1 +0,0 @@
-<h1>Ignore me!</h1>

data/fixtures/preview-server-app/source/should_be_ignored2.html

@@ -1 +0,0 @@
-<h1>Ignore me! 2</h1>

data/fixtures/preview-server-app/source/should_be_ignored3.html

@@ -1 +0,0 @@
-<h1>Ignore me! 3</h1>

data/fixtures/preview-server-app/source/static.html

@@ -1 +0,0 @@
-Static, no code!

data/fixtures/preview-server-hook-app/config.rb

@@ -1,19 +0,0 @@
-set :layout, false
-
-class MyFeature < Middleman::Extension
-  def initialize(app, options_hash = {}, &block)
-    super
-
-    app.before_server do |server_information|
-      puts "/// #{server_information.listeners.first} ///"
-      puts "/// #{server_information.port} ///"
-      puts "/// #{server_information.server_name} ///"
-      puts "/// #{server_information.site_addresses.first} ///"
-      puts "/// ### END ### ///"
-    end
-  end
-end
-
-::Middleman::Extensions.register(:my_feature, MyFeature)
-
-activate :my_feature

data/fixtures/preview-server-hook-app/source/index.html.erb

@@ -1,9 +0,0 @@
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>preview-server-hook-app</title>
-  </head>
-  <body>
-    <h1>preview-server-hook-app</h1>
-  </body>
-</html>

data/spec/middleman/.gitkeep

@@ -1 +0,0 @@
-.gitkeep