middleman-core 3.0.0 → 3.0.1.pre

data/lib/middleman-core/templates.rb

@@ -4,12 +4,12 @@ require "thor/group"
 
 # Templates namespace
 module Middleman::Templates
-  
+
   # Static methods
   class << self
-    
+
     # Get list of registered templates and add new ones
-    # 
+    #
     #     Middleman::Templates.register(:ext_name, klass)
     #
     # @param [Symbol] name The name of the template
@@ -20,15 +20,15 @@ module Middleman::Templates
       @_template_mappings[name] = klass if name && klass
       @_template_mappings
     end
-    
+
     # Middleman::Templates.register(name, klass)
     alias :registered :register
   end
-  
+
   # Base Template class. Handles basic options and paths.
   class Base < ::Thor::Group
     include Thor::Actions
-    
+
     def initialize(names, options)
       super
       source_paths << File.join(File.dirname(__FILE__), 'templates')
@@ -36,25 +36,25 @@ module Middleman::Templates
 
     # Required path for the new project to be generated
     argument :location, :type => :string
-    
+
     # Name of the template being used to generate the project.
     class_option :template, :default => "default"
-    
+
     # Output a config.ru file for Rack if --rack is passed
     class_option :rack, :type => :boolean, :default => false
-    
+
     # Write a Rack config.ru file for project
     # @return [void]
     def generate_rack!
       return unless options[:rack]
       template "shared/config.ru", File.join(location, "config.ru")
     end
-    
+
     # Write a Bundler Gemfile file for project
     # @return [void]
     def generate_bundler!
       template "shared/Gemfile.tt", File.join(location, "Gemfile")
-      
+
       inside(location) do
         ::Middleman::Cli::Bundle.new.invoke(:bundle)
       end unless ENV["TEST"]
@@ -62,7 +62,7 @@ module Middleman::Templates
 
     # Output a .gitignore file
     class_option :git, :type => :boolean, :default => true
-    
+
     # Write a .gitignore file for project
     # @return [void]
     def generate_gitignore!

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

@@ -1,22 +1,22 @@
 # Default Middleman template
 class Middleman::Templates::Default < Middleman::Templates::Base
-  
-  class_option "css_dir", 
-    :default => "stylesheets", 
+
+  class_option "css_dir",
+    :default => "stylesheets",
     :desc    => 'The path to the css files'
-  class_option "js_dir", 
-    :default => "javascripts", 
+  class_option "js_dir",
+    :default => "javascripts",
     :desc    => 'The path to the javascript files'
-  class_option "images_dir", 
-    :default => "images", 
+  class_option "images_dir",
+    :default => "images",
     :desc    => 'The path to the image files'
-    
+
   # Template files are relative to this file
   # @return [String]
   def self.source_root
     File.dirname(__FILE__)
   end
-  
+
   # Actually output the files
   # @return [void]
   def build_scaffold!
@@ -31,8 +31,8 @@ class Middleman::Templates::Default < Middleman::Templates::Base
     empty_directory File.join(location, "source", options[:images_dir])
     copy_file "default/source/images/background.png", File.join(location, "source", options[:images_dir], "background.png")
     copy_file "default/source/images/middleman.png", File.join(location, "source", options[:images_dir], "middleman.png")
-  end  
+  end
 end
 
 # Register this template
-Middleman::Templates.register(:default, Middleman::Templates::Default)
+Middleman::Templates.register(:default, Middleman::Templates::Default)

data/lib/middleman-core/templates/extension/Gemfile

@@ -1,4 +1,17 @@
 source :rubygems
 
 # Specify your gem's dependencies in <%= name %>.gemspec
-gemspec
+gemspec
+
+group :development do
+  gem "rake",     "~> 0.9.2"
+  gem "rdoc",     "~> 3.9"
+  gem "yard",     "~> 0.8.0"
+end
+
+group :test do
+  gem "cucumber", "~> 1.2.0"
+  gem "fivemat"
+  gem "aruba",    "~> 0.4.11"
+  gem "rspec",    "~> 2.7"
+end

data/lib/middleman-core/templates/extension/Rakefile

@@ -9,4 +9,6 @@ end
 
 require 'rake/clean'
 
-task :test => ["cucumber"]
+task :test => ["cucumber"]
+
+task :default => :test

data/lib/middleman-core/templates/extension/features/support/env.rb

@@ -1,4 +1,4 @@
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 require "middleman-core"
 require "middleman-core/step_definitions"
-require File.join(PROJECT_ROOT_PATH, 'lib', '<%= name %>')
+require File.join(PROJECT_ROOT_PATH, 'lib', '<%= name %>')

data/lib/middleman-core/templates/extension/gitignore

@@ -0,0 +1,2 @@
+# Ignore bundler lock file
+Gemfile.lock

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

@@ -4,22 +4,22 @@ require "middleman-core"
 # Extension namespace
 module MyExtension
   class << self
-    
+
     # Called when user `activate`s your extension
     def registered(app, options={})
       # Setup extension-specific config
       app.set :config_variable, false
-      
+
       # Include class methods
       # app.extend ClassMethods
-      
+
       # Include instance methods
       # app.send :include, InstanceMethods
-      
+
       app.after_configuration do
         # Do something
-        
-        # config_variable is now either the default or the user's 
+
+        # config_variable is now either the default or the user's
         # setting from config.rb
       end
     end
@@ -30,20 +30,20 @@ module MyExtension
   #   def a_class_method
   #   end
   # end
-  
+
   # module InstanceMethods
   #   def an_instance_method
   #   end
   # end
-    
+
 end
 
 
 # Register extensions which can be activated
 # Make sure we have the version of Middleman we expect
 # ::Middleman::Extensions.register(:extension_name) do
-#   
+#
 #   # Return the extension module
 #   ::MyExtension
-#   
-# end
+#
+# end

data/lib/middleman-core/templates/extension/lib/middleman_extension.rb

@@ -1 +1 @@
-require "<%= name %>"
+require "<%= name %>"

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

@@ -1,22 +1,22 @@
 # HTML5 Boilerplate template
 class Middleman::Templates::Html5 < Middleman::Templates::Base
-  
-  class_option "css_dir", 
-    :default => "css", 
+
+  class_option "css_dir",
+    :default => "css",
     :desc    => 'The path to the css files'
-  class_option "js_dir", 
-    :default => "js", 
+  class_option "js_dir",
+    :default => "js",
     :desc    => 'The path to the javascript files'
-  class_option "images_dir", 
-    :default => "img", 
+  class_option "images_dir",
+    :default => "img",
     :desc    => 'The path to the image files'
-    
+
   # Templates are relative to this file
   # @return [String]
   def self.source_root
     File.dirname(__FILE__)
   end
-  
+
   # Output the files
   # @return [void]
   def build_scaffold!
@@ -27,4 +27,4 @@ class Middleman::Templates::Html5 < Middleman::Templates::Base
 end
 
 # Register the template
-Middleman::Templates.register(:html5, Middleman::Templates::Html5)
+Middleman::Templates.register(:html5, Middleman::Templates::Html5)

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

@@ -1,6 +1,6 @@
 # Local templates
 class Middleman::Templates::Local < Middleman::Templates::Base
-  
+
   # Look for templates in ~/.middleman
   # @return [String]
   def self.source_root
@@ -11,15 +11,15 @@ class Middleman::Templates::Local < Middleman::Templates::Base
   # @return [void]
   def build_scaffold!
     directory options[:template].to_s, location
-  end  
+  end
 end
 
 # Iterate over the directories in the templates path and register each one.
 Dir[File.join(Middleman::Templates::Local.source_root, "*")].each do |dir|
   next unless File.directory?(dir)
-  
+
   template_file = File.join(dir, "template.rb")
-  
+
   if File.exists?(template_file)
     require template_file
   else

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

@@ -1,6 +1,6 @@
 # Mobile HTML5 Boilerplate
 class Middleman::Templates::Mobile < Middleman::Templates::Base
-  
+
   # Slightly different paths
   class_option :css_dir, :default => "css"
   class_option :js_dir, :default => "js"
