middleman-cli 4.2.1 → 4.3.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4feeae5ebc27d96fb3612590049cd936012f7656
-  data.tar.gz: a287d26153d59501e030c532dc67689e78ab2660
+  metadata.gz: 62508ac01ace610a0772fa2aaba90e46edf0fb36
+  data.tar.gz: d110634639c89a17396209780555aec998e895cb
 SHA512:
-  metadata.gz: 281d2d6fb77e14e1f44df900fde079524b0a59065f3f69ad8cca7b0d5be2f4816437bbb46f4d353efa134d2d44089a102b59c44c489a17dedac60ae33efa7465
-  data.tar.gz: 6f2f0b7c5d009764111a3014d69422dff3435806da3c09a745c1a28d7df1bc4ccd3076b57da72beea24bb0d13cde3f921a0ba7f009f992533a2e3ed1f4b601ec
+  metadata.gz: c5fa44cea315462e39202442c8fbd904f08d8b5108a9772e1e59a9431031a83da197f6f879487261b4b5d9da8d2f05286141367cb4e1580817ba4c23fbb161cd
+  data.tar.gz: 0e913ef272bb8f9a9a670f38adcd0eb4cce77a9b9856b0ac18f1826ce6d08c7449d774952ff384b95b7d379ff628f5d990c724d5502d390b48c4e77c04a17b70

data/bin/middleman

@@ -47,7 +47,6 @@ 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

data/features/cli_init.feature

@@ -14,9 +14,8 @@ Feature: Middleman CLI
       | config.rb                                     |
       | source/index.html.erb                         |
       | source/layouts/layout.erb                     |
-      | source/javascripts/all.js                     |
+      | source/javascripts/site.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"

data/features/preview_server.feature

@@ -9,7 +9,7 @@ Feature: Run the preview server
     And the default aruba timeout is 30 seconds
 
   Scenario: Start the server with defaults
-    When I run `middleman server` interactively
+    When I run the interactive middleman server
     And I stop middleman if the output contains:
     """
     Inspect your site configuration
@@ -139,6 +139,7 @@ Feature: Run the preview server
     Inspect your site configuration at "http://127.0.0.5:4567/__middleman"
     """
 
+  @wip
   Scenario: Start the server with bind address ::1
     Given a file named ".hosts" with:
     """

data/features/support/env.rb

@@ -8,11 +8,8 @@ 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
+require 'simplecov'
+SimpleCov.start
 
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-cli')

data/lib/middleman-cli/build.rb

@@ -42,7 +42,9 @@ module Middleman::Cli
     # Core build Thor command
     # @return [void]
     def build
-      unless ENV['MM_ROOT']
+      root = ENV['MM_ROOT'] || Dir.pwd
+
+      unless File.exists?(File.join(root, "config.rb"))
         raise Thor::Error, 'Error: Could not find a Middleman project config, perhaps you are in the wrong folder?'
       end
 
@@ -79,7 +81,7 @@ module Middleman::Cli
       ::Middleman::Util.instrument 'builder.run' do
         if builder.run!
           clean_directories! if options['clean']
-          shell.say 'Project built successfully.'
+          puts 'Project built successfully.'
         else
           msg = 'There were errors during this build'
           unless options['verbose']

data/lib/middleman-cli/init.rb

@@ -22,6 +22,10 @@ module Middleman::Cli
                  default: false,
                  desc: 'Skip bundle install'
 
+    class_option 'bundle-path',
+                 type: :string,
+                 desc: 'Use specified bundle path'
+
     # The init task
     def init
       require 'fileutils'
@@ -43,7 +47,7 @@ module Middleman::Cli
 
         begin
           data = ::JSON.parse(uri.read)
-          data['links']['github']
+          is_local_dir = false
           data['links']['github'].split('#')
         rescue ::OpenURI::HTTPError
           say "Template `#{options[:template]}` not found in Middleman Directory."
@@ -52,21 +56,12 @@ module Middleman::Cli
         end
       else
         repo_name, repo_branch = options[:template].split('#')
-        [repository_path(repo_name), repo_branch]
+        repo_path, is_local_dir = repository_path(repo_name)
+        [repo_path, repo_branch]
       end
 
-      dir = Dir.mktmpdir
-
       begin
-        branch_cmd = repo_branch ? "-b #{repo_branch} " : ''
-
-        git_path = "#{branch_cmd}#{repo_path}"
-        run("#{GIT_CMD} clone --depth 1 #{branch_cmd}#{repo_path} #{dir}")
-
-        unless $?.success?
-          say "Git clone command failed. Make sure git repository exists: #{git_path}", :red
-          exit 1
-        end
+        dir = is_local_dir ? repo_path : clone_repository(repo_path, repo_branch)
 
         inside(target) do
           thorfile = File.join(dir, 'Thorfile')
@@ -80,10 +75,11 @@ module Middleman::Cli
             directory dir, '.', exclude_pattern: /\.git\/|\.gitignore$/
           end
 
-          run('bundle install') unless ENV['TEST'] || options[:'skip-bundle']
+          bundle_args = options[:'bundle-path'] ? " --path=#{options[:'bundle-path']}" : ''
+          run("bundle install#{bundle_args}") unless ENV['TEST'] || options[:'skip-bundle']
         end
       ensure
-        FileUtils.remove_entry(dir) if File.directory?(dir)
+        FileUtils.remove_entry(dir) if !is_local_dir && File.directory?(dir)
       end
     end
 
@@ -112,8 +108,30 @@ module Middleman::Cli
       repo.split('/').length == 1
     end
 
-    def repository_path(repo)
-      repo.include?('://') || repo.include?('git@') ? repo : "https://github.com/#{repo}.git"
+    def repository_path(repo_name)
+      if repo_name.include?('://') || /^[^@]+@[^:]+:.+/ =~ repo_name
+        repo_name
+      elsif (repo_path = Pathname(repo_name)).directory? && repo_path.absolute?
+        [repo_name, true]
+      else
+        "https://github.com/#{repo_name}.git"
+      end
+    end
+
+    def clone_repository(repo_path, repo_branch)
+      dir = Dir.mktmpdir
+
+      branch_cmd = repo_branch ? "-b #{repo_branch} " : ''
+
+      git_path = "#{branch_cmd}#{repo_path}"
+      run("#{GIT_CMD} clone --depth 1 #{branch_cmd}#{repo_path} #{dir}")
+
+      unless $?.success?
+        say "Git clone command failed. Make sure git repository exists: #{git_path}", :red
+        exit 1
+      end
+
+      dir
     end
 
     # Add to CLI

data/middleman-cli.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.email       = ['me@tdreyno.com', 'ben@benhollis.net']
   s.homepage    = 'http://middlemanapp.com'
   s.summary     = 'Hand-crafted frontend development'
-  s.description = 'A static site generator. Provides dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.'
+  s.description = 'A static site generator. Provides dozens of templating languages (Haml, Sass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.'
 
   s.files        = `git ls-files -z`.split("\0")
   s.test_files   = `git ls-files -z -- {fixtures,features}/*`.split("\0")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.0.rc.1
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -32,8 +32,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 description: A static site generator. Provides dozens of templating languages (Haml,
-  Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache
-  busting, Yaml data (and more) an easy part of your development cycle.
+  Sass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting,
+  Yaml data (and more) an easy part of your development cycle.
 email:
 - me@tdreyno.com
 - ben@benhollis.net
@@ -98,12 +98,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development