middleman-cli 4.1.0.rc.1 → 4.1.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a55a47e652b3501db52cdd026f821833d4911ca0
-  data.tar.gz: 6844c00c8a36b5d6dfce34e8e136a7d38207a1f6
+  metadata.gz: f56a6b880d1fd6a68637089f0498e22db06e592c
+  data.tar.gz: ef4484d9dd4183e48685bdda817766c87d6247e1
 SHA512:
-  metadata.gz: 261e3cfce78e9fbab83d7bf81e157fb3767897fdbbeb11e817f751c8fecbdd7e28bbad52c7b6ea3dbe4a460ec097e9d8f5ff220398e82266c6c7518d00ba8e21
-  data.tar.gz: bd7734c89384ce59d9457a2e0e9b6bb00ac9eed428849416490f5668c69258205e952051ef6b9a7f0aa2f131297c492b274c9177e7ca04808fbb7698e453478e
+  metadata.gz: 9650bb5c122da185f691fd20509c0cbf249fcd5425d4e57e953c51aadd1de6fcc6c2a1d5be9be7ba062005c2d36ae0699a3ea9d64ba99a4eb416f3dead1e9de3
+  data.tar.gz: 3f0d0958af6f0c3c2f4d268ac73523890ca196bfcf1c7d86b466f0f53ac88386b79c7dfe6902fa534695ee0393c9e37774037cac0ad68a1903805278588fb569

data/Rakefile

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

data/features/cli_extension.feature

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

data/features/cli_init.feature

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

data/features/preview_server-hook.feature

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

data/features/preview_server.feature

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

data/features/support/env.rb

@@ -0,0 +1,19 @@
+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')

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

data/lib/middleman-cli/build.rb

@@ -48,31 +48,38 @@ module Middleman::Cli
       verbose = options['verbose'] ? 0 : 1
       instrument = options['instrument']
 
-      @app = ::Middleman::Application.new do
-        config[:mode] = :build
-        config[:environment] = env
-        config[:show_exceptions] = false
-        ::Middleman::Logger.singleton(verbose, instrument)
-      end
+      builder = nil
 
-      builder = Middleman::Builder.new(@app,
-                                       glob: options['glob'],
-                                       clean: options['clean'],
-                                       parallel: options['parallel'])
-      builder.thor = self
-      builder.on_build_event(&method(:on_event))
+      ::Middleman::Logger.singleton(verbose, instrument)
 
-      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.'
+      ::Middleman::Util.instrument 'builder_setup' do
+        @app = ::Middleman::Application.new do
+          config[:mode] = :build
+          config[:environment] = env
+          config[:show_exceptions] = false
         end
-        shell.say msg, :red
 
-        exit(1)
+        builder = Middleman::Builder.new(@app,
+                                         glob: options['glob'],
+                                         clean: options['clean'],
+                                         parallel: options['parallel'])
+        builder.thor = self
+        builder.on_build_event(&method(:on_event))
+      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
+
+          exit(1)
+        end
       end
     end
 

data/lib/middleman-cli/init.rb

@@ -4,6 +4,8 @@ module Middleman::Cli
   class Init < Thor::Group
     include Thor::Actions
 
+    GIT_CMD = 'git'.freeze
+
     check_unknown_options!
 
     argument :target, type: :string, default: '.'
@@ -25,6 +27,13 @@ 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'
@@ -51,10 +60,11 @@ module Middleman::Cli
       begin
         branch_cmd = repo_branch ? "-b #{repo_branch} " : ''
 
-        run("git clone --depth 1 #{branch_cmd}#{repo_path} #{dir}")
+        git_path = "#{branch_cmd}#{repo_path}"
+        run("#{GIT_CMD} clone --depth 1 #{branch_cmd}#{repo_path} #{dir}")
 
-        unless File.directory?(dir)
-          say 'Git clone failed, maybe the url is invalid or you don\'t have the permissions?', :red
+        unless $?.success?
+          say "Git clone command failed. Make sure git repository exists: #{git_path}", :red
           exit 1
         end
 
@@ -79,6 +89,25 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cli
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc.1
+  version: 4.1.0.rc.2
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -47,8 +47,24 @@ files:
 - ".yardopts"
 - Rakefile
 - bin/middleman
-- features/.gitkeep
-- fixtures/.gitkeep
+- features/cli_extension.feature
+- features/cli_init.feature
+- features/preview_server-hook.feature
+- features/preview_server.feature
+- features/support/env.rb
+- fixtures/preview-server-app/bin/dns_server.rb
+- fixtures/preview-server-app/config.rb
+- fixtures/preview-server-app/source/index.html.erb
+- fixtures/preview-server-app/source/layout.erb
+- fixtures/preview-server-app/source/layouts/custom.erb
+- fixtures/preview-server-app/source/real.html
+- fixtures/preview-server-app/source/real/index.html.erb
+- fixtures/preview-server-app/source/should_be_ignored.html
+- fixtures/preview-server-app/source/should_be_ignored2.html
+- fixtures/preview-server-app/source/should_be_ignored3.html
+- fixtures/preview-server-app/source/static.html
+- fixtures/preview-server-hook-app/config.rb
+- fixtures/preview-server-hook-app/source/index.html.erb
 - lib/middleman-cli.rb
 - lib/middleman-cli/build.rb
 - lib/middleman-cli/config.rb
@@ -92,6 +108,22 @@ signing_key:
 specification_version: 4
 summary: Hand-crafted frontend development
 test_files:
-- features/.gitkeep
-- fixtures/.gitkeep
+- features/cli_extension.feature
+- features/cli_init.feature
+- features/preview_server-hook.feature
+- features/preview_server.feature
+- features/support/env.rb
+- fixtures/preview-server-app/bin/dns_server.rb
+- fixtures/preview-server-app/config.rb
+- fixtures/preview-server-app/source/index.html.erb
+- fixtures/preview-server-app/source/layout.erb
+- fixtures/preview-server-app/source/layouts/custom.erb
+- fixtures/preview-server-app/source/real.html
+- fixtures/preview-server-app/source/real/index.html.erb
+- fixtures/preview-server-app/source/should_be_ignored.html
+- fixtures/preview-server-app/source/should_be_ignored2.html
+- fixtures/preview-server-app/source/should_be_ignored3.html
+- fixtures/preview-server-app/source/static.html
+- fixtures/preview-server-hook-app/config.rb
+- fixtures/preview-server-hook-app/source/index.html.erb
 has_rdoc: