middleman-core 3.4.0 → 3.4.1

data/lib/middleman-core/preview_server/server_url.rb

@@ -6,7 +6,7 @@ module Middleman
     class ServerUrl
       private
 
-      attr_reader :hosts, :port, :https
+      attr_reader :hosts, :port, :https, :format_output
 
       public
 
@@ -14,6 +14,7 @@ module Middleman
         @hosts = opts.fetch(:hosts)
         @port  = opts.fetch(:port)
         @https = opts.fetch(:https, false)
+        @format_output = opts.fetch(:format_output, true)
       end
 
       # Return bind addresses
@@ -21,7 +22,11 @@ module Middleman
       # @return [Array]
       #   List of bind addresses of format host:port
       def to_bind_addresses
-        hosts.map { |l| format('"%s:%s"', l.to_s, port) }
+        if format_output
+          hosts.map { |l| format('"%s:%s"', l.to_s, port) }
+        else
+          hosts.map { |l| format('%s:%s', l.to_s, port) }
+        end
       end
 
       # Return server urls
@@ -29,7 +34,11 @@ module Middleman
       # @return [Array]
       #   List of urls of format http://host:port
       def to_urls
-        hosts.map { |l| format('"%s://%s:%s"', https? ? 'https' : 'http', l.to_browser, port) }
+        if format_output
+          hosts.map { |l| format('"%s://%s:%s"', https? ? 'https' : 'http', l.to_browser, port) }
+        else
+          hosts.map { |l| format('%s://%s:%s', https? ? 'https' : 'http', l.to_browser, port) }
+        end
       end
 
       # Return server config urls
@@ -37,7 +46,11 @@ module Middleman
       # @return [Array]
       #   List of urls of format http://host:port/__middleman
       def to_config_urls
-        hosts.map { |l| format('"%s://%s:%s/__middleman"', https? ? 'https' : 'http', l.to_browser, port) }
+        if format_output
+          hosts.map { |l| format('"%s://%s:%s/__middleman"', https? ? 'https' : 'http', l.to_browser, port) }
+        else
+          hosts.map { |l| format('%s://%s:%s/__middleman', https? ? 'https' : 'http', l.to_browser, port) }
+        end
       end
 
       private

data/lib/middleman-core/renderers/asciidoc.rb

