middleman-core 3.0.0.alpha.7 → 3.0.0.alpha.8

data/features/preview_changes.feature

@@ -15,4 +15,15 @@ Feature: Preview Changes
       """
     When I go to "/content.html"
     Then I should see "Hola Mundo"
-    
+    
+  Scenario: A template is removed during preview
+    Given the Server is running at "preview-app"
+    And the file "source/a-page.html.erb" has the contents
+      """
+      Hello World
+      """
+    When I go to "/a-page.html"
+    Then I should see "Hello World"
+    And the file "source/a-page.html.erb" is removed
+    When I go to "/a-page.html"
+    Then I should see "File Not Found"

data/lib/middleman-core/base.rb

@@ -213,7 +213,7 @@ class Middleman::Base
   # Add Builder Callbacks
   register Middleman::CoreExtensions::Builder
   
-  # Add Guard Callbacks
+  # Add Watcher Callbacks
   register Middleman::CoreExtensions::FileWatcher
   
   # Activate Data package

data/lib/middleman-core/cli/server.rb

@@ -43,7 +43,7 @@ module Middleman::Cli
       }
       
       puts "== The Middleman is loading"
-      Middleman::Guard.start(params)
+      Middleman::Watcher.start(params)
     end
   end
   

data/lib/middleman-core/core_extensions/file_watcher.rb

@@ -61,6 +61,7 @@ module Middleman::CoreExtensions::FileWatcher
     # @param [String] path The file that changed
     # @return [void]
     def file_did_change(path)
+      return if ::Middleman::Watcher.ignore_list.any? { |r| path.match(r) }
       file_changed.each do |callback, matcher|
         next if path.match(%r{^#{build_dir}/})
         next if !matcher.nil? && !path.match(matcher)
@@ -73,6 +74,7 @@ module Middleman::CoreExtensions::FileWatcher
     # @param [String] path The file that was deleted
     # @return [void]
     def file_did_delete(path)
+      return if ::Middleman::Watcher.ignore_list.any? { |r| path.match(r) }
       file_deleted.each do |callback, matcher|
         next if path.match(%r{^#{build_dir}/})
         next unless matcher.nil? || path.match(matcher)

data/lib/middleman-core/core_extensions/front_matter.rb

@@ -91,7 +91,6 @@ module Middleman::CoreExtensions::FrontMatter
       file = File.expand_path(file, @app.root)
       content = File.read(file)
       
-      # @app.logger.debug :frontmatter_update, Time.now, file if @app.logging?
       result = parse_front_matter(content)
         
       if result

data/lib/middleman-core/core_extensions/rendering.rb

@@ -1,3 +1,10 @@
+# Shutup Tilt Warnings
+class Tilt::Template
+  def warn(*args)
+    # Kernel.warn(*args)
+  end
+end
+
 module Middleman::CoreExtensions::Rendering
   class << self
     def registered(app)
@@ -244,4 +251,4 @@ module Middleman::CoreExtensions::Rendering
       end
     end
   end
-end
+end

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

@@ -1,16 +1,26 @@
+# ERb renderer
 module Middleman::Renderers::ERb
+  
+  # Setup extension
   class << self
+    
+    # once registered
     def registered(app)
+      # Setup a default ERb engine
       app.set :erb_engine, :erb
       app.set :erb_engine_prefix, ::Tilt
       
+      # After config
       app.after_configuration do
+        # Find the user's prefered engine
+        # Convert symbols to classes
         if erb_engine.is_a? Symbol
           engine = engine.to_s
           engine = engine == "erb" ? "ERB" : engine.camelize
           erb_engine = erb_engine_prefix.const_get("#{engine}Template")
         end
         
+        # Tell Tilt to use the preferred engine
         ::Tilt.prefer(erb_engine)
       end
     end

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

@@ -1,15 +1,17 @@
-require "fileutils"
-
-Given /^a project at "([^\"]*)"$/ do |dirname|
-  @target = File.join(PROJECT_ROOT_PATH, "fixtures", dirname)
-end
-
 Then /^the file "([^\"]*)" has the contents$/ do |path, contents|
-  file_path = File.expand_path(path, @target)
-  File.open(file_path, 'w') { |f| f.write(contents) }
+  write_file(path, contents)
   step %Q{the file "#{path}" did change}
 end
 
+Then /^the file "([^\"]*)" is removed$/ do |path|
+  step %Q{I remove the file "#{path}"}
+  step %Q{the file "#{path}" did delete}
+end
+
 Then /^the file "([^\"]*)" did change$/ do |path|
   @server_inst.file_did_change(path)
+end
+
+Then /^the file "([^\"]*)" did delete$/ do |path|
+  @server_inst.file_did_delete(path)
 end

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

@@ -22,9 +22,10 @@ Given /^current environment is "([^\"]*)"$/ do |env|
 end
 
 Given /^the Server is running at "([^\"]*)"$/ do |app_path|
-  step %Q{a project at "#{app_path}"}
+  step %Q{a fixture app "#{app_path}"}
+    
+  root_dir = File.expand_path(current_dir)
 
-  root_dir = File.join(PROJECT_ROOT_PATH, "fixtures", app_path)
   if File.exists?(File.join(root_dir, "source"))
     ENV["MM_SOURCE"] = "source"
   else
@@ -32,7 +33,7 @@ Given /^the Server is running at "([^\"]*)"$/ do |app_path|
   end
   
   initialize_commands = @initialize_commands || []
-  initialize_commands.unshift lambda { 
+  initialize_commands.unshift lambda {
     set :root, root_dir
     set :environment, @current_env || :development
     set :show_exceptions, false

data/lib/middleman-core/vendor/rb-fsevent-0.4.3.1/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Thibaud Guillaume-Gentil
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/middleman-core/vendor/rb-fsevent-0.4.3.1/README.rdoc

@@ -0,0 +1,254 @@
+= rb-fsevent
+
+Very simple & usable Mac OSX FSEvents API
+
+- RubyCocoa not required!
+- Signals are working (really)
+- Tested on MRI 1.8.7 & 1.9.2
+- Tested on JRuby 1.6.3
+
+== Install
+
+    gem install rb-fsevent
+
+== Usage
+
+=== Singular path
+
+    require 'rb-fsevent'
+
+    fsevent = FSEvent.new
+    fsevent.watch Dir.pwd do |directories|
+      puts "Detected change inside: #{directories.inspect}"
+    end
+    fsevent.run
+
+=== Multiple paths
+
+    require 'rb-fsevent'
+
+    paths = ['/tmp/path/one', '/tmp/path/two', Dir.pwd]
+
+    fsevent = FSEvent.new
+    fsevent.watch paths do |directories|
+      puts "Detected change inside: #{directories.inspect}"
+    end
+    fsevent.run
+
+=== Multiple paths and additional options as a Hash
+
+    require 'rb-fsevent'
+
+    paths = ['/tmp/path/one', '/tmp/path/two', Dir.pwd]
+    options = {:latency => 1.5, :no_defer => true }
+
+    fsevent = FSEvent.new
+    fsevent.watch paths, options do |directories|
+      puts "Detected change inside: #{directories.inspect}"
+    end
+    fsevent.run
+
+=== Multiple paths and additional options as an Array
+
+    require 'rb-fsevent'
+
+    paths = ['/tmp/path/one', '/tmp/path/two', Dir.pwd]
+    options = ['--latency', 1.5, '--no-defer']
+
+    fsevent = FSEvent.new
+    fsevent.watch paths, options do |directories|
+      puts "Detected change inside: #{directories.inspect}"
+    end
+    fsevent.run
+
+== Options
+
+When defining options using a hash or hash-like object, it gets checked for validity and converted to the appropriate fsevent_watch commandline arguments array when the FSEvent class is instantiated. This is obviously the safest and preferred method of passing in options.
+
+You may, however, choose to pass in an array of commandline arguments as your options value and it will be passed on, unmodified, to the fsevent_watch binary when called.
+
+So far, the following options are supported...
+
+- :latency => 0.5 # in seconds
+- :no_defer => true
+- :watch_root => true
+- :since_when => 18446744073709551615 # an FSEventStreamEventId
+
+=== Latency
+
+The :latency parameter determines how long the service should wait after the first event before passing that information along to the client. If your latency is set to 4 seconds, and 300 changes occur in the first three, then the callback will be fired only once. If latency is set to 0.1 in the exact same scenario, you will see that callback fire somewhere closer to between 25 and 30 times.
+
+Setting a higher latency value allows for more effective temporal coalescing, resulting in fewer callbacks and greater overall efficiency... at the cost of apparent responsiveness. Setting this to a reasonably high value (and NOT setting :no_defer) is particularly well suited for background, daemon, or batch processing applications.
+
+Implementation note: It appears that FSEvents will only coalesce events from a maximum of 32 distinct subpaths, making the above completely accurate only when events are to fewer than 32 subpaths. Creating 300 files in one directory, for example, or 30 files in 10 subdirectories, but not 300 files within 300 subdirectories. In the latter case, you may receive 31 callbacks in one go after the latency period. As this appears to be an implementation detail, the number could potentially differ across OS revisions. It is entirely possible that this number is somehow configurable, but I have not yet discovered an accepted method of doing so.
+
+=== NoDefer
+
+The :no_defer option changes the behavior of the latency parameter completely. Rather than waiting for $latency period of time before sending along events in an attempt to coalesce a potential deluge ahead of time, that first event is sent along to the client immediately and is followed by a $latency period of silence before sending along any additional events that occurred within that period.
+
+This behavior is particularly useful for interactive applications where that feeling of apparent responsiveness is most important, but you still don't want to get overwhelmed by a series of events that occur in rapid succession.
+
+=== WatchRoot
+
+The :watch_root option allows for catching the scenario where you start watching "~/src/demo_project" and either it is later renamed to "~/src/awesome_sauce_3000" or the path changes in such a manner that the original directory is now at "~/clients/foo/iteration4/demo_project".
+
+Unfortunately, while this behavior is somewhat supported in the fsevent_watch binary built as part of this project, support for passing across detailed metadata is not (yet). As a result, you would not receive the appropriate RootChanged event and be able to react appropriately. Also, since the C code doesn't open watched directories and retain that file descriptor as part of path-specific callback metadata, we are unable to issue an F_GETPATH fcntl() to determine the directory's new path.
+
+Please do not use this option until proper support is added in an upcoming (planned) release.
+
+=== SinceWhen
+
+The FSEventStreamEventId passed in to :since_when is used as a base for reacting to historic events. Unfortunately, not only is the metadata for transitioning from historic to live events not currently passed along, but it is incorrectly passed as a change event on the root path, and only per-host event streams are currently supported. When using per-host event streams, the event IDs are not guaranteed to be unique or contiguous when shared volumes (firewire/USB/net/etc) are used on multiple macs.
+
+Please do not use this option until proper support is added in an upcoming (planned) release, unless it's acceptable for you to receive that one fake event that's handled incorrectly when events transition from historical to live. Even in that scenario, there's no metadata available for determining the FSEventStreamEventId of the last received event.
+
+WARNING: passing in 0 as the parameter to :since_when will return events for every directory modified since "the beginning of time".
+
+== Debugging output
+
+If the gem is installed with the environment variable FWDEBUG set to the string "true", then fsevent_watch will be built with its various DEBUG sections defined, and the output to STDERR is truly verbose (and hopefully helpful in debugging your application and not just fsevent_watch itself). If enough people find this to be directly useful when developing code that makes use of rb-fsevent, then it wouldn't be hard to clean this up and make it a feature enabled by a commandline argument instead. Until somebody files an issue, however, I will assume otherwise.
+
+    append_path called for: /tmp/moo/cow/
+      resolved path to: /private/tmp/moo/cow
+
+    config.sinceWhen    18446744073709551615
+    config.latency      0.300000
+    config.flags        00000000
+    config.paths
+      /private/tmp/moo/cow
+
+    FSEventStreamRef @ 0x100108540:
+       allocator = 0x7fff705a4ee0
+       callback = 0x10000151e
+       context = {0, 0x0, 0x0, 0x0, 0x0}
+       numPathsToWatch = 1
+       pathsToWatch = 0x7fff705a4ee0
+            pathsToWatch[0] = '/private/tmp/moo/cow'
+       latestEventId = -1
+       latency = 300000 (microseconds)
+       flags = 0x00000000
+       runLoop = 0x0
+       runLoopMode = 0x0
+
+
+    FSEventStreamCallback fired!
+      numEvents: 32
+      event path: /private/tmp/moo/cow/1/a/
+      event flags: 00000000
+      event ID: 1023767
+      event path: /private/tmp/moo/cow/1/b/
+      event flags: 00000000
+      event ID: 1023782
+      event path: /private/tmp/moo/cow/1/c/
+      event flags: 00000000
+      event ID: 1023797
+      event path: /private/tmp/moo/cow/1/d/
+      event flags: 00000000
+      event ID: 1023812
+      event path: /private/tmp/moo/cow/1/e/
+      event flags: 00000000
+      event ID: 1023827
+      event path: /private/tmp/moo/cow/1/f/
+      event flags: 00000000
+      event ID: 1023842
+      event path: /private/tmp/moo/cow/1/g/
+      event flags: 00000000
+      event ID: 1023857
+      event path: /private/tmp/moo/cow/1/h/
+      event flags: 00000000
+      event ID: 1023872
+      event path: /private/tmp/moo/cow/1/i/
+      event flags: 00000000
+      event ID: 1023887
+      event path: /private/tmp/moo/cow/1/j/
+      event flags: 00000000
+      event ID: 1023902
+      event path: /private/tmp/moo/cow/1/k/
+      event flags: 00000000
+      event ID: 1023917
+      event path: /private/tmp/moo/cow/1/l/
+      event flags: 00000000
+      event ID: 1023932
+      event path: /private/tmp/moo/cow/1/m/
+      event flags: 00000000
+      event ID: 1023947
+      event path: /private/tmp/moo/cow/1/n/
+      event flags: 00000000
+      event ID: 1023962
+      event path: /private/tmp/moo/cow/1/o/
+      event flags: 00000000
+      event ID: 1023977
+      event path: /private/tmp/moo/cow/1/p/
+      event flags: 00000000
+      event ID: 1023992
+      event path: /private/tmp/moo/cow/1/q/
+      event flags: 00000000
+      event ID: 1024007
+      event path: /private/tmp/moo/cow/1/r/
+      event flags: 00000000
+      event ID: 1024022
+      event path: /private/tmp/moo/cow/1/s/
+      event flags: 00000000
+      event ID: 1024037
+      event path: /private/tmp/moo/cow/1/t/
+      event flags: 00000000
+      event ID: 1024052
+      event path: /private/tmp/moo/cow/1/u/
+      event flags: 00000000
+      event ID: 1024067
+      event path: /private/tmp/moo/cow/1/v/
+      event flags: 00000000
+      event ID: 1024082
+      event path: /private/tmp/moo/cow/1/w/
+      event flags: 00000000
+      event ID: 1024097
+      event path: /private/tmp/moo/cow/1/x/
+      event flags: 00000000
+      event ID: 1024112
+      event path: /private/tmp/moo/cow/1/y/
+      event flags: 00000000
+      event ID: 1024127
+      event path: /private/tmp/moo/cow/1/z/
+      event flags: 00000000
+      event ID: 1024142
+      event path: /private/tmp/moo/cow/1/
+      event flags: 00000000
+      event ID: 1024145
+      event path: /private/tmp/moo/cow/2/a/
+      event flags: 00000000
+      event ID: 1024160
+      event path: /private/tmp/moo/cow/2/b/
+      event flags: 00000000
+      event ID: 1024175
+      event path: /private/tmp/moo/cow/2/c/
+      event flags: 00000000
+      event ID: 1024190
+      event path: /private/tmp/moo/cow/2/d/
+      event flags: 00000000
+      event ID: 1024205
+      event path: /private/tmp/moo/cow/2/e/
+      event flags: 00000000
+      event ID: 1024220
+
+== Note about FFI
+
+rb-fsevent doesn't use {ruby-ffi}[http://github.com/ffi/ffi] anymore because it sadly doesn't allow for catching Signals. You can still see the code in the {ffi branch}[http://github.com/thibaudgg/rb-fsevent/tree/ffi].
+
+== Development
+
+- Source hosted at {GitHub}[http://github.com/thibaudgg/rb-fsevent]
+- Report issues/Questions/Feature requests on {GitHub Issues}[http://github.com/thibaudgg/rb-fsevent/issues]
+
+Pull requests are quite welcome! Please ensure that your commits are in a topic branch for each individual changeset than can be reasonably isolated. It is also important to ensure that your changes are well tested... whether that means new tests, modified tests, or fixing a scenario where the existing tests currently fail. If you have rvm and the required rubies currently installed, we have a helper task for running the testsuite in all of them:
+
+    rake spec:portability
+
+The list of tested RVM targets is currently:
+
+    %w[1.8.6 1.8.7 1.9.2 jruby-head]
+
+== Authors
+
+- {Thibaud Guillaume-Gentil}[http://github.com/thibaudgg]
+- {Travis Tilley}[http://github.com/ttilley]
+

data/lib/middleman-core/vendor/rb-fsevent-0.4.3.1/ext/extconf.rb

@@ -0,0 +1,61 @@
+# Workaround to make Rubygems believe it builds a native gem
+require 'mkmf'
+create_makefile('none')
+
+# TODO: determine whether we really need to be working around instead of with mkmf
+
+if `uname -s`.chomp != 'Darwin'
+  puts "Warning! Only Darwin (Mac OS X) systems are supported, nothing will be compiled"
+else
+  begin
+    xcode_path = %x[xcode-select -print-path].to_s.strip!
+  rescue Errno::ENOENT
+  end
+
+  raise "Could not find a suitable Xcode installation" unless xcode_path
+
+  gem_root       = File.expand_path(File.join('..'))
+  darwin_version = `uname -r`.to_i
+  sdk_version    = { 9 => '10.5', 10 => '10.6', 11 => '10.7' }[darwin_version]
+
+  raise "Only Darwin systems greater than 8 (Mac OS X 10.5+) are supported" unless sdk_version
+
+  core_flags = %W{
+    -isysroot #{xcode_path}/SDKs/MacOSX#{sdk_version}.sdk
+    -mmacosx-version-min=#{sdk_version} -mdynamic-no-pic -std=gnu99
+  }
+
+  cflags = core_flags + %w{-Os -pipe}
+
+  wflags = %w{
+    -Wmissing-prototypes -Wreturn-type -Wmissing-braces -Wparentheses -Wswitch
+    -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable
+    -Wunused-value -Wuninitialized -Wunknown-pragmas -Wshadow
+    -Wfour-char-constants -Wsign-compare -Wnewline-eof -Wconversion
+    -Wshorten-64-to-32 -Wglobal-constructors -pedantic
+  }
+
+  ldflags = %w{
+    -dead_strip -framework CoreServices
+  }
+
+  cc_opts = core_flags + ldflags
+
+  cc_opts += %w{
+    -D DEBUG=true
+  } if ENV['FWDEBUG'] == "true"
+  
+  cc_bin = `which clang || which gcc`.to_s.strip!
+
+  compile_command = "CFLAGS='#{cflags.join(' ')} #{wflags.join(' ')}' #{cc_bin} #{cc_opts.join(' ')} -o '#{gem_root}/bin/fsevent_watch' fsevent/fsevent_watch.c"
+
+  STDERR.puts(compile_command)
+
+  # Compile the actual fsevent_watch binary
+  system "mkdir -p #{File.join(gem_root, 'bin')}"
+  system compile_command
+
+  unless File.executable?("#{gem_root}/bin/fsevent_watch")
+    raise "Compilation of fsevent_watch failed (see README)"
+  end
+end