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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 62508ac01ace610a0772fa2aaba90e46edf0fb36
-  data.tar.gz: d110634639c89a17396209780555aec998e895cb
+SHA256:
+  metadata.gz: 869f5be23dce78a38e541a0292cdf3c68ddfde54358906859b6748e400964cd4
+  data.tar.gz: 41193c17e826abdf41afd3fc6dd38e46a075b42ce14ab6b101d43c746151f6a9
 SHA512:
-  metadata.gz: c5fa44cea315462e39202442c8fbd904f08d8b5108a9772e1e59a9431031a83da197f6f879487261b4b5d9da8d2f05286141367cb4e1580817ba4c23fbb161cd
-  data.tar.gz: 0e913ef272bb8f9a9a670f38adcd0eb4cce77a9b9856b0ac18f1826ce6d08c7449d774952ff384b95b7d379ff628f5d990c724d5502d390b48c4e77c04a17b70
+  metadata.gz: 15ae81a110b21f1d1373d5f24ed201b23c3274b317f8497765a4eefe68f116ad9464d1bc75ec729e9c686952d11d342ff0a91ae981aa8572cafebb3fa69eefed
+  data.tar.gz: f3e0cc810a50f74b4108ef54e38726c8f9a1c63ad50461360f1612a1743ba35959584b65ffca0a7dcaa97dd3a6e4cb0d70c131c541153c397bcabc1f1360edc6

data/Rakefile

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

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,13 +35,13 @@ module Middleman::Cli
   end
 end
 
-require "middleman-cli"
+require 'middleman-cli'
 
 # Change directory to the root
-Dir.chdir(ENV["MM_ROOT"]) if ENV["MM_ROOT"]
+Dir.chdir(ENV['MM_ROOT']) if ENV['MM_ROOT']
 
 # Default command is server
-if ARGV[0] != 'help' && (ARGV.length < 1 || ARGV.first.include?('-'))
+if ARGV[0] != 'help' && (ARGV.empty? || ARGV.first.include?('-'))
   ARGV.unshift('server')
 end
 

data/features/preview_server.feature

@@ -316,6 +316,7 @@ 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,5 +1,6 @@
-ENV["TEST"] = "true"
+ENV['TEST'] = 'true'
 
+require 'backports/latest'
 require 'sassc'
 
 require 'simplecov'

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

@@ -6,25 +6,24 @@ 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.'
+db = if File.file? db_file
+       warn 'Found dns db'
+       Psych.load_file(db_file)
+     else
+       warn '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,7 +1,5 @@
-# rubocop:disable FileName
-
 # Setup our load paths
-libdir = File.expand_path(File.dirname(__FILE__))
+libdir = __dir__
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 # Require Thor since that's what the whole CLI is built around

data/lib/middleman-cli/build.rb

@@ -44,7 +44,7 @@ module Middleman::Cli
     def build
       root = ENV['MM_ROOT'] || Dir.pwd
 
-      unless File.exists?(File.join(root, "config.rb"))
+      unless File.exist?(File.join(root, 'config.rb'))
         raise Thor::Error, 'Error: Could not find a Middleman project config, perhaps you are in the wrong folder?'
       end
 
@@ -101,7 +101,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

@@ -39,26 +39,26 @@ 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)
+                                   is_local_dir = false
+                                   data['links']['github'].split('#')
+                                 rescue ::OpenURI::HTTPError
+                                   say "Template `#{options[:template]}` not found in Middleman Directory."
+                                   say 'Did you mean to use a full `user/repo` path?'
+                                   exit 1
+                                 end
+                               else
+                                 repo_name, repo_branch = options[:template].split('#')
+                                 repo_path, is_local_dir = repository_path(repo_name)
+                                 [repo_path, repo_branch]
+                               end
 
       begin
         dir = is_local_dir ? repo_path : clone_repository(repo_path, repo_branch)
@@ -88,6 +88,7 @@ module Middleman::Cli
     # Copied from Bundler
     def git_present?
       return @git_present if defined?(@git_present)
+
       @git_present = which(GIT_CMD) || which('git.exe')
     end
 
@@ -126,7 +127,7 @@ module Middleman::Cli
       git_path = "#{branch_cmd}#{repo_path}"
       run("#{GIT_CMD} clone --depth 1 #{branch_cmd}#{repo_path} #{dir}")
 
-      unless $?.success?
+      unless $CHILD_STATUS.success?
         say "Git clone command failed. Make sure git repository exists: #{git_path}", :red
         exit 1
       end

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

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

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

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

data/lib/middleman-cli/templates/extension/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

@@ -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 = '>= 2.3.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.1
+  version: 4.3.0.rc.2
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -95,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development