diff --git a/Gemfile b/Gemfile index 25460022..f2f42815 100644 --- a/Gemfile +++ b/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" diff --git a/Rakefile b/Rakefile index dc76177b..a2c22438 100644 --- a/Rakefile +++ b/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| diff --git a/middleman-more/.gemtest b/middleman-more/.gemtest deleted file mode 100644 index e69de29b..00000000 diff --git a/middleman-more/Rakefile b/middleman-more/Rakefile deleted file mode 100644 index 8f25f891..00000000 --- a/middleman-more/Rakefile +++ /dev/null @@ -1,5 +0,0 @@ -# coding:utf-8 -RAKE_ROOT = __FILE__ - -GEM_NAME = "middleman" -require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper') \ No newline at end of file diff --git a/middleman-more/features/.gitkeep b/middleman-more/features/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/middleman-more/fixtures/.gitkeep b/middleman-more/fixtures/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/middleman-more/lib/middleman-more.rb b/middleman-more/lib/middleman-more.rb deleted file mode 100644 index a3c7bae8..00000000 --- a/middleman-more/lib/middleman-more.rb +++ /dev/null @@ -1 +0,0 @@ -require "middleman-core" \ No newline at end of file diff --git a/middleman-more/middleman-more.gemspec b/middleman-more/middleman-more.gemspec deleted file mode 100644 index afffb676..00000000 --- a/middleman-more/middleman-more.gemspec +++ /dev/null @@ -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 diff --git a/middleman-more/spec/middleman-more/future_spec.rb b/middleman-more/spec/middleman-more/future_spec.rb deleted file mode 100644 index e69de29b..00000000 diff --git a/middleman-more/spec/spec_helper.rb b/middleman-more/spec/spec_helper.rb deleted file mode 100644 index e69de29b..00000000 diff --git a/middleman/middleman.gemspec b/middleman/middleman.gemspec index a8fcbd6e..bf4c2948 100644 --- a/middleman/middleman.gemspec +++ b/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"])