Replace hooks

.editorconfig

@@ -1,13 +0,0 @@
-# editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false

.gitignore

@@ -1,6 +1,3 @@
-.byebug_history
-npm-debug.log
-manifest.yaml
 /.bundle
 .DS_Store
 coverage
@@ -13,7 +10,6 @@ Gemfile.lock
 docs
 .rbenv-*
 .ruby-version
-.ruby-gemset
 .*.swp
 build
 doc
@@ -24,4 +20,4 @@ Makefile
 .idea
 *.sublime-workspace
 /bin
-middleman-core/fixtures/compass-sprites-app/source/images/icon-s0de2218f58.png
+middleman-core/fixtures/compass-sprites-app/source/images/icon-s0de2218f58.png

.rubocop.yml

@@ -10,13 +10,11 @@ AllCops:
     - '**/tmp/**/*'
     - '**/bin/**/*'
     - 'middleman-core/lib/middleman-core/step_definitions/**/*'
+    - 'middleman-core/lib/vendored-middleman-deps/**/*'
+    - 'middleman-cli/lib/middleman-templates/**/*'
     - 'middleman-core/fixtures/**/*'
     - 'middleman-core/features/**/*'
     - 'middleman-core/spec/**/*'
-    - 'middleman-cli/lib/middleman-cli/templates/**/*'
-    - 'middleman-cli/fixtures/**/*'
-    - 'middleman-cli/features/**/*'
-    - 'middleman-cli/spec/**/*'
 DoubleNegation:
   Enabled: false
 LineLength:
@@ -27,10 +25,14 @@ ClassLength:
   Enabled: false
 Documentation:
   Enabled: false
+Encoding:
+  Enabled: false
 HashSyntax:
   EnforcedStyle: ruby19
 SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: no_space
+BlockDelimiters:
+  Enabled: false
 PerlBackrefs:
   Enabled: false
 ClassAndModuleChildren:
@@ -39,6 +41,8 @@ AssignmentInCondition:
   Enabled: false
 CyclomaticComplexity:
   Enabled: false
+AbcSize:
+  Enabled: false
 HandleExceptions:
   Enabled: false
 EndAlignment:
@@ -52,20 +56,8 @@ FormatString:
 CaseIndentation:
   IndentWhenRelativeTo: end
 TrivialAccessors:
-  Enabled: false
-SingleLineBlockParams:
-  Enabled: false
+  ExactNameMatch: true
 Metrics/AbcSize:
   Enabled: false
 Metrics/PerceivedComplexity:
   Enabled: false
-Style/ParallelAssignment:
-  Enabled: false
-Style/BlockDelimiters:
-  Enabled: false
-Style/MultilineBlockChain:
-  Enabled: false
-Style/SpecialGlobalVars:
-  Enabled: false
-Style/FrozenStringLiteralComment:
-  Enabled: false

.travis.yml

@@ -5,19 +5,25 @@ before_script:
   - bundle update
 rvm:
   - ruby-head
-  - 2.3.1
-  - 2.2.4
+  - jruby-head
+  - jruby-19mode
+  - 2.2
+  - 2.1
+  - 2.0
 os:
   - linux
-  # - osx
+  - osx
 matrix:
   fast_finish: true
   allow_failures:
     - rvm: ruby-head
+    - rvm: jruby-19mode
+    - rvm: jruby-head
 env:
   global:
+    - JRUBY_OPTS='-J-Xmx1024M'
     - TEST=true
-    - CODECLIMATE_REPO_TOKEN=81787f7b1c3bfa937edadcafbc94f807bf5af5c1142c7b793f2d9969a271de1f
+    - CODECLIMATE_REPO_TOKEN=81787f7b1c3bfa937edadcafbc94f807bf5af5c1142c7b793f2d9969a271de1f 
 script: bundle exec rake test
 notifications:
   slack: middleman:JW9OvXmn1m3XrSERe8866nBR

CHANGELOG.md