@@ -11,7 +11,7 @@ class Middleman::Templates::Mobile < Middleman::Templates::Base
   def self.source_root
     File.dirname(__FILE__)
   end
-  
+
   # Output the files
   # @return [void]
   def build_scaffold!
@@ -22,4 +22,4 @@ class Middleman::Templates::Mobile < Middleman::Templates::Base
 end
 
 # Register the template
-Middleman::Templates.register(:mobile, Middleman::Templates::Mobile)
+Middleman::Templates.register(:mobile, Middleman::Templates::Mobile)

data/lib/middleman-core/templates/shared/config.ru

@@ -1,4 +1,4 @@
 require 'rubygems'
-require 'middleman'
+require 'middleman/rack'
 
 run Middleman.server

data/lib/middleman-core/templates/shared/config.tt

@@ -1,9 +1,9 @@
-### 
+###
 # Compass
 ###
 
 # Susy grids in Compass
-# First: gem install compass-susy-plugin
+# First: gem install susy --pre
 # require 'susy'
 
 # Change Compass configuration
@@ -16,13 +16,13 @@
 ###
 
 # Per-page layout changes:
-# 
+#
 # With no layout
 # page "/path/to/file.html", :layout => false
-# 
+#
 # With alternative layout
 # page "/path/to/file.html", :layout => :otherlayout
-# 
+#
 # A path which all have the same layout
 # with_layout :admin do
 #   page "/admin/*"
@@ -72,21 +72,21 @@ set :images_dir, '<%= options[:images_dir] -%>'
 configure :build do
   # For example, change the Compass output style for deployment
   # activate :minify_css
-  
+
   # Minify Javascript on build
   # activate :minify_javascript
-  
+
   # Enable cache buster
   # activate :cache_buster
-  
+
   # Use relative URLs
   # activate :relative_assets
-  
+
   # Compress PNGs after build
   # First: gem install middleman-smusher
   # require "middleman-smusher"
   # activate :smusher
-  
+
   # Or use a different image path
   # set :http_path, "/Content/images/"
 end

data/lib/middleman-core/util.rb

@@ -1,3 +1,9 @@
+# Our custom logger
+require "middleman-core/logger"
+
+# For instrumenting
+require "active_support/notifications"
+
 # Using Thor's indifferent hash access
 require "thor"
 
@@ -5,8 +11,26 @@ require "thor"
 require "pathname"
 
 module Middleman
+
   module Util
-    
+
+    # The logger
+    #
+    # @return [Middleman::Logger] The logger
+    def self.logger(*args)
+      if !@_logger || args.length > 0
+        @_logger = ::Middleman::Logger.new(*args)
+      end
+
+      @_logger
+    end
+
+    # Facade for ActiveSupport/Notification
+    def self.instrument(name, payload={}, &block)
+      name << ".middleman" unless name =~ /\.middleman$/
+      ::ActiveSupport::Notifications.instrument(name, payload, &block)
+    end
+
     # Recursively convert a normal Hash into a HashWithIndifferentAccess
     #
     # @private
@@ -28,13 +52,13 @@ module Middleman
         data
       end
     end
-    
+
     # Normalize a path to not include a leading slash
     # @param [String] path
     # @return [String]
     def self.normalize_path(path)
       # The tr call works around a bug in Ruby's Unicode handling
-      path.sub(/^\//, "").tr('','') 
+      path.sub(/^\//, "").tr('','')
     end
 
     # Extract the text of a Rack response as a string.
@@ -55,7 +79,7 @@ module Middleman
         response.to_s
       end
     end
-    
+
     # Takes a matcher, which can be a literal string
     # or a string containing glob expressions, or a
     # regexp, or a proc, or anything else that responds
@@ -74,7 +98,7 @@ module Middleman
         File.fnmatch(matcher.to_s, path)
       end
     end
-    
+
     # Get a recusive list of files inside a set of paths.
     # Works with symlinks.
     #
@@ -105,7 +129,7 @@ module Middleman
       end
 
       # Whether the key is in the cache
-      # 
+      #
       # @param key Anything Hash can use as a key
       # @return [Boolean]
       def has_key?(key)