middleman 3.0.0.alpha.4 → 3.0.0.alpha.5

data/features/fonts.feature

@@ -1,8 +1,11 @@
 Feature: Web Fonts
 
   Scenario: Checking built folder for content
-    Given a built app at "fonts-app"
-    Then "stylesheets/fonts.css" should exist at "fonts-app" and include "/fonts/StMarie-Thin.otf"
+    Given a successfully built app at "fonts-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | stylesheets/fonts.css                         |
+    And the file "stylesheets/fonts.css" should contain "/fonts/StMarie-Thin.otf"
     
   Scenario: Rendering scss
     Given the Server is running at "fonts-app"

data/features/sprockets.feature

@@ -21,8 +21,10 @@ Feature: Sprockets
     Then I should see "Hello One"
     
   Scenario: Multiple engine files should build correctly
-    Given a built app at "test-app"
-    Then "javascripts/multiple_engines.js" should exist at "test-app" and include "Hello One"
+    Given a successfully built app at "test-app"
+    When I cd to "build"
+    Then a file named "javascripts/multiple_engines.js" should exist
+    And the file "javascripts/multiple_engines.js" should contain "Hello One"
   
   Scenario: Sprockets CSS require //require
     Given the Server is running at "test-app"

data/fixtures/3rd-party-command/config.rb

@@ -0,0 +1,10 @@
+class HelloWorld < Thor
+  default_task :say_hi
+
+  desc "hello", "Say hello"
+  def say_hi
+    puts "Hello World"
+  end
+end
+
+Middleman::Cli::Base.register(HelloWorld, :hello, "hello", "Say hello")

data/lib/middleman.rb

@@ -1,17 +1,27 @@
+require "rbconfig"
+
 # Setup our load paths
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 # Top-level Middleman object
 module Middleman
+  WINDOWS = !!(RUBY_PLATFORM =~ /(mingw|bccwin|wince|mswin32)/i)
+  JRUBY   = !!(RbConfig::CONFIG["RUBY_INSTALL_NAME"] =~ /^jruby/i)
+  
   # Auto-load modules on-demand
   autoload :Base,           "middleman/base"
   autoload :Cache,          "middleman/cache"
-  autoload :Builder,        "middleman/builder"
-  autoload :CLI,            "middleman/cli"
   autoload :Templates,      "middleman/templates"
   autoload :Guard,          "middleman/guard"
   
+  module Cli
+    autoload :Base,         "middleman/cli"
+    autoload :Build,        "middleman/cli/build"
+    autoload :Init,         "middleman/cli/init"
+    autoload :Server,       "middleman/cli/server"
+  end
+  
   # Custom Renderers
   module Renderers
     autoload :Haml,         "middleman/renderers/haml"
@@ -156,12 +166,6 @@ module Middleman
   
   class << self
     
-    # Where to look for custom templates
-    # @returns [String]
-    def templates_path
-      File.join(File.expand_path("~/"), ".middleman")
-    end
-    
     # Automatically load extensions from available RubyGems
     # which contain the EXTENSION_FILE
     #
@@ -225,10 +229,13 @@ module Middleman
     
       app_class = options[:app] ||= ::Middleman.server.inst
       opts[:app] = app_class
-      opts[:server] = 'thin'
-    
-      # require "thin"
-      # ::Thin::Logging.silent = true if options[:debug] != "true"
+      opts[:server] = if ::Middleman::JRUBY
+        'webrick' # Maybe Kirk?
+      else
+        require "thin"
+        ::Thin::Logging.silent = !options[:is_logging]
+        'thin'
+      end
 
       server = ::Rack::Server.new(opts)
       server.start

data/lib/middleman/base.rb

@@ -91,6 +91,7 @@ class Middleman::Base
     # Use Rack middleware
     #
     # @param [Class] Middleware
+    # @return [void]
     def use(middleware, *args, &block)
       @middleware ||= []
       @middleware << [middleware, args, block]
@@ -99,6 +100,7 @@ class Middleman::Base
     # Add Rack App mapped to specific path
     #
     # @param [String] Path to map
+    # @return [void]
     def map(map, &block)
       @mappings ||= []
       @mappings << [map, block]
@@ -106,6 +108,7 @@ class Middleman::Base
     
     # Mix-in helper methods. Accepts either a list of Modules
     # and/or a block to be evaluated
+    # @return [void]
     def helpers(*extensions, &block)
       class_eval(&block)   if block_given?
       include(*extensions) if extensions.any?
@@ -123,6 +126,7 @@ class Middleman::Base
     #
     # @param [Symbol] Unique key name
     # @param Default value
+    # @return [void]
     def set(key, value)
       @defaults ||= {}
       @defaults[key] = value
@@ -133,6 +137,7 @@ class Middleman::Base
   #
   # @param [Symbol] Name of the attribue
   # @param Attribute value
+  # @return [void]
   def set(key, value=nil, &block)
     setter = "#{key}=".to_sym
     self.class.send(:attr_accessor, key) if !respond_to?(setter)
