middleman-core 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c11a191bebfe7ff3fc0a2418fc2334f38373f01
-  data.tar.gz: 45c019a96a431a716864f3ee952614022c6ad374
+  metadata.gz: 1f29faf31f921ea85c08f3c81e8c6da2c7a6da73
+  data.tar.gz: 3f11d6e9256c1ede7defeadb5354a9f8a585840c
 SHA512:
-  metadata.gz: 234bf4823fc4870dd79df4605b8cee91efbe7037b6a2403ce0bb2c2c33f9f4ff736349eae87aecdfbe964a28f0a4ff51434bb7511cb529523a410006904fa855
-  data.tar.gz: eae2a780c9486f90aa2230a4b8e756e463a330af7088e710d5818e2bcec852d43267fcbce0a4a00f97da1a5717ae59278c606b773b78d789e694c3e4bb7beb74
+  metadata.gz: 0592e5ff04f84fc5a5d4b47709d602d3d4e8af423018ae41d68c2bb848db928b28ff516bfa8374d2e62add07875d9372f2ab686029d23a26e35f86e7fb604cc2
+  data.tar.gz: 417ff295d39b237122130c249ec40c6c51b99c922960595174ca9606b519727818a3277651ba6e798e5eb797063d2bb499ec4f66747768381a679a074433ac3b

data/lib/middleman-core/config_context.rb

@@ -22,6 +22,10 @@ module Middleman
       app.subscribe_to_callbacks(&method(:execute_callbacks))
     end
 
+    def include(mod)
+      self.extend(mod)
+    end
+
     def helpers(*helper_modules, &block)
       helper_modules ||= []
 

data/lib/middleman-core/sources/source_watcher.rb

@@ -2,6 +2,7 @@
 require 'listen'
 require 'middleman-core/contracts'
 require 'digest'
+require 'set'
 
 # Monkey patch Listen silencer so `only` works on directories too
 module Listen
@@ -49,7 +50,7 @@ module Middleman
     # Reference to lower level listener
     attr_reader :listener
 
-    IGNORED_DIRECTORIES = %w(.git node_modules .sass-cache).freeze
+    IGNORED_DIRECTORIES = Set.new(%w(.git node_modules .sass-cache vendor/bundle .bundle))
 
     # Construct a new SourceWatcher
     #
@@ -167,7 +168,8 @@ module Middleman
       @listener = ::Listen.to(@directory.to_s, config, &method(:on_listener_change))
 
       @listener.ignore(/^\.sass-cache/)
-      # @listener.only(@only) unless @only.empty?
+      @listener.ignore(/^node_modules/)
+      @listener.ignore(/^vendor\/bundle/)
 
       @listener.start
     end
@@ -222,7 +224,8 @@ module Middleman
 
     Contract Pathname => Bool
     def should_not_recurse?(p)
-      IGNORED_DIRECTORIES.include?(p.basename.to_s)
+      relative_path = p.relative_path_from(@directory).to_s
+      IGNORED_DIRECTORIES.include?(relative_path)
     end
 
     # The `listen` gem callback.
@@ -255,7 +258,8 @@ module Middleman
         logger.debug "== Change (#{f[:types].inspect}): #{f[:relative_path]}"
       end
 
-      related_updates = ::Middleman::Util.find_related_files(app, (updated_paths + removed_paths)).select(&method(:valid?))
+      related_sources = valid_updates.map { |u| u[:full_path] } + removed_paths
+      related_updates = ::Middleman::Util.find_related_files(app, related_sources).select(&method(:valid?))
 
       related_updates.each do |f|
         logger.debug "== Possible Change (#{f[:types].inspect}): #{f[:relative_path]}"

data/lib/middleman-core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler