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

data/lib/middleman/step_definitions/builder_steps.rb

@@ -3,48 +3,40 @@ require 'fileutils'
 Given /^app "([^\"]*)" is using config "([^\"]*)"$/ do |path, config_name|
   target = File.join(PROJECT_ROOT_PATH, "fixtures", path)
   config_path = File.join(target, "config-#{config_name}.rb")
-  config_dest = File.join(target, "config.rb")
+  config_dest = File.join(current_dir, "config.rb")
   FileUtils.cp(config_path, config_dest)
 end
 
-Given /^a built app at "([^\"]*)"$/ do |path|
-  target = File.join(PROJECT_ROOT_PATH, "fixtures", path)
-  
-  build_target = File.join(target, "build")
-  FileUtils.rm_rf(build_target)
-  
-  build_cmd = File.join(MIDDLEMAN_BIN_PATH, "middleman build")
-  `cd #{target} && #{build_cmd}`
-end
+Given /^a fixture app "([^\"]*)"$/ do |path|
+  step %Q{a directory named "#{path}"}
 
-Then /^cleanup built app at "([^\"]*)"$/ do |path|
-  target = File.join(PROJECT_ROOT_PATH, "fixtures", path, "build")
-  FileUtils.rm_rf(target)
+  target_path = File.join(PROJECT_ROOT_PATH, "fixtures", path)
+  FileUtils.cp_r(target_path, current_dir)
+  
+  step %Q{I cd to "#{path}"}
 end
 
-Given /^a built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path, flags|
-  target = File.join(PROJECT_ROOT_PATH, "fixtures", path)
-  build_cmd = File.join(MIDDLEMAN_BIN_PATH, "middleman build")
-  `cd #{target} && #{build_cmd} #{flags}`
+Given /^a built app at "([^\"]*)"$/ do |path|
+  step %Q{a fixture app "#{path}"}
+  step %Q{I run `middleman build`}
 end
 
-Then /^"([^\"]*)" should exist at "([^\"]*)"$/ do |target_file, path|
-  target = File.join(PROJECT_ROOT_PATH, "fixtures", path, "build", target_file)
-  File.exists?(target).should be_true
+Given /^was successfully built$/ do
+  step %Q{a directory named "build" should exist}
+  step %Q{the exit status should be 0}
 end
 
-Then /^"([^\"]*)" should exist at "([^\"]*)" and include "([^\"]*)"$/ do |target_file, path, expected|
-  target = File.join(PROJECT_ROOT_PATH, "fixtures", path, "build", target_file)
-  File.exists?(target).should be_true
-  File.read(target).should include(expected)
+Given /^a successfully built app at "([^\"]*)"$/ do |path|
+  step %Q{a built app at "#{path}"}
+  step %Q{was successfully built}
 end
 
-Then /^"([^\"]*)" should not exist at "([^\"]*)"$/ do |target_file, path|
-  target = File.join(PROJECT_ROOT_PATH, "fixtures", path, "build", target_file)
-  File.exists?(target).should be_false
+Given /^a built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path, flags|
+  step %Q{a fixture app "#{path}"}
+  step %Q{I run `middleman build #{flags}`}
 end
 
-Then /^the last exit code should be "([^\"]*)"$/ do |exit_code|
-  exit_code = exit_code.to_i
-  $?.exitstatus.should == exit_code
+Given /^a successfully built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path, flags|
+  step %Q{a built app at "#{path}" with flags "#{flags}"}
+  step %Q{was successfully built}
 end

data/lib/middleman/step_definitions/middleman_steps.rb

@@ -1,3 +1,5 @@
+require "fileutils"
+
 Given /^a project at "([^\"]*)"$/ do |dirname|
   @target = File.join(PROJECT_ROOT_PATH, "fixtures", dirname)
 end

data/lib/middleman/templates.rb

@@ -9,18 +9,20 @@ module Middleman::Templates
   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
     # @param [Class] klass The class to be executed for this template
     # @return [Hash] List of registered templates
-    def registered(*args)
+    def register(*args)
       @_template_mappings ||= {}
       @_template_mappings[args[0]] = args[1] if args.length == 2
       @_template_mappings
     end
     
     # Middleman::Templates.register(name, klass)
-    alias :register :registered
+    alias :registered :register
   end
   
   # Base Template class. Handles basic options and paths.