@@ -8,7 +8,7 @@ module Middleman
           app.config.define_setting :asciidoc, {
             safe: :safe,
             backend: :html5,
-            attributes: %W(showtitle env=middleman env-middleman middleman-version=#{::Middleman::VERSION})
+            attributes: %W(env=middleman env-middleman middleman-version=#{::Middleman::VERSION})
           }, 'AsciiDoc engine options (Hash)'
           app.config.define_setting :asciidoc_attributes, [], 'AsciiDoc custom attributes (Array)'
           app.before_configuration do

data/lib/middleman-core/renderers/liquid.rb

@@ -7,7 +7,7 @@ module Middleman
     module Liquid
       # Setup extension
       class << self
-        # Once registerd
+        # Once registered
         def registered(app)
           app.before_configuration do
             template_extensions liquid: :html

data/lib/middleman-core/sitemap/extensions/content_type.rb

@@ -5,7 +5,7 @@ module Middleman::Sitemap::Extensions
   module ContentType
     # The preferred MIME content type for this resource
     def content_type
-      # Allow explcitly setting content type from page/proxy options
+      # Allow explicitly setting content type from page/proxy options
       meta_type = metadata[:options][:content_type]
       return meta_type if meta_type
 

data/lib/middleman-core/sitemap/store.rb

@@ -54,7 +54,7 @@ module Middleman
         rebuild_resource_list!(:registered_new)
       end
 
-      # Rebuild the list of resources from scratch, using registed manipulators
+      # Rebuild the list of resources from scratch, using registered manipulators
       # rubocop:disable UnusedMethodArgument
       # @return [void]
       def rebuild_resource_list!(reason=nil)
@@ -99,7 +99,7 @@ module Middleman
         end
       end
 
-      # Invalidate our cached view of resource that are not ingnored. If your extension
+      # Invalidate our cached view of resource that are not ignored. If your extension
       # adds ways to ignore files, you should call this to make sure #resources works right.
       def invalidate_resources_not_ignored_cache!
         @resources_not_ignored = nil
@@ -211,20 +211,21 @@ module Middleman
 
           @app.logger.debug '== Rebuilding resource list'
 
-          @resources = @resource_list_manipulators.reduce([]) do |result, (_, inst)|
-            newres = inst.manipulate_resource_list(result)
+          @resources = []
+
+          @resource_list_manipulators.each do |(_, inst)|
+            @resources = inst.manipulate_resource_list(@resources)
 
             # Reset lookup cache
             reset_lookup_cache!
-            newres.each do |resource|
+            
+            @resources.each do |resource|
               @_lookup_by_path[resource.path] = resource
               @_lookup_by_destination_path[resource.destination_path] = resource
             end
 
-            newres
+            invalidate_resources_not_ignored_cache!
           end
-
-          invalidate_resources_not_ignored_cache!
         end
       end
 

data/lib/middleman-core/step_definitions.rb

@@ -1,5 +1,5 @@
 require 'aruba/cucumber'
-require 'aruba/jruby'
+require 'aruba/config/jruby'
 require 'middleman-core/step_definitions/middleman_steps'
 require 'middleman-core/step_definitions/builder_steps'
 require 'middleman-core/step_definitions/server_steps'

data/lib/middleman-core/step_definitions/builder_steps.rb

@@ -5,29 +5,27 @@ Before do
 end
 
 Given /^app "([^\"]*)" is using config "([^\"]*)"$/ do |path, config_name|
-  target = File.join(PROJECT_ROOT_PATH, 'fixtures', path)
-  config_path = File.join(current_directory, "config-#{config_name}.rb")
-  config_dest = File.join(current_directory, 'config.rb')
-  FileUtils.cp(config_path, config_dest)
+  copy("config-#{config_name}.rb", 'config.rb')
 end
 
 Given /^an empty app$/ do
   step %Q{a directory named "empty_app"}
   step %Q{I cd to "empty_app"}
-  ENV['MM_ROOT'] = nil
+
+  delete_environment_variable 'MM_ROOT'
 end
 
 Given /^a fixture app "([^\"]*)"$/ do |path|
-  ENV['MM_ROOT'] = nil
+  delete_environment_variable 'MM_ROOT'
 
   # This step can be reentered from several places but we don't want
   # to keep re-copying and re-cd-ing into ever-deeper directories
-  next if File.basename(current_directory) == path
+  next if File.basename(expand_path('.')) == path
 
   step %Q{a directory named "#{path}"}
 
   target_path = File.join(PROJECT_ROOT_PATH, 'fixtures', path)
-  FileUtils.cp_r(target_path, current_directory)
+  FileUtils.cp_r(target_path, expand_path('.'))
 
   step %Q{I cd to "#{path}"}
 end
@@ -58,20 +56,20 @@ Given /^a successfully built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path,
 end
 
 Given /^a modification time for a file named "([^\"]*)"$/ do |file|
-  target = File.join(current_directory, file)
+  target = expand_path(file)
   @modification_times[target] = File.mtime(target)
 end
 
 Then /^the file "([^\"]*)" should not have been updated$/ do |file|
-  target = File.join(current_directory, file)
+  target = expand_path(file)
   File.mtime(target).should == @modification_times[target]
 end
 
 # Provide this Aruba overload in case we're matching something with quotes in it
 Then /^the file "([^"]*)" should contain '([^']*)'$/ do |file, partial_content|
-  check_file_content(file, Regexp.new(Regexp.escape(partial_content)), true)
+  expect(file).to have_file_content Regexp.new(Regexp.escape(partial_content))
 end
 
 And /the file "(.*)" should be gzipped/ do |file|
-  expect(File.binread(File.join(current_directory, file), 2)).to eq(['1F8B'].pack('H*'))
+  expect(File.binread(expand_path(file), 2)).to eq(['1F8B'].pack('H*'))
 end

