middleman-core 3.0.0 → 3.0.1.pre

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

@@ -1,26 +1,26 @@
 # CLI Module
 module Middleman::Cli
-  
+
   # A initializing Bundler
   class Bundle < Thor
     include Thor::Actions
     check_unknown_options!
-    
+
     namespace :bundle
-    
+
     desc "bundle", "Setup initial bundle", :hide => true
-    
+
     # The setup task
     def bundle
       run('bundle install --without development test')#, :capture => true)
     end
   end
-  
+
   # A upgrading Bundler
   class Upgrade < Thor
     include Thor::Actions
     check_unknown_options!
-    
+
     namespace :upgrade
 
     desc "upgrade", "Upgrade installed bundle"
@@ -32,7 +32,7 @@ module Middleman::Cli
       end
     end
   end
-  
+
   # Map "u" to "upgrade"
   Base.map({
     "u" => "upgrade"

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

@@ -1,22 +1,29 @@
 # CLI Module
 module Middleman::Cli
-  
+
   # A thor task for creating new projects
   class Extension < Thor
     include Thor::Actions
-    
+
     check_unknown_options!
-    
+
     namespace :extension
-    
+
     # Required path for the new project to be generated
     argument :name, :type => :string
-
-    desc "extension [options]", "Create Middleman extension scaffold NAME"
     
+    # Template files are relative to this file
+    # @return [String]
+    def self.source_root
+      File.join(File.dirname(__FILE__), "..", "templates", "extension")
+    end
+    
+    desc "extension [options]", "Create Middleman extension scaffold NAME"
+
     # The extension task
     # @param [String] name
     def extension
+      generate_gitignore!
       template "Rakefile", File.join(name, "Rakefile")
       template "gemspec", File.join(name, "#{name}.gemspec")
       template "Gemfile", File.join(name, "Gemfile")
@@ -25,12 +32,18 @@ module Middleman::Cli
       template "features/support/env.rb", File.join(name, "features", "support", "env.rb")
       empty_directory File.join(name, "fixtures")
     end
-    
-    # Template files are relative to this file
-    # @return [String]
-    def self.source_root
-      File.join(File.dirname(__FILE__), "..", "templates", "extension")
-    end
+
+    # Output a .gitignore file
+    class_option :git, :type => :boolean, :default => true
+
+    no_tasks {
+      # Write a .gitignore file for project
+      # @return [void]
+      def generate_gitignore!
+        return unless options[:git]
+        copy_file "gitignore", File.join(name, ".gitignore")
+      end
+    }
 
   end
 end

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

@@ -2,35 +2,35 @@ require "middleman-core/templates"
 
 # CLI Module
 module Middleman::Cli
-  
+
   # A thor task for creating new projects
   class Init < Thor
     check_unknown_options!
-    
+
     namespace :init
-    
+
     desc "init NAME [options]", "Create new project NAME"
     available_templates = ::Middleman::Templates.registered.keys.join(", ")
-    method_option "template", 
-      :aliases => "-T", 
+    method_option "template",
+      :aliases => "-T",
       :default => "default",
       :desc    => "Use a project template: #{available_templates}"
-    method_option "css_dir", 
-      # :default => "stylesheets", 
+    method_option "css_dir",
+      # :default => "stylesheets",
       :desc    => 'The path to the css files'
-    method_option "js_dir", 
-      # :default => "javascripts", 
+    method_option "js_dir",
+      # :default => "javascripts",
       :desc    => 'The path to the javascript files'
-    method_option "images_dir", 
-      # :default => "images", 
+    method_option "images_dir",
+      # :default => "images",
       :desc    => 'The path to the image files'
-    method_option "rack", 
-      :type    => :boolean, 
-      :default => false, 
+    method_option "rack",
+      :type    => :boolean,
+      :default => false,
       :desc    => 'Include a config.ru file'
-    method_option "bundler", 
-      :type    => :boolean, 
-      :default => false, 
+    method_option "bundler",
+      :type    => :boolean,
+      :default => false,
       :desc    => 'Create a Gemfile and use Bundler to manage gems'
     # The init task
     # @param [String] name
@@ -39,7 +39,7 @@ module Middleman::Cli
       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
@@ -48,7 +48,7 @@ module Middleman::Cli
   def self.exit_on_failure?
     true
   end
-  
+
   # Map "i", "new" and "n" to "init"
   Base.map({
     "i"   => "init",

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

@@ -1,40 +1,48 @@
 # CLI Module
 module Middleman::Cli
-  
+
   # Server thor task
   class Server < Thor
     check_unknown_options!
-    
+
     namespace :server
-    
+
     desc "server [options]", "Start the preview server"
     method_option :environment,
-      :aliases => "-e", 
-      :default => ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development', 
+      :aliases => "-e",
+      :default => ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development',
       :desc    => "The environment Middleman will run under"
     method_option :host,
       :type    => :string,
       :aliases => "-h",
-      :default => "0.0.0.0", 
+      :default => "0.0.0.0",
       :desc    => "Bind to HOST address"
     method_option :port,
-      :aliases => "-p", 
-      :default => "4567", 
+      :aliases => "-p",
+      :default => "4567",
       :desc    => "The port Middleman will listen on"
     method_option :verbose,
-      :type    => :boolean, 
+      :type    => :boolean,
       :default => false,
       :desc    => 'Print debug messages'
-    method_option "disable-watcher", 
-      :type    => :boolean, 
+    method_option :instrument,
+      :type    => :string,
+      :default => false,
+      :desc    => 'Print instrument messages'
+    method_option "disable-watcher",
+      :type    => :boolean,
       :default => false,
       :desc    => 'Disable the file change and delete watcher process'
-    
+    method_option :profile,
+      :type    => :boolean,
+      :default => false,
+      :desc    => 'Generate profiling report for server startup'
+
     # Start the server
     def server
       require "middleman-core"
       require "middleman-core/preview_server"
-      
+
       if !ENV["MM_ROOT"]
         puts "== Could not find a Middleman project config.rb"
         puts "== Treating directory as a static site to be served"
@@ -47,9 +55,10 @@ module Middleman::Cli
         :host              => options["host"],
         :environment       => options["environment"],
         :debug             => options["verbose"],
+        :instrumenting     => options["instrument"],
         :"disable-watcher" => options["disable-watcher"]
       }
-      
+
       puts "== The Middleman is loading"
       ::Middleman::PreviewServer.start(params)
     end
@@ -57,8 +66,8 @@ module Middleman::Cli
 
   def self.exit_on_failure?
     true
-  end  
-  
+  end
+
   # Map "s" to "server"
   Base.map({ "s" => "server" })
 end

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

@@ -1,9 +1,9 @@
 module Middleman
   module CoreExtensions
-    
+
     # Convenience methods to allow config.rb to talk to the Builder
     module Builder
-  
+
       # Extension registered
       class << self
         # @private
@@ -14,4 +14,4 @@ module Middleman
       end
     end
   end
-end
+end

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

@@ -1,10 +1,10 @@
 module Middleman
   module CoreExtensions
-    
+
     # The data extension parses YAML and JSON files in the data/ directory
     # and makes them available to config.rb, templates and extensions
     module Data
-  
+
       # Extension registered
       class << self
         # @private
@@ -12,13 +12,13 @@ module Middleman
           # Data formats
           require "yaml"
           require "active_support/json"
-      
+
           app.set :data_dir, "data"
           app.send :include, InstanceMethods
         end
         alias :included :registered
       end
-  
+
       # Instance methods
       module InstanceMethods
         # Setup data files before anything else so they are available when
@@ -27,14 +27,14 @@ module Middleman
           self.files.changed DataStore.matcher do |file|
             self.data.touch_file(file) if file.match(%r{^#{self.data_dir}\/})
           end
-    
+
           self.files.deleted DataStore.matcher do |file|
             self.data.remove_file(file) if file.match(%r{^#{self.data_dir}\/})
           end
-      
+
           super
         end
-    
+
         # The data object
         #
         # @return [DataStore]
@@ -42,13 +42,13 @@ module Middleman
           @_data ||= DataStore.new(self)
         end
       end
-  
+
       # The core logic behind the data extension.
       class DataStore
-    
+
         # Static methods
         class << self
-      
+
           # The regex which tells Middleman which files are for data
           #
           # @return [Regexp]
@@ -56,7 +56,7 @@ module Middleman
             %r{[\w-]+\.(yml|yaml|json)$}
           end
         end
-    
+
         # Store static data hash
         #
         # @param [Symbol] name Name of the data, used for namespacing
@@ -78,7 +78,7 @@ module Middleman
           @_callback_sources[name.to_s] = proc unless name.nil? || proc.nil?
           @_callback_sources
         end
-    
+
         # Setup data store
         #
         # @param [Middleman::Application] app The current instance of Middleman
@@ -86,7 +86,7 @@ module Middleman
           @app = app
           @local_data = {}
         end
-    
+
         # Update the internal cache for a given file path
         #
         # @param [String] file The file to be re-parsed
@@ -95,7 +95,7 @@ module Middleman
           file = File.expand_path(file, @app.root)
           extension = File.extname(file)
           basename  = File.basename(file, extension)
-      
+
           if %w(.yaml .yml).include?(extension)
             data = YAML.load_file(file)
           elsif extension == ".json"
@@ -106,7 +106,7 @@ module Middleman
 
           @local_data[basename] = ::Middleman::Util.recursively_enhance(data)
         end
-    
+
         # Remove a given file from the internal cache
         #
         # @param [String] file The file to be cleared
@@ -116,26 +116,26 @@ module Middleman
           basename  = File.basename(file, extension)
           @local_data.delete(basename) if @local_data.has_key?(basename)
         end
-    
+
         # Get a hash hash from either internal static data or a callback
         #
         # @param [String, Symbol] path The name of the data namespace
         # @return [Hash, nil]
         def data_for_path(path)
           response = nil
-      
+
           @@local_sources ||= {}
           @@callback_sources ||= {}
-      
+
           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
         end
-    
+
         # "Magically" find namespaces of data if they exist
         #
         # @param [String] path The namespace to search for
@@ -145,36 +145,36 @@ module Middleman
             return @local_data[path.to_s]
           else
             result = data_for_path(path)
-      
+
             if result
               return ::Middleman::Util.recursively_enhance(result)
             end
           end
-      
+
           super
         end
-    
+
         # Convert all the data into a static hash
         #
         # @return [Hash]
         def to_h
           data = {}
-      
+
           self.store.each do |k, v|
             data[k] = data_for_path(k)
           end
-      
+
           self.callbacks.each do |k, v|
             data[k] = data_for_path(k)
           end
-      
+
           (@local_data || {}).each do |k, v|
             data[k] = v
           end
-      
+
           data
         end
       end
     end
   end
-end
+end