middleman-core 3.0.0.alpha.9 → 3.0.0.beta.1

data/Rakefile

@@ -2,4 +2,48 @@
 RAKE_ROOT = __FILE__
 
 require 'rubygems'
-require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
+
+desc "Build vendored gems"
+task :build_vendor do
+  raise unless File.exist?('Rakefile')
+
+  # Destroy vendor
+  sh "rm -rf lib/middleman-core/vendor/darwin"
+  sh "rm -rf lib/middleman-core/vendor/linux"
+
+  # Clone the correct gems
+  sh "git clone https://github.com/thibaudgg/rb-fsevent.git lib/middleman-core/vendor/darwin"
+  sh "cd lib/middleman-core/vendor/darwin && git checkout 1ca42b987596f350ee7b19d8f8210b7b6ae8766b"
+  sh "git clone https://github.com/nex3/rb-inotify.git lib/middleman-core/vendor/linux"
+  sh "cd lib/middleman-core/vendor/linux && git checkout 01e7487e7a8d8f26b13c6835a321390c6618ccb7"
+
+  # Strip out the .git directories
+  %w[darwin linux].each {|platform| sh "rm -rf lib/middleman-core/vendor/#{platform}/.git"}
+
+  # Move ext directory of darwin to root
+  sh "mkdir -p ext"
+  sh "cp -r lib/middleman-core/vendor/darwin/ext/* ext/"
+
+  # Alter darwin extconf.rb
+  extconf_path = File.expand_path("../ext/extconf.rb", __FILE__)
+  extconf_contents = File.read(extconf_path)
+  extconf_contents.sub!(/puts "Warning/, '#\0')
+  extconf_contents.gsub!(/bin\/fsevent_watch/, 'bin/fsevent_watch_guard')
+  File.open(extconf_path, 'w') { |f| f << extconf_contents }
+
+  # Alter lib/middleman-core/vendor/darwin/lib/rb-fsevent/fsevent.rb
+  fsevent_path = File.expand_path("../lib/middleman-core/vendor/darwin/lib/rb-fsevent/fsevent.rb", __FILE__)
+  fsevent_contents = File.read(fsevent_path)
+  fsevent_contents.sub!(/fsevent_watch/, 'fsevent_watch_guard')
+  fsevent_contents.sub!(/'\.\.'/, "'..', '..', '..', '..', '..'")
+
+  File.open(fsevent_path, 'w') { |f| f << fsevent_contents }
+end
+
+desc "Compile mac executable"
+task :build_mac_exec do
+  Dir.chdir(File.expand_path("../ext", __FILE__)) do
+    system("ruby extconf.rb") or raise
+  end
+end

data/bin/middleman

@@ -31,7 +31,7 @@ if ENV["MM_ROOT"]
 end
 
 # Default command is server
-ARGV << "server" if ARGV.length < 1
+ARGV.unshift("server") if ARGV.length < 1 || ARGV.first.include?("-")
 
 # Require Middleman
 require 'middleman-core'

data/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_guard' 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_guard")
+    raise "Compilation of fsevent_watch failed (see README)"
+  end
+end

data/features/cli.feature

@@ -11,9 +11,8 @@ Feature: Middleman CLI
       | source/images/middleman.png                   |
       | source/layouts/layout.erb                     |
       | source/javascripts/all.js                     |
-      | source/stylesheets/all.css.scss               |
-      | source/stylesheets/_animate.scss              |
-      | source/stylesheets/_normalize.scss            |
+      | source/stylesheets/all.css                    |
+      | source/stylesheets/normalize.css              |
       
   Scenario: Create a new project (alias i)
     When I run `middleman i MY_PROJECT`

data/lib/middleman-core/base.rb

@@ -322,9 +322,9 @@ class Middleman::Base
 
     if env["PATH_INFO"] == "/__middleman__" && env["REQUEST_METHOD"] == "POST"
       if req.params.has_key?("change")
-        file_did_change(req.params["change"])
+        self.files.did_change(req.params["change"])
       elsif req.params.has_key?("delete")
-        file_did_delete(req.params["delete"])
+        self.files.did_delete(req.params["delete"])
       end
       
       res.status = 200

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

@@ -93,7 +93,7 @@ module Middleman::Cli
     # @param [String] destination
     # @param [Hash] config
     # @return [String] the actual destination file path that was created
-    desc "private method", :hide => true
+    desc "", "", :hide => true
     def tilt_template(source, destination, config={})
       build_dir = self.class.shared_instance.build_dir
       request_path = destination.sub(/^#{build_dir}/, "")

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

@@ -8,38 +8,43 @@ module Middleman::Cli
     namespace :server
     
     desc "server [options]", "Start the preview server"
-    method_option "environment", 
+    method_option :environment,
       :aliases => "-e", 
       :default => ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development', 
       :desc    => "The environment Middleman will run under"
     method_option :host,
-      :type => :string,
+      :type    => :string,
       :aliases => "-h",
       :default => "0.0.0.0", 
-      :desc => "Bind to HOST address"
-    method_option "port",
+      :desc    => "Bind to HOST address"
+    method_option :port,
       :aliases => "-p", 
       :default => "4567", 
       :desc    => "The port Middleman will listen on"
-    method_option "verbose", 
+    method_option :verbose,
       :type    => :boolean, 
       :default => false,
       :desc    => 'Print debug messages'
+    method_option "disable-watcher", 
+      :type    => :boolean, 
+      :default => false,
+      :desc    => 'Disable the file change and delete watcher process'
     
     # Start the server
     def server
       if !ENV["MM_ROOT"]
-        puts "== Warning: Could not find a Middleman project config.rb"
+        puts "== Could not find a Middleman project config.rb"
         puts "== Treating directory as a static site to be served"
         ENV["MM_ROOT"] = Dir.pwd
         ENV["MM_SOURCE"] = ""
       end
 
       params = {
-        :port        => options["port"],
-        :host        => options["host"],
-        :environment => options["environment"],
-        :debug       => options["verbose"]
+        :port              => options["port"],
+        :host              => options["host"],
+        :environment       => options["environment"],
+        :debug             => options["verbose"],
+        :"disable-watcher" => options["disable-watcher"]
       }
       
       puts "== The Middleman is loading"

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

@@ -21,12 +21,12 @@ module Middleman::CoreExtensions::Data
     # Setup data files before anything else so they are available when
     # parsing config.rb
     def initialize
-      file_changed DataStore.matcher do |file|
-        data.touch_file(file) if file.match(%r{^#{data_dir}\/})
+      self.files.changed DataStore.matcher do |file|
+        self.data.touch_file(file) if file.match(%r{^#{self.data_dir}\/})
       end
     
-      file_deleted DataStore.matcher do |file|
-        data.remove_file(file) if file.match(%r{^#{data_dir}\/})
+      self.files.deleted DataStore.matcher do |file|
+        self.data.remove_file(file) if file.match(%r{^#{self.data_dir}\/})
       end
       
       super
@@ -36,24 +36,7 @@ module Middleman::CoreExtensions::Data
     #
     # @return [DataStore]
     def data
-      @data ||= DataStore.new(self)
-    end
-
-    # Makes a hash available on the data var with a given name
-    #
-    # @param [Symbol] name Name of the data, used for namespacing
-    # @param [Hash] content The content for this data
-    # @return [void]
-    def data_content(name, content)
-      DataStore.data_content(name, content)
-    end
-
-    # Makes a hash available on the data var with a given name
-    #
-    # @param [Symbol] name Name of the data, used for namespacing
-    # @return [void]
-    def data_callback(name, &block)
-      DataStore.data_callback(name, block)
+      @_data ||= DataStore.new(self)
     end
   end
   
@@ -69,26 +52,28 @@ module Middleman::CoreExtensions::Data
       def matcher
         %r{[\w-]+\.(yml|yaml|json)$}
       end
+    end
+    
+    # Store static data hash
+    #
+    # @param [Symbol] name Name of the data, used for namespacing
+    # @param [Hash] content The content for this data
+    # @return [void]
+    def store(name=nil, content=nil)
+      @_local_sources ||= {}
+      @_local_sources[name.to_s] = content unless name.nil? || content.nil?
+      @_local_sources
+    end
 
-      # Store static data hash
-      #
-      # @param [Symbol] name Name of the data, used for namespacing
-      # @param [Hash] content The content for this data
-      # @return [void]
-      def data_content(name, content)
-        @@local_sources ||= {}
-        @@local_sources[name.to_s] = content
-      end
-
-      # Store callback-based data
-      #
-      # @param [Symbol] name Name of the data, used for namespacing
-      # @param [Proc] proc The callback which will return data
-      # @return [void]
-      def data_callback(name, proc)
-        @@callback_sources ||= {}
-        @@callback_sources[name.to_s] = proc
-      end
+    # Store callback-based data
+    #
+    # @param [Symbol] name Name of the data, used for namespacing
+    # @param [Proc] proc The callback which will return data
+    # @return [void]
+    def callbacks(name=nil, proc=nil)
+      @_callback_sources ||= {}
+      @_callback_sources[name.to_s] = proc unless name.nil? || proc.nil?
+      @_callback_sources
     end
     
     # Setup data store
@@ -139,10 +124,10 @@ module Middleman::CoreExtensions::Data
       @@local_sources ||= {}
       @@callback_sources ||= {}
       
-      if @@local_sources.has_key?(path.to_s)
-        response = @@local_sources[path.to_s]
-      elsif @@callback_sources.has_key?(path.to_s)
-        response = @@callback_sources[path.to_s].call()
+      if self.store.has_key?(path.to_s)
+        response = self.store[path.to_s]
+      elsif self.callbacks.has_key?(path.to_s)
+        response = self.callbacks[path.to_s].call()
       end
       
       response
@@ -172,14 +157,11 @@ module Middleman::CoreExtensions::Data
     def to_h
       data = {}
       
-      @@local_sources ||= {}
-      @@callback_sources ||= {}
-      
-      (@@local_sources || {}).each do |k, v|
+      self.store.each do |k, v|
         data[k] = data_for_path(k)
       end
       
-      (@@callback_sources || {}).each do |k, v|
+      self.callbacks.each do |k, v|
         data[k] = data_for_path(k)
       end
       

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

@@ -2,30 +2,24 @@ require "find"
 
 # API for watching file change events
 module Middleman::CoreExtensions::FileWatcher
+  
   # Setup extension
   class << self
-    # @private
+    
+    # Once registered
     def registered(app)
       app.extend ClassMethods
       app.send :include, InstanceMethods
       
-      app.delegate :file_changed, :file_deleted, :to => :"self.class"
-      
       # Before parsing config, load the data/ directory
       app.before_configuration do
-        data_path = File.join(root, data_dir)
-        Find.find(data_path) do |path|
-          next if File.directory?(path)
-          file_did_change(path.sub("#{root}/", ""))
-        end if File.exists?(data_path)
+        data_path = File.join(self.root, self.data_dir)
+        self.files.reload_path(data_path) if File.exists?(data_path)
       end
       
       # After config, load everything else
       app.ready do
-        Find.find(root) do |path|
-          next if File.directory?(path)
-          file_did_change(path.sub("#{root}/", ""))
-        end
+        self.files.reload_path(self.root)
       end
     end
     alias :included :registered
@@ -33,52 +27,105 @@ module Middleman::CoreExtensions::FileWatcher
   
   # Class methods
   module ClassMethods
+    
+    # Access the file api
+    # @return [Middleman::CoreExtensions::FileWatcher::API]
+    def files
+      @_files_api ||= API.new
+    end
+  end
+  
+  # Instance methods
+  module InstanceMethods
+    
+    # Access the file api
+    # @return [Middleman::CoreExtensions::FileWatcher::API]
+    def files
+      api = self.class.files
+      api.instance ||= self
+      api
+    end
+  end
+  
+  # Core File Change API class
+  class API
+    attr_accessor :instance, :known_paths
+    
+    # Initialize api and internal path cache
+    def initialize
+      self.known_paths = []
+    end
+    
     # Add callback to be run on file change
     #
     # @param [nil,Regexp] matcher A Regexp to match the change path against
     # @return [Array<Proc>]
-    def file_changed(matcher=nil, &block)
-      @_file_changed ||= []
-      @_file_changed << [block, matcher] if block_given?
-      @_file_changed
+    def changed(matcher=nil, &block)
+      @_changed ||= []
+      @_changed << [block, matcher] if block_given?
+      @_changed
     end
     
     # Add callback to be run on file deletion
     #
     # @param [nil,Regexp] matcher A Regexp to match the deleted path against
     # @return [Array<Proc>]
-    def file_deleted(matcher=nil, &block)
-      @_file_deleted ||= []
-      @_file_deleted << [block, matcher] if block_given?
-      @_file_deleted
+    def deleted(matcher=nil, &block)
+      @_deleted ||= []
+      @_deleted << [block, matcher] if block_given?
+      @_deleted
     end
-  end
   
-  # Instance methods
-  module InstanceMethods
     # Notify callbacks that a file changed
     #
     # @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)
-        instance_exec(path, &callback)
-      end
+    def did_change(path)
+      self.known_paths << path unless self.known_paths.include?(path)
+      self.run_callbacks(path, :changed)
     end
 
     # Notify callbacks that a file was deleted
     #
     # @param [String] path The file that was deleted
     # @return [void]
-    def file_did_delete(path)
+    def did_delete(path)
+      self.known_paths.delete(path) if self.known_paths.include?(path)
+      self.run_callbacks(path, :deleted)
+    end
+    
+    # Manually trigger update events
+    #
+    # @param [String] path The path to reload
+    # @return [void]
+    def reload_path(path)
+      subset = self.known_paths.select { |p| p.match(%r{^#{path}}) }
+      
+      Find.find(path) do |path|
+        next if File.directory?(path)
+        relative_path = path.sub("#{self.instance.root}/", "")
+        subset.delete(relative_path) if subset.include?(relative_path)
+        self.did_change(relative_path)
+      end
+      
+      subset.each do |removed_path|
+        self.did_delete(removed_path)
+      end
+    end
+    
+  protected
+    # Notify callbacks for a file given an array of callbacks
+    #
+    # @param [String] path The file that was changed
+    # @param [Symbol] callbacks_name The name of the callbacks method
+    # @return [void]
+    def run_callbacks(path, callbacks_name)
       return if ::Middleman::Watcher.ignore_list.any? { |r| path.match(r) }
-      file_deleted.each do |callback, matcher|
-        next if path.match(%r{^#{build_dir}/})
+
+      self.send(callbacks_name).each do |callback, matcher|
+        next if path.match(%r{^#{self.instance.build_dir}/})
         next unless matcher.nil? || path.match(matcher)
-        instance_exec(path, &callback)
+        self.instance.instance_exec(path, &callback)
       end
     end
   end

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

@@ -30,12 +30,12 @@ module Middleman::CoreExtensions::FrontMatter
 
       matcher = %r{#{static_path}.*(#{exts})}
       
-      file_changed matcher do |file|
-        frontmatter_extension.touch_file(file)
+      self.files.changed matcher do |file|
+        self.frontmatter_extension.touch_file(file)
       end
 
-      file_deleted matcher do |file|
-        frontmatter_extension.remove_file(file)
+      self.files.deleted matcher do |file|
+        self.frontmatter_extension.remove_file(file)
       end
 
       provides_metadata matcher do |path|

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

@@ -26,9 +26,9 @@ module Middleman::CoreExtensions::Rendering
       static_path = source_dir.sub(self.root, "").sub(/^\//, "")
       render_regex = static_path.empty? ? // : (%r{^#{static_path + "/"}})
       
-      file_changed render_regex do |file|
-        path = File.expand_path(file, root)
-        cache.remove(:raw_template, path)
+      self.files.changed render_regex do |file|
+        path = File.expand_path(file, self.root)
+        self.cache.remove(:raw_template, path)
       end
     end
     

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

@@ -31,12 +31,12 @@ module Middleman::CoreExtensions::Sitemap
       static_path = source_dir.sub(self.root, "").sub(/^\//, "")
       sitemap_regex = static_path.empty? ? // : (%r{^#{static_path + "/"}})
       
-      file_changed sitemap_regex do |file|
-        sitemap.touch_file(file)
+      self.files.changed sitemap_regex do |file|
+        self.sitemap.touch_file(file)
       end
 
-      file_deleted sitemap_regex do |file|
-        sitemap.remove_file(file)
+      self.files.deleted sitemap_regex do |file|
+        self.sitemap.remove_file(file)
       end
     end
     

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

@@ -65,7 +65,7 @@ module Middleman::Sitemap
       
       # Forward remaining data to helpers
       if md.has_key?(:page)
-        app.data_content("page", md[:page])
+        app.data.store("page", md[:page])
       end
       
       blocks.compact.each do |block|

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

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

data/lib/middleman-core/templates/default/source/layouts/layout.erb

@@ -9,7 +9,7 @@
     <!-- Use title if it's in the page YAML frontmatter -->
     <title><%= data.page.title || "The Middleman" %></title>
     
-    <%= stylesheet_link_tag "all" %>
+    <%= stylesheet_link_tag "normalize", "all" %>
     <%= javascript_include_tag  "all" %>
   </head>
   

data/lib/middleman-core/templates/default/source/stylesheets/all.css

@@ -0,0 +1,55 @@
+@charset "utf-8";
+
+body {
+  background: #d4d4d4 url("../images/background.png");
+  text-align: center;
+  font-family: sans-serif; }
+
+h1 {
+  color: rgba(0, 0, 0, .3);
+  font-weight: bold;
+  font-size: 32px;
+  letter-spacing: -1px;
+  text-transform: uppercase;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, .5);
+  background: url("../images/middleman.png") no-repeat center 100px;
+  padding: 350px 0 10px;
+  margin: 0; }
+
+.doc {
+  font-size: 14px;
+  margin: 0; }
+  .doc:before,
+  .doc:after {
+    opacity: .2;
+    padding: 6px;
+    font-style: normal;
+    position: relative;
+    content: "•"; }
+  .doc a {
+    color: rgba(0, 0, 0, 0.3); }
+    .doc a:hover {
+      color: #666; }
+
+.welcome {
+  -webkit-animation-name: welcome;
+  -webkit-animation-duration: .9s; }
+
+@-webkit-keyframes welcome {
+  from {
+    -webkit-transform: scale(0);
+    opacity: 0;
+  }
+  50% {
+   -webkit-transform: scale(0);
+   opacity: 0;
+  }
+  82.5% {
+    -webkit-transform: scale(1.03);
+    -webkit-animation-timing-function: ease-out;
+    opacity: 1;
+  }
+  to {
+    -webkit-transform: scale(1);
+  }
+}

data/lib/middleman-core/templates/default.rb

@@ -14,9 +14,8 @@ class Middleman::Templates::Default < Middleman::Templates::Base
     copy_file "default/source/index.html.erb", File.join(location, "source/index.html.erb")
     copy_file "default/source/layouts/layout.erb", File.join(location, "source/layouts/layout.erb")
     empty_directory File.join(location, "source", options[:css_dir])
-    copy_file "default/source/stylesheets/all.css.scss", File.join(location, "source", options[:css_dir], "all.css.scss")
-    copy_file "default/source/stylesheets/_animate.scss", File.join(location, "source", options[:css_dir], "_animate.scss")
-    copy_file "default/source/stylesheets/_normalize.scss", File.join(location, "source", options[:css_dir], "_normalize.scss")
+    copy_file "default/source/stylesheets/all.css", File.join(location, "source", options[:css_dir], "all.css")
+    copy_file "default/source/stylesheets/normalize.css", File.join(location, "source", options[:css_dir], "normalize.css")
     empty_directory File.join(location, "source", options[:js_dir])
     copy_file "default/source/javascripts/all.js", File.join(location, "source", options[:js_dir], "all.js")
     empty_directory File.join(location, "source", options[:images_dir])