data/lib/middleman-core/step_definitions/commandline_steps.rb

@@ -1,11 +1,11 @@
 When /^I stop (?:middleman|all commands) if the output( of the last command)? contains:$/ do |last_command, expected|
   begin
-    Timeout.timeout(exit_timeout) do
+    Timeout.timeout(aruba.config.exit_timeout) do
       loop do
-        fail "You need to start middleman interactively first." unless @interactive
+        fail "You need to start middleman interactively first." if last_command_started.nil?
 
-        if unescape(@interactive.output) =~ Regexp.new(unescape(expected))
-          only_processes.each { |p| p.terminate }
+        if sanitize_text(last_command_started.output) =~ Regexp.new(sanitize_text(expected))
+          terminate_all_commands
           break
         end
 
@@ -13,10 +13,10 @@ When /^I stop (?:middleman|all commands) if the output( of the last command)? co
       end
     end
   rescue ChildProcess::TimeoutError, TimeoutError
-    @interactive.terminate
+    terminate_all_commands
   ensure
-    announcer.stdout @interactive.stdout
-    announcer.stderr @interactive.stderr
+    announcer.announce :stdout, last_command_started.stdout
+    announcer.announce :stderr, last_command_started.stderr
   end
 end
 
@@ -68,7 +68,7 @@ Given /I start a mdns server with:/ do |string|
     )
   )
 
-  set_env 'PATH', File.expand_path(File.join(current_dir, 'bin')) + ':' + ENV['PATH']
+  set_environment_variable 'PATH', File.expand_path(File.join(current_dir, 'bin')) + ':' + ENV['PATH']
   write_file db_file, string
 
   @mdns_server = run("dns_server.rb #{db_file} #{port}", 120)
@@ -80,7 +80,7 @@ end
 
 # Make sure each and every process is really dead
 After do
-  only_processes.each { |p| p.terminate }
+  terminate_all_commands
 end
 
 Before '@ruby-2.1' do

data/lib/middleman-core/step_definitions/middleman_steps.rb

@@ -9,9 +9,17 @@ Then /^the file "([^\"]*)" is removed$/ do |path|
 end
 
 Then /^the file "([^\"]*)" did change$/ do |path|
-  @server_inst.files.did_change(path)
+  cd '.' do
+    with_environment do
+      @server_inst.files.did_change(path)
+    end
+  end
 end
 
 Then /^the file "([^\"]*)" did delete$/ do |path|
-  @server_inst.files.did_delete(path)
+  cd '.' do
+    with_environment do
+      @server_inst.files.did_delete(path)
+    end
+  end
 end

data/lib/middleman-core/step_definitions/server_steps.rb

@@ -31,15 +31,13 @@ Given /^current environment is "([^\"]*)"$/ do |env|
 end
 
 Given /^the Server is running$/ do
-  root_dir = File.expand_path(current_directory)
-
-  if File.exists?(File.join(root_dir, 'source'))
-    ENV['MM_SOURCE'] = 'source'
+  if exist? 'source'
+    set_environment_variable 'MM_SOURCE', 'source'
   else
-    ENV['MM_SOURCE'] = ''
+    set_environment_variable 'MM_SOURCE', ''
   end
 
-  ENV['MM_ROOT'] = root_dir
+  set_environment_variable 'MM_ROOT', expand_path('.')
 
   initialize_commands = @initialize_commands || []
   initialize_commands.unshift lambda {
@@ -47,10 +45,12 @@ Given /^the Server is running$/ do
     set :show_exceptions, false
   }
 
-  in_current_directory do
-    @server_inst = Middleman::Application.server.inst do
-      initialize_commands.each do |p|
-        instance_exec(&p)
+  cd '.' do
+    with_environment do
+      @server_inst = Middleman::Application.server.inst do
+        initialize_commands.each do |p|
+          instance_exec(&p)
+        end
       end
     end
   end