@@ -1,135 +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.
-
-# 4.1.11
-
-* Upgrade to Rack 2.
-
-# 4.1.10
-
-* Fix unicode issues in URL deeplinks.
-* Add prefix option to asset_hash (#1949)
-
-# 4.1.9
-
-* Fix `--watcher-*` CLI flags.
-* Allow spaces in paths to work with `link_to`. Fixes #1914
-* Add support for dotenv
-* Fix asset_url with asset_hash (#1919)
-* Allow partial lookups without a current_resource (#1912)
-
-# 4.1.8
-
-* Expose `development?` and `production?` helpers to template context.
-* require the `try` core extension (#1911)
-* Fix contract for Sitemap::Store.register_resource_list_manipulator (#1907)
-* Loosen contract on Resource#source_file to Maybe[String] (#1906)
-* Let collection loops access ConfigContext for helpers. #1879
-* Use https:// to clone templates (#1901)
-* Allow numbers to be unique page_ids (#1886)
-* Prevent infinite loop when encountering files where base filename is a possible templating engine
-
-# 4.1.7
-
-* Upgrade fastimage to 2.0
-* Fix shutdown of external_pipeline commands when config.rb is changed. #1877
-* Allow calls to `app.` to work as collections after initial config parse. #1876
-
-
-# 4.1.5-4.1.6
-
-* Fix file recursion when looking for possible asset dependencies. Major preview server performance improvement.
-
-# 4.1.4
-
-* Unify default extensions for all URL processing extensions. #1855
-* Fix URL regex for `content: ` context of CSS. #1853
-* Make sure CLI config over-rides `config.rb` order.
-* Fix relative assets in some contexts. #1842
-
-# 4.1.3
-
-* Expose all top-level config options to CLI (flags now match config. latency -> watcher_latency, etc).
-* Fix directory indexes with `.htm` and `.xhtml` files. #1821
-
-# 4.1.2
-
-* Add `page_id` concept. Using the `id` key in frontmatter, proxy or page will set an ID on a resource which can be referenced by `url_for` and `link_to`.
-* Allow looking for `Gemfile` when setting up a project to fail gracefully.
-* Send correct exit code when external_pipeline fails during build.
-* Fix error when customizing `layouts_dir`. #1028
-* Fix collections (commands in loops) not being processed by `page` command. #1226
-* Correctly asset_hash sourcemap references.
-
-# 4.1.1
-
-* Fix bad code that made `/__middleman/` break.
-
-# 4.1.0
-
-* Add rewrite_ignore option to asset_hash, asset_host, cache_buster & relative_assets. This proc let's you opt-out of the extension behavior on a per-path basis.
-* gzip extension now compresses svgs by default
-* Fix the `encoding` option.
-* Fix relative paths on `image_tag` helper.
-* Correctly exit with error code on failed `init`
-* Fixed `asset_hash` when path has query string or #hashes
-* Fix new extension template
-* Don't parse frontmatter on ignored files.
-* Fix displaying frontmatter on `/__middleman/sitemap`
-* Add `skip_build_clean` config which when set to a block, will avoid removing non-generated paths from build, like .git #1716
-* Minor performance improvements
-* DRY-up config.rb-specific commands like `ignore` or `path`.
-* Fix automatic images with absolute (or images dir missing) paths in markdown. Fixes #1755
-* Fix asset_host in combination with Google Analytics snippet. #1751
-* Show an error message when git CLI is not available. #1765
-* Correctly show file names of GZIP'ed assets. #1364
-* Build file output is now parallel-ized! Use `middleman build --no-parallel` to disable.
-* Make template file extensions that get layouts by default configurable via `config[:extensions_with_layout]`
-* Remove `=` from inline url matcher. This means paths in HTML attributes MUST be quoted. Fixes #1780
-
-# 4.0.0
-
-* Add `:locales` and `:data` source types to the list of files which trigger a live-reload.
-* Rename i18n `lang` and `langs` to `locale` and `locales`.
-* Avoid matching URLs across new lines. #1689
-* Load Middleman Directory when doing `init` over SSL
-* Fix `external_pipeline` first runs running out of sequence.
-
-# 4.0.0.rc.2
-
-* Rather than applying layouts to all files which are not .txt, .css, .js, .json: the new behavior is to only default layouts to active for .html
-* Switch from Ruby Sass to SassC.
-* `relative_assets` extension overrides local `relative: false` option to stylesheet/javascript tag helpers.
-* Add `before_server`-hook to the preview server which is run before the Webrick server is started
-* Add `-d` to `middleman server` to make it run as daemon
-* Trigger "Possible File Change" events on files which share an output or template type with a changed file. Allows LiveReload to update on partial changes.
-* Added `import_file SOURCE, TARGET` and `import_path SOURCE_FOLDER` to copy resources from outside the project in. Does NOT do file change watching. Perfect for `bower_components`.
-
-# 4.0.0.rc.1
-
-* Removed ability to use JSON as frontmatter. Still allowed in data/ folder.
-* Added YAML data postscript. Like frontmatter, but reversed. Attach content after the key/value data as a `:postscript` key to the data structure (if Hash).
-
-# 4.0.0.beta.2
-
-* Fixed regression causing exceptions to be silently thrown away outside of `--verbose` mode in the dev server.
-* Pull in `--ssl` option from stable.
-* Replace `hooks` gem with custom callback solution.
-
-# 4.0.0.beta.1
-
 * Add `resources` class method to extensions to allow simple string-based resource generation.
 * rename `app.add_to_instance` to `Extension.expose_to_application` for adding extension-local methods to the shared app instance.
 * rename `app.add_to_config_context` to `Extension.expose_to_config` for adding extension-local methods to the sandboxed scope of `config.rb`
-* Add `Extension.expose_to_template`, which auto binds copies of extension-local methods into a Template context.
+* Add `Extension.expose_to_templates`, which auto binds copies of extension-local methods into a Template context.
 * Remove side-loading of CLI tasks from `tasks/`
 * Add the option of naming `config.rb` as `middleman.rb`.
 * Builder extracted from Thor. `after_build` hook now passes an instance of a Builder instead of the Thor CLI.
@@ -158,4 +33,3 @@ master
 * Remove deprecated `request` instance
 * Remove old module-style extension support
 * Placed all `config.rb` evaluation inside the `ConfigContext` class
-* The preview server can now serve over HTTPS using the `--https` flag. It will use an automatic self-signed cert which can be overridden using `--ssl_certificate` and `--ssl_private_key`. These settings can also be set in `config.rb`

CONTRIBUTING.md

@@ -29,9 +29,6 @@ Ideally, a bug report should include a pull request with failing specs.
 [gist]: https://gist.github.com/
 
 ## Submitting a Pull Request
-
-**WE DO NOT ACCEPT NEW FEATURES FOR THE V3 BRANCH ANYMORE**
-
 1. [Fork the repository.][fork]
 2. Create a topic [branch]. `git checkout -b local_topic_branch`
 3. Add specs for your unimplemented feature or bug fix.

Gemfile

@@ -5,34 +5,25 @@ gem 'rake', '~> 10.3', require: false
 gem 'yard', '~> 0.8', require: false
 
 # Test tools
-gem 'byebug'
-gem 'aruba', '~> 0.7.4', require: false
-gem 'rspec', '~> 3.0', require: false
-gem 'cucumber', '~> 2.0', require: false
-gem 'addressable', '~> 2.4.0', require: false
-
-# Pry tools
-gem 'pry'
+gem 'pry', '~> 0.10', group: :development, require: false
+gem 'pry-byebug'
 gem 'pry-stack_explorer'
-gem 'pry-rescue'
+gem 'aruba', '~> 0.6', require: false
+gem 'rspec', '~> 3.0', require: false
+gem 'fivemat', '~> 1.3', require: false
+gem 'cucumber', '~> 1.3', require: false
 
 # Optional middleman dependencies, included for tests
 gem 'haml', '>= 4.0.5', require: false
-gem 'sassc', '~> 1.8', require: false
 gem 'coffee-script', '~> 2.2', require: false
 gem 'kramdown', '~> 1.2', require: false
+gem 'less', '2.3', require: false
 gem 'slim', '>= 2.0', require: false
 gem 'liquid', '>= 2.6', require: false
 gem 'stylus', '>= 1.0', require: false
-gem 'sinatra', '>= 2.0.0.beta2', require: false
-gem 'redcarpet', '>= 3.1', require: false
-
-# Dns server to test preview server
-gem 'rubydns', '~> 1.0.1', require: false
-
-# To test javascript
-gem 'poltergeist', '~> 1.8', require: false
-gem 'phantomjs', '~> 2.1.1.0', require: false
+gem 'sinatra', '>= 1.4', require: false
+gem 'redcarpet', '>= 3.1', require: false unless RUBY_ENGINE == 'jruby'
+gem 'asciidoctor', '~> 0.1', require: false
 
 # For less, note there is no compatible JS runtime for windows
 gem 'therubyrhino', '>= 2.0', platforms: :jruby
@@ -40,13 +31,12 @@ gem 'therubyracer', '>= 0.12', platforms: :ruby
 
 # Code Quality
 gem 'rubocop', '~> 0.24', require: false
-gem 'simplecov', '~> 0.10', require: false
+gem 'simplecov', '~> 0.9', require: false
 gem 'coveralls', '~> 0.8', require: false
 gem 'codeclimate-test-reporter', '~> 0.3', require: false, group: :test
 
 # Middleman itself
 gem 'middleman-cli', path: 'middleman-cli'
 gem 'middleman-core', path: 'middleman-core'
-
 # gem 'middleman-compass', github: 'middleman/middleman-compass', require: false
 # gem 'middleman-sprockets', github: 'middleman/middleman-sprockets', require: false

ISSUE_TEMPLATE.md

@@ -1,9 +0,0 @@
-## Expected behavior and actual behavior
-
-## Steps to reproduce the problem (from a clean middleman installation)
-
-## Additional information
-
-- Ruby version: 
-- Middleman version: 
-- OS version: 

README.md

@@ -10,7 +10,7 @@ The last few years have seen an explosion in the amount and variety of tools dev
 
 * [Sass](http://sass-lang.com/) for DRY stylesheets
 * [CoffeeScript](http://coffeescript.org/) for safer and less verbose javascript
-* Multiple asset management solutions, including [Sprockets](https://github.com/rails/sprockets)
+* Multiple asset management solutions, including [Sprockets](https://github.com/sstephenson/sprockets)
 * [ERb](http://ruby-doc.org/stdlib-2.0.0/libdoc/erb/rdoc/ERB.html) & [Haml](http://haml.info/) for dynamic pages and simplified HTML syntax
 
 **Middleman** gives the stand-alone developer access to all these tools and many, many more. Why would you use a stand-alone framework instead of Ruby on Rails?
@@ -19,7 +19,7 @@ These days, many websites are built with an API in mind. Rather than package the
 
 ## Installation
 
-Middleman is built on Ruby and uses the RubyGems package manager for installation. These are usually pre-installed on Mac OS X and Linux. Windows users can install both using [RubyInstaller]. For windows [RubyInstaller-Devkit] is also required.
+Middleman is built on Ruby and uses the RubyGems package manager for installation. These are usually pre-installed on Mac OS X and Linux. Windows users can install both using [RubyInstaller].
 
 ```
 gem install middleman
@@ -91,7 +91,7 @@ The best way to get quick responses to your issues and swift fixes to your bugs
 
 ## Donate
 
-[Click here to lend your support to Middleman](https://plasso.co/s/4dXbHBorC3)
+[Click here to lend your support to Middleman](https://spacebox.io/s/4dXbHBorC3)
 
 ## Versioning
 
@@ -121,6 +121,5 @@ Copyright (c) 2010-2015 Thomas Reynolds. MIT Licensed, see [LICENSE] for details
 [codeclimate]: https://codeclimate.com/github/middleman/middleman
 [gittip]: https://www.gittip.com/middleman/
 [rubyinstaller]: http://rubyinstaller.org/
-[RubyInstaller-Devkit]: http://rubyinstaller.org/add-ons/devkit/
 [rubydoc]: http://rubydoc.info/github/middleman/middleman
 [LICENSE]: https://github.com/middleman/middleman/blob/master/LICENSE.md

Rakefile

@@ -1,9 +1,10 @@
+require 'rubygems' unless defined?(Gem)
 require 'rake'
 
 require File.expand_path('../middleman-core/lib/middleman-core/version.rb', __FILE__)
 
 ROOT = File.expand_path(File.dirname(__FILE__))
-GEM_NAME = 'middleman'.freeze
+GEM_NAME = 'middleman'
 
 middleman_gems = %w(middleman-core middleman-cli middleman)
 GEM_PATHS = middleman_gems.freeze
@@ -36,7 +37,7 @@ end
 desc 'Generate documentation for all middleman gems'
 task :doc do
   GEM_PATHS.each do |g|
-    Dir.chdir(File.join(ROOT, g).to_s) { sh "#{Gem.ruby} -S rake yard" }
+    Dir.chdir("#{File.join(ROOT, g)}") { sh "#{Gem.ruby} -S rake yard" }
   end
 end
 
@@ -45,14 +46,16 @@ task :test do
   Rake::Task['rubocop'].invoke
 
   GEM_PATHS.each do |g|
-    Dir.chdir(File.join(ROOT, g).to_s) { sh "#{Gem.ruby} -S rake test" }
+    Dir.chdir("#{File.join(ROOT, g)}") { sh "#{Gem.ruby} -S rake test" }
   end
+
+  Rake::Task['rubocop'].invoke
 end
 
 desc 'Run specs for all middleman gems'
 task :spec do
   GEM_PATHS.each do |g|
-    Dir.chdir(File.join(ROOT, g).to_s) { sh "#{Gem.ruby} -S rake spec" }
+    Dir.chdir("#{File.join(ROOT, g)}") { sh "#{Gem.ruby} -S rake spec" }
   end
 end
 

gem_rake_helper.rb

@@ -1,3 +1,4 @@
+require 'rubygems' unless defined?(Gem)
 require 'rake'
 require 'yard'
 
@@ -20,14 +21,15 @@ Cucumber::Rake::Task.new do |t|
   exempt_tags << '--tags ~@encoding' unless Object.const_defined?(:Encoding)
   exempt_tags << '--tags ~@nowindows' if Gem.win_platform?
   exempt_tags << '--tags ~@travishatesme' if ENV['TRAVIS'] == 'true'
-  t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict" # --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
+  t.cucumber_opts = "--color #{exempt_tags.join(' ')} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
 end
 
 Cucumber::Rake::Task.new(:cucumber_wip) do |t|
   exempt_tags = ['--tags @wip']
+  exempt_tags << '--tags ~@nojava' if RUBY_PLATFORM == 'java'
   exempt_tags << '--tags ~@encoding' unless Object.const_defined?(:Encoding)
   exempt_tags << '--tags ~@nowindows' if Gem.win_platform?
-  t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict" # --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
+  t.cucumber_opts = "--color #{exempt_tags.join(' ')} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
 end
 
 require 'rspec/core/rake_task'

middleman-cli/Rakefile

@@ -1,4 +1,4 @@
 # coding:utf-8
-RAKE_ROOT = __FILE__.freeze
-GEM_NAME = 'middleman-cli'.freeze
+RAKE_ROOT = __FILE__
+GEM_NAME = 'middleman-cli'
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

middleman-cli/bin/middleman

@@ -4,37 +4,11 @@ require 'middleman-core/profiling'
 if ARGV.include? '--profile'
   Middleman::Profiling.profiler = Middleman::Profiling::RubyProfProfiler.new
 end
-# Middleman::Profiling.start
+Middleman::Profiling.start
 
 require "middleman-core/load_paths"
 Middleman.setup_load_paths
 
-require 'dotenv'
-::Dotenv.load
-
-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,
-                          desc: setting.description
-      elsif setting.default.is_a?(TrueClass) || setting.default.is_a?(FalseClass)
-        base.class_option setting.key,
-                          type: :boolean,
-                          desc: setting.description
-      end
-    end
-  end
-end
-
 require "middleman-cli"
 
 # Change directory to the root
@@ -45,26 +19,5 @@ 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[:environment] = (ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development').to_sym
-  config[:mode] = :config
-  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)

middleman-cli/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 ///
-    """

middleman-cli/features/preview_server.feature

@@ -1,536 +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"
-    """
-
-  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"
-    """
-
-  @ruby-2.1
-  @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"
-    """
-
-  @ruby-2.1
-  @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"
-    """

middleman-cli/features/support/env.rb

@@ -1,19 +0,0 @@
-ENV["TEST"] = "true"
-
-require 'sassc'
-
-require 'simplecov'
-SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
-
-require 'phantomjs/poltergeist'
-Capybara.javascript_driver = :poltergeist
-
-require 'coveralls'
-Coveralls.wear!
-
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.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')

middleman-cli/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

middleman-cli/fixtures/preview-server-app/source/index.html.erb

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

middleman-cli/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>

middleman-cli/fixtures/preview-server-app/source/layouts/custom.erb

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

middleman-cli/fixtures/preview-server-app/source/real.html

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

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

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

middleman-cli/fixtures/preview-server-app/source/should_be_ignored.html

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

middleman-cli/fixtures/preview-server-app/source/should_be_ignored2.html

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

middleman-cli/fixtures/preview-server-app/source/should_be_ignored3.html

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

middleman-cli/fixtures/preview-server-app/source/static.html

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

middleman-cli/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

middleman-cli/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>

middleman-cli/lib/middleman-cli.rb

@@ -21,3 +21,13 @@ 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'

middleman-cli/lib/middleman-cli/build.rb

@@ -1,5 +1,3 @@
-require 'middleman-core/application'
-
 # CLI Module
 module Middleman::Cli
   # The CLI Build class
@@ -10,15 +8,12 @@ module Middleman::Cli
 
     class_option :environment,
                  aliases: '-e',
-                 default: ENV['MM_ENV'] || ENV['RACK_ENV'] || :production
+                 default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'production',
+                 desc: 'The environment Middleman will run under'
     class_option :clean,
                  type: :boolean,
                  default: true,
                  desc: 'Remove orphaned files from build (--no-clean to disable)'
-    class_option :parallel,
-                 type: :boolean,
-                 default: true,
-                 desc: 'Output files in parallel (--no-parallel to disable)'
     class_option :glob,
                  type: :string,
                  aliases: '-g',
@@ -29,7 +24,7 @@ module Middleman::Cli
                  default: false,
                  desc: 'Print debug messages'
     class_option :instrument,
-                 type: :boolean,
+                 type: :string,
                  default: false,
                  desc: 'Print instrument messages'
     class_option :profile,
@@ -37,8 +32,6 @@ 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
@@ -51,44 +44,34 @@ 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[:show_exceptions] = false
-          config[:cli_options] = cli_options.each_with_object({}) do |(k, v), sum|
-            sum[k] = v
-          end
-        end
-
-        builder = Middleman::Builder.new(@app,
-                                         glob: options['glob'],
-                                         clean: options['clean'],
-                                         parallel: options['parallel'])
-        builder.thor = self
-        builder.on_build_event(&method(:on_event))
+      @app = ::Middleman::Application.new do
+        config[:mode] = :build
+        config[:environment] = env
+        config[:show_exceptions] = false
+        ::Middleman::Logger.singleton(verbose, instrument)
       end
 
-      ::Middleman::Util.instrument 'builder.run' do
-        if builder.run!
-          clean_directories! if options['clean']
-          shell.say '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
-          shell.say msg, :red
+      builder = Middleman::Builder.new(@app,
+                                       glob: options['glob'],
+                                       clean: options['clean'],
+                                       parallel: options['parallel'])
+      builder.thor = self
+      builder.on_build_event(&method(:on_event))
 
-          exit(1)
+      if builder.run!
+        clean_directories! if options['clean']
+      else
+        msg = 'There were errors during this build'
+        unless options['verbose']
+          msg << ', re-run with `middleman build --verbose` to see the full exception.'
         end
+        shell.say msg, :red
+
+        exit(1)
       end
     end
 

middleman-cli/lib/middleman-cli/config.rb

@@ -1,41 +0,0 @@
-# CLI Module
-module Middleman::Cli
-  # The CLI Config class
-  class Config < Thor::Group
-    include Thor::Actions
-
-    check_unknown_options!
-
-    class_option :environment,
-                 aliases: '-e',
-                 default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development',
-                 desc: 'The environment Middleman will run under'
-    def console
-      require 'json'
-      require 'middleman-core'
-      require 'middleman-core/logger'
-
-      opts = {
-        environment: options['environment']
-      }
-
-      # Don't output info messages
-      ::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
-        config[:environment] = opts[:environment].to_sym if opts[:environment]
-      end
-
-      puts JSON.pretty_generate(app.config.to_h)
-
-      app.shutdown!
-    end
-
-    # Add to CLI
-    Base.register(self, 'config', 'config [options]', 'Output a Middleman configuration in JSON format')
-  end
-end

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

@@ -30,8 +30,8 @@ module Middleman::Cli
       template 'extension/Rakefile', File.join(name, 'Rakefile')
       template 'extension/gemspec', File.join(name, "#{name}.gemspec")
       template 'extension/Gemfile', File.join(name, 'Gemfile')
+      template 'extension/lib/middleman_extension.rb', File.join(name, 'lib', 'middleman_extension.rb')
       template 'extension/lib/lib.rb', File.join(name, 'lib', "#{name}.rb")
-      template 'extension/lib/lib/extension.rb', File.join(name, 'lib', name, 'extension.rb')
       template 'extension/features/support/env.rb', File.join(name, 'features', 'support', 'env.rb')
       empty_directory File.join(name, 'fixtures')
     end

middleman-cli/lib/middleman-cli/init.rb

@@ -4,8 +4,6 @@ module Middleman::Cli
   class Init < Thor::Group
     include Thor::Actions
 
-    GIT_CMD = 'git'.freeze
-
     check_unknown_options!
 
     argument :target, type: :string, default: '.'
@@ -27,18 +25,11 @@ module Middleman::Cli
       require 'fileutils'
       require 'tmpdir'
 
-      unless git_present?
-        msg =  'You need to install the git command line tool to initialize a new project. '
-        msg << "For help installing git, please refer to GitHub's tutorial at https://help.github.com/articles/set-up-git"
-        say msg, :red
-        exit 1
-      end
-
       repo_path, repo_branch = if shortname?(options[:template])
         require 'open-uri'
         require 'json'
 
-        api = 'https://directory.middlemanapp.com/api'
+        api = 'http://directory.middlemanapp.com/api'
         uri = ::URI.parse("#{api}/#{options[:template]}.json")
 
         begin
@@ -48,7 +39,7 @@ module Middleman::Cli
         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
+          exit
         end
       else
         repo_name, repo_branch = options[:template].split('#')
@@ -60,12 +51,11 @@ module Middleman::Cli
       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}")
+        run("git 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
+        unless File.directory?(dir)
+          say 'Git clone failed, maybe the url is invalid or you don\'t have the permissions?', :red
+          exit
         end
 
         inside(target) do
@@ -89,31 +79,12 @@ module Middleman::Cli
 
     protected
 
-    # Copied from Bundler
-    def git_present?
-      return @git_present if defined?(@git_present)
-      @git_present = which(GIT_CMD) || which('git.exe')
-    end
-
-    # Copied from Bundler
-    def which(executable)
-      if File.file?(executable) && File.executable?(executable)
-        executable
-      elsif ENV['PATH']
-        path = ENV['PATH'].split(File::PATH_SEPARATOR).find do |p|
-          abs_path = File.join(p, executable)
-          File.file?(abs_path) && File.executable?(abs_path)
-        end
-        path && File.expand_path(executable, path)
-      end
-    end
-
     def shortname?(repo)
       repo.split('/').length == 1
     end
 
     def repository_path(repo)
-      repo.include?('://') || repo.include?('git@') ? repo : "https://github.com/#{repo}.git"
+      repo.include?('://') || repo.include?('git@') ? repo : "git://github.com/#{repo}.git"
     end
 
     # Add to CLI

middleman-cli/lib/middleman-cli/server.rb

@@ -5,32 +5,41 @@ module Middleman::Cli
     check_unknown_options!
 
     class_option :environment,
-                 aliases: '-e'
+                 aliases: '-e',
+                 default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development',
+                 desc: 'The environment Middleman will run under'
+    class_option :host,
+                 type: :string,
+                 aliases: '-h',
+                 desc: 'Bind to HOST address'
     class_option :port,
-                 aliases: '-p'
-    class_option :server_name,
-                 aliases: '-s'
-    class_option :bind_address,
-                 aliases: '-b'
+                 aliases: '-p',
+                 desc: 'The port Middleman will listen on'
     class_option :verbose,
                  type: :boolean,
                  default: false,
                  desc: 'Print debug messages'
     class_option :instrument,
-                 type: :boolean,
+                 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 :daemon,
+    class_option :force_polling,
                  type: :boolean,
-                 aliases: '-d',
                  default: false,
-                 desc: 'Daemonize preview server'
-
-    Middleman::Cli.import_config(self)
+                 desc: 'Force file watcher into polling mode'
+    class_option :latency,
+                 type: :numeric,
+                 aliases: '-l',
+                 default: 0.5,
+                 desc: 'Set file watcher latency, in seconds'
 
     # Start the server
     def server
@@ -43,14 +52,19 @@ module Middleman::Cli
       end
 
       params = {
+        port: options['port'],
+        host: options['host'],
+        environment: options['environment'],
         debug: options['verbose'],
         instrumenting: options['instrument'],
+        disable_watcher: options['disable_watcher'],
         reload_paths: options['reload_paths'],
-        daemon: options['daemon']
+        force_polling: options['force_polling'],
+        latency: options['latency']
       }
 
       puts '== The Middleman is loading'
-      ::Middleman::PreviewServer.start(params, options)
+      ::Middleman::PreviewServer.start(params)
     end
 
     # Add to CLI

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

@@ -13,6 +13,7 @@ end
 
 group :test do
   gem 'cucumber'
+  gem 'fivemat'
   gem 'aruba'
   gem 'rspec'
 end

middleman-cli/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 = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
 end
 
 require 'rake/clean'

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

@@ -1,6 +1,38 @@
-require "middleman-core"
+# Require core library
+require 'middleman-core'
 
-Middleman::Extensions.register :<%= name %> do
-  require "my-extension/extension"
-  MyExtension
+# Extension namespace
+class MyExtension < ::Middleman::Extension
+  option :my_option, 'default', 'An example option'
+
+  def initialize(app, options_hash={}, &block)
+    # Call super to build options from the options_hash
+    super
+
+    # Require libraries only when activated
+    # require 'necessary/library'
+
+    # set up your extension
+    # puts options.my_option
+  end
+
+  def after_configuration
+    # Do something
+  end
+
+  # A Sitemap Manipulator
+  # def manipulate_resource_list(resources)
+  # end
+
+  # helpers do
+  #   def a_helper
+  #   end
+  # end
 end
+
+# Register extensions which can be activated
+# Make sure we have the version of Middleman we expect
+# Name param may be omited, it will default to underscored
+# version of class name
+
+# MyExtension.register(:my_extension)

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

@@ -1,31 +0,0 @@
-# Require core library
-require 'middleman-core'
-
-# Extension namespace
-class MyExtension < ::Middleman::Extension
-  option :my_option, 'default', 'An example option'
-
-  def initialize(app, options_hash={}, &block)
-    # Call super to build options from the options_hash
-    super
-
-    # Require libraries only when activated
-    # require 'necessary/library'
-
-    # set up your extension
-    # puts options.my_option
-  end
-
-  def after_configuration
-    # Do something
-  end
-
-  # A Sitemap Manipulator
-  # def manipulate_resource_list(resources)
-  # end
-
-  # helpers do
-  #   def a_helper
-  #   end
-  # end
-end

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

@@ -0,0 +1 @@
+require '<%= name %>'

middleman-cli/middleman-cli.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files   = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.executable   = 'middleman'
   s.require_path = 'lib'
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 1.9.3'
 
   # CLI
   s.add_dependency('thor', ['>= 0.17.0', '< 2.0'])

middleman-core/.rspec

@@ -1 +0,0 @@
---color

middleman-core/Rakefile

@@ -1,4 +1,5 @@
 # coding:utf-8
-RAKE_ROOT = __FILE__.freeze
+RAKE_ROOT = __FILE__
 GEM_NAME = ENV['NAME'] || 'middleman-core'
+require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

middleman-core/cucumber.yml

@@ -1,2 +0,0 @@
-default: --require features --tags ~@wip
-wip: --require features --tags @wip

middleman-core/features/asset_hash.feature

@@ -12,7 +12,7 @@ Feature: Assets get file hashes appended to them and references to them are upda
       | images/300px-59adce76.jpg |
       | images/100px-5fd6fb90.gif |
       | javascripts/application-1d8d5276.js |
-      | stylesheets/site-8bc55985.css |
+      | stylesheets/site-7474cadd.css |
       | index.html |
       | subdir/index.html |
       | other/index.html |
@@ -26,21 +26,21 @@ Feature: Assets get file hashes appended to them and references to them are upda
       | stylesheets/site.css |
 
     And the file "javascripts/application-1d8d5276.js" should contain "img.src = '/images/100px-5fd6fb90.jpg'"
-    And the file "stylesheets/site-8bc55985.css" should contain:
+    And the file "stylesheets/site-7474cadd.css" should contain:
       """
       background-image: url("../images/100px-5fd6fb90.jpg")
       """
     And the file "index.html" should contain 'href="apple-touch-icon.png"'
-    And the file "index.html" should contain 'href="stylesheets/site-8bc55985.css"'
+    And the file "index.html" should contain 'href="stylesheets/site-7474cadd.css"'
     And the file "index.html" should contain 'src="javascripts/application-1d8d5276.js"'
     And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"'
-    And the file "subdir/index.html" should contain 'href="../stylesheets/site-8bc55985.css"'
+    And the file "subdir/index.html" should contain 'href="../stylesheets/site-7474cadd.css"'
     And the file "index.html" should contain 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
     And the file "index.html" should contain 'src="images/100px-5fd6fb90.gif"'
     And the file "index.html" should contain 'src="images/100px-1242c368.png"'
     And the file "subdir/index.html" should contain 'src="../javascripts/application-1d8d5276.js"'
     And the file "subdir/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
-    And the file "other/index.html" should contain 'href="../stylesheets/site-8bc55985.css"'
+    And the file "other/index.html" should contain 'href="../stylesheets/site-7474cadd.css"'
     And the file "other/index.html" should contain 'src="../javascripts/application-1d8d5276.js"'
     And the file "other/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
     And the file "api.json" should contain 'images/100px-5fd6fb90.gif'
@@ -50,42 +50,26 @@ Feature: Assets get file hashes appended to them and references to them are upda
     And the file "subdir/api.json" should contain 'images/100px-5fd6fb90.jpg'
     And the file "subdir/api.json" should contain 'images/100px-1242c368.png'
 
-  Scenario: Hashed fonts assets work with woff and woff2 extension
-    Given a successfully built app at "asset-hash-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | fonts/fontawesome-webfont-56ce13e7.woff |
-      | fonts/fontawesome-webfont-10752316.woff2 |
-    And the file "stylesheets/uses_fonts-88aa3e2b.css" should contain "src: url('../fonts/fontawesome-webfont-10752316.woff2')"
-    And the file "stylesheets/uses_fonts-88aa3e2b.css" should contain "url('../fonts/fontawesome-webfont-56ce13e7.woff')"
-
   Scenario: Hashed assets work in preview server
     Given the Server is running at "asset-hash-app"
     When I go to "/"
     Then I should see 'href="apple-touch-icon.png"'
-    And I should see 'href="stylesheets/site-d1a750ca.css"'
-    And I should see 'href="stylesheets/fragment-99b76247.css"'
+    And I should see 'href="stylesheets/site-7474cadd.css"'
     And I should see 'src="javascripts/application-1d8d5276.js"'
     And I should see 'src="images/100px-5fd6fb90.jpg"'
     And I should see 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
-    And I should see 'src="images/100px-5fd6fb90.jpg?test"'
-    And I should see 'src="images/100px-5fd6fb90.jpg?#test"'
-    And I should see 'src="images/100px-5fd6fb90.jpg#test"'
     When I go to "/subdir/"
-    Then I should see 'href="../stylesheets/site-d1a750ca.css"'
+    Then I should see 'href="../stylesheets/site-7474cadd.css"'
     And I should see 'src="../javascripts/application-1d8d5276.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="../stylesheets/site-d1a750ca.css"'
+    Then I should see 'href="../stylesheets/site-7474cadd.css"'
     And I should see 'src="../javascripts/application-1d8d5276.js"'
     And I should see 'src="../images/100px-5fd6fb90.jpg"'
-    And I should see 'src="../images/100px-5fd6fb90.jpg?test"'
-    And I should see 'src="../images/100px-5fd6fb90.jpg?#test"'
-    And I should see 'src="../images/100px-5fd6fb90.jpg#test"'
     When I go to "/javascripts/application-1d8d5276.js"
     Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
-    When I go to "/stylesheets/site-d1a750ca.css"
-    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg");'
+    When I go to "/stylesheets/site-7474cadd.css"
+    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")'
     When I go to "/api.json"
     Then I should see 'images/100px-5fd6fb90.gif'
     And I should see 'images/100px-5fd6fb90.jpg'
@@ -94,11 +78,6 @@ Feature: Assets get file hashes appended to them and references to them are upda
     Then I should see 'images/100px-5fd6fb90.gif'
     And I should see 'images/100px-5fd6fb90.jpg'
     And I should see 'images/100px-1242c368.png'
-    When I go to "/stylesheets/fragment-99b76247.css"
-    And I should see 'url("../images/100px-5fd6fb90.jpg");'
-    And I should see 'url("../images/100px-5fd6fb90.jpg?test");'
-    And I should see 'url("../images/100px-5fd6fb90.jpg?#test");'
-    And I should see 'url("../images/100px-5fd6fb90.jpg#test");'
 
   Scenario: Hashed assets work with Slim
     Given the Server is running at "asset-hash-app"
@@ -107,69 +86,17 @@ Feature: Assets get file hashes appended to them and references to them are upda
     And I should see 'src="images/100px-5fd6fb90.jpg"'
     And I should see 'srcset="images/100px-5fd6fb90.jpg 1x, images/200px-c11eb203.jpg 2x, images/300px-59adce76.jpg 3x"'
 
-  Scenario: Enabling an asset host still produces hashed files and references (hash first)
-    Given a fixture app "asset-hash-host-app"
-    And a file named "config.rb" with:
-      """
-      set :sass_source_maps, false
-      activate :asset_hash
-      activate :directory_indexes
-      activate :asset_host, host: 'http://middlemanapp.com'
-      """
+  Scenario: Enabling an asset host still produces hashed files and references
     Given the Server is running at "asset-hash-host-app"
     When I go to "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
-    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-2902933e.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-1fdf4fb5.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
     When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-1fdf4fb5.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
     When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
+    Then I should see 'href="http://middlemanapp.com/stylesheets/site-1fdf4fb5.css"'
     And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
-    When I go to "/stylesheets/fragment-2902933e.css"
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg");'
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test");'
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test");'
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg#test");'
-
-  Scenario: Enabling an asset host still produces hashed files and references (host first)
-    Given a fixture app "asset-hash-host-app"
-    And a file named "config.rb" with:
-      """
-      set :sass_source_maps, false
-      activate :asset_host, host: 'http://middlemanapp.com'
-      activate :directory_indexes
-      activate :asset_hash
-      """
-    Given the Server is running at "asset-hash-host-app"
-    When I go to "/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
-    Then I should see 'href="http://middlemanapp.com/stylesheets/fragment-2902933e.css"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
-    When I go to "/subdir/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
-    When I go to "/other/"
-    Then I should see 'href="http://middlemanapp.com/stylesheets/site-7474cadd.css"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?test"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test"'
-    And I should see 'src="http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"'
-    When I go to "/stylesheets/fragment-2902933e.css"
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg")'
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?test")'
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg?#test")'
-    And I should see 'url("http://middlemanapp.com/images/100px-5fd6fb90.jpg#test")'
 
   Scenario: The asset hash should change when a SASS partial changes
     Given the Server is running at "asset-hash-app"
@@ -179,14 +106,14 @@ Feature: Assets get file hashes appended to them and references to them are upda
         font-size: 14px
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-4d4e34e6.css'
+    Then I should see 'href="../stylesheets/uses_partials-423a00f7.css'
     And the file "source/stylesheets/_partial.sass" has the contents
       """
       body
         font-size: 18px !important
       """
     When I go to "/partials/"
-    Then I should see 'href="../stylesheets/uses_partials-ec347271.css'
+    Then I should see 'href="../stylesheets/uses_partials-e8c3d4eb.css'
 
   Scenario: The asset hash should change when a Rack-based filter changes
     Given a fixture app "asset-hash-app"
@@ -200,10 +127,12 @@ Feature: Assets get file hashes appended to them and references to them are upda
       """
     Given the Server is running at "asset-hash-app"
     When I go to "/"
-    Then I should see 'href="stylesheets/site-5ad7def0.css'
-    When I go to "stylesheets/site-5ad7def0.css"
-    Then I should see 'background-image: url("../images/100px-5fd6fb90.jpg")'
+    Then I should see 'href="stylesheets/site-ac2166fd.css'
+    When I go to "stylesheets/site-ac2166fd.css"
+    Then I should see 'background-image'
     Then I should see 'Added by Rack filter'
+    When I go to "stylesheets/site-7474cadd.css"
+    Then I should see 'Not Found'
 
   Scenario: Hashed-asset files are not produced for ignored paths
     Given a fixture app "asset-hash-app"
@@ -241,84 +170,16 @@ Feature: Assets get file hashes appended to them and references to them are upda
       | javascripts/application-1d8d5276.js |
       | stylesheets/site-7474cadd.css |
 
-  Scenario: Hashed-asset files are not replaced for rewrite ignored paths
-    Given a fixture app "asset-hash-app"
-    And a file named "config.rb" with:
-      """
-      is_stylesheet = proc { |path| path.start_with? '/stylesheets' }
-      activate :asset_hash, rewrite_ignore: [
-        %r(javascripts/*),
-        '/subdir/*',
-        is_stylesheet
-      ]
-      activate :relative_assets
-      activate :directory_indexes
-      """
-    And a successfully built app at "asset-hash-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | index.html |
-      | subdir/index.html |
-      | images/100px-5fd6fb90.jpg |
-      | javascripts/application-1d8d5276.js |
-      | stylesheets/site-8bc55985.css |
-    And the following files should not exist:
-      | images/100px.jpg |
-      | javascripts/application.js |
-      | stylesheets/site.css |
-    And the file "javascripts/application-1d8d5276.js" should contain "img.src = '/images/100px.jpg'"
-    And the file "stylesheets/site-8bc55985.css" should contain:
-      """
-      background-image: url("../images/100px.jpg")
-      """
-    And the file "index.html" should contain 'href="stylesheets/site-8bc55985.css"'
-    And the file "index.html" should contain 'src="javascripts/application-1d8d5276.js"'
-    And the file "index.html" should contain 'src="images/100px-5fd6fb90.jpg"'
-    And the file "subdir/index.html" should contain:
-      """
-      <h2>Image url3:</h2>
-      <p><img src="../images/100px.jpg"></p>
-      """
+  # @wip Currently broken, we should move all asset-host functionality out of Compass and into something more similar to asset_hash with Rack-based rewrites
+  # Scenario: Enabling an asset host and referencing assets in CSS with URL fragments are rewritten correctly
+  #   Given a successfully built app at "asset-hash-host-app"
+  #   When I cd to "build"
 
-  Scenario: Already minified files should still be hashed
-    Given a successfully built app at "asset-hash-minified-app"
-    When I cd to "build"
-    Then the following files should exist:
-      | javascripts/jquery.min-276c87ff.js |
-      | stylesheets/test-7de2ad06.css |
-    And the following files should not exist:
-      | javascripts/jquery.min.js |
-    And the file "stylesheets/test-7de2ad06.css" should contain:
-      """
-      .no-bug{background-image:url(/images/100px-5fd6fb90.jpg)}
-      .bug{content:"";background-image:url(/images/100px-5fd6fb90.jpg)}
-      .no-bug{content:""; background-image:url(/images/100px-5fd6fb90.jpg)}
-      """
+  #   Then the following files should exist:
+  #     | images/100px-5fd6fb90.jpg |
+  #     | stylesheets/fragment-c058ecb2.css |
+  #   And the following files should not exist:
+  #     | images/100px.jpg |
 
-  Scenario: Source map paths include the hash
-    Given a successfully built app at "asset-hash-source-map"
-    When I cd to "build"
-    Then the following files should exist:
-      | index.html |
-      | javascripts/application-4553338c.js |
-      | javascripts/application.js-22cc2b5f.map |
-      | index.html |
-    And the following files should not exist:
-      | javascripts/application.js |
-      | javascripts/application.js.map |
-
-    And the file "javascripts/application-4553338c.js" should contain "//# sourceMappingURL=application.js-22cc2b5f.map"
-
-  Scenario: Hashes can contain a prefix
-    Given a successfully built app at "asset-hash-prefix"
-    When I cd to "build"
-    Then the following files should exist:
-      | index.html |
-      | javascripts/application-myprefix-4553338c.js |
-      | javascripts/application.js-myprefix-22cc2b5f.map |
-      | index.html |
-    And the following files should not exist:
-      | javascripts/application.js |
-      | javascripts/application.js.map |
-
-    And the file "javascripts/application-myprefix-4553338c.js" should contain "//# sourceMappingURL=application.js-myprefix-22cc2b5f.map"
+  #   And the file "stylesheets/fragment-c058ecb2.css" should contain "http://middlemanapp.com/images/100px-5fd6fb90.jpg#test"
+  #   And the file "stylesheets/fragment-c058ecb2.css" should not contain "http://middlemanapp.com/images/100px.jpg#test"

middleman-core/features/asset_host.feature

@@ -8,25 +8,19 @@ Feature: Alternate between multiple asset hosts
       """
     And the Server is running
     When I go to "/asset_host.html"
-    Then I should see "'.google-analytics.com/ga.js'"
     Then I should see 'src="https://code.jquery.com/jquery-2.1.3.min.js"'
     Then I should see content matching %r{http://assets1.example.com/}
     Then I should not see content matching %r{http://assets1.example.com//}
-    Then I should see content matching %r{<a href="https://github.com/angular/angular.js">Angular.js</a>}
-    Then I should see content matching %r{'//www.example.com/script.js'}
     When I go to "/stylesheets/asset_host.css"
     Then I should see content matching %r{http://assets1.example.com/}
     Then I should not see content matching %r{http://assets1.example.com//}
-    When I go to "/javascripts/asset_host.js"
-    Then I should not see content matching %r{http://assets1.example.com/}
 
   Scenario: Set proc host with inline-option
     Given a fixture app "asset-host-app"
     And a file named "config.rb" with:
       """
       activate :asset_host, host: Proc.new { |asset|
-        hash = Digest::MD5.digest(asset).bytes.map!(&:ord).reduce(&:+)
-        "http://assets%d.example.com" % (hash % 4)
+        "http://assets%d.example.com" % (asset.hash % 4)
       }
       """
     And the Server is running
@@ -34,22 +28,6 @@ Feature: Alternate between multiple asset hosts
     Then I should see 'src="https://code.jquery.com/jquery-2.1.3.min.js"'
     Then I should see content matching %r{http://assets1.example.com/}
     Then I should not see content matching %r{http://assets1.example.com//}
-    Then I should see content matching %r{<a href="https://github.com/angular/angular.js">Angular.js</a>}
-    Then I should see content matching %r{'//www.example.com/script.js'}
     When I go to "/stylesheets/asset_host.css"
     Then I should see content matching %r{http://assets1.example.com/}
-    Then I should not see content matching %r{http://assets1.example.com//}
-
-  Scenario: Hosts are not rewritten for rewrite ignored paths
-    Given a fixture app "asset-host-app"
-    And a file named "config.rb" with:
-      """
-      activate :asset_host, host: "http://assets1.example.com", rewrite_ignore: [
-        '/stylesheets/asset_host.css',
-      ]
-      """
-    And the Server is running
-    When I go to "/asset_host.html"
-    Then I should see content matching %r{http://assets1.example.com/}
-    When I go to "/stylesheets/asset_host.css"
-    Then I should not see content matching %r{http://assets1.example.com/}
+    Then I should not see content matching %r{http://assets1.example.com//}

middleman-core/features/automatic_image_sizes.feature

@@ -2,28 +2,15 @@ Feature: Automatically detect and insert image dimensions into tags
   In order to speed up development and appease YSlow
 
   Scenario: Rendering an image with the feature disabled
-    Given a fixture app "automatic-image-size-app"
-    And a file named "config.rb" with:
-      """
-      """
+    Given "automatic_image_sizes" feature is "disabled"
     And the Server is running at "automatic-image-size-app"
     When I go to "/auto-image-sizes.html"
     Then I should not see "width="
     And I should not see "height="
-    When I go to "/markdown-sizes.html"
-    Then I should not see "width="
-    And I should not see "height="
-
+  
   Scenario: Rendering an image with the feature enabled
-    Given a fixture app "automatic-image-size-app"
-    And a file named "config.rb" with:
-      """
-      activate :automatic_image_sizes
-      """
+    Given "automatic_image_sizes" feature is "enabled"
     And the Server is running at "automatic-image-size-app"
     When I go to "/auto-image-sizes.html"
-    Then I should see 'width="1"'
-    And I should see 'height="1"'
-    When I go to "/markdown-sizes.html"
-    Then I should see 'width="1"'
-    And I should see 'height="1"'
+    Then I should see "width="
+    And I should see "height="

middleman-core/features/builder.feature

@@ -20,13 +20,13 @@ Feature: Builder
       | layout                                        |
       | layouts/custom                                |
       | layouts/content_for                           |
-
+      
     And the file "index.html" should contain "Comment in layout"
     And the file "index.html" should contain "<h1>Welcome</h1>"
     And the file "static.html" should contain "Static, no code!"
     And the file "services/index.html" should contain "Services"
     And the file "stylesheets/static.css" should contain "body"
-
+    
   Scenario: Build glob
     Given a successfully built app at "glob-app" with flags "--glob '*.css'"
     When I cd to "build"
@@ -34,28 +34,16 @@ Feature: Builder
       | index.html                                    |
     Then the following files should exist:
       | stylesheets/site.css                          |
-
+  
   Scenario: Build with errors
     Given a built app at "build-with-errors-app"
     Then the exit status should be 1
-
+  
   Scenario: Build empty errors
     Given a built app at "empty-app"
     Then the exit status should be 1
 
-  Scenario: Build external_pipeline errors
-    Given a built app at "external-pipeline-error"
-    Then the exit status should be 1
-
   Scenario: Build alias (b)
     Given a fixture app "large-build-app"
     When I run `middleman b`
-    Then was successfully built
-
-  Scenario: Builded text file(ex: html, css, xml, txt)'s permission is 0644
-    Given a successfully built app at "large-build-app"
-    When I cd to "build"
-    Then the mode of filesystem object "index.html" should match "0644"
-    And the mode of filesystem object "stylesheets/static.css" should match "0644"
-    And the mode of filesystem object "feed.xml" should match "0644"
-    And the mode of filesystem object ".htaccess" should match "0644"
+    Then was successfully built

middleman-core/features/cache_buster.feature

@@ -39,18 +39,4 @@ Feature: Generate mtime-based query string for busting browser caches
     And the Server is running at "cache-buster-app"
     When I go to "/cache-buster.html"
     Then I should see "site.css?"
-    Then I should see "blank.gif?"
-
-  Scenario: URLs are not rewritten for rewrite ignored paths
-    Given a fixture app "cache-buster-app"
-    And a file named "config.rb" with:
-      """
-      activate :cache_buster, rewrite_ignore: [
-        '/cache-buster.html',
-      ]
-      """
-    And the Server is running at "cache-buster-app"
-    When I go to "/cache-buster.html"
-    Then I should see 'site.css"'
-    Then I should see 'empty-with-include.js"'
-    Then I should see 'blank.gif"'
+    Then I should see "blank.gif?"

middleman-core/features/chained_templates.feature

@@ -7,19 +7,16 @@ Feature: Templates should be chainable
     Then I should see "Title</h1>"
     And I should see "Subtitle</h2>"
     And I should see "Sup</h3>"
-
+    
   Scenario: Build chained template
     Given a successfully built app at "chained-app"
     When I cd to "build"
     Then the following files should exist:
       | index.html                                    |
-      | test.erb.combobreaker                         |
+
     And the file "index.html" should contain "Title</h1>"
     And the file "index.html" should contain "Subtitle</h2>"
     And the file "index.html" should contain "Sup</h3>"
-    And the file "test.erb.combobreaker" should contain "Title</h1>"
-    And the file "test.erb.combobreaker" should contain "Subtitle</h2>"
-    And the file "test.erb.combobreaker" should contain "Sup</h3>"
 
   Scenario: Partials are parsed by multiple template engines: Outer template has .erb and inner .md.erb
     Given a fixture app "partial-chained_templates-app"
@@ -32,7 +29,7 @@ Feature: Templates should be chainable
     And a template named "my_partial.html.md.erb" with:
     """
     ## My Partial
-
+    
     <%= 'hello world' %>
     """
     And the Server is running
@@ -61,7 +58,7 @@ Feature: Templates should be chainable
     And a template named "my_partial.html.md.erb" with:
     """
     ## My Partial
-
+    
     <%= 'hello world' %>
     """
     And the Server is running
@@ -90,7 +87,7 @@ Feature: Templates should be chainable
     And a template named "my_partial.html.erb" with:
     """
     <h2>My Partial</h2>
-
+    
     <%= 'hello world' %>
     """
     And the Server is running

middleman-core/features/clean_build.feature

@@ -16,22 +16,6 @@ Feature: Build Clean
       | build/should_be_ignored3.html |
     And the file "build/index.html" should contain "Comment in layout"
 
-  Scenario: Clean build has a whitelist
-    Given a fixture app "clean-app"
-    When a file named "build/.test" with:
-      """
-      Hello
-      """
-    When a file named "config.rb" with:
-      """
-      set :skip_build_clean do |path|
-        path =~ /\.test/
-      end
-      """
-    Given a built app at "clean-app"
-    Then the following files should exist:
-      | build/.test         |
-
   Scenario: Clean build an app with newly ignored files and a nested output directory
     Given a fixture app "clean-nested-app"
     When a file named "config.rb" with:
@@ -58,21 +42,3 @@ Feature: Build Clean
     Then the following files should not exist:
       | sub/dir/about.html         |
       | sub/dir/nested/nested.html |
-
-  Scenario: Build and clean an app under a hidden directory
-    Given a fixture app "clean-app"
-    And app "clean-app" is using config "hidden-dir-before"
-    And a built app at "clean-app"
-    Then the following files should exist:
-      | .build/index.html              |
-      | .build/should_be_ignored.html  |
-      | .build/should_be_ignored2.html |
-      | .build/should_be_ignored3.html |
-    Given app "clean-app" is using config "hidden-dir-after"
-    And a built app at "clean-app"
-    Then the following files should exist:
-      | .build/index.html              |
-    And the following files should not exist:
-      | .build/should_be_ignored.html  |
-      | .build/should_be_ignored2.html |
-      | .build/should_be_ignored3.html |

middleman-core/features/cli_extension.feature

@@ -9,6 +9,6 @@ Feature: Middleman New Extension CLI
       | Rakefile                                      |
       | my-extension-library.gemspec                  |
       | features/support/env.rb                       |
-      | lib/my-extension-library/extension.rb         |
+      | lib/middleman_extension.rb                    |
       | lib/my-extension-library.rb                   |
       | .gitignore                                    |

middleman-core/features/cli_init.feature

@@ -57,15 +57,11 @@ Feature: Middleman CLI
     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`
+    When I run `middleman init MY_PROJECT -T amicus`
     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
+    And the file "README.md" should contain "Amicus"
+    And the file ".gitignore" should not exist
 
   Scenario: Create a new project using github(user/repository)
     When I run `middleman init MY_PROJECT -T middleman/middleman-templates-default` interactively

middleman-core/features/collections.feature

@@ -98,7 +98,7 @@ Feature: Collections
     And a file named "source/index.html.erb" with:
       """
       <% collection(:articles).each do |article| %>
-        Article: <%= article.data.title || article.file_descriptor[:relative_path] %>
+        Article: <%= article.data.title || article.source_file[:relative_path] %>
       <% end %>
       """
     Given the Server is running at "collections-app"
@@ -144,33 +144,6 @@ Feature: Collections
     And I should see 'Article: Blog3 Another Article'
     And I should see 'Article: Blog2 Yet Another Article'
 
-  Scenario: Work with local helpers
-    Given a fixture app "collections-app"
-    And a file named "config.rb" with:
-      """
-      module TestHelper
-        def help_me
-          "ok"
-        end
-      end
-
-      include TestHelper
-
-      data.articles.each_with_index do |a, i|
-        proxy "/#{i}-#{help_me}.html", a
-      end
-      """
-    And a file named "data/articles.yaml" with:
-      """
-      ---
-      - "/blog1/2011-01-01-new-article.html"
-      - "/blog2/2011-01-02-another-article.html"
-      """
-    Given the Server is running at "collections-app"
-    When I go to "0-ok.html"
-    Then I should see 'Newer Article Content'
-    When I go to "1-ok.html"
-    Then I should see 'Another Article Content'
 
   Scenario: Collected data update with file changes
     Given a fixture app "collections-app"
@@ -219,47 +192,4 @@ Feature: Collections
     Then I should see 'Newer Article Content'
     When I go to "2.html"
     Then I should see 'Again'
-
-  Scenario: Arbitrary live datasets
-    Given a fixture app "collections-app"
-    And a file named "config.rb" with:
-      """
-      ignore "/description_template.html"
-
-      live {
-        Dir[File.join(root, "descriptions/*.txt")]
-      }.each do |description_name|
-        base = File.basename(description_name, '.txt')
-        proxy "#{base}.html", "/description_template.html", locals: {
-          contents: File.read(description_name)
-        }
-      end
-      """
-    And a file named "source/description_template.html.erb" with:
-      """
-      <%= contents %>
-      """
-    And a file named "descriptions/test1.txt" with:
-      """
-      Test1
-      """
-    Given the Server is running at "collections-app"
-    When I go to "test1.html"
-    Then I should see 'Test1'
-    When I go to "test2.html"
-    Then I should see 'Not Found'
-
-    When the file "descriptions/test2.txt" has the contents
-      """
-      Test2
-      """
-    When I go to "test1.html"
-    Then I should see 'Test1'
-    When I go to "test2.html"
-    Then I should see 'Test2'
-
-    When the file "descriptions/test1.txt" is removed
-    When I go to "test1.html"
-    Then I should see 'Not Found'
-    When I go to "test2.html"
-    Then I should see 'Test2'
+    

middleman-core/features/content_type.feature

@@ -12,8 +12,6 @@ Feature: Setting the right content type for files
     Then the content type should be "text/css"
     When I go to "/README"
     Then the content type should be "text/plain"
-    When I go to "/index.php"
-    Then the content type should be "text/php"
 
   Scenario: Content type can be set explicitly via page or proxy or frontmatter
     Given a fixture app "content-type-app"
@@ -33,7 +31,6 @@ Feature: Setting the right content type for files
     When I go to "/override.html"
     Then the content type should be "text/neato"
 
-  @preserve_mime_types
   Scenario: Content types can be overridden with mime_type
     Given a fixture app "content-type-app"
     And a file named "config.rb" with:

middleman-core/features/custom_layouts.feature

@@ -11,22 +11,6 @@ Feature: Custom layouts
     When I go to "/custom-layout.html"
     Then I should see "Custom Layout"
 
-  Scenario: Using custom :layout attribute with proxy
-    Given a fixture app "custom-layout-app2"
-    And a file named "config.rb" with:
-      """
-      page '/test/*', layout: :custom
-      proxy "/test/me.html", "/custom-layout.html"
-      live { %w(you) }.each do |who|
-        proxy "/test/#{who}.html", "/custom-layout.html"
-      end
-      """
-    And the Server is running at "custom-layout-app2"
-    When I go to "/test/me.html"
-    Then I should see "Custom Layout"
-    When I go to "/test/you.html"
-    Then I should see "Custom Layout"
-
   Scenario: Using custom :layout attribute with folders
     Given a fixture app "custom-layout-app2"
     And a file named "config.rb" with:
@@ -81,4 +65,4 @@ Feature: Custom layouts
     When I go to "/path/index.html"
     Then I should see "Alt"
     And I should see "Monde"
-    And I should not see "Hello"
+    And I should not see "Hello"

middleman-core/features/data.feature

@@ -51,10 +51,3 @@ Feature: Local Data API
     Then I should see "title1:Hello"
     Then I should see "title2:More"
     Then I should see "title3:Stuff"
-
-  Scenario: Using data postscript
-    Given the Server is running at "nested-data-app"
-    When I go to "/extracontent.html"
-    Then I should see "<h1>With Content</h1>"
-    Then I should see '<h2 id="header-2">Header 2</h2>'
-    Then I should see "<p>Paragraph 1</p>"

middleman-core/features/default-layout.feature

@@ -1,90 +0,0 @@
-Feature: Describe which files get layouts
-
-  Background:
-    Given an empty app
-    And a file named "config.rb" with:
-      """
-      page "/about.html", layout: :layout2
-      """
-    And a file named "source/layouts/layout.erb" with:
-      """
-      In Layout
-      <%= yield %>
-      """
-    And a file named "source/layouts/layout2.erb" with:
-      """
-      <root>
-        <title>Second Layout</title>
-        <%= yield %>
-      </root>
-      """
-    And a file named "source/index.html.erb" with:
-      """
-      In Index
-      """
-    And a file named "source/about.html.erb" with:
-      """
-      In About
-      """
-    And a file named "source/style.css.scss" with:
-      """
-      html { border: 1; }
-      """
-    And a file named "source/style2.scss" with:
-      """
-      html { border: 2; }
-      """
-    And a file named "source/data.json" with:
-      """
-      { "hello": "world" }
-      """
-    And a file named "source/script.js" with:
-      """
-      helloWorld();
-      """
-    And a file named "source/test.xml.erb" with:
-      """
-      ---
-      layout: layout2
-      ---
-
-      <test>Hi</test>
-      """
-    And the Server is running at "empty_app"
-
-  Scenario: Normal Template
-    When I go to "/index.html"
-    Then I should see "In Index"
-    And I should see "In Layout"
-
-  Scenario: Normal Template with override
-    When I go to "/about.html"
-    Then I should see "In About"
-    And I should see "Second Layout"
-    And I should not see "In Layout"
-
-  Scenario: Sass
-    When I go to "/style.css"
-    Then I should see "border: 1"
-    And I should not see "In Layout"
-
-  Scenario: Sass with extension
-    When I go to "/style2"
-    Then I should see "border: 2"
-    And I should not see "In Layout"
-
-  Scenario: JSON
-    When I go to "/data.json"
-    Then I should see "hello"
-    And I should not see "In Layout"
-
-  Scenario: JS
-    When I go to "/script.js"
-    Then I should see "helloWorld()"
-    And I should not see "In Layout"
-
-  Scenario: XML
-    When I go to "/test.xml"
-    Then I should see "<test>Hi</test>"
-    And I should see "<title>Second Layout</title>"
-

middleman-core/features/directory_index.feature

@@ -9,7 +9,6 @@ Feature: Directory Index
       | a_folder/needs_index/index.html               |
       | leave_me_alone.html                           |
       | wildcard_leave_me_alone.html                  |
-      | regex_leave_me_alone2.html                    |
       | evil spaces/index.html                        |
       | regular/index.html                            |
       | .htaccess                                     |
@@ -22,13 +21,12 @@ Feature: Directory Index
       | a_folder/needs_index.html                     |
       | leave_me_alone/index.html                     |
       | wildcard_leave_me_alone/index.html            |
-      | regex_leave_me_alone2/index.html              |
     And the file "needs_index/index.html" should contain "Indexable"
     And the file "a_folder/needs_index/index.html" should contain "Indexable"
     And the file "leave_me_alone.html" should contain "Stay away"
     And the file "regular/index.html" should contain "Regular"
     And the file "evil spaces/index.html" should contain "Filled with Evil Spaces"
-
+    
   Scenario: Preview normal file
     Given the Server is running at "indexable-app"
     When I go to "/needs_index/"

middleman-core/features/dynamic_pages.feature

@@ -31,8 +31,7 @@ Feature: Dynamic Pages
       | should_be_ignored6.html                       |
       | should_be_ignored7.html                       |
       | should_be_ignored8.html                       |
-      | should_be_ignored9.html                       |
-
+    
   Scenario: Preview basic proxy
     Given the Server is running at "dynamic-pages-app"
     When I go to "/fake.html"
@@ -43,46 +42,46 @@ Feature: Dynamic Pages
     Then I should see "I am real"
     When I go to "/fake4.html"
     Then I should see "I am real"
-
+    
   Scenario: Preview proxy with variable one
     Given the Server is running at "dynamic-pages-app"
     When I go to "/fake/one.html"
     Then I should see "I am real: one"
     Then I should see "Global: I am one glob"
     Then I should see "All: I am all glob"
-
+    
     When I go to "/fake2/one.html"
     Then I should see "I am real: one"
     Then I should see "Global: I am two glob"
     Then I should see "All: I am all glob"
-
+    
     When I go to "/fake3/one.html"
     Then I should see "I am real: one"
     Then I should see "Global: I am three glob"
     Then I should see "All: I am all glob"
-
+    
     When I go to "/fake4/one.html"
     Then I should see "I am real: one"
     Then I should see "Global: I am four glob"
     Then I should see "All: I am all glob"
-
+    
   Scenario: Preview proxy with variable two
     Given the Server is running at "dynamic-pages-app"
     When I go to "/fake/two.html"
     Then I should see "I am real: two"
     Then I should see "Global: I am one glob"
     Then I should see "All: I am all glob"
-
+    
     When I go to "/fake2/two.html"
     Then I should see "I am real: two"
     Then I should see "Global: I am two glob"
     Then I should see "All: I am all glob"
-
+    
     When I go to "/fake3/two.html"
     Then I should see "I am real: two"
     Then I should see "Global: I am three glob"
     Then I should see "All: I am all glob"
-
+    
     When I go to "/fake4/two.html"
     Then I should see "I am real: two"
     Then I should see "Global: I am four glob"
@@ -102,7 +101,7 @@ Feature: Dynamic Pages
     Then the file "fake3/one.html" should contain "I am real: one"
     Then the file "fake3/one.html" should contain "Global: I am three glob"
     Then the file "fake3/one.html" should contain "All: I am all glob"
-
+    
   Scenario: Target ignore
     Given the Server is running at "dynamic-pages-app"
     When I go to "/target_ignore.html"
@@ -113,7 +112,7 @@ Feature: Dynamic Pages
     Then I should see "Ignore me! 7"
     When I go to "/target_ignore4.html"
     Then I should see "Ignore me! 8"
-
+    
   Scenario: Preview ignored paths
     Given the Server is running at "dynamic-pages-app"
     When I go to "/should_be_ignored.html"
@@ -131,6 +130,4 @@ Feature: Dynamic Pages
     When I go to "/should_be_ignored7.html"
     Then I should see "File Not Found"
     When I go to "/should_be_ignored8.html"
-    Then I should see "File Not Found"
-    When I go to "/should_be_ignored9.html"
-    Then I should see "File Not Found"
+    Then I should see "File Not Found"

middleman-core/features/encoding_option.feature

@@ -1,28 +0,0 @@
-# encoding: iso-8859-1
-Feature: encoding option
-
-  Scenario: No encoding set
-    Given a fixture app "clean-app"
-    Given the Server is running at "clean-app"
-
-    When I go to "/index.html"
-    Then the "Content-Type" header should contain "text/html"
-    Then the "Content-Type" header should contain "charset=utf-8"
-
-  @wip
-  Scenario: Custom encoding set
-    Given a fixture app "i-8859-1-app"
-    And a file named "config.rb" with:
-      """
-      set :encoding, "ISO-8859-1"
-
-      ::Rack::Mime::MIME_TYPES['.html'] = 'text/html; charset=iso-8859-1'
-      ::Rack::Mime::MIME_TYPES['.htm'] = 'text/html; charset=iso-8859-1'
-      ::Rack::Mime::MIME_TYPES['.map'] = 'application/json; charset=iso-8859-1'
-      """
-    Given the Server is running at "i-8859-1-app"
-
-    When I go to "/index.html"
-    Then the "Content-Type" header should contain "text/html"
-    Then the "Content-Type" header should contain "charset=iso-8859-1"
-    Then I should see "äöü"

middleman-core/features/extension_api_deprecations.feature

@@ -1,10 +0,0 @@
-Feature: Extension author could use some hooks
-
-  Scenario: When build
-    Given a fixture app "extension-api-deprecations-app"
-    When I run `middleman build`
-    Then the exit status should be 0
-    And the output should contain "`set :layout` is deprecated"
-    And the file "build/index.html" should contain "In Index"
-    And the file "build/index.html" should not contain "In Layout"
-

middleman-core/features/extension_hooks.feature

@@ -1,13 +0,0 @@
-Feature: Extension author could use some hooks
-
-  Scenario: When build
-    Given a fixture app "extension-hooks-app"
-    When I run `middleman build`
-    Then the exit status should be 0
-    And the output should contain "/// after_configuration ///"
-    And the output should contain "/// ready ///"
-    And the output should contain "/// before_build ///"
-    And the output should contain "/// before ///"
-    And the output should contain "/// before_render ///"
-    And the output should contain "/// after_render ///"
-    And the output should contain "/// after_build ///"

middleman-core/features/front-matter-neighbor.feature

@@ -22,7 +22,7 @@ Feature: Neighboring YAML Front Matter
     Then I should not see "---"
     When I go to "/raw-front-matter.php.frontmatter"
     Then I should see "File Not Found"
-
+    
   Scenario: YAML not on first line, with encoding
     Given the Server is running at "frontmatter-neighbor-app"
     When I go to "/front-matter-encoding.html"
@@ -30,12 +30,23 @@ Feature: Neighboring YAML Front Matter
     Then I should not see "---"
     When I go to "/front-matter-encoding.html.erb.frontmatter"
     Then I should see "File Not Found"
+    
+  Scenario: Rendering html (json)
+    Given the Server is running at "frontmatter-neighbor-app"
+    When I go to "/json-front-matter.html.erb.frontmatter"
+    Then I should see "File Not Found"
+    When I go to "/json-front-matter-2.php"
+    Then I should see "<h1>This is the title</h1>"
+    Then I should see "<?php"
+    Then I should not see ";;;"
+    When I go to "/json-front-matter-2.php.erb.frontmatter"
+    Then I should see "File Not Found"
 
   Scenario: A template changes frontmatter during preview
     Given the Server is running at "frontmatter-neighbor-app"
     And the file "source/front-matter-change.html.erb" has the contents
       """
-      FileA <%= current_page.data.title %>
+      <%= current_page.data.title %>
       """
     And the file "source/front-matter-change.html.erb.frontmatter" has the contents
       """
@@ -43,8 +54,6 @@ Feature: Neighboring YAML Front Matter
       title: Hello World
       layout: false
       ---
-
-      FileB
       """
     When I go to "/front-matter-change.html"
     Then I should see "Hello World"
@@ -54,8 +63,6 @@ Feature: Neighboring YAML Front Matter
       title: Hola Mundo
       layout: false
       ---
-
-      FileC
       """
     When I go to "/front-matter-change.html"
     Then I should see "Hola Mundo"

middleman-core/features/front-matter.feature

@@ -28,23 +28,40 @@ Feature: YAML Front Matter
     Then I should not see "layout: false"
     Then I should not see "title: Pandoc likes trailing dots..."
 
-  Scenario: Rendering Haml (yaml)
-    Given the Server is running at "frontmatter-app"
-    When I go to "/front-matter-haml.html"
-    Then I should see "<h1>This is the title</h1>"
-    Then I should not see "---"
 
   Scenario: YAML not on first line, no encoding
     Given the Server is running at "frontmatter-app"
     When I go to "/front-matter-line-2.html"
     Then I should see "<h1></h1>"
     Then I should see "---"
-
+    
   Scenario: YAML not on first line, with encoding
     Given the Server is running at "frontmatter-app"
     When I go to "/front-matter-encoding.html"
     Then I should see "<h1>This is the title</h1>"
     Then I should not see "---"
+    
+  Scenario: Rendering html (json)
+    Given the Server is running at "frontmatter-app"
+    When I go to "/json-front-matter.html"
+    Then I should see "<h1>This is the title</h1>"
+    Then I should not see ";;;"
+    When I go to "/json-front-matter-2.php"
+    Then I should see "<h1>This is the title</h1>"
+    Then I should see "<?php"
+    Then I should not see ";;;"
+
+  Scenario: JSON not on first line, no encoding
+    Given the Server is running at "frontmatter-app"
+    When I go to "/json-front-matter-line-2.html"
+    Then I should see "<h1></h1>"
+    Then I should see ";;;"
+    
+  Scenario: JSON not on first line, with encoding
+    Given the Server is running at "frontmatter-app"
+    When I go to "/json-front-matter-encoding.html"
+    Then I should see "<h1>This is the title</h1>"
+    Then I should not see ";;;"
 
   Scenario: A template changes frontmatter during preview
     Given the Server is running at "frontmatter-app"

middleman-core/features/gzip.feature

@@ -22,7 +22,7 @@ Feature: GZIP assets during build
     Given a fixture app "gzip-app"
     And a file named "config.rb" with:
       """
-      activate :gzip, exts: %w(.htm .html .js .xhtml)
+      activate :gzip, exts: %w(.js .html .htm)
       """
     And a successfully built app at "gzip-app"
     Then the following files should exist:

middleman-core/features/helpers_link_to.feature

@@ -40,29 +40,19 @@ Feature: link_to helper
     """
     absolute: <%= link_to "Needs Index", "/needs_index.html", relative: true %>
     relative: <%= link_to "Relative", "needs_index.html", relative: true %>
-
-    absolute spaces: <%= link_to "Spaces Index", "/evil spaces.html", relative: true %>
-    relative spaces: <%= link_to "Spaces Relative", "evil spaces.html", relative: true %>
     """
     And a file named "source/link_to/sub.html.erb" with:
     """
     absolute: <%= link_to "Needs Index", "/needs_index.html", relative: true %>
     relative: <%= link_to "Relative", "../needs_index.html", relative: true %>
-
-    absolute spaces: <%= link_to "Spaces Index", "/evil spaces.html", relative: true %>
-    relative spaces: <%= link_to "Spaces Relative", "../evil spaces.html", relative: true %>
     """
     And the Server is running at "indexable-app"
     When I go to "/link_to.html"
     Then I should see 'absolute: <a href="needs_index.html">Needs Index</a>'
     Then I should see 'relative: <a href="needs_index.html">Relative</a>'
-    Then I should see 'absolute spaces: <a href="evil%20spaces.html">Spaces Index</a>'
-    Then I should see 'relative spaces: <a href="evil%20spaces.html">Spaces Relative</a>'
     When I go to "/link_to/sub.html"
     Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
     Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
-    Then I should see 'absolute spaces: <a href="../evil%20spaces.html">Spaces Index</a>'
-    Then I should see 'relative spaces: <a href="../evil%20spaces.html">Spaces Relative</a>'
 
   Scenario: link_to relative works with strip_index_file
     Given a fixture app "indexable-app"
@@ -123,7 +113,7 @@ Feature: link_to helper
     When I go to "/link_to/sub.html"
     Then I should see 'absolute: <a href="../needs_index.html">Needs Index</a>'
     Then I should see 'relative: <a href="../needs_index.html">Relative</a>'
-
+  
   Scenario: link_to knows about directory indexes
     Given a fixture app "indexable-app"
     And a file named "source/link_to.html.erb" with:

middleman-core/features/i18n_link_to.feature

@@ -1,209 +0,0 @@
-Feature: i18n Paths
-
-  Scenario: link_to is i18n aware
-    Given a fixture app "empty-app"
-    And a file named "data/pages.yml" with:
-      """
-      - hello.html
-      """
-    And a file named "locales/en.yml" with:
-      """
-      ---
-      en:
-        msg: Hello
-        home: Home
-      """
-    And a file named "locales/es.yml" with:
-      """
-      ---
-      es:
-        paths:
-          hello: "hola"
-        msg: Hola
-        home: Casa
-      """
-    And a file named "source/localizable/index.html.erb" with:
-      """
-      Page: <%= t(:hom) %>
-      """
-    And a file named "source/localizable/hello.html.erb" with:
-      """
-      Page: <%= t(:msg) %>
-
-      <%= link_to "Current Home", "/index.html", class: 'current' %>
-      <%= link_to "Other Home", "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en %>
-      <% link_to "/index.html", class: 'current' do %><span>Home: Current Block</span><% end %>
-      <% link_to "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en do %><span>Home: Other Block</span><% end %>
-
-      <% data.pages.each_with_index do |p, i| %>
-        <%= link_to "Current #{p}", "/#{p}", class: 'current' %>
-        <%= link_to "Other #{p}", "/#{p}", title: "Other #{p}", locale: ::I18n.locale == :en ? :es : :en %>
-        <% link_to "/#{p}", class: 'current' do %><span>Current Block</span><% end %>
-        <% link_to "/#{p}", title: "Other #{p}", locale: ::I18n.locale == :en ? :es : :en do %><span>Other Block</span><% end %>
-      <% end %>
-      """
-    And a file named "config.rb" with:
-      """
-      set :strip_index_file, false
-      activate :i18n, mount_at_root: :en
-      """
-    Given the Server is running at "empty-app"
-    When I go to "/hello.html"
-    Then I should see "Page: Hello"
-    Then I should see '<a href="/index.html" class="current">Current Home</a>'
-    Then I should see '<a href="/es/index.html" title="Other Home">Other Home</a>'
-    Then I should see '<a href="/index.html" class="current"><span>Home: Current Block</span></a>'
-    Then I should see '<a href="/es/index.html" title="Other Home"><span>Home: Other Block</span></a>'
-    Then I should see '<a href="/hello.html" class="current">Current hello.html</a>'
-    Then I should see '<a href="/es/hola.html" title="Other hello.html">Other hello.html</a>'
-    Then I should see '<a href="/hello.html" class="current"><span>Current Block</span></a>'
-    Then I should see '<a href="/es/hola.html" title="Other hello.html"><span>Other Block</span></a>'
-    When I go to "/es/hola.html"
-    Then I should see "Page: Hola"
-    Then I should see '<a href="/es/index.html" class="current">Current Home</a>'
-    Then I should see '<a href="/index.html" title="Other Home">Other Home</a>'
-    Then I should see '<a href="/es/index.html" class="current"><span>Home: Current Block</span></a>'
-    Then I should see '<a href="/index.html" title="Other Home"><span>Home: Other Block</span></a>'
-    Then I should see '<a href="/es/hola.html" class="current">Current hello.html</a>'
-    Then I should see '<a href="/hello.html" title="Other hello.html">Other hello.html</a>'
-    Then I should see '<a href="/es/hola.html" class="current"><span>Current Block</span></a>'
-    Then I should see '<a href="/hello.html" title="Other hello.html"><span>Other Block</span></a>'
-
-  Scenario: link_to is i18n aware and supports relative_links
-    Given a fixture app "empty-app"
-    And a file named "locales/en.yml" with:
-      """
-      ---
-      en:
-        msg: Hello
-        home: Home
-      """
-    And a file named "locales/es.yml" with:
-      """
-      ---
-      es:
-        paths:
-          hello: "hola"
-        msg: Hola
-        home: Casa
-      """
-    And a file named "source/assets/css/main.css.scss" with:
-      """
-      $color: red;
-      body { background: $color; }
-      """
-    And a file named "source/localizable/index.html.erb" with:
-      """
-      Page: <%= t(:home) %>
-      <%= stylesheet_link_tag :main %>
-      """
-    And a file named "source/localizable/hello.html.erb" with:
-      """
-      Page: <%= t(:msg) %>
-
-      <%= link_to "Current Home", "/index.html", class: 'current' %>
-      <%= link_to "Other Home", "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en %>
-      <% link_to "/index.html", class: 'current' do %><span>Home: Current Block</span><% end %>
-      <% link_to "/index.html", title: "Other Home", locale: ::I18n.locale == :en ? :es : :en do %><span>Home: Other Block</span><% end %>
-
-      <%= link_to "Current hello.html", "/hello.html", class: 'current' %>
-      <%= link_to "Other hello.html", "/hello.html", title: "Other hello.html", locale: ::I18n.locale == :en ? :es : :en %>
-      <% link_to "/hello.html", class: 'current' do %><span>Current Block</span><% end %>
-      <% link_to "/hello.html", title: "Other hello.html", locale: ::I18n.locale == :en ? :es : :en do %><span>Other Block</span><% end %>
-      """
-    And a file named "config.rb" with:
-      """
-      set :css_dir, 'assets/css'
-      set :relative_links, true
-      set :strip_index_file, false
-      activate :i18n, mount_at_root: :en
-      activate :relative_assets
-      """
-    Given the Server is running at "empty-app"
-    When I go to "/index.html"
-    Then I should see "assets/css/main.css"
-    When I go to "/hello.html"
-    Then I should see "Page: Hello"
-    Then I should see '<a href="index.html" class="current">Current Home</a>'
-    Then I should see '<a href="es/index.html" title="Other Home">Other Home</a>'
-    Then I should see '<a href="index.html" class="current"><span>Home: Current Block</span></a>'
-    Then I should see '<a href="es/index.html" title="Other Home"><span>Home: Other Block</span></a>'
-    Then I should see '<a href="hello.html" class="current">Current hello.html</a>'
-    Then I should see '<a href="es/hola.html" title="Other hello.html">Other hello.html</a>'
-    Then I should see '<a href="hello.html" class="current"><span>Current Block</span></a>'
-    Then I should see '<a href="es/hola.html" title="Other hello.html"><span>Other Block</span></a>'
-    When I go to "/es/hola.html"
-    Then I should see "Page: Hola"
-    Then I should see '<a href="index.html" class="current">Current Home</a>'
-    Then I should see '<a href="../index.html" title="Other Home">Other Home</a>'
-    Then I should see '<a href="index.html" class="current"><span>Home: Current Block</span></a>'
-    Then I should see '<a href="../index.html" title="Other Home"><span>Home: Other Block</span></a>'
-    Then I should see '<a href="hola.html" class="current">Current hello.html</a>'
-    Then I should see '<a href="../hello.html" title="Other hello.html">Other hello.html</a>'
-    Then I should see '<a href="hola.html" class="current"><span>Current Block</span></a>'
-    Then I should see '<a href="../hello.html" title="Other hello.html"><span>Other Block</span></a>'
-
-  Scenario: url_for is i18n aware
-    Given a fixture app "empty-app"
-    And a file named "data/pages.yml" with:
-      """
-      - hello.html
-      - article.html
-      """
-    And a file named "locales/en.yml" with:
-      """
-      ---
-      en:
-        msg: Hello
-      """
-    And a file named "locales/es.yml" with:
-      """
-      ---
-      es:
-        paths:
-          hello: "hola"
-        msg: Hola
-      """
-    And a file named "source/localizable/hello.html.erb" with:
-      """
-      Page: <%= t(:msg) %>
-      <% data.pages.each_with_index do |p, i| %>
-        Current: <%= url_for "/#{p}" %>
-        Other: <%= url_for "/#{p}", locale: ::I18n.locale == :en ? :es : :en %>
-      <% end %>
-      """
-    And a file named "source/localizable/article.html.erb" with:
-      """
-      Page Lang: Default
-
-      Current: <%= url_for "/article.html" %>
-      Other: <%= url_for "/article.html", locale: ::I18n.locale == :en ? :es : :en %>
-      """
-    And a file named "source/localizable/article.es.html.erb" with:
-      """
-      Page Lang: Spanish
-
-      Current: <%= url_for "/article.html" %>
-      Other: <%= url_for "/article.html", locale: :en %>
-      """
-    And a file named "config.rb" with:
-      """
-      activate :i18n, mount_at_root: :en
-      """
-    Given the Server is running at "empty-app"
-    When I go to "/hello.html"
-    Then I should see "Page: Hello"
-    Then I should see 'Current: /hello.html'
-    Then I should see 'Other: /es/hola.html'
-    When I go to "/es/hola.html"
-    Then I should see "Page: Hola"
-    Then I should see 'Current: /es/hola.html'
-    Then I should see 'Other: /hello.html'
-    When I go to "/article.html"
-    Then I should see "Page Lang: Default"
-    Then I should see 'Current: /article.html'
-    Then I should see 'Other: /es/article.html'
-    When I go to "/es/article.html"
-    Then I should see "Page Lang: Spanish"
-    Then I should see 'Current: /es/article.html'
-    Then I should see 'Other: /article.html'

middleman-core/features/i18n_mixed_sources.feature

@@ -1,39 +0,0 @@
-Feature: i18n merging path trees
-
-  Scenario: Mixing localized and non-localized sources and merging the path trees (see issue #1709)
-    Given a fixture app "i18n-test-app"
-    And a file named "config.rb" with:
-      """
-      activate :i18n, mount_at_root: :en, langs: [:en, :es]
-      """
-    Given the Server is running at "i18n-mixed-sources"
-
-    When I go to "/"
-    Then I should see "Current locale: en"
-    Then I should see "path: is-localized Home"
-    When I go to "/es"
-    Then I should see "Current locale: es"
-    Then I should see "path: is-localized Home"
-
-    When I go to "/a/"
-    Then I should see "Current locale: en"
-    Then I should see "path: is-localized Home # a/index.html.erb"
-    When I go to "/es/a/"
-    Then I should see "Current locale: es"
-    Then I should see "path: is-localized Home # a/index.html.erb"
-
-    When I go to "/b/"
-    Then I should see "Current locale: en"
-    Then I should see "path: is-localized Home # b/index.html.erb"
-
-    When I go to "/a/sub.html"
-    Then I should see "Current locale: en"
-    Then I should see "path: is-localized Home # a/index.html.erb # a/sub.html.erb"
-
-    When I go to "/b/sub.html"
-    Then I should see "Current locale: en"
-    Then I should see "path: is-localized Home # b/index.html.erb # b/sub.html.erb"
-
-    When I go to "/es/b/sub.html"
-    Then I should see "Current locale: es"
-    Then I should see "path: is-localized Home # b/index.html.erb # b/sub.html.erb"

middleman-core/features/ignore.feature

@@ -12,7 +12,7 @@ Feature: Ignoring paths
     And the following files should not exist:
       | build/plain.html |
       | build/about.html |
-
+      
   Scenario: Ignore a single path (server)
     Given a fixture app "ignore-app"
     And a file named "config.rb" with:
@@ -28,35 +28,6 @@ Feature: Ignoring paths
     When I go to "/about.html"
     Then I should see "File Not Found"
 
-  Scenario: Ignoring collected values
-    Given a fixture app "ignore-app"
-    And a file named "data/ignores.yaml" with:
-      """
-      ---
-      - "plain"
-      """
-    And a file named "config.rb" with:
-       """
-       data.ignores.each do |name|
-         ignore "#{name}.html"
-       end
-       """
-    And the Server is running
-    When I go to "/plain.html"
-    Then I should see "File Not Found"
-    When I go to "/about.html"
-    Then I should not see "File Not Found"
-
-    When the file "data/ignores.yaml" has the contents
-      """
-      ---
-      - "about"
-      """
-    When I go to "/plain.html"
-    Then I should not see "File Not Found"
-    When I go to "/about.html"
-    Then I should see "File Not Found"
-
   Scenario: Ignore a globbed path (build)
     Given a fixture app "ignore-app"
     And a file named "config.rb" with:
@@ -76,7 +47,7 @@ Feature: Ignoring paths
       | build/reports/index.html |
       | build/reports/another.html |
       | build/images/icons/messages.png |
-
+      
   Scenario: Ignore a globbed path (server)
     Given a fixture app "ignore-app"
     And a file named "config.rb" with:
@@ -122,7 +93,7 @@ Feature: Ignoring paths
       | build/reports/index.html |
       | build/reports/another.html |
       | build/images/icons/messages.png |
-
+      
   Scenario: Ignore a regex (server)
     Given a fixture app "ignore-app"
     And a file named "config.rb" with:
@@ -147,4 +118,4 @@ Feature: Ignoring paths
     When I go to "/reports/another.html"
     Then I should see "File Not Found"
     When I go to "/images/icons/messages.png"
-    Then I should see "File Not Found"
+    Then I should see "File Not Found"

middleman-core/features/import_files.feature

@@ -1,15 +0,0 @@
-Feature: Import files
-
-  Scenario: Move one path to another
-    Given the Server is running at "import-app"
-    When I go to "/static.html"
-    Then I should see 'Not Found'
-    When I go to "/static2.html"
-    Then I should see 'Static, no code!'
-
-  Scenario: Import all of bower
-    Given the Server is running at "import-app"
-    When I go to "/bower_components/jquery/dist/jquery.js"
-    Then I should see 'jQuery'
-    When I go to "/bower_components2/jquery/dist/jquery.js"
-    Then I should see 'jQuery'

middleman-core/features/javascript-testing.feature

@@ -1,18 +0,0 @@
-Feature: Test a site with javascript included
-
-  As a software developer
-  I want to develop a site using javascript
-  I would like to have a server step rendering javascript correctly in order to test it
-
-  @javascript
-  Scenario: Existing app with javascript
-    Given the Server is running at "javascript-app"
-    When I go to "/index.html"
-    Then I should see:
-    """
-    Local Hour
-    """
-    And I should see:
-    """
-    Local Minutes
-    """

middleman-core/features/markdown_kramdown_in_slim.feature

@@ -1,42 +0,0 @@
-Feature: Markdown support in Slim (Kramdown)
-  In order to test support of the Slim markdown filter
-
-  Scenario: Markdown filter in Slim works (with Kramdown)
-    Given a fixture app "markdown-in-slim-app"
-    And a file named "config.rb" with:
-      """
-      set :markdown_engine, :kramdown
-      activate :directory_indexes
-      """
-    And a file named "source/markdown_filter.html.slim" with:
-      """
-      markdown:
-        # H1
-
-        paragraph
-      """
-    Given the Server is running at "markdown-in-slim-app"
-    When I go to "/markdown_filter/"
-    Then I should see ">H1</h1>"
-    Then I should see "<p>paragraph</p>"
-
-
-  Scenario: Markdown filter in Slim uses our link_to and image_tag helpers (with Kramdown)
-    Given a fixture app "markdown-in-slim-app"
-    And a file named "config.rb" with:
-      """
-      set :markdown_engine, :kramdown
-      activate :directory_indexes
-      """
-    And a file named "source/link_and_image.html.slim" with:
-      """
-      markdown:
-        [A link](/link_target.html)
-
-        ![image](blank.gif){: srcset="image_2x.jpg 2x"}
-      """
-    Given the Server is running at "markdown-in-slim-app"
-    When I go to "/link_and_image/"
-    Then I should see "/link_target/"
-    Then I should see "/images/image_2x.jpg 2x"
-    Then I should see 'src="/images/blank.gif"'

middleman-core/features/markdown_redcarpet.feature

@@ -1,3 +1,4 @@
+@nojava
 Feature: Markdown (Redcarpet) support
   In order to test included Redcarpet support
 

middleman-core/features/markdown_redcarpet_in_haml.feature

@@ -1,3 +1,4 @@
+@nojava
 Feature: Markdown support in Haml
   In order to test support of the Haml markdown filter
 

middleman-core/features/markdown_redcarpet_in_slim.feature

@@ -1,41 +0,0 @@
-Feature: Markdown support in Slim
-  In order to test support of the Slim markdown filter
-
-  Scenario: Markdown filter in Slim works
-    Given a fixture app "markdown-in-slim-app"
-    And a file named "config.rb" with:
-      """
-      set :markdown_engine, :redcarpet
-      activate :directory_indexes
-      """
-    And a file named "source/markdown_filter.html.slim" with:
-      """
-      markdown:
-        # H1
-
-        paragraph
-      """
-    Given the Server is running at "markdown-in-slim-app"
-    When I go to "/markdown_filter/"
-    Then I should see ">H1</h1>"
-    Then I should see "<p>paragraph</p>"
-
-
-  Scenario: Markdown filter in Slim uses our link_to and image_tag helpers
-    Given a fixture app "markdown-in-slim-app"
-    And a file named "config.rb" with:
-      """
-      set :markdown_engine, :redcarpet
-      activate :directory_indexes
-      """
-    And a file named "source/link_and_image.html.slim" with:
-      """
-      markdown:
-        [A link](/link_target.html)
-
-        ![image](blank.gif)
-      """
-    Given the Server is running at "markdown-in-slim-app"
-    When I go to "/link_and_image/"
-    Then I should see "/link_target/"
-    Then I should see 'src="/images/blank.gif"'

middleman-core/features/minify_css.feature

@@ -5,19 +5,16 @@ Feature: Minify CSS
     Given a fixture app "minify-css-app"
     And a file named "config.rb" with:
       """
-      config[:sass_source_maps] = false
       """
     And the Server is running at "minify-css-app"
     When I go to "/stylesheets/site.css"
     Then I should see "7" lines
     And I should see "only screen and (device-width"
-
+    
   Scenario: Rendering external css with the feature enabled
     Given a fixture app "minify-css-app"
     And a file named "config.rb" with:
       """
-      config[:sass_source_maps] = false
-
       activate :minify_css
       """
     And the Server is running at "minify-css-app"
@@ -28,27 +25,11 @@ Feature: Minify CSS
     Then I should see "1" lines
     When I go to "/stylesheets/report.css"
     Then I should see "p{border:1px solid #ff6600}"
-
-  Scenario: Rendering external css in a proxied resource
-    Given a fixture app "minify-css-app"
-    And a file named "config.rb" with:
-      """
-      config[:sass_source_maps] = false
-
-      activate :minify_css
-      proxy '/css-proxy', '/stylesheets/site.css', ignore: true
-      """
-    And the Server is running at "minify-css-app"
-    When I go to "/css-proxy"
-    Then I should see "1" lines
-    And I should see "only screen and (device-width"
-
+    
   Scenario: Rendering external css with passthrough compressor
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
       """
-      config[:sass_source_maps] = false
-
       module ::PassThrough
         def self.compress(data)
           data
@@ -65,7 +46,6 @@ Feature: Minify CSS
     Given a fixture app "minify-css-app"
     And a file named "config.rb" with:
       """
-      config[:sass_source_maps] = false
       """
     And the Server is running at "minify-css-app"
     When I go to "/inline-css.html"
@@ -78,13 +58,11 @@ Feature: Minify CSS
       }
     </style>
     """
-
+   
   Scenario: Rendering inline css with a passthrough minifier
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
       """
-      config[:sass_source_maps] = false
-
       module ::PassThrough
         def self.compress(data)
           data
@@ -110,8 +88,6 @@ Feature: Minify CSS
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
       """
-      config[:sass_source_maps] = false
-
       module ::HelloCompressor
         def self.compress(data)
           "Hello"
@@ -130,13 +106,11 @@ Feature: Minify CSS
       Hello
     </style>
     """
-
+    
   Scenario: Rendering inline css with the feature enabled
     Given a fixture app "minify-css-app"
     And a file named "config.rb" with:
       """
-      config[:sass_source_maps] = false
-
       activate :minify_css, inline: true
       """
     And the Server is running at "minify-css-app"
@@ -146,60 +120,4 @@ Feature: Minify CSS
     <style>
       body{test:style;good:deal}
     </style>
-    """
-
-  Scenario: Rendering inline css in a PHP document
-    Given a fixture app "minify-css-app"
-    And a file named "config.rb" with:
-      """
-      config[:sass_source_maps] = false
-
-      activate :minify_css, inline: true
-      """
-    And the Server is running at "minify-css-app"
-    When I go to "/inline-css.php"
-    Then I should see:
-    """
-    <?='Hello'?>
-
-    <style>
-      body{test:style;good:deal}
-    </style>
-    """
-
-  Scenario: Rendering inline css in a proxied resource
-    Given a fixture app "minify-css-app"
-    And a file named "config.rb" with:
-      """
-      config[:sass_source_maps] = false
-
-      activate :minify_css, inline: true
-      proxy '/inline-css-proxy', '/inline-css.html', ignore: true
-      """
-    And the Server is running at "minify-css-app"
-    When I go to "/inline-css-proxy"
-    Then I should see:
-    """
-    <style>
-      body{test:style;good:deal}
-    </style>
-    """
-
-  @preserve_mime_types
-  Scenario: Configuring content types of resources to be minified
-    Given a fixture app "minify-css-app"
-    And a file named "config.rb" with:
-      """
-      config[:sass_source_maps] = false
-
-      mime_type('.xcss', 'text/x-css')
-      activate :minify_css, content_types: ['text/x-css'],
-                            inline: true,
-                            inline_content_types: ['text/html']
-      """
-    And the Server is running at "minify-css-app"
-    When I go to "/stylesheets/site.xcss"
-    Then I should see "1" lines
-    And I should see "only screen and (device-width"
-    When I go to "/inline-css.php"
-    Then I should see "8" lines
+    """

middleman-core/features/minify_javascript.feature

@@ -38,7 +38,7 @@ Feature: Minify Javascript
       I'm a jQuery {{template}}.
     </script>
     """
-
+    
   Scenario: Rendering inline js with a passthrough minifier
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
@@ -86,7 +86,7 @@ Feature: Minify Javascript
     </script>
     """
 
-  Scenario: Rendering inline JS with a passthrough minifier using activate-style compressor
+  Scenario: Rendering inline css with a passthrough minifier using activate-style compressor
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
       """
@@ -119,7 +119,7 @@ Feature: Minify Javascript
       I'm a jQuery {{template}}.
     </script>
     """
-
+    
   Scenario: Rendering inline js with the feature enabled
     Given a fixture app "minify-js-app"
     And a file named "config.rb" with:
@@ -146,42 +146,6 @@ Feature: Minify Javascript
     </script>
     """
 
-  Scenario: Rendering inline js in a PHP document
-    Given a fixture app "minify-js-app"
-    And a file named "config.rb" with:
-      """
-      activate :minify_javascript, inline: true
-      """
-    And the Server is running at "minify-js-app"
-    When I go to "/inline-js.php"
-    Then I should see:
-    """
-    <?='Hello'?>
-
-    <script>
-      !function(){should(),all.be(),on={one:line}}();
-    </script>
-    <script type='text/javascript'>
-      //<!--
-    !function(){one,line(),here()}();
-      //-->
-    </script>
-    <script type='text/html'>
-      I'm a jQuery {{template}}.
-    </script>
-    """
-
-  Scenario: Rendering inline js in a proxied resource
-    Given a fixture app "minify-js-app"
-    And a file named "config.rb" with:
-      """
-      activate :minify_javascript, inline: true
-      proxy '/inline-js-proxy', '/inline-js.html', ignore: true
-      """
-    And the Server is running at "minify-js-app"
-    When I go to "/inline-js-proxy"
-    Then I should see "14" lines
-
   Scenario: Rendering external js with the feature enabled
     Given a fixture app "minify-js-app"
     And a file named "config.rb" with:
@@ -193,18 +157,7 @@ Feature: Minify Javascript
     Then I should see "1" lines
     When I go to "/more-js/other.js"
     Then I should see "1" lines
-
-  Scenario: Rendering external js in a proxied resource
-    Given a fixture app "minify-js-app"
-    And a file named "config.rb" with:
-      """
-      activate :minify_javascript
-      proxy '/js-proxy', '/javascripts/js_test.js', ignore: true
-      """
-    And the Server is running at "minify-js-app"
-    When I go to "/js-proxy"
-    Then I should see "1" lines
-
+    
   Scenario: Rendering external js with a passthrough minifier
     And the Server is running at "passthrough-app"
     When I go to "/javascripts/js_test.js"
@@ -219,7 +172,7 @@ Feature: Minify Javascript
     And the Server is running at "minify-js-app"
     When I go to "/inline-coffeescript.html"
     Then I should see "3" lines
-
+  
   Scenario: Rendering external js (coffeescript) with the feature enabled
     Given a fixture app "minify-js-app"
     And a file named "config.rb" with:
@@ -229,7 +182,7 @@ Feature: Minify Javascript
     And the Server is running at "minify-js-app"
     When I go to "/javascripts/coffee_test.js"
     Then I should see "1" lines
-
+    
   Scenario: Rendering inline js (coffeescript) with a passthrough minifier
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
@@ -247,7 +200,7 @@ Feature: Minify Javascript
     And the Server is running at "passthrough-app"
     When I go to "/inline-coffeescript.html"
     Then I should see "13" lines
-
+    
   Scenario: Rendering external js (coffeescript) with a passthrough minifier
     Given a fixture app "passthrough-app"
     And a file named "config.rb" with:
@@ -263,4 +216,4 @@ Feature: Minify Javascript
     And the Server is running at "passthrough-app"
     When I go to "/javascripts/coffee_test.js"
     Then I should see "11" lines
-
+    

middleman-core/features/move_files.feature

@@ -1,44 +0,0 @@
-Feature: Move files
-
-  Scenario: Move one path to another
-    Given a fixture app "large-build-app"
-    And a file named "config.rb" with:
-    """
-    move_file "/static.html", "/static2.html"
-    """
-    And the Server is running at "large-build-app"
-    When I go to "/static.html"
-    Then I should see 'Not Found'
-    When I go to "/static2.html"
-    Then I should see 'Static, no code!'
-
-  Scenario: Move one path to another with directory indexes
-    Given a fixture app "large-build-app"
-    And a file named "config.rb" with:
-    """
-    activate :directory_indexes
-    move_file "/static.html", "/static2.html"
-    """
-    And the Server is running at "large-build-app"
-    When I go to "/static.html"
-    Then I should see 'Not Found'
-    When I go to "/static/index.html"
-    Then I should see 'Not Found'
-    When I go to "/static2.html"
-    Then I should see 'Static, no code!'
-
-  Scenario: Move one path to another with directory indexes (using dest path)
-    Given a fixture app "large-build-app"
-    And a file named "config.rb" with:
-    """
-    activate :directory_indexes
-    move_file "/static/index.html", "/static2.html"
-    """
-    And the Server is running at "large-build-app"
-    When I go to "/static.html"
-    Then I should see 'Not Found'
-    When I go to "/static/index.html"
-    Then I should see 'Not Found'
-    When I go to "/static2.html"
-    Then I should see 'Static, no code!'
-

middleman-core/features/nested_layouts.feature

@@ -5,37 +5,37 @@ Feature: Allow nesting of layouts
     When I go to "/index.html"
     Then I should see:
     """
-    Master Erb
+    Master
     <h1>Index Title</h1>
-      I am Outer
-        I am Inner
+      Outer
+        Inner
       Template
-
+    
     """
     When I go to "/another.html"
     Then I should see:
     """
-    Master Erb
+    Master
     <h1>New Article Title</h1>
-      I am Outer
-        I am Inner
+      Outer
+        Inner
       <p>The Article Content</p>
     """
-
+    
   Scenario: A page uses an inner layout when uses an outer layout (slim)
     Given the Server is running at "nested-layout-app"
     When I go to "/slim-test.html"
-    Then I should see "<h1>Master Slim</h1><p>New Article Title</p><div><h2>I am Outer</h2><h3>I am Inner</h3><p>The Article Content</p>"
-
+    Then I should see "<h1>Master</h1><p>New Article Title</p><div><h2>Outer</h2><h3>Inner</h3><p>The Article Content</p>"
+    
   Scenario: A page uses an inner layout when uses an outer layout (haml)
     Given the Server is running at "nested-layout-app"
     When I go to "/haml-test.html"
     Then I should see:
     """
-    Master Haml
+    Master
     <h1>New Article Title</h1>
-    I am Outer
-    I am Inner
+    Outer
+    Inner
     <p>The Article Content</p>
     """
 
@@ -43,16 +43,13 @@ Feature: Allow nesting of layouts
     Given the Server is running at "nested-layout-app"
     When I go to "/data-one.html"
     Then I should see "Page Number One"
-    And I should see "Page #1"
-    And I should see "I am Inner"
-    And I should see "I am Outer"
-    And I should see "Master Erb"
+    And I should see "Inner"
     When I go to "/data-two.html"
     Then I should see "Page Number Two"
-    And I should not see "I am Inner"
+    And I should not see "Inner"
     When I go to "/data-one.html"
     Then I should see "Page Number One"
-    And I should see "I am Inner"
+    And I should see "Inner"
     When I go to "/data-two.html"
     Then I should see "Page Number Two"
-    And I should not see "I am Inner"
+    And I should not see "Inner"

middleman-core/features/page-id.feature

@@ -1,72 +0,0 @@
-Feature: Page IDs
-
-  Scenario: link_to works with blocks (erb)
-    Given the Server is running at "page-id-app"
-    When I go to "/index.html"
-    Then I should see "I am: index"
-    And I should see "URL1: /fm.html"
-    And I should see "URL2: /2.html"
-    And I should see 'URL3: <a href="/3.html">Hi</a>'
-    And I should see 'URL4: <a href="/overwrites/from-default.html">Sym</a>'
-    And I should see 'URL5: <a href="/implicit.html">Imp</a>'
-    And I should see 'URL6: <a href="/folder/foldern.html">Foldern</a>'
-    And I should see 'URL7: <a href="/feed.xml">Feed</a>'
-
-    When I go to "/fm.html"
-    Then I should see "I am: frontmatter"
-    When I go to "/implicit.html"
-    Then I should see "I am: implicit"
-    When I go to "/feed.xml"
-    Then I should see "I am: feed.xml"
-    When I go to "/folder/foldern.html"
-    Then I should see "I am: folder/foldern"
-
-    When I go to "/1.html"
-    Then I should see "I am: page1"
-    When I go to "/2.html"
-    Then I should see "I am: page2"
-    When I go to "/3.html"
-    Then I should see "I am: page3"
-
-    When I go to "/overwrites/from-default.html"
-    Then I should see "I am: something-else"
-
-    When I go to "/overwrites/from-frontmatter.html"
-    Then I should see "I am: from_frontmatter"
-
-  Scenario: Override page ID derivation with a proc
-    Given a fixture app "page-id-app"
-    And app "page-id-app" is using config "proc"
-    And the Server is running at "page-id-app"
-
-    When I go to "/index.html"
-    Then I should see "I am: index.html-foo"
-    And I should see "URL1: /fm.html"
-    And I should see "URL2: /2.html"
-    And I should see 'URL3: <a href="/3.html">Hi</a>'
-    And I should see 'URL4: <a href="/overwrites/from-default.html">Sym</a>'
-    And I should see 'URL8: <a href="/implicit.html">Imp</a>'
-    And I should see 'URL9: <a href="/folder/foldern.html">Foldern</a>'
-    And I should see 'URL10: <a href="/feed.xml">Feed</a>'
-
-    When I go to "/fm.html"
-    Then I should see "I am: frontmatter"
-    When I go to "/implicit.html"
-    Then I should see "I am: implicit.html-foo"
-    When I go to "/feed.xml"
-    Then I should see "I am: feed.xml-foo"
-    When I go to "/folder/foldern.html"
-    Then I should see "I am: folder/foldern.html-foo"
-
-    When I go to "/1.html"
-    Then I should see "I am: page1"
-    When I go to "/2.html"
-    Then I should see "I am: page2"
-    When I go to "/3.html"
-    Then I should see "I am: page3"
-
-    When I go to "/overwrites/from-default.html"
-    Then I should see "I am: something-else"
-
-    When I go to "/overwrites/from-frontmatter.html"
-    Then I should see "I am: from_frontmatter"

middleman-core/features/partials.feature

@@ -5,30 +5,25 @@ Feature: Provide Sane Defaults for Partial Behavior
     When I go to "/index.html"
     Then I should see "Header"
     And I should see "Footer"
-
+    
   Scenario: Finds shared partials relative to the root (sub)
     Given the Server is running at "partials-app"
     When I go to "/sub/index.html"
     Then I should see "Header"
     And I should see "Footer"
-
-  Scenario: Flags error when partial is not found
-    Given the Server is running at "partials-app"
-    When I go to "/index_missing.html"
-    Then I should see "Error: Could not locate partial"
-
+    
   Scenario: Prefers partials of the same engine type
     Given the Server is running at "partials-app"
     When I go to "/index.html"
     Then I should see "ERb Main"
-
+  
   Scenario: Prefers partials of the same engine type
     Given the Server is running at "partials-app"
     When I go to "/second.html"
     Then I should see "Str Main"
     And I should see "Header"
     And I should see "Footer"
-
+    
   Scenario: Finds partial relative to template
     Given the Server is running at "partials-app"
     When I go to "/sub/index.html"
@@ -38,7 +33,7 @@ Feature: Provide Sane Defaults for Partial Behavior
     Given the Server is running at "partials-app"
     When I go to "/locals.html"
     Then I should see "Local var is bar"
-
+  
   Scenario: Partial and Layout use different engines
     Given the Server is running at "different-engine-partial"
     When I go to "/index.html"
@@ -55,10 +50,3 @@ Feature: Provide Sane Defaults for Partial Behavior
     Then I should see "File Not Found"
     When I go to "/_code_snippet.html"
     Then I should see "File Not Found"
-
-Scenario: Works with blocks
-    Given the Server is running at "partials-app"
-    When I go to "/block.html"
-    Then I should see "Start"
-    And I should see "Contents"
-    And I should see "End"

middleman-core/features/redirects.feature

@@ -8,7 +8,6 @@ Feature: Meta redirects
     """
     And the Server is running at "large-build-app"
     When I go to "/hello.html"
-    Then I should see '<link rel="canonical" href="world.html"'
     Then I should see '<meta http-equiv=refresh content="0; url=world.html"'
 
   Scenario: Redirect to external site

middleman-core/features/relative_assets.feature

@@ -21,12 +21,6 @@ Feature: Relative Assets
     Given "relative_assets" feature is "disabled"
     And the Server is running at "relative-assets-app"
     When I go to "/relative_image.html"
-    Then I should see '"/stylesheets/relative_assets.css"'
-    Then I should see '"/javascripts/app.js"'
-    Then I should see "/images/blank.gif"
-    When I go to "/absolute_image_relative_css.html"
-    Then I should see '"stylesheets/relative_assets.css"'
-    Then I should see '"javascripts/app.js"'
     Then I should see "/images/blank.gif"
 
   Scenario: Rendering css with the feature enabled
@@ -36,16 +30,6 @@ Feature: Relative Assets
     Then I should see 'url("../images/blank.gif'
     When I go to "/javascripts/application.js"
     Then I should not see "../"
-    When I go to "/stylesheets/fonts.css"
-    Then I should see 'url(../fonts/roboto/roboto-regular-webfont.eot'
-    And I should see 'url(../fonts/roboto/roboto-regular-webfont.woff'
-    And I should see 'url(../fonts/roboto/roboto-regular-webfont.ttf'
-    And I should see 'url(../fonts/roboto/roboto-regular-webfont.svg'
-    When I go to "/stylesheets/fonts2.css"
-    Then I should see 'url(../fonts/roboto/roboto-regular-webfont.eot'
-    And I should see 'url(../fonts/roboto/roboto-regular-webfont.woff'
-    And I should see 'url(../fonts/roboto/roboto-regular-webfont.ttf'
-    And I should see 'url(../fonts/roboto/roboto-regular-webfont.svg'
 
   Scenario: Building css with the feature enabled
     Given a fixture app "relative-assets-app"
@@ -69,15 +53,10 @@ Feature: Relative Assets
     When I cd to "build"
     Then the file "relative_image/index.html" should contain "../stylesheets/relative_assets.css"
 
-  Scenario: Rendering html with the feature enabled (overrides relative option on helpers)
+  Scenario: Rendering html with the feature enabled
     Given "relative_assets" feature is "enabled"
     And the Server is running at "relative-assets-app"
     When I go to "/relative_image.html"
-    Then I should see '"stylesheets/relative_assets.css"'
-    Then I should see '"javascripts/app.js"'
-    When I go to "/relative_image_absolute_css.html"
-    Then I should see '"stylesheets/relative_assets.css"'
-    Then I should see '"javascripts/app.js"'
     Then I should not see "/images/blank.gif"
     And I should see "images/blank.gif"
 
@@ -120,7 +99,7 @@ Feature: Relative Assets
       """
     And the Server is running at "relative-assets-app"
     When I go to "/sub/image_tag.html"
-    Then I should see '<img src="../img/blank.gif"'
+    Then I should see '<img src="../img/blank.gif" />'
 
   Scenario: Relative assets should not break data URIs in image_tag
     Given a fixture app "relative-assets-app"
@@ -131,18 +110,4 @@ Feature: Relative Assets
       """
     And the Server is running at "relative-assets-app"
     When I go to "/sub/image_tag.html"
-    Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />'
-
-  Scenario: URLs are not rewritten for rewrite ignored paths
-    Given a fixture app "relative-assets-app"
-    And a file named "config.rb" with:
-      """
-      activate :relative_assets, rewrite_ignore: [
-        '/stylesheets/fonts.css',
-      ]
-      """
-    And the Server is running at "relative-assets-app"
-    When I go to "/stylesheets/relative_assets.css"
-    Then I should see 'url("../images/blank.gif'
-    When I go to "/stylesheets/fonts.css"
-    Then I should see 'url(/fonts/roboto/roboto-regular-webfont.eot'
+    Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />'

middleman-core/features/relative_assets_helpers_only.feature

@@ -1,123 +0,0 @@
-Feature: Relative Assets (Helpers Only)
-
-  Scenario: Rendering css with the feature enabled
-    Given a fixture app "relative-assets-app"
-    And a file named "config.rb" with:
-      """
-      activate :relative_assets, helpers_only: true
-      """
-    And a file named "source/stylesheets/relative_assets.css.sass.erb" with:
-      """
-      h1
-        background: url("<%= asset_url('images/blank.gif') %>")
-      h2
-        background: url("<%= asset_url('/images/blank2.gif') %>")
-      """
-    And a file named "source/javascripts/application.js.erb" with:
-      """
-      function foo() {
-        var img = document.createElement('img');
-        img.src = '<%= asset_url("images/100px.jpg") %>';
-        var body = document.getElementsByTagName('body')[0];
-        body.insertBefore(img, body.firstChild);
-      }
-
-      window.onload = foo;
-      """
-    And a file named "source/stylesheets/fonts3.css.erb" with:
-      """
-      @font-face {
-        font-family: 'Roboto2';
-        src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot") %>);
-        src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot?#iefix") %>) format('embedded-opentype'),
-            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.woff") %>) format('woff'),
-            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.ttf") %>) format('truetype'),
-            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.svg#robotoregular") %>) format('svg');
-        font-weight: normal;
-        font-style: normal;
-      }
-      """
-    And the Server is running at "relative-assets-app"
-    When I go to "/stylesheets/relative_assets.css"
-    Then I should see 'url("../images/blank.gif'
-    And I should see 'url("../images/blank2.gif'
-    When I go to "/javascripts/application.js"
-    Then I should not see "../"
-    When I go to "/stylesheets/fonts3.css"
-    Then I should see 'url(../fonts/roboto/roboto-regular-webfont.eot'
-    And I should see 'url(../fonts/roboto/roboto-regular-webfont.woff'
-    And I should see 'url(../fonts/roboto/roboto-regular-webfont.ttf'
-    And I should see 'url(../fonts/roboto/roboto-regular-webfont.svg'
-
-  Scenario: Relative css reference with directory indexes
-    Given a fixture app "relative-assets-app"
-    And a file named "config.rb" with:
-      """
-      activate :directory_indexes
-      activate :relative_assets, helpers_only: true
-      """
-    And the Server is running at "relative-assets-app"
-    When I go to "/relative_image/index.html"
-    Then I should see "../stylesheets/relative_assets.css"
-
-  Scenario: Relative assets via image_tag
-    Given a fixture app "relative-assets-app"
-    And a file named "config.rb" with:
-      """
-      activate :relative_assets, helpers_only: true
-      """
-    And a file named "source/sub/image_tag.html.erb" with:
-      """
-      <%= image_tag '/img/blank.gif' %>
-      """
-    And the Server is running at "relative-assets-app"
-    When I go to "/sub/image_tag.html"
-    Then I should see '<img src="../img/blank.gif"'
-
-  Scenario: Relative assets should not break data URIs in image_tag
-    Given a fixture app "relative-assets-app"
-    And a file named "config.rb" with:
-      """
-      activate :relative_assets, helpers_only: true
-      """
-    And a file named "source/sub/image_tag.html.erb" with:
-      """
-      <%= image_tag "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" %>
-      """
-    And the Server is running at "relative-assets-app"
-    When I go to "/sub/image_tag.html"
-    Then I should see '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" />'
-
-  Scenario: URLs are not rewritten for rewrite ignored paths
-    Given a fixture app "relative-assets-app"
-    And a file named "config.rb" with:
-      """
-      activate :relative_assets, rewrite_ignore: [
-        '/stylesheets/fonts3.css',
-      ], helpers_only: true
-      """
-    And a file named "source/stylesheets/relative_assets.css.sass.erb" with:
-      """
-      h1
-        background: url("<%= asset_url('images/blank.gif') %>")
-      h2
-        background: url("<%= asset_url('/images/blank2.gif') %>")
-      """
-    And a file named "source/stylesheets/fonts3.css.erb" with:
-      """
-      @font-face {
-        font-family: 'Roboto2';
-        src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot") %>);
-        src: url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.eot?#iefix") %>) format('embedded-opentype'),
-            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.woff") %>) format('woff'),
-            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.ttf") %>) format('truetype'),
-            url(<%= asset_url("/fonts/roboto/roboto-regular-webfont.svg#robotoregular") %>) format('svg');
-        font-weight: normal;
-        font-style: normal;
-      }
-      """
-    And the Server is running at "relative-assets-app"
-    When I go to "/stylesheets/relative_assets.css"
-    Then I should see 'url("../images/blank.gif'
-    When I go to "/stylesheets/fonts3.css"
-    Then I should see 'url(/fonts/roboto/roboto-regular-webfont.eot'

middleman-core/features/sass_in_slim.feature

@@ -1,40 +0,0 @@
-Feature: Sass/SCSS support in Slim
-  In order to test support of the Slim sass and scss filters
-
-  Scenario: Sass filter in Slim works
-    Given a fixture app "sass-in-slim-app"
-    And a file named "config.rb" with:
-      """
-      activate :directory_indexes
-      """
-    And a file named "source/sass_filter.html.slim" with:
-      """
-      sass:
-        .sass
-          margin: 0
-      """
-    Given the Server is running at "sass-in-slim-app"
-    When I go to "/sass_filter/"
-    Then I should see "text/css"
-    Then I should see ".sass"
-    Then I should see "margin:0"
-
-
-  Scenario: SCSS filter in Slim works
-    Given a fixture app "sass-in-slim-app"
-    And a file named "config.rb" with:
-      """
-      activate :directory_indexes
-      """
-    And a file named "source/scss_filter.html.slim" with:
-      """
-      scss:
-        .scss {
-          margin: 0;
-        }
-      """
-    Given the Server is running at "sass-in-slim-app"
-    When I go to "/scss_filter/"
-    Then I should see "text/css"
-    Then I should see ".scss"
-    Then I should see "margin:0"

middleman-core/features/slim.feature

@@ -78,4 +78,4 @@ Feature: Support slim templating language
     When I go to "/sass.html"
     Then I should see "html,body,div"
     When I go to "/error.html"
-    Then I should see "Error:"
+    Then I should see "Error: Invalid"

middleman-core/features/stylus.feature

@@ -1,3 +1,4 @@
+@nojava
 Feature: Stylus Updates and Partials
   Scenario: The preview server should update stylesheets when Stylus changes
     Given the Server is running at "stylus-preview-app"

middleman-core/features/support/env.rb

@@ -1,13 +1,9 @@
 ENV["TEST"] = "true"
-
-require 'sassc'
+ENV["AUTOLOAD_SPROCKETS"] ||= "false"
 
 require 'simplecov'
 SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
 
-require 'phantomjs/poltergeist'
-Capybara.javascript_driver = :poltergeist
-
 require 'coveralls'
 Coveralls.wear!
 

middleman-core/features/support/preserve_mime_types.rb

@@ -1,7 +0,0 @@
-Around('@preserve_mime_types') do |_scenario, block|
-  mime_types = ::Rack::Mime::MIME_TYPES.clone
-
-  block.call
-
-  ::Rack::Mime::MIME_TYPES.replace mime_types
-end

middleman-core/features/template-key-collision.feature

@@ -1,26 +0,0 @@
-Feature: Don't allow template locals to overwrite template helpers
-
-  Scenario: Normal Template
-    Given an empty app
-    And a file named "config.rb" with:
-      """
-      class TestExt < ::Middleman::Extension
-        expose_to_template foo: :foo
-
-        def foo
-          "bar"
-        end
-      end
-
-      ::Middleman::Extensions.register :test, TestExt
-
-      activate :test
-
-      page "/index.html", locals: { foo: false }
-      """
-    And a file named "source/index.html.erb" with:
-      """
-      <%= foo %>
-      """
-    Given a built app at "empty_app"
-    Then the exit status should be 1

middleman-core/features/twitter-bootstrap-compile.feature

@@ -0,0 +1,6 @@
+@nojava @nowindows
+Feature: Compile a complicated Twitter bootstrap app
+
+  Scenario: User drops Twitter Bootstrap source into an app
+
+    Given a successfully built app at "twitter-bootstrap-app"

middleman-core/features/working_directory.feature

@@ -0,0 +1,33 @@
+Feature: Honour working directory 
+  Honour the working directory during testing
+  In order to support helpers which work with the current directories
+
+  Scenario: Set working directory for helpers in tests
+    Given a fixture app "empty-app"
+    And a file named "source/index.html.erb" with:
+    """
+    <%= Dir.getwd %>
+    """
+    And the Server is running
+    When I go to "/index.html"
+    Then I should see:
+    """
+    aruba
+    """
+
+  Scenario: Set working directory for config.rb in tests
+    Given a fixture app "empty-app"
+    And a file named "config.rb" with:
+    """
+    set :my_working_directory, Dir.getwd
+    """
+    And a file named "source/index.html.erb" with:
+    """
+    <%= config[:my_working_directory] %>
+    """
+    And the Server is running
+    When I go to "/index.html"
+    Then I should see:
+    """
+    aruba
+    """

middleman-core/fixtures/asset-hash-app/source/index.html.erb

@@ -4,9 +4,6 @@
 
 <h2>Image url:</h2>
 <img src="<%= image_path('100px.jpg') %>" srcset="<%= image_path('100px.jpg') %> 1x, <%= image_path('200px.jpg') %> 2x, <%= image_path('300px.jpg') %> 3x">
-<%= image_tag('100px.jpg?test') %>
-<%= image_tag('100px.jpg?#test') %>
-<%= image_tag('100px.jpg#test') %>
 
 <h2>Ignored path:</h2>
 <link rel="apple-touch-icon" href="apple-touch-icon.png">

middleman-core/fixtures/asset-hash-app/source/layout.erb

@@ -3,16 +3,16 @@
   <head>
     <meta charset="utf-8">
 
-    <%= stylesheet_link_tag "site", "fragment" %>
+    <%= stylesheet_link_tag "site" %>
     <%= javascript_include_tag "application" %>
     <%= yield_content :head %>
   </head>
-
+  
   <body class="<%= page_classes %>">
 
     <div id="main" role="main">
       <%= yield %>
     </div>
-
+    
   </body>
 </html>

middleman-core/fixtures/asset-hash-app/source/other.html.erb

@@ -1,5 +1,2 @@
 <h2>Image url:</h2>
 <img src="<%= image_path('100px.jpg') %>">
-<img src="<%= image_path('100px.jpg?test') %>">
-<img src="<%= image_path('100px.jpg?#test') %>">
-<img src="<%= image_path('100px.jpg#test') %>">

middleman-core/fixtures/asset-hash-app/source/stylesheets/fragment.css.scss

@@ -1,7 +0,0 @@
-#main {
-  padding: 50px;
-  background-image: image-url('100px.jpg');
-  background-image: image-url('100px.jpg?test');
-  background-image: image-url('100px.jpg?#test');
-  background-image: image-url('100px.jpg#test');
-}