middleman 2.0.0.rc99 → 2.0.0

data/README.md

@@ -1,8 +1,9 @@
-# middleman
+Middleman [![Build Status](http://travis-ci.org/tdreyno/middleman.png)](http://travis-ci.org/tdreyno/middleman)
+=========
 
-The Middleman is ever-vigilant against tag-soup, unreadable CSS and repetition. He stands-watch over your Haml, Sass, and CoffeeScript producing only the cleanest and most efficient markup.
+Middleman is ever-vigilant against tag-soup, unreadable CSS and repetition. He stands-watch over your Haml, Sass, and CoffeeScript producing only the cleanest and most efficient markup.
 
-[![Build Status](http://travis-ci.org/tdreyno/middleman.png)](http://travis-ci.org/tdreyno/middleman)
+[![Click here to lend your support to Middleman](http://www.pledgie.com/campaigns/15807.png)](http://www.pledgie.com/campaigns/15807)
 
 ## Getting Started
 

data/features/builder.feature

@@ -17,7 +17,7 @@ Feature: Builder
     Then "images/Child folder/regular_file(example).txt" should exist at "test-app"
     And cleanup built app at "test-app"
     
-  Scenario: Force relative assets
-    Given a built app at "relative-app" with flags "--relative"
-    Then "stylesheets/relative_assets.css" should exist at "relative-app" and include "../"
-    And cleanup built app at "relative-app"
+  # Scenario: Force relative assets
+  #   Given a built app at "relative-app" with flags "--relative"
+  #   Then "stylesheets/relative_assets.css" should exist at "relative-app" and include "../"
+  #   And cleanup built app at "relative-app"

data/lib/middleman.rb

@@ -161,3 +161,5 @@ module Middleman
     sandbox
   end
 end
+
+require "middleman/version"

data/lib/middleman/cli.rb

@@ -19,6 +19,7 @@ module Middleman
     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)

data/lib/middleman/templates.rb

@@ -23,6 +23,23 @@ module Middleman::Templates
     class_option :css_dir, :default => "stylesheets"
     class_option :js_dir, :default => "javascripts"
     class_option :images_dir, :default => "images"
+    class_option :rack, :type => :boolean, :default => false
+    class_option :bundler, :type => :boolean, :default => false
+    
+    def generate_rack
+      if options[:rack]
+        template "shared/config.ru", File.join(location, "config.ru")
+      end
+    end
+    
+    def generate_bundler
+      if options[:bundler]
+        template "shared/Gemfile.tt", File.join(location, "Gemfile")
+        
+        say_status :run, "bundle install"
+        print `cd #{location} && "#{Gem.ruby}" -rubygems "#{Gem.bin_path('bundler', 'bundle')}" install`
+      end
+    end
   end
 end
 

data/lib/middleman/templates/blog.rb

@@ -5,13 +5,16 @@ class Middleman::Templates::Blog < Middleman::Templates::Base
   
   def build_scaffold
     template "blog/config.tt", File.join(location, "config.rb")
-    template "blog/config.ru", File.join(location, "config.ru")
     directory "blog/source", File.join(location, "source")
     
     empty_directory File.join(location, "source", options[:css_dir])
     empty_directory File.join(location, "source", options[:js_dir])
     empty_directory File.join(location, "source", options[:images_dir])
   end
+  
+  def generate_rack
+    template "blog/config.ru", File.join(location, "config.ru")
+  end
 end
 
 Middleman::Templates.register(:blog, Middleman::Templates::Blog)

data/lib/middleman/templates/default.rb

@@ -5,9 +5,6 @@ class Middleman::Templates::Default < Middleman::Templates::Base
   
   def build_scaffold
     template "shared/config.tt", File.join(location, "config.rb")
-    if options[:rack]
-      template "shared/config.ru", File.join(location, "config.ru")
-    end
     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")
     empty_directory File.join(location, "source", options[:css_dir])

data/lib/middleman/templates/shared/Gemfile.tt

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gem "middleman", "~><%= Middleman::VERSION %>"

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.rc99"
+  VERSION = "2.0.0"
 end

data/middleman.gemspec

@@ -9,13 +9,31 @@ Gem::Specification.new do |s|
   s.authors     = ["Thomas Reynolds"]
   s.email       = ["me@tdreyno.com"]
   s.homepage    = "http://middlemanapp.com"
-  s.summary     = "A static site generator based on Sinatra. Providing Haml, Sass, Compass, CoffeeScript and including minification, compression and cache busting."
+  s.summary     = "Hand-crafted frontend development"
+  s.description = "A static site generator based on Sinatra. Providing dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle."
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {fixtures,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  # TODO remove for 2.1.x
+  s.post_install_message =<<eos
+********************************************************************************
+
+  Welcome to Middleman 2.0
+  
+  In addition to many new features, some backwards-incompatible
+  changes have been made to the structure of Middleman sites.
+  
+  Before running you old, v1.x project on Middleman 2.0,
+  review the Migration guide:
+  
+  http://middlemanapp.com/guides/migrating
+
+********************************************************************************
+eos
+
   s.add_runtime_dependency("rack", ["~> 1.3.0"])
   s.add_runtime_dependency("thin", ["~> 1.2.11"])
   s.add_runtime_dependency("thor", ["~> 0.14.0"])

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 15424147
-  prerelease: 6
+  hash: 15
+  prerelease: 
   segments: 
   - 2
   - 0
   - 0
-  - rc
-  - 99
-  version: 2.0.0.rc99
+  version: 2.0.0
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-06 00:00:00 Z
+date: 2011-08-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -397,7 +395,7 @@ dependencies:
         version: 2.6.0
   type: :development
   version_requirements: *id023
-description: 
+description: A static site generator based on Sinatra. Providing dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.
 email: 
 - me@tdreyno.com
 executables: 
@@ -598,6 +596,7 @@ files:
 - lib/middleman/templates/html5/source/test/qunit/qunit.js
 - lib/middleman/templates/html5/source/test/tests.js
 - lib/middleman/templates/local.rb
+- lib/middleman/templates/shared/Gemfile.tt
 - lib/middleman/templates/shared/config.ru
 - lib/middleman/templates/shared/config.tt
 - lib/middleman/version.rb
@@ -605,7 +604,21 @@ files:
 homepage: http://middlemanapp.com
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  ********************************************************************************
+  
+    Welcome to Middleman 2.0
+    
+    In addition to many new features, some backwards-incompatible
+    changes have been made to the structure of Middleman sites.
+    
+    Before running you old, v1.x project on Middleman 2.0,
+    review the Migration guide:
+    
+    http://middlemanapp.com/guides/migrating
+  
+  ********************************************************************************
+
 rdoc_options: []
 
 require_paths: 
@@ -622,21 +635,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: A static site generator based on Sinatra. Providing Haml, Sass, Compass, CoffeeScript and including minification, compression and cache busting.
+summary: Hand-crafted frontend development
 test_files: 
 - features/asset_host.feature
 - features/automatic_image_sizes.feature