@@ -263,6 +268,10 @@ class Middleman::Base
     @_current_path
   end
   
+  # Set the current path
+  #
+  # @param [String] path The new current path
+  # @return [void]
   def current_path=(path)
     @_current_path = path
     @request = Thor::CoreExt::HashWithIndifferentAccess.new({ :path => path })
@@ -423,7 +432,7 @@ class Middleman::Base
   # Expand a path to include the index file if it's a directory
   #
   # @private
-  # @param [String] Request path
+  # @param [String] path Request path
   # @return [String] Path with index file if necessary
   def full_path(path)
     cache.fetch(:full_path, path) do
@@ -437,8 +446,9 @@ class Middleman::Base
   
   # Add a new mime-type for a specific extension
   #
-  # @param [Symbol] File extension
-  # @param [String] Mime type
+  # @param [Symbol] type File extension
+  # @param [String] value Mime type
+  # @return [void]
   def mime_type(type, value=nil)
     return type if type.nil? || type.to_s.include?('/')
     type = ".#{type}" unless type.to_s[0] == ?.
@@ -461,18 +471,20 @@ protected
   end
   
   # Set middleware at the class level
+  # @return [void]
   def use(middleware, *args, &block)
     self.class.use(middleware, *args, &block)
   end
   
   # Set mapped rack app at the class level
+  # @return [void]
   def map(map, &block)
     self.class.map(map, &block)
   end
   
   # Immediately send static file
   #
-  # @param [String] File to send
+  # @param [String] path File to send
   def send_file(path)
     extension = File.extname(path)
     matched_mime = mime_type(extension)
@@ -488,7 +500,9 @@ protected
   
   # Set the content type for the current request
   #
-  # @param [String] Content type
+  # @param [String] type Content type
+  # @param [Hash] params
+  # @return [void]
   def content_type(type = nil, params={})
     return res['Content-Type'] unless type
     default = params.delete :default

data/lib/middleman/cli.rb

@@ -1,123 +1,47 @@
 require 'thor'
+require "thor/group"
 
-module Middleman
-  class CLI < Thor
-    include Thor::Actions
-    check_unknown_options!
-    default_task :server
-
-    class_option "help", 
-      :type    => :boolean, 
-      :default => false, 
-      :aliases => "-h"
-    def initialize(*)
-      super
-      help_check if options[:help]
-    end
-
-    desc "init NAME [options]", "Create new project NAME"
-    available_templates = Middleman::Templates.registered.keys.join(", ")
-    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.has_key?(key)
-        raise Thor::Error.new "Unknown project template '#{key}'"
-      end
-      
-      thor_group = Middleman::Templates.registered[key]
-      thor_group.new([name], options).invoke_all
-    end
-
-    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 :host,
-        :type => :string,
-        :aliases => "-h",
-        # :required => true,
-        :default => "0.0.0.0", 
-        :desc => "Bind to HOST address"
-    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
-      params = {
-        :port        => options["port"],
-        :host        => options["host"],
-        :environment => options["environment"],
-        :debug       => options["debug"]
-      }
-      
-      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    => '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
-      thor_group = Middleman::Builder.new([], options).invoke_all
-    end
-
-    desc "migrate", "Migrates an older project to the 2.0 structure"
-    def migrate
-      return if File.exists?("source")
-      `mv public source`
-      `cp -R views/* source/`
-      `rm -rf views`
-    end
-
+# CLI Module
+module Middleman::Cli
+  
+  class Base < Thor
     desc "version", "Show version"
     def version
       require 'middleman/version'
       say "Middleman #{Middleman::VERSION}"
     end
     
-  private
-
-    def help_check
-      help self.class.send(:retrieve_task_name, ARGV.dup)
-      exit 0
+    def help(meth = nil, subcommand = false)
+      if meth && !self.respond_to?(meth)
+        klass, task = Thor::Util.find_class_and_task_by_namespace("#{meth}:#{meth}")
+        klass.start(["-h", task].compact, :shell => self.shell)
+      else
+        list = []
+        Thor::Util.thor_classes_in(Middleman::Cli).each do |klass|
+          list += klass.printable_tasks(false)
+        end
+        list.sort!{ |a,b| a[0] <=> b[0] }
+        
+        shell.say "Tasks:"
+        shell.print_table(list, :ident => 2, :truncate => true)
+        shell.say
+      end
+    end
+    
+    def method_missing(meth, *args)
+      meth = meth.to_s
+      
+      if self.class.map.has_key?(meth)
+        meth = self.class.map[meth]
+      end
+      
+      klass, task = Thor::Util.find_class_and_task_by_namespace("#{meth}:#{meth}")
+      args.unshift(task) if task
+      klass.start(args, :shell => self.shell)
     end
   end
 end
+
+require "middleman/cli/init"
+require "middleman/cli/server"
+require "middleman/cli/build"

data/lib/middleman/{builder.rb → cli/build.rb}

@@ -1,11 +1,44 @@
-require "thor"
-require "thor/group"
+require "rack"
 require "rack/test"
-require "find"
 
