RubyGems - middleman - Versions diffs - 2.0.9.pre-x86-mswin32 - Mend

middleman 2.0.9.pre-x86-mswin32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (196) hide show

data/.gemtest +0 -0
data/.gitignore +13 -0
data/.travis.yml +4 -0
data/CHANGELOG +47 -0
data/Gemfile +3 -0
data/LICENSE +20 -0
data/README.md +19 -0
data/Rakefile +15 -0
data/bin/middleman +73 -0
data/bin/mm-build +9 -0
data/bin/mm-init +9 -0
data/bin/mm-server +9 -0
data/features/asset_host.feature +14 -0
data/features/automatic_image_sizes.feature +16 -0
data/features/builder.feature +23 -0
data/features/cache_buster.feature +26 -0
data/features/coffee-script.feature +17 -0
data/features/data.feature +12 -0
data/features/directory_index.feature +29 -0
data/features/dynamic_pages.feature +33 -0
data/features/front-matter.feature +7 -0
data/features/generator.feature +8 -0
data/features/helpers_auto_javascript_include_tag.feature +27 -0
data/features/helpers_auto_stylesheet_link_tag.feature +27 -0
data/features/helpers_page_classes.feature +17 -0
data/features/liquid.feature +6 -0
data/features/markdown.feature +7 -0
data/features/minify_css.feature +24 -0
data/features/minify_javascript.feature +23 -0
data/features/padrino_helpers.feature +10 -0
data/features/page_alias_and_layouts.feature +44 -0
data/features/relative_assets.feature +44 -0
data/features/scss-support.feature +12 -0
data/features/sinatra.feature +6 -0
data/features/slim.feature +7 -0
data/features/sprockets.feature +21 -0
data/features/sprockets_gems.feature +7 -0
data/features/step_definitions/asset_host_steps.rb +8 -0
data/features/step_definitions/builder_steps.rb +40 -0
data/features/step_definitions/generator_steps.rb +30 -0
data/features/step_definitions/middleman_steps.rb +46 -0
data/features/step_definitions/page_layout_steps.rb +13 -0
data/features/support/env.rb +3 -0
data/features/tiny_src.feature +15 -0
data/fixtures/indexable-app/config.rb +2 -0
data/fixtures/indexable-app/source/a_folder/needs_index.html +1 -0
data/fixtures/indexable-app/source/leave_me_alone.html +1 -0
data/fixtures/indexable-app/source/needs_index.html +1 -0
data/fixtures/indexable-app/source/regular/index.html +1 -0
data/fixtures/relative-app/config.rb +0 -0
data/fixtures/relative-app/source/images/blank.gif +0 -0
data/fixtures/relative-app/source/stylesheets/relative_assets.css.sass +3 -0
data/fixtures/sprockets-app/config.rb +1 -0
data/fixtures/sprockets-app/source/jquery_include.js +1 -0
data/fixtures/sprockets-app/source/library/javascripts/sprockets_base.js +5 -0
data/fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js +3 -0
data/fixtures/test-app/config.rb +51 -0
data/fixtures/test-app/data/test.yml +4 -0
data/fixtures/test-app/source/_liquid_partial.liquid +1 -0
data/fixtures/test-app/source/_partial.haml +1 -0
data/fixtures/test-app/source/a_folder/needs_index.html +1 -0
data/fixtures/test-app/source/asset_host.html.haml +1 -0
data/fixtures/test-app/source/auto-css.html.haml +1 -0
data/fixtures/test-app/source/auto-css/auto-css.html.haml +1 -0
data/fixtures/test-app/source/auto-css/index.html.haml +1 -0
data/fixtures/test-app/source/auto-css/sub/auto-css.html.haml +1 -0
data/fixtures/test-app/source/auto-image-sizes.html.haml +1 -0
data/fixtures/test-app/source/auto-js.html.haml +1 -0
data/fixtures/test-app/source/auto-js/auto-js.html.haml +1 -0
data/fixtures/test-app/source/auto-js/index.html.haml +1 -0
data/fixtures/test-app/source/auto-js/sub/auto-js.html.haml +1 -0
data/fixtures/test-app/source/cache-buster.html.haml +2 -0
data/fixtures/test-app/source/custom-layout-dir/index.html.haml +1 -0
data/fixtures/test-app/source/custom-layout.html.haml +1 -0
data/fixtures/test-app/source/data.html.erb +1 -0
data/fixtures/test-app/source/data2.html.liquid +2 -0
data/fixtures/test-app/source/front-matter.html.erb +6 -0
data/fixtures/test-app/source/images/Child folder/regular_file(example).txt +1 -0
data/fixtures/test-app/source/images/Read me (example).txt +1 -0
data/fixtures/test-app/source/images/blank.gif +0 -0
data/fixtures/test-app/source/img/blank.gif +0 -0
data/fixtures/test-app/source/index.html.haml +6 -0
data/fixtures/test-app/source/inline-coffeescript.html.haml +3 -0
data/fixtures/test-app/source/inline-css.html.haml +4 -0
data/fixtures/test-app/source/inline-js.html.haml +7 -0
data/fixtures/test-app/source/javascripts/auto-js.js +1 -0
data/fixtures/test-app/source/javascripts/auto-js/auto-js.js +1 -0
data/fixtures/test-app/source/javascripts/auto-js/index.js +1 -0
data/fixtures/test-app/source/javascripts/auto-js/sub/auto-js.js +1 -0
data/fixtures/test-app/source/javascripts/broken-coffee.js.coffee +3 -0
data/fixtures/test-app/source/javascripts/coffee_test.js.coffee +3 -0
data/fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js +1 -0
data/fixtures/test-app/source/javascripts/jquery_base.js +5 -0
data/fixtures/test-app/source/javascripts/multiple_engines.js.coffee.erb +1 -0
data/fixtures/test-app/source/javascripts/sprockets_base.js +5 -0
data/fixtures/test-app/source/javascripts/sprockets_sub.js +3 -0
data/fixtures/test-app/source/layout.haml +6 -0
data/fixtures/test-app/source/layouts/custom.haml +5 -0
data/fixtures/test-app/source/liquid_master.html.liquid +1 -0
data/fixtures/test-app/source/markdown.html.markdown +1 -0
data/fixtures/test-app/source/needs_index.html +1 -0
data/fixtures/test-app/source/padrino_test.html.haml +5 -0
data/fixtures/test-app/source/page-classes.html.haml +1 -0
data/fixtures/test-app/source/real.html +1 -0
data/fixtures/test-app/source/real/index.html.erb +5 -0
data/fixtures/test-app/source/relative_image.html.erb +1 -0
data/fixtures/test-app/source/services/index.html.haml +1 -0
data/fixtures/test-app/source/should_be_ignored.html +1 -0
data/fixtures/test-app/source/should_be_ignored2.html +1 -0
data/fixtures/test-app/source/should_be_ignored3.html +1 -0
data/fixtures/test-app/source/slim.html.slim +7 -0
data/fixtures/test-app/source/spaces in file.html.erb +1 -0
data/fixtures/test-app/source/static.html +1 -0
data/fixtures/test-app/source/stylesheets/asset_host.css.sass +3 -0
data/fixtures/test-app/source/stylesheets/auto-css.css +3 -0
data/fixtures/test-app/source/stylesheets/auto-css/auto-css.css +3 -0
data/fixtures/test-app/source/stylesheets/auto-css/index.css +0 -0
data/fixtures/test-app/source/stylesheets/auto-css/sub/auto-css.css +3 -0
data/fixtures/test-app/source/stylesheets/layout.css.sass +2 -0
data/fixtures/test-app/source/stylesheets/relative_assets.css.sass +3 -0
data/fixtures/test-app/source/stylesheets/site.css.sass +1 -0
data/fixtures/test-app/source/stylesheets/site_scss.css.scss +1 -0
data/fixtures/test-app/source/stylesheets/static.css +2 -0
data/fixtures/test-app/source/sub1/page-classes.html.haml +1 -0
data/fixtures/test-app/source/sub1/sub2/page-classes.html.haml +1 -0
data/fixtures/test-app/source/tiny_src.html.haml +1 -0
data/lib/middleman.rb +202 -0
data/lib/middleman/base.rb +198 -0
data/lib/middleman/builder.rb +163 -0
data/lib/middleman/cli.rb +87 -0
data/lib/middleman/config.ru +2 -0
data/lib/middleman/core_extensions/assets.rb +57 -0
data/lib/middleman/core_extensions/builder.rb +41 -0
data/lib/middleman/core_extensions/compass.rb +102 -0
data/lib/middleman/core_extensions/data.rb +120 -0
data/lib/middleman/core_extensions/default_helpers.rb +77 -0
data/lib/middleman/core_extensions/features.rb +102 -0
data/lib/middleman/core_extensions/front_matter.rb +116 -0
data/lib/middleman/core_extensions/rack_map.rb +35 -0
data/lib/middleman/core_extensions/rendering.rb +19 -0
data/lib/middleman/core_extensions/routing.rb +87 -0
data/lib/middleman/core_extensions/sprockets.rb +102 -0
data/lib/middleman/features/asset_host.rb +22 -0
data/lib/middleman/features/automatic_image_sizes.rb +31 -0
data/lib/middleman/features/automatic_image_sizes/fastimage.rb +287 -0
data/lib/middleman/features/cache_buster.rb +42 -0
data/lib/middleman/features/directory_indexes.rb +56 -0
data/lib/middleman/features/lorem.rb +126 -0
data/lib/middleman/features/minify_css.rb +10 -0
data/lib/middleman/features/minify_javascript.rb +43 -0
data/lib/middleman/features/relative_assets.rb +38 -0
data/lib/middleman/features/tiny_src.rb +11 -0
data/lib/middleman/guard.rb +71 -0
data/lib/middleman/renderers/coffee_script.rb +8 -0
data/lib/middleman/renderers/haml.rb +31 -0
data/lib/middleman/renderers/liquid.rb +29 -0
data/lib/middleman/renderers/markdown.rb +34 -0
data/lib/middleman/renderers/sass.rb +63 -0
data/lib/middleman/renderers/slim.rb +8 -0
data/lib/middleman/templates.rb +53 -0
data/lib/middleman/templates/default.rb +17 -0
data/lib/middleman/templates/default/source/index.html.erb +5 -0
data/lib/middleman/templates/default/source/layout.erb +19 -0
data/lib/middleman/templates/default/source/stylesheets/site.css.scss +32 -0
data/lib/middleman/templates/html5.rb +16 -0
data/lib/middleman/templates/html5/source/404.html +38 -0
data/lib/middleman/templates/html5/source/README.md +388 -0
data/lib/middleman/templates/html5/source/apple-touch-icon-114x114-precomposed.png +0 -0
data/lib/middleman/templates/html5/source/apple-touch-icon-57x57-precomposed.png +0 -0
data/lib/middleman/templates/html5/source/apple-touch-icon-72x72-precomposed.png +0 -0
data/lib/middleman/templates/html5/source/apple-touch-icon-precomposed.png +0 -0
data/lib/middleman/templates/html5/source/apple-touch-icon.png +0 -0
data/lib/middleman/templates/html5/source/crossdomain.xml +25 -0
data/lib/middleman/templates/html5/source/css/style.css +293 -0
data/lib/middleman/templates/html5/source/favicon.ico +0 -0
data/lib/middleman/templates/html5/source/humans.txt +43 -0
data/lib/middleman/templates/html5/source/img/.gitignore +2 -0
data/lib/middleman/templates/html5/source/index.html +79 -0
data/lib/middleman/templates/html5/source/js/libs/jquery-1.6.2.js +8981 -0
data/lib/middleman/templates/html5/source/js/libs/jquery-1.6.2.min.js +18 -0
data/lib/middleman/templates/html5/source/js/libs/modernizr-2.0.6.min.js +4 -0
data/lib/middleman/templates/html5/source/js/mylibs/.gitignore +2 -0
data/lib/middleman/templates/html5/source/js/plugins.js +20 -0
data/lib/middleman/templates/html5/source/js/script.js +8 -0
data/lib/middleman/templates/html5/source/robots.txt +5 -0
data/lib/middleman/templates/html5/source/test/index.html +31 -0
data/lib/middleman/templates/html5/source/test/qunit/qunit.css +148 -0
data/lib/middleman/templates/html5/source/test/qunit/qunit.js +1265 -0
data/lib/middleman/templates/html5/source/test/tests.js +24 -0
data/lib/middleman/templates/local.rb +20 -0
data/lib/middleman/templates/shared/Gemfile.tt +3 -0
data/lib/middleman/templates/shared/config.ru +4 -0
data/lib/middleman/templates/shared/config.tt +104 -0
data/lib/middleman/version.rb +3 -0
data/middleman.gemspec +79 -0
metadata +826 -0