@@ -44,14 +46,20 @@ module Middleman::Templates
     
     # Output a config.ru file for Rack if --rack is passed
     class_option :rack, :type => :boolean, :default => false
-    def generate_rack
+    
+    # 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
     
     # Output a Gemfile file for Bundler if --bundler is passed
     class_option :bundler, :type => :boolean, :default => false
-    def generate_bundler
+    
+    # Write a Bundler Gemfile file for project
+    # @return [void]
+    def generate_bundler!
       return unless options[:bundler]
       template "shared/Gemfile.tt", File.join(location, "Gemfile")
       

data/lib/middleman/templates/default.rb

@@ -2,12 +2,14 @@
 class Middleman::Templates::Default < Middleman::Templates::Base
   
   # Template files are relative to this file
+  # @return [String]
   def self.source_root
     File.dirname(__FILE__)
   end
   
   # Actually output the files
-  def build_scaffold
+  # @return [void]
+  def build_scaffold!
     template "shared/config.tt", File.join(location, "config.rb")
     copy_file "default/source/index.html.erb", File.join(location, "source/index.html.erb")
     copy_file "default/source/layout.erb", File.join(location, "source/layout.erb")

data/lib/middleman/templates/html5.rb

@@ -7,12 +7,14 @@ class Middleman::Templates::Html5 < Middleman::Templates::Base
   class_option :images_dir, :default => "img"
 
   # Templates are relative to this file
+  # @return [String]
   def self.source_root
     File.dirname(__FILE__)
   end
   
   # Output the files
-  def build_scaffold
+  # @return [void]
+  def build_scaffold!
     template "shared/config.tt", File.join(location, "config.rb")
     directory "html5/source", File.join(location, "source")
     empty_directory File.join(location, "source")

data/lib/middleman/templates/local.rb

@@ -2,18 +2,20 @@
 class Middleman::Templates::Local < Middleman::Templates::Base
   
   # Look for templates in ~/.middleman
+  # @return [String]
   def self.source_root
-    Middleman.templates_path
+    File.join(File.expand_path("~/"), ".middleman")
   end
 
   # Just copy from the template path
-  def build_scaffold
+  # @return [void]
+  def build_scaffold!
     directory options[:template].to_s, location
   end  
 end
 
 # Iterate over the directories in the templates path and register each one.
-Dir[File.join(Middleman.templates_path, "*")].each do |dir|
+Dir[File.join(Middleman::Templates::Local.source_root, "*")].each do |dir|
   next unless File.directory?(dir)
   Middleman::Templates.register(File.basename(dir).to_sym, Middleman::Templates::Local)
 end

data/lib/middleman/templates/mobile.rb

@@ -7,12 +7,14 @@ class Middleman::Templates::Mobile < Middleman::Templates::Base
   class_option :images_dir, :default => "img"
 
   # Template files are relative to this file
+  # @return [String]
   def self.source_root
     File.dirname(__FILE__)
   end
   
   # Output the files
-  def build_scaffold
+  # @return [void]
+  def build_scaffold!
     template "shared/config.tt", File.join(location, "config.rb")
     directory "mobile/source", File.join(location, "source")
     empty_directory File.join(location, "source")

data/lib/middleman/version.rb

@@ -2,8 +2,12 @@
 require "rubygems"
 
 module Middleman
-  VERSION = "3.0.0.alpha.4"
+  # Current Version
+  # @return [String]
+  VERSION = "3.0.0.alpha.5"
   
+  # Parsed version for RubyGems
   # @private
+  # @return [String]
   GEM_VERSION = ::Gem::Version.create(VERSION)
 end

data/middleman-x86-mingw32.gemspec

@@ -1,6 +1,4 @@
 # -*- encoding: utf-8 -*-
-require "rbconfig"
-
 $:.push File.expand_path("../lib", __FILE__)
 require "middleman/version"
 