-module Middleman
-  class Builder < Thor::Group
+module Middleman::Cli
+  class Build < Thor
     include Thor::Actions
+    check_unknown_options!
+    
+    namespace :build
+    
+    desc "build [options]", "Builds the static site for deployment"
+    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
+      if options.has_key?("relative") && options["relative"]
+        self.class.shared_instance.activate :relative_assets
+      end
+    
+      self.class.shared_rack
+
+      opts = {}
+      opts[:glob]  = options["glob"]  if options.has_key?("glob")
+      opts[:clean] = options["clean"] if options.has_key?("clean")
+
+      action GlobAction.new(self, self.class.shared_instance, opts)
+
+      self.class.shared_instance.run_hook :after_build, self
+    end
     
     class << self
       def shared_instance
@@ -13,11 +46,11 @@ module Middleman
           set :environment, :build
         end
       end
-      
+
       def shared_server
         @_shared_server ||= shared_instance.class
       end
-      
+
       def shared_rack
         @_shared_rack ||= begin
           mock = ::Rack::MockSession.new(shared_server.to_rack_app)
@@ -28,6 +61,8 @@ module Middleman
       end
     end
     
+    source_root(shared_instance.root)
+    
     # @private
     module ThorActions
       # Render a template to a file.
@@ -36,12 +71,12 @@ module Middleman
         config = args.last.is_a?(Hash) ? args.pop : {}
         destination = args.first || source
 
-        request_path = destination.sub(/^#{::Middleman::Builder.shared_instance.build_dir}/, "")
+        request_path = destination.sub(/^#{self.class.shared_instance.build_dir}/, "")
 
         begin
-          destination, request_path = ::Middleman::Builder.shared_instance.reroute_builder(destination, request_path)
+          destination, request_path = self.class.shared_instance.reroute_builder(destination, request_path)
 
-          response = ::Middleman::Builder.shared_rack.get(request_path.gsub(/\s/, "%20"))
+          response = self.class.shared_rack.get(request_path.gsub(/\s/, "%20"))
 
           create_file(destination, response.body, config)
 
@@ -52,36 +87,8 @@ module Middleman
         end
       end
     end
+
     include ThorActions
-    
-    class_option :relative, :type => :boolean, :aliases => "-r", :default => false, :desc => 'Override the config.rb file and force relative urls'
-    class_option :glob, :type => :string, :aliases => "-g", :default => nil, :desc => 'Build a subset of the project'
-    
-    def initialize(*args)
-      super
-      
-      if options.has_key?("relative") && options["relative"]
-        self.class.shared_instance.activate :relative_assets
-      end
-    end
-    
-    def source_paths
-      @source_paths ||= [
-        self.class.shared_instance.root
-      ]
-    end
-    
-    def build_all_files
-      self.class.shared_rack
-      
-      opts = { }
-      opts[:glob]  = options["glob"]  if options.has_key?("glob")
-      opts[:clean] = options["clean"] if options.has_key?("clean")
-      
-      action GlobAction.new(self, self.class.shared_instance, opts)
-      
-      self.class.shared_instance.run_hook :after_build, self
-    end
   end
   
   # @private
@@ -92,9 +99,9 @@ module Middleman
       @app         = app
       source       = @app.source
       @destination = @app.build_dir
-      
+
       @source = File.expand_path(base.find_in_source_paths(source.to_s))
-      
+
       super(base, destination, config)
     end
 
@@ -109,7 +116,7 @@ module Middleman
     end
 
   protected
-  
+
     def clean!
       files       = @cleaning_queue.select { |q| File.file? q }
       directories = @cleaning_queue.select { |q| File.directory? q }
@@ -124,7 +131,7 @@ module Middleman
         base.remove_file d, :force => true if directory_empty? d 
       end
     end
-  
+
     def cleaning?
       @config.has_key?(:clean) && @config[:clean]
     end
@@ -142,20 +149,20 @@ module Middleman
         end
       end if File.exist?(@destination)
     end
-    
+
     def execute!
       sort_order = %w(.png .jpeg .jpg .gif .bmp .svg .svgz .ico .woff .otf .ttf .eot .js .css)
-      
+
       paths = @app.sitemap.all_paths.sort do |a, b|
         a_ext = File.extname(a)
         b_ext = File.extname(b)
-        
+
         a_idx = sort_order.index(a_ext) || 100
         b_idx = sort_order.index(b_ext) || 100
-        
+
         a_idx <=> b_idx
       end
-      
+
       paths.each do |path|
         file_source = path
         file_destination = File.join(given_destination, file_source.gsub(source, '.'))
@@ -168,15 +175,17 @@ module Middleman
         elsif @app.sitemap.ignored?(file_source)
           next
         end
-        
+
         if @config[:glob]
           next unless File.fnmatch(@config[:glob], file_source)
         end
-        
+
         file_destination = base.tilt_template(file_source, file_destination, { :force => true })
 
         @cleaning_queue.delete(file_destination) if cleaning?
       end
     end
   end
-end
+  
+  Base.map({ "b" => "build" })
+end