middleman-cli 4.3.0.rc.4 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a015cd8e53b2704ba320851f560dbebe67402b1ea1771b56f6efc1d9558b34b5
-  data.tar.gz: 781202b9739198f2eeebe08807189d64f771eab6f957e37f1869c6c4f067b839
+  metadata.gz: f7c809bca619d378af240d3f39668bb6c066c5af4ef0c970cda6907b56fe9d9b
+  data.tar.gz: 9ce8697764f3dfca793c6bfa57973645254fccbc93497306ef92cdc3d59489b3
 SHA512:
-  metadata.gz: 21eceda8007615dd7cc4a96bb1dfda09b13851167a0f3982511f141578c409c29c900a75578922797987d5da0a78de24a2ac5fd4b5fc20fa47493b8963a6a33f
-  data.tar.gz: f4385f04aaa92837c3f04d781999c7f6d4ef33b7e65b07f9c5f1f163e8c8a9daaff5a2fab77c5d094ff098d24edcff8e1ca65957f37d59ffe9d07925d9355c00
+  metadata.gz: 7a25198d428b7fff9d548e13fb452f2798a9627030ddb5df0fade810f3b8d07aff682f60e411647ff1d2152fc93624d577ad58eee448efb8cd32d5b50383690b
+  data.tar.gz: e5acbbe0573e2cc6e26bc077ef25bb09f33bd25f5ee20e9a263591cc05d377fd99f2973c1b5f7fe2e8c4f5cba0cd87c064767b018599f1e7daac5608fab203a1

data/bin/middleman

@@ -6,7 +6,7 @@ if ARGV.include? '--profile'
 end
 # Middleman::Profiling.start
 
-require 'middleman-core/load_paths'
+require "middleman-core/load_paths"
 Middleman.setup_load_paths
 
 require 'dotenv'
@@ -35,18 +35,19 @@ module Middleman::Cli
   end
 end
 
-require 'middleman-cli'
+require "middleman-cli"
 
 # Change directory to the root
-Dir.chdir(ENV['MM_ROOT']) if ENV['MM_ROOT']
+Dir.chdir(ENV["MM_ROOT"]) if ENV["MM_ROOT"]
 
 # Default command is server
-if ARGV[0] != 'help' && (ARGV.empty? || ARGV.first.include?('-'))
+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

data/features/cli_init.feature

@@ -14,7 +14,7 @@ Feature: Middleman CLI
       | config.rb                                     |
       | source/index.html.erb                         |
       | source/layouts/layout.erb                     |
-      | source/javascripts/site.js                    |
+      | source/javascripts/site.js                     |
       | source/stylesheets/site.css.scss              |
 
   Scenario: Create a new project in the current directory

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 the interactive middleman server
+    When I run `middleman server` interactively
     And I stop middleman if the output contains:
     """
     Inspect your site configuration
@@ -139,7 +139,6 @@ 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:
     """
@@ -316,7 +315,6 @@ Feature: Run the preview server
     Inspect your site configuration at "http://[::1]:4567/__middleman"
     """
 
-  @wip
   Scenario: Start the server with https
     When I run `middleman server --verbose --https` interactively
     And I stop middleman if the output contains:

data/features/support/env.rb

@@ -1,13 +1,15 @@
-ENV['TEST'] = 'true'
+ENV["TEST"] = "true"
 
-require 'backports/latest'
 require 'sassc'
 
 require 'simplecov'
 SimpleCov.root(File.expand_path(File.dirname(__FILE__) + '/../..'))
 
-require 'simplecov'
-SimpleCov.start
+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')

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

@@ -6,24 +6,25 @@ require 'psych'
 db_file = ARGV[0]
 port = ARGV[1] || 5300
 
-db = if File.file? db_file
-       warn 'Found dns db'
-       Psych.load_file(db_file)
-     else
-       warn 'Found no dns db. Use default db.'
+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
+        {
+          /www\.example\.org/ => '1.1.1.1'
+        }
+      end
 
 interfaces = [
-  [:udp, '127.0.0.1', port],
-  [:tcp, '127.0.0.1', port]
+    [:udp, "127.0.0.1", port],
+    [:tcp, "127.0.0.1", port]
 ]
 
+
 # Start the RubyDNS server
-RubyDNS.run_server(listen: interfaces) do
+RubyDNS::run_server(listen: interfaces) do
   db.each do |matcher, result|
     match(matcher, Resolv::DNS::Resource::IN::A) do |transaction|
       transaction.respond!(result)

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

@@ -9,7 +9,7 @@ class MyFeature < Middleman::Extension
       puts "/// #{server_information.port} ///"
       puts "/// #{server_information.server_name} ///"
       puts "/// #{server_information.site_addresses.first} ///"
-      puts '/// ### END ### ///'
+      puts "/// ### END ### ///"
     end
   end
 end

data/lib/middleman-cli.rb

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

data/lib/middleman-cli/build.rb

@@ -42,9 +42,7 @@ module Middleman::Cli
     # Core build Thor command
     # @return [void]
     def build
-      root = ENV['MM_ROOT'] || Dir.pwd
-
-      unless File.exist?(File.join(root, 'config.rb'))
+      unless ENV['MM_ROOT']
         raise Thor::Error, 'Error: Could not find a Middleman project config, perhaps you are in the wrong folder?'
       end
 
@@ -81,7 +79,7 @@ module Middleman::Cli
       ::Middleman::Util.instrument 'builder.run' do
         if builder.run!
           clean_directories! if options['clean']
-          puts 'Project built successfully.'
+          shell.say 'Project built successfully.'
         else
           msg = 'There were errors during this build'
           unless options['verbose']
@@ -101,7 +99,7 @@ module Middleman::Cli
     # @param [String] contents The event contents.
     # @param [String] extra The extra information.
     # @return [void]
-    def on_event(event_type, target, extra = nil)
+    def on_event(event_type, target, extra=nil)
       case event_type
       when :error
         say_status :error, target, :red

data/lib/middleman-cli/init.rb

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

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

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

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

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

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

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

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

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

data/middleman-cli.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-cli
 version: !ruby/object:Gem::Version
-  version: 4.3.0.rc.4
+  version: 4.3.0
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2019-01-11 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, Slim, CoffeeScript, and more). Makes minification, compression, cache busting,
-  Yaml data (and more) an easy part of your development cycle.
+  Sass, Compass, 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
@@ -95,15 +95,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development