Update Gemfile to allow bundler to ever complete. Also simplify Gemfile, update dependencies, and remove $LOAD_PATH hacking from gemspecs.

This commit is contained in:
Ben Hollis 2013-01-25 22:31:40 -08:00
parent 7c9c4d03db
commit 6dbe7f7a5a
3 changed files with 27 additions and 37 deletions

32
Gemfile
View file

@ -1,30 +1,25 @@
source :rubygems 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"
end
group :test do # Test tools
gem "cucumber", "~> 1.2.0" gem "cucumber", "~> 1.2.1"
gem "fivemat" gem "fivemat", "~> 1.1.0"
gem "aruba", "~> 0.4.11" gem "aruba", "~> 0.5.1"
gem "rspec", "~> 2.7" gem "rspec", "~> 2.12"
# For actual tests # Optional middleman dependencies, included for tests
gem "sinatra" gem "sinatra"
gem "slim", "~> 1.2.0" gem "slim", "~> 1.2.0"
gem "coffee-filter", "~> 0.1.1" gem "coffee-filter", "~> 0.1.1"
gem "liquid", "~> 2.2" gem "liquid", "~> 2.2"
# gem "cane" gem "less", "~> 2.2"
gem "stylus", "~> 0.6.2"
# gem "pry"
# gem "pry-debugger"
platforms :ruby do platforms :ruby do
gem "therubyracer", "0.10.2" gem "therubyracer", "0.10.2"
gem "redcarpet", "~> 2.1.1" gem "redcarpet", "~> 2.1.1"
end end
@ -32,11 +27,8 @@ group :test do
gem "therubyrhino", "1.73.5" gem "therubyrhino", "1.73.5"
end end
gem "less", "~> 2.2" # Middleman itself
gem "stylus"
end
gem "middleman-sprockets", :github => "middleman/middleman-sprockets"
gem "middleman-core", :path => "middleman-core" gem "middleman-core", :path => "middleman-core"
gem "middleman-more", :path => "middleman-more" gem "middleman-more", :path => "middleman-more"
gem "middleman-sprockets", :github => "middleman/middleman-sprockets"
gem "middleman", :path => "middleman" gem "middleman", :path => "middleman"

View file

@ -1,6 +1,5 @@
# -*- encoding: utf-8 -*- # -*- 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| Gem::Specification.new do |s|
s.name = "middleman-core" s.name = "middleman-core"

View file

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