@@ -68,61 +68,81 @@ Given /^a template named "([^\"]*)" with:$/ do |name, string|
 end
 
 When /^I go to "([^\"]*)"$/ do |url|
-  in_current_directory do
-    visit(URI.encode(url).to_s)
+  cd '.' do
+    with_environment do
+      visit(URI.encode(url).to_s)
+    end
   end
 end
 
 Then /^going to "([^\"]*)" should not raise an exception$/ do |url|
-  in_current_directory do
-    expect{ visit(URI.encode(url).to_s) }.to_not raise_exception
+  cd '.' do
+    with_environment do
+      expect{ visit(URI.encode(url).to_s) }.to_not raise_exception
+    end
   end
 end
 
 Then /^the content type should be "([^\"]*)"$/ do |expected|
-  in_current_directory do
-    expect(page.response_headers['Content-Type']).to start_with expected
+  cd '.' do
+    with_environment do
+      expect(page.response_headers['Content-Type']).to start_with expected
+    end
   end
 end
 
 Then /^I should see "([^\"]*)"$/ do |expected|
-  in_current_directory do
-    expect(page.body).to include expected
+  cd '.' do
+    with_environment do
+      expect(page.body).to include expected
+    end
   end
 end
 
 Then /^I should see '([^\']*)'$/ do |expected|
-  in_current_directory do
-    expect(page.body).to include expected
+  cd '.' do
+    with_environment do
+      expect(page.body).to include expected
+    end
   end
 end
 
 Then /^I should see:$/ do |expected|
-  in_current_directory do
-    expect(page.body).to include expected
+  cd '.' do
+    with_environment do
+      expect(page.body).to include expected
+    end
   end
 end
 
 Then /^I should not see "([^\"]*)"$/ do |expected|
-  in_current_directory do
-    expect(page.body).not_to include expected
+  cd '.' do
+    with_environment do
+      expect(page.body).not_to include expected
+    end
   end
 end
 
 Then /^I should not see:$/ do |expected|
-  in_current_directory do
-    expect(page.body).not_to include expected
+  cd '.' do
+    with_environment do
+      expect(page.body).not_to include expected
+    end
   end
 end
 
 Then /^the status code should be "([^\"]*)"$/ do |expected|
-  in_current_directory do
-    expect(page.status_code).to eq expected.to_i
+  cd '.' do
+    with_environment do
+      expect(page.status_code).to eq expected.to_i
+    end
   end
 end
 
 Then /^I should see "([^\"]*)" lines$/ do |lines|
-  in_current_directory do
-    expect(page.body.chomp.split($/).length).to eq lines.to_i
+  cd '.' do
+    with_environment do
+      expect(page.body.chomp.split($/).length).to eq lines.to_i
+    end
   end
 end

data/lib/middleman-core/templates/shared/Gemfile.tt

@@ -5,10 +5,10 @@ source 'https://rubygems.org'
 gem "middleman", "~><%= Middleman::VERSION %>"
 
 # Live-reloading plugin
-gem "middleman-livereload", "~> 3.1.0"
+gem "middleman-livereload", "~> 3.3.0"
 
 # For faster file watcher updates on Windows:
 gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
 
 # Windows does not come with time zone data
-gem "tzinfo-data", platforms: [:mswin, :mingw, :jruby]
+gem "tzinfo-data", platforms: [:mswin, :mingw, :jruby]

data/lib/middleman-core/templates/shared/config.ru

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'middleman/rack'
 
 run Middleman.server

data/lib/middleman-core/templates/shared/gitignore

@@ -16,3 +16,6 @@
 
 # Ignore .DS_store file
 .DS_Store
+
+# Ignore gems installed in local directory
+/vendor/bundle/

data/lib/middleman-core/util.rb

@@ -112,7 +112,7 @@ module Middleman
         end
       end
 
-      # Get a recusive list of files inside a path.
+      # Get a recursive list of files inside a path.
       # Works with symlinks.
       #
       # @param path Some path string or Pathname

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.4.0' unless const_defined?(:VERSION)
+  VERSION = '3.4.1' unless const_defined?(:VERSION)
 end