data/lib/middleman/base.rb ADDED

@@ -0,0 +1,198 @@
+require "i18n"
+require "active_support"
+require "active_support/json"
+require "active_support/core_ext/class/attribute_accessors"
+module Middleman::Base
+  class << self
+    def registered(app)
+      app.extend ClassMethods
+      app.send :include, InstanceMethods
+      # Basic Sinatra config
+      app.set :app_file,    __FILE__
+      app.set :root,        Dir.pwd
+      app.set :sessions,    false
+      app.set :logging,     false
+      app.set :environment, (ENV['MM_ENV'] && ENV['MM_ENV'].to_sym) || :development
+      # Middleman-specific options
+      app.set :index_file,  "index.html"  # What file responds to folder requests
+                                      # Such as the homepage (/) or subfolders (/about/)
+      # These directories are passed directly to Compass
+      app.set :js_dir,      "javascripts" # Where to look for javascript files
+      app.set :css_dir,     "stylesheets" # Where to look for CSS files
+      app.set :images_dir,  "images"      # Where to look for images
+      app.set :fonts_dir,   "fonts"       # Where to look for fonts
+      app.set :build_dir,   "build"       # Which folder are builds output to
+      app.set :http_prefix, nil           # During build, add a prefix for absolute paths
+      # Pass all request to Middleman, even "static" files
+      app.set :static, false
+      app.set :views, "source"
+      # Add Builder Callbacks
+      app.register Middleman::CoreExtensions::Builder
+      # Add Rack::Builder.map to Sinatra
+      app.register Middleman::CoreExtensions::RackMap
+      # Activate custom features
+      app.register Middleman::CoreExtensions::Features
+      # Activate Yaml Data package
+      app.register Middleman::CoreExtensions::Data
+      # Setup custom rendering
+      app.register Middleman::CoreExtensions::Rendering
+      # Compass framework
+      app.register Middleman::CoreExtensions::Compass
+      # Sprockets asset handling
+      app.register Middleman::CoreExtensions::Sprockets
+      # Setup asset path pipeline
+      app.register Middleman::CoreExtensions::Assets
+      # Activate built-in helpers
+      app.register Middleman::CoreExtensions::DefaultHelpers
+      # with_layout and page routing
+      app.register Middleman::CoreExtensions::Routing
+      # Parse YAML from templates
+      app.register Middleman::CoreExtensions::FrontMatter
+      app.set :default_features, [
+        :lorem
+      ]
+      # Default layout name
+      app.set :layout, :layout
+      # This will match all requests not overridden in the project's config.rb
+      app.not_found do
+        process_request
+      end
+      # Custom 404 handler (to be styled)
+      app.error Sinatra::NotFound do
+        content_type 'text/html'
+        "<html><body><h1>File Not Found</h1><p>#{request.path_info}</p></body>"
+      end
+      # See if Tilt cannot handle this file
+      app.before_processing(:base) do |result|
+        request_path = request.path_info.gsub("%20", " ")
+        should_be_ignored = !(request["is_proxy"]) && settings.excluded_paths.include?("/#{request_path}")
+        if result && !should_be_ignored
+          extensionless_path, template_engine = result
+          # Return static files
+          if !::Tilt.mappings.has_key?(template_engine.to_s)
+            content_type mime_type(File.extname(request_path)), :charset => 'utf-8'
+            status 200
+            send_file File.join(settings.views, request_path)
+            false
+          else
+            true
+          end
+        else
+          if !%w(favicon.ico).include?(request_path)
+            $stderr.puts "File not found: #{request_path}"
+          end
+          status 404
+          false
+        end
+      end
+    end
+    alias :included :registered
+  end
+  module ClassMethods
+    # Override Sinatra's set to accept a block
+    # Specifically for the asset_host feature
+    def set(option, value=self, &block)
+      if block_given?
+        value = Proc.new { block }
+      end
+      super(option, value, &nil)
+    end
+    def before_processing(name=:unnamed, idx=-1, &block)
+      @before_processes ||= []
+      @before_processes.insert(idx, [name, block])
+    end
+    def execute_before_processing!(inst, resolved_template)
+      @before_processes ||= []
+      @before_processes.all? do |name, block|
+        inst.instance_exec(resolved_template, &block)
+      end
+    end
+    # Convenience method to check if we're in build mode
+    def build?; environment == :build; end
+  end
+  module InstanceMethods
+    # Internal method to look for templates and evaluate them if found
+    def process_request(options={})
+      if !settings.views.include?(settings.root)
+        settings.set :views, File.join(settings.root, settings.views)
+      end
+      # Normalize the path and add index if we're looking at a directory
+      request.path_info = self.class.path_to_index(request.path)
+      request_path = request.path_info.gsub("%20", " ")
+      found_template = resolve_template(request_path, :raise_exceptions => false)
+      return status(404) unless found_template
+      return unless settings.execute_before_processing!(self, found_template)
+      options.merge!(request['custom_options'] || {})
+      old_layout = settings.layout
+      settings.set :layout, options[:layout] if !options[:layout].nil?
+      local_layout = if settings.layout
+        if options[:layout] == false || request.path_info =~ /\.(css|js)$/
+          false
+        else
+          settings.fetch_layout_path(settings.layout).to_sym
+        end
+      else
+        false
+      end
+      render_options = { :layout => local_layout }
+      render_options[:layout_engine] = options[:layout_engine] if options.has_key? :layout_engine
+      path, engine = found_template
+      locals = request['custom_locals'] || {}
+      begin
+        result = render(engine, path, render_options, locals)
+        if result
+          content_type mime_type(File.extname(request_path)), :charset => 'utf-8'
+          status 200
+          body result
+        end
+      # rescue
+      #   status(404)
+      ensure
+        settings.set :layout, old_layout
+      end
+    end
+  end
+end

