Merge pull request #1013 from bhollis/middleman-no-more

No longer depend on middleman-more

Gemfile

@@ -42,6 +42,5 @@ gem 'coveralls', :require => false
 
 # Middleman itself
 gem "middleman-core", :path => "middleman-core"
-gem "middleman-more", :path => "middleman-more"
 gem "middleman-sprockets", :github => "middleman/middleman-sprockets"
 gem "middleman", :path => "middleman"

Rakefile

@@ -7,7 +7,7 @@ require File.expand_path("../middleman-core/lib/middleman-core/version.rb", __FI
 ROOT = File.expand_path(File.dirname(__FILE__))
 GEM_NAME = 'middleman'
 
-middleman_gems = %w(middleman-more middleman-core middleman)
+middleman_gems = %w(middleman-core middleman)
 GEM_PATHS = middleman_gems.freeze
 
 def sh_rake(command)
@@ -18,7 +18,7 @@ def say(text, color=:magenta)
   n = { :bold => 1, :red => 31, :green => 32, :yellow => 33, :blue => 34, :magenta => 35 }.fetch(color, 0)
   puts "\e[%dm%s\e[0m" % [n, text]
 end
-  
+
 desc "Run 'install' for all projects"
 task :install do
   GEM_PATHS.each do |dir|

middleman-more/Rakefile

@@ -1,5 +0,0 @@
-# coding:utf-8
-RAKE_ROOT = __FILE__
-
-GEM_NAME = "middleman"
-require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

middleman-more/lib/middleman-more.rb

@@ -1 +0,0 @@
-require "middleman-core"

middleman-more/middleman-more.gemspec

@@ -1,19 +0,0 @@
-# -*- 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|
-  s.name        = "middleman-more"
-  s.version     = Middleman::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.license     = "MIT"
-  s.authors     = ["Thomas Reynolds", "Ben Hollis"]
-  s.email       = ["me@tdreyno.com", "ben@benhollis.net"]
-  s.homepage    = "http://middlemanapp.com"
-  s.summary     = "Hand-crafted frontend development"
-  s.description = "A static site generator. Provides 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 -z`.split("\0")
-  s.test_files    = `git ls-files -z -- {fixtures,features}/*`.split("\0")
-  s.require_paths = ["lib"]
-end

middleman/middleman.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("middleman-core", Middleman::VERSION)
-  s.add_dependency("middleman-more", Middleman::VERSION)
   s.add_dependency("middleman-sprockets", ">= 3.1.2")
   s.add_dependency("haml", [">= 3.1.6"])
   s.add_dependency("sass", [">= 3.1.20"])