Merge remote-tracking branch 'origin/3.0-stable'

Conflicts:
	middleman-core/middleman-core-x86-mingw32.gemspec

Gemfile

@@ -1,42 +1,34 @@
 source :rubygems
 
-group :development do
+# Build and doc tools
-  gem "rake",     "~> 0.9.2"
+gem "rake",     "~> 10.0.3"
-  gem "rdoc",     "~> 3.9"
+gem "yard",     "~> 0.8.0"
-  gem "yard",     "~> 0.8.0"
+
+# Test tools
+gem "cucumber", "~> 1.2.1"
+gem "fivemat",  "~> 1.1.0"
+gem "aruba",    "~> 0.5.1"
+gem "rspec",    "~> 2.12"
+
+# Optional middleman dependencies, included for tests
+gem "sinatra"
+gem "slim", "~> 1.2.0"
+gem "coffee-filter", "~> 0.1.1"
+gem "liquid", "~> 2.2"
+gem "less", "~> 2.2"
+gem "stylus", "~> 0.6.2"
+
+platforms :ruby do
+  gem "therubyracer", "0.10.2"
+  gem "redcarpet", "~> 2.1.1"
 end
 
-group :test do
+platforms :jruby do
-  gem "cucumber", "~> 1.2.0"
+  gem "therubyrhino", "1.73.5"
-  gem "fivemat"
-  gem "aruba",    "~> 0.4.11"
-  gem "rspec",    "~> 2.7"
-
-  # For actual tests
-  gem "sinatra"
-  gem "slim", "~> 1.2.0"
-  gem "coffee-filter", "~> 0.1.1"
-  gem "liquid", "~> 2.2"
-  # gem "cane"
-
-  # gem "pry"
-  # gem "pry-debugger"
-
-  platforms :ruby do
-    gem "therubyracer", "0.10.2"
-    
-    gem "redcarpet", "~> 2.1.1"
-  end
-  
-  platforms :jruby do 
-    gem "therubyrhino", "1.73.5"
-  end
-  
-  gem "less", "~> 2.2"
-  gem "stylus"
 end
 
-gem "middleman-sprockets", :github => "middleman/middleman-sprockets"
+# Middleman itself
 gem "middleman-core", :path => "middleman-core"
 gem "middleman-more", :path => "middleman-more"
-gem "middleman", :path => "middleman"
+gem "middleman-sprockets", :github => "middleman/middleman-sprockets"
+gem "middleman", :path => "middleman"

middleman-core/middleman-core.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+require File.expand_path("../lib/middleman-core/version", __FILE__)
-require "middleman-core/version"
 
 Gem::Specification.new do |s|
   s.name        = "middleman-core"
@@ -27,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency("rack-test", ["~> 0.6.1"])
   
   # CLI
-  s.add_dependency("thor", ["~> 0.15.4"])
+  s.add_dependency("thor", [">= 0.15.4", "~> 0.15"])
   
   # Helpers
   s.add_dependency("activesupport", ["~> 3.2.6"])

middleman-more/middleman-more.gemspec

@@ -1,5 +1,4 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
 require File.expand_path("../../middleman-core/lib/middleman-core/version.rb", __FILE__)
 
 Gem::Specification.new do |s|