@@ -26,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency("tilt", ["~> 1.3.1"])
   s.add_dependency("i18n", ["~> 0.6.0"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
-  s.add_dependency("uglifier", ["~> 1.1.0"])
+  s.add_dependency("uglifier", ["~> 1.2.0"])
   s.add_dependency("haml", ["~> 3.1.0"])
   s.add_dependency("sass", ["~> 3.1.7"])
   s.add_dependency("activesupport", ["~> 3.1.0"])
@@ -34,22 +32,25 @@ Gem::Specification.new do |s|
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("execjs", ["~> 1.2.7"])
   s.add_dependency("sprockets", ["~> 2.1.2"])
-  s.add_dependency("sprockets-sass", ["~> 0.3.0"])
-  s.add_dependency("guard", ["~> 0.8.8"])
+  s.add_dependency("sprockets-sass", ["~> 0.6.0"])
+  s.add_dependency("guard", ["~> 0.9.1"])
+  s.add_dependency("redcarpet", ["~> 2.0.0"])
   
   s.add_dependency("eventmachine", ["1.0.0.beta.4.1"])
   s.add_dependency("win32-process", ["~> 0.6.5"])
-  s.add_dependency("rb-fchange")
   
   # Development and test
   s.add_development_dependency("slim")
-  s.add_development_dependency("maruku")
+  s.add_development_dependency("sinatra")
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
-  s.add_development_dependency("liquid", ["~> 2.2.0"])
+  s.add_development_dependency("liquid", ["~> 2.2"])
   s.add_development_dependency("cucumber", ["~> 1.1.0"])
+  s.add_development_dependency("aruba")
   s.add_development_dependency("rake", ["~> 0.9.2"])
-  s.add_development_dependency("rspec", ["~> 2.7.0"])
+  s.add_development_dependency("rspec", ["~> 2.7"])
+  s.add_development_dependency("rdoc", ["~> 3.9"])
+  s.add_development_dependency("yard")
   s.add_development_dependency("jquery-rails")
-  s.add_development_dependency("bootstrap-rails")
+  s.add_development_dependency("bootstrap-rails", ["0.0.5"])
 end
 

data/middleman.gemspec

@@ -1,6 +1,4 @@
 # -*- encoding: utf-8 -*-
-require "rbconfig"
-
 $:.push File.expand_path("../lib", __FILE__)
 require "middleman/version"
 
@@ -26,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency("tilt", ["~> 1.3.1"])
   s.add_dependency("i18n", ["~> 0.6.0"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
-  s.add_dependency("uglifier", ["~> 1.1.0"])
+  s.add_dependency("uglifier", ["~> 1.2.0"])
   s.add_dependency("haml", ["~> 3.1.0"])
   s.add_dependency("sass", ["~> 3.1.7"])
   s.add_dependency("activesupport", ["~> 3.1.0"])
@@ -34,22 +32,20 @@ Gem::Specification.new do |s|
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("execjs", ["~> 1.2.7"])
   s.add_dependency("sprockets", ["~> 2.1.2"])
-  s.add_dependency("sprockets-sass", ["~> 0.5.0"])
-  s.add_dependency("guard", ["~> 0.8.8"])
+  s.add_dependency("sprockets-sass", ["~> 0.6.0"])
+  s.add_dependency("guard", ["~> 0.9.1"])
   s.add_dependency("redcarpet", ["~> 2.0.0"])
   
-  # OSX
-  s.add_dependency("rb-fsevent")
-  
   # Development and test
   s.add_development_dependency("slim")
   s.add_development_dependency("sinatra")
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
-  s.add_development_dependency("liquid", ["~> 2.2.0"])
+  s.add_development_dependency("liquid", ["~> 2.2"])
   s.add_development_dependency("cucumber", ["~> 1.1.0"])
+  s.add_development_dependency("aruba")
   s.add_development_dependency("rake", ["~> 0.9.2"])
-  s.add_development_dependency("rspec", ["~> 2.7.0"])
-  s.add_development_dependency("rdoc", ["~> 3.9.4"])
+  s.add_development_dependency("rspec", ["~> 2.7"])
+  s.add_development_dependency("rdoc", ["~> 3.9"])
   s.add_development_dependency("yard")
   s.add_development_dependency("jquery-rails")
   s.add_development_dependency("bootstrap-rails", ["0.0.5"])

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: -3702664396
+  hash: -3702664394
   prerelease: 6
   segments: 
   - 3
   - 0
   - 0
   - alpha
-  - 4
-  version: 3.0.0.alpha.4
+  - 5
+  version: 3.0.0.alpha.5
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 -08:00
+date: 2011-12-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,12 +124,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 31
         segments: 
         - 1
-        - 1
+        - 2
         - 0
-        version: 1.1.0
+        version: 1.2.0
   name: uglifier
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -252,12 +252,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
         - 0
-        - 5
+        - 6
         - 0
-        version: 0.5.0
+        version: 0.6.0
   name: sprockets-sass
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -268,12 +268,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 57
         segments: 
         - 0
-        - 8
-        - 8
-        version: 0.8.8
+        - 9
+        - 1
+        version: 0.9.1
   name: guard
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
@@ -294,7 +294,7 @@ dependencies:
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :runtime
+  type: :development
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -304,7 +304,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rb-fsevent
+  name: slim
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -318,26 +318,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: slim
+  name: sinatra
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
   requirement: &id020 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: sinatra
-  version_requirements: *id020
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -349,11 +335,11 @@ dependencies:
         - 1
         version: 0.1.1
   name: coffee-filter
-  version_requirements: *id021
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -362,14 +348,13 @@ dependencies:
         segments: 
         - 2
         - 2
-        - 0
-        version: 2.2.0
+        version: "2.2"
   name: liquid
-  version_requirements: *id022
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -381,6 +366,20 @@ dependencies:
         - 0
         version: 1.1.0
   name: cucumber
+  version_requirements: *id022
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id023 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: aruba
   version_requirements: *id023
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -406,12 +405,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 13
         segments: 
         - 2
         - 7
-        - 0
-        version: 2.7.0
+        version: "2.7"
   name: rspec
   version_requirements: *id025
 - !ruby/object:Gem::Dependency 
@@ -422,12 +420,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 21
         segments: 
         - 3
         - 9
-        - 4
-        version: 3.9.4
+        version: "3.9"
   name: rdoc
   version_requirements: *id026
 - !ruby/object:Gem::Dependency 
@@ -494,6 +491,7 @@ files:
 - README.md
 - Rakefile
 - bin/middleman
+- features/3rd_party_cli.feature
 - features/asset_host.feature
 - features/auto_layout.feature
 - features/automatic_image_sizes.feature
@@ -501,6 +499,7 @@ files:
 - features/cache_buster.feature
 - features/chained_templates.feature
 - features/clean_build.feature
+- features/cli.feature
 - features/coffee-script.feature
 - features/content_for.feature
 - features/current_page_request_path_backwards.feature
@@ -535,6 +534,7 @@ files:
 - features/step_definitions/page_layout_steps.rb
 - features/support/env.rb
 - features/wildcard_page_helper.feature
+- fixtures/3rd-party-command/config.rb
 - fixtures/build-with-errors-app/config.rb
 - fixtures/build-with-errors-app/source/index.html.erb
 - fixtures/chained-app/config.rb
@@ -757,9 +757,11 @@ files:
 - fixtures/wildcard-directory-index-app/source/layouts/layout.erb
 - lib/middleman.rb
 - lib/middleman/base.rb
-- lib/middleman/builder.rb
 - lib/middleman/cache.rb
 - lib/middleman/cli.rb
+- lib/middleman/cli/build.rb
+- lib/middleman/cli/init.rb
+- lib/middleman/cli/server.rb
 - lib/middleman/core_extensions/assets.rb
 - lib/middleman/core_extensions/builder.rb
 - lib/middleman/core_extensions/compass.rb
@@ -1128,6 +1130,7 @@ signing_key:
 specification_version: 3
 summary: Hand-crafted frontend development
 test_files: 
+- features/3rd_party_cli.feature
 - features/asset_host.feature
 - features/auto_layout.feature
 - features/automatic_image_sizes.feature
@@ -1135,6 +1138,7 @@ test_files:
 - features/cache_buster.feature
 - features/chained_templates.feature
 - features/clean_build.feature
+- features/cli.feature
 - features/coffee-script.feature
 - features/content_for.feature
 - features/current_page_request_path_backwards.feature
@@ -1169,6 +1173,7 @@ test_files:
 - features/step_definitions/page_layout_steps.rb
 - features/support/env.rb
 - features/wildcard_page_helper.feature
+- fixtures/3rd-party-command/config.rb
 - fixtures/build-with-errors-app/config.rb
 - fixtures/build-with-errors-app/source/index.html.erb
 - fixtures/chained-app/config.rb