middleman 2.0.16.1 → 3.0.0.alpha.2

data/lib/middleman/builder.rb

@@ -3,8 +3,10 @@ require "thor/group"
 require 'rack/test'
 require 'find'
 
-SHARED_SERVER = Middleman.server
-SHARED_SERVER.set :environment, :build
+SHARED_SERVER_INST = Middleman.server.inst do
+  set :environment, :build
+end
+SHARED_SERVER = SHARED_SERVER_INST.class
 
 module Middleman
   module ThorActions
@@ -12,73 +14,21 @@ module Middleman
       config = args.last.is_a?(Hash) ? args.pop : {}
       destination = args.first || source
       
-      # source  = File.expand_path(find_in_source_paths(source.to_s))
-      # context = instance_eval('binding')
+      request_path = destination.sub(/^#{SHARED_SERVER_INST.build_dir}/, "")
       
-      request_path = destination.sub(/^#{SHARED_SERVER.build_dir}/, "")
-      
-      begin
-        destination, request_path = SHARED_SERVER.reroute_builder(destination, request_path)
+      # begin
+        destination, request_path = SHARED_SERVER_INST.reroute_builder(destination, request_path)
         
         request_path.gsub!(/\s/, "%20")
         response = Middleman::Builder.shared_rack.get(request_path)
-        
-        dequeue_file_from destination if cleaning?
 
         create_file destination, nil, config do
           response.body
         end if response.status == 200
-      rescue
-      end
-    end
-    
-    
-    def clean!(destination)
-      return unless cleaning?
-      queue_current_paths_from destination
-      add_clean_up_callback
-    end
-    
-    def cleaning?
-      options.has_key?("clean") && options["clean"]
-    end
-    
-    def add_clean_up_callback
-      clean_up_callback = lambda do 
-        files       = @cleaning_queue.select { |q| File.file? q }
-        directories = @cleaning_queue.select { |q| File.directory? q }
-
-        files.each { |f| remove_file f, :force => true }
-
-        directories = directories.sort_by {|d| d.length }.reverse!
-
-        directories.each do |d|
-          remove_file d, :force => true if directory_empty? d 
-        end
-      end
-      self.class.after_run :clean_up_callback do
-        clean_up_callback.call
-      end
-    end
-
-    def directory_empty?(directory)
-      Dir["#{directory}/*"].empty?
+      # rescue
+        # say_status :error, destination, :red
+      # end
     end
-
-    def queue_current_paths_from(destination)
-      @cleaning_queue = []
-      Find.find(destination) do |path|
-        next if path.match(/\/\./)
-        unless path == destination
-          @cleaning_queue << path.sub(destination, destination[/([^\/]+?)$/])
-        end
-      end
-    end
-
-    def dequeue_file_from(destination)
-      @cleaning_queue.delete_if {|q| q == destination }
-    end
-    
   end
   
   class Builder < Thor::Group
@@ -87,7 +37,7 @@ module Middleman
     
     def self.shared_rack
       @shared_rack ||= begin
-        mock = ::Rack::MockSession.new(SHARED_SERVER)
+        mock = ::Rack::MockSession.new(SHARED_SERVER.to_rack_app)
         sess = ::Rack::Test::Session.new(mock)
         response = sess.get("__middleman__")
         sess
@@ -101,155 +51,121 @@ module Middleman
       super
       
       if options.has_key?("relative") && options["relative"]
-        SHARED_SERVER.activate :relative_assets
+        SHARED_SERVER_INST.activate :relative_assets
       end
     end
     
     def source_paths
       @source_paths ||= [
-        SHARED_SERVER.root
+        SHARED_SERVER_INST.root
       ]
     end
     
     def build_all_files
       self.class.shared_rack
       
-      if options.has_key?("glob")
-        action GlobAction.new(self, SHARED_SERVER.views, SHARED_SERVER.build_dir, { :force => true, :glob => options["glob"] })
-      else      
-        action DirectoryAction.new(self, SHARED_SERVER.views, SHARED_SERVER.build_dir, { :force => true })
+      opts = { }
+      opts[:glob]  = options["glob"]  if options.has_key?("glob")
+      opts[:clean] = options["clean"] if options.has_key?("clean")
       
-        SHARED_SERVER.proxied_paths.each do |url, proxy|
-          tilt_template(url.gsub(/^\//, "#{SHARED_SERVER.build_dir}/"), { :force => true })
-        end
-      end
-    end
-    
-    @@hooks = {}
-    def self.after_run(name, &block)
-      @@hooks[name] = block
-    end
-    
-    def run_hooks
-      return if options.has_key?("glob")
-      
-      @@hooks.each do |name, proc|
-        instance_eval(&proc)
-      end
+      action GlobAction.new(self, SHARED_SERVER_INST, opts)
       
-      SHARED_SERVER.after_build_callbacks.each do |proc|
-        instance_eval(&proc)
-      end
+      SHARED_SERVER_INST.run_hook :after_build, self
     end
   end
   
-  class BaseAction < ::Thor::Actions::EmptyDirectory
+  class GlobAction < ::Thor::Actions::EmptyDirectory
     attr_reader :source
 
-    def initialize(base, source, destination=nil, config={}, &block)
+    def initialize(base, app, config={}, &block)
+      @app         = app
+      source       = @app.views
+      @destination = @app.build_dir
+      
       @source = File.expand_path(base.find_in_source_paths(source.to_s))
-      @block  = block
-      super(base, destination, { :recursive => true }.merge(config))
+      
+      super(base, destination, config)
     end
 
     def invoke!
-      base.clean! destination
+      queue_current_paths if cleaning?
       execute!
+      clean! if cleaning?
     end
 
     def revoke!
       execute!
     end
-    
+
   protected
-    def handle_path(file_source)
-      # Skip partials prefixed with an underscore while still handling files prefixed with 2 consecutive underscores
-      return unless file_source.gsub(SHARED_SERVER.root, '').split('/').select { |p| p[/^_[^_]/] }.empty?
-      
-      file_extension = File.extname(file_source)
-      file_destination = File.join(given_destination, file_source.gsub(source, '.'))
-      file_destination.gsub!('/./', '/')
-      
-      handled_by_tilt = ::Tilt.mappings.has_key?(file_extension.gsub(/^\./, ""))
-      if handled_by_tilt
-        file_destination.gsub!(file_extension, "")
-      end
-      
-      destination = base.tilt_template(file_source, file_destination, config, &@block)
-    end
-  end
   
-  class GlobAction < BaseAction
+    def clean!
+      files       = @cleaning_queue.select { |q| File.file? q }
+      directories = @cleaning_queue.select { |q| File.directory? q }
 
-  protected
-    def execute!
-      Dir[File.join(source, @config[:glob])].each do |path|
-        file_name = path.gsub(SHARED_SERVER.views + "/", "")
-        if file_name == "layouts"
-          false
-        elsif file_name.include?("layout.") && file_name.split(".").length == 2
-          false
-        else
-          next if File.directory?(path)
+      files.each do |f| 
+        base.remove_file f, :force => true
+      end
 
-          handle_path(path)
+      directories = directories.sort_by {|d| d.length }.reverse!
 
-          true
-        end
+      directories.each do |d|
+        base.remove_file d, :force => true if directory_empty? d 
       end
     end
-  end
   
-  class DirectoryAction < BaseAction
-    def invoke!
-      base.empty_directory given_destination, config
-      super
+    def cleaning?
+      @config.has_key?(:clean) && @config[:clean]
+    end
+
+    def directory_empty?(directory)
+      Dir["#{directory}/*"].empty?
+    end
+
+    def queue_current_paths
+      @cleaning_queue = []
+      Find.find(@destination) do |path|
+        next if path.match(/\/\./)
+        unless path == destination
+          @cleaning_queue << path.sub(@destination, destination[/([^\/]+?)$/])
+        end
+      end
     end
     
-  protected
-    def handle_directory(lookup, &block)
-      lookup = File.join(lookup, '*')
+    def execute!
+      sort_order = %w(.png .jpeg .jpg .gif .bmp .ico .woff .otf .ttf .eot .js .css)
       
-      results = Dir[lookup].sort do |a, b|
-        simple_a = a.gsub(SHARED_SERVER.root + "/", '').gsub(SHARED_SERVER.views + "/", '') 
-        simple_b = b.gsub(SHARED_SERVER.root + "/", '').gsub(SHARED_SERVER.views + "/", '')
+      paths = @app.sitemap.all_paths.sort do |a, b|
+        a_ext = File.extname(a)
+        b_ext = File.extname(b)
         
-        a_dir = simple_a.split("/").first
-        b_dir = simple_b.split("/").first
+        a_idx = sort_order.index(a_ext) || 100
+        b_idx = sort_order.index(b_ext) || 100
         
-        if a_dir == SHARED_SERVER.images_dir
-          -1
-        elsif b_dir == SHARED_SERVER.images_dir
-          1
-        else
-          0
-        end
+        a_idx <=> b_idx
       end
       
-      results = results.select(&block) if block_given?
-      
-      results.each do |file_source|
-        if File.directory?(file_source)
-          handle_directory(file_source)
+      paths.each do |path|
+        file_source = path
+        file_destination = File.join(given_destination, file_source.gsub(source, '.'))
+        file_destination.gsub!('/./', '/')
+        
+        if @app.sitemap.generic_path?(file_source)
+          # no-op
+        elsif @app.sitemap.proxied_path?(file_source)
+          file_source = @app.sitemap.path_target(file_source)
+        elsif @app.sitemap.ignored_path?(file_source)
           next
         end
         
-        handle_path(file_source)
-      end
-    end
-
-    def execute!
-      handle_directory(source) do |path|
-        file_name = path.gsub(SHARED_SERVER.views + "/", "")
-        if file_name == "layouts"
-          false
-        elsif file_name.include?("layout.") && file_name.split(".").length == 2
-          false
-        else
-          true
+        @cleaning_queue.delete(file_destination) if cleaning?
+        
+        if @config[:glob]
+          next unless File.fnmatch(@config[:glob], file_source)
         end
+        
+        base.tilt_template(file_source, file_destination, { :force => true })
       end
     end
-    
   end
 end

data/lib/middleman/cli.rb

@@ -6,20 +6,38 @@ module Middleman
     check_unknown_options!
     default_task :server
 
-    class_option "help", :type => :boolean, :default => false, :aliases => "-h"
+    class_option "help", 
+      :type    => :boolean, 
+      :default => false, 
+      :aliases => "-h"
     def initialize(*)
       super
       help_check if options[:help]
     end
 
-    desc "init NAME", "Create new Middleman project directory NAME"
+    desc "init NAME [options]", "Create new project NAME"
     available_templates = Middleman::Templates.registered_names.join(", ")
-    method_option "template", :aliases => "-T", :default => "default", :desc => "Optionally use a pre-defined project template: #{available_templates}"
-    method_option "css_dir", :default => "stylesheets", :desc => 'The path to the css files'
-    method_option "js_dir", :default => "javascripts", :desc => 'The path to the javascript files'
-    method_option "images_dir", :default => "images", :desc => 'The path to the image files'
-    method_option "rack", :type => :boolean, :default => false, :desc => 'Include a config.ru file'
-    method_option "bundler", :type => :boolean, :default => false, :desc => 'Create a Gemfile and use Bundler to manage gems'
+    method_option "template", 
+      :aliases => "-T", 
+      :default => "default",
+      :desc    => "Use a project template: #{available_templates}"
+    method_option "css_dir", 
+      :default => "stylesheets", 
+      :desc    => 'The path to the css files'
+    method_option "js_dir", 
+      :default => "javascripts", 
+      :desc    => 'The path to the javascript files'
+    method_option "images_dir", 
+      :default => "images", 
+      :desc    => 'The path to the image files'
+    method_option "rack", 
+      :type    => :boolean, 
+      :default => false, 
+      :desc    => 'Include a config.ru file'
+    method_option "bundler", 
+      :type    => :boolean, 
+      :default => false, 
+      :desc    => 'Create a Gemfile and use Bundler to manage gems'
     def init(name)
       key = options[:template].to_sym
       unless Middleman::Templates.registered_templates.has_key?(key)
@@ -30,42 +48,54 @@ module Middleman
       thor_group.new([name], options).invoke_all
     end
 
-    desc "server [-p 4567] [-e development]", "Starts the Middleman preview server"
-    method_option "environment", :aliases => "-e", :default => ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development', :desc => "The environment Middleman will run under"
-    method_option "port", :aliases => "-p", :default => "4567", :desc => "The port Middleman will listen on"
-    
-    method_option "disable-watcher", :default => false, :type => :boolean, :desc => "Don't use config.rb watcher (also disables livereload)"
-    method_option "livereload", :default => false, :type => :boolean, :desc => "Whether to enable Livereload or not"
-    method_option "livereload-port", :default => "35729", :desc => "The port Livereload will listen on"
+    desc "server [options]", "Start the preview server"
+    method_option "environment", 
+      :aliases => "-e", 
+      :default => ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development', 
+      :desc    => "The environment Middleman will run under"
+    method_option "port",
+      :aliases => "-p", 
+      :default => "4567", 
+      :desc    => "The port Middleman will listen on"
+    method_option "debug", 
+      :type    => :boolean, 
+      :default => false,
+      :desc    => 'Print debug messages'
     def server
       v1_check
       
-      if options["livereload"]
-        livereload_options = {:port => options["livereload-port"]}
-      end
-      
       params = {
-        :port        => options[:port],
-        :environment => options[:environment]
+        :port        => options["port"],
+        :environment => options["environment"],
+        :debug       => options["debug"]
       }
       
-      if options["disable-watcher"]
-        Middleman.start_server(params)
-      else
-        Middleman::Guard.start(params, livereload_options)
-      end
+      puts "== The Middleman is loading"
+      Middleman::Guard.start(params)
     end
 
     desc "build", "Builds the static site for deployment"
-    method_option :relative, :type => :boolean, :aliases => "-r", :default => false, :desc => 'Override the config.rb file and force relative urls'
-    method_option :clean, :type => :boolean, :aliases => "-c", :default => false, :desc => 'Builds a clean project removing any orpahand files or directories'
-    method_option :glob, :type => :string, :aliases => "-g", :default => nil, :desc => 'Build a subset of the project'
+    method_option :relative, 
+      :type    => :boolean, 
+      :aliases => "-r", 
+      :default => false, 
+      :desc    => 'Force relative urls'
+    method_option :clean, 
+      :type    => :boolean, 
+      :aliases => "-c", 
+      :default => false, 
+      :desc    => 'Removes orpahand files or directories from build'
+    method_option :glob, 
+      :type    => :string, 
+      :aliases => "-g", 
+      :default => nil, 
+      :desc    => 'Build a subset of the project'
     def build
       v1_check
       thor_group = Middleman::Builder.new([], options).invoke_all
     end
 
-    desc "migrate", "Migrates an older Middleman project to the 2.0 structure"
+    desc "migrate", "Migrates an older project to the 2.0 structure"
     def migrate
       return if File.exists?("source")
       `mv public source`
@@ -73,7 +103,7 @@ module Middleman
       `rm -rf views`
     end
 
-    desc "version", "Show Middleman version"
+    desc "version", "Show version"
     def version
       require 'middleman/version'
       say "Middleman #{Middleman::VERSION}"
@@ -92,6 +122,5 @@ module Middleman
       help self.class.send(:retrieve_task_name, ARGV.dup)
       exit 0
     end
-
   end
 end