data/lib/middleman/builder.rb ADDED

@@ -0,0 +1,163 @@
+require "thor"
+require "thor/group"
+require 'rack/test'
+SHARED_SERVER = Middleman.server
+SHARED_SERVER.set :environment, :build
+module Middleman
+  module ThorActions
+    def tilt_template(source, *args, &block)
+      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.build_dir}/, "")
+      begin
+        destination, request_path = SHARED_SERVER.reroute_builder(destination, request_path)
+        request_path.gsub!(/\s/, "%20")
+        response = Middleman::Builder.shared_rack.get(request_path)
+        create_file destination, nil, config do
+          response.body
+        end if response.status == 200
+      rescue
+      end
+    end
+  end
+  class Builder < Thor::Group
+    include Thor::Actions
+    include Middleman::ThorActions
+    def self.shared_rack
+      @shared_rack ||= begin
+        mock = ::Rack::MockSession.new(SHARED_SERVER)
+        sess = ::Rack::Test::Session.new(mock)
+        sess.get("/")
+        sess
+      end
+    end
+    class_option :relative, :type => :boolean, :aliases => "-r", :default => false, :desc => 'Override the config.rb file and force relative urls'
+    def initialize(*args)
+      super
+      if options.has_key?("relative") && options["relative"]
+        SHARED_SERVER.activate :relative_assets
+      end
+    end
+    def source_paths
+      @source_paths ||= [
+        SHARED_SERVER.root
+      ]
+    end
+    def build_all_files
+      self.class.shared_rack
+      action Directory.new(self, SHARED_SERVER.views, SHARED_SERVER.build_dir, { :force => true })
+      SHARED_SERVER.proxied_paths.each do |url, proxy|
+        tilt_template(url.gsub(/^\//, "#{SHARED_SERVER.build_dir}/"), { :force => true })
+      end
+    end
+    @@hooks = {}
+    def self.after_run(name, &block)
+      @@hooks[name] = block
+    end
+    def run_hooks
+      @@hooks.each do |name, proc|
+        instance_eval(&proc)
+      end
+      SHARED_SERVER.after_build_callbacks.each do |proc|
+        instance_eval(&proc)
+      end
+    end
+  end
+  class Directory < ::Thor::Actions::EmptyDirectory
+    attr_reader :source
+    def initialize(base, source, destination=nil, config={}, &block)
+      @source = File.expand_path(base.find_in_source_paths(source.to_s))
+      @block  = block
+      super(base, destination, { :recursive => true }.merge(config))
+    end
+    def invoke!
+      base.empty_directory given_destination, config
+      execute!
+    end
+    def revoke!
+      execute!
+    end
+  protected
+    def handle_directory(lookup, &block)
+      lookup = File.join(lookup, '*')
+      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 + "/", '')
+        a_dir = simple_a.split("/").first
+        b_dir = simple_b.split("/").first
+        if a_dir == SHARED_SERVER.images_dir
+          -1
+        elsif b_dir == SHARED_SERVER.images_dir
+          1
+        else
+          0
+        end
+      end
+      results = results.select(&block) if block_given?
+      results.each do |file_source|
+        if File.directory?(file_source)
+          handle_directory(file_source)
+          next
+        end
+        # Skip partials prefixed with an underscore
+        next unless file_source.gsub(SHARED_SERVER.root, '').split('/').select { |p| p[0,1] == '_' }.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
+    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
+        end
+      end
+    end
+  end
+end

data/lib/middleman/cli.rb ADDED

@@ -0,0 +1,87 @@
+require 'thor'
+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", "Create new Middleman project directory 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'
+    def init(name)
+      key = options[:template].to_sym
+      unless Middleman::Templates.registered_templates.has_key?(key)
+        key = :default
+      end
+      thor_group = Middleman::Templates.registered_templates[key]
+      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 "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"
+    def server
+      v1_check
+      if options["livereload"]
+        livereload_options = {:port => options["livereload-port"]}
+      end
+      Middleman::Guard.start({
+        :port        => options[:port],
+        :environment => options[:environment]
+      }, livereload_options)
+    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'
+    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"
+    def migrate
+      return if File.exists?("source")
+      `mv public source`
+      `cp -R views/* source/`
+      `rm -rf views`
+    end
+    desc "version", "Show Middleman version"
+    def version
+      require 'middleman/version'
+      say "Middleman #{Middleman::VERSION}"
+    end
+  private
+    def v1_check
+      if File.exists?("views") || File.exists?("public")
+        $stderr.puts "== Error: The views and public folders are have been combined. Use the 'middleman migrate' command to merge your folders automatically."
+        exit 1
+      end
+    end
+    def help_check
+      help self.class.send(:retrieve_task_name, ARGV.dup)
+      exit 0
+    end
+  end
+end

data/lib/middleman/config.ru ADDED

	@@ -0,0 +1,2 @@
1	+ require 'middleman'
2	+ run Middleman.server