Merge branch 'master' of git://github.com/couchrest/couchrest_model

This commit is contained in:
Lucas Renan 2011-05-17 22:27:00 -03:00
commit f11a99dbfb
2 changed files with 11 additions and 15 deletions

View file

@ -1,21 +1,18 @@
require 'rubygems' require 'rubygems'
require 'bundler' require 'bundler'
Bundler::GemHelper.install_tasks require 'rspec/core/rake_task'
require 'rake'
require "rake/rdoctask" require "rake/rdoctask"
require 'rspec' Bundler::GemHelper.install_tasks
require 'rspec/core/rake_task'
desc "Run all specs" desc "Run all specs"
Rspec::Core::RakeTask.new(:spec) do |spec| RSpec::Core::RakeTask.new(:spec) do |spec|
spec.rspec_opts = ["--color"] spec.rspec_opts = ["--color"]
spec.pattern = 'spec/**/*_spec.rb' spec.pattern = 'spec/**/*_spec.rb'
end end
desc "Print specdocs" desc "Print specdocs"
Rspec::Core::RakeTask.new(:doc) do |spec| RSpec::Core::RakeTask.new(:doc) do |spec|
spec.rspec_opts = ["--format", "specdoc"] spec.rspec_opts = ["--format", "specdoc"]
spec.pattern = 'spec/*_spec.rb' spec.pattern = 'spec/*_spec.rb'
end end

View file

@ -27,7 +27,6 @@ Gem::Specification.new do |s|
s.add_dependency(%q<mime-types>, "~> 1.15") s.add_dependency(%q<mime-types>, "~> 1.15")
s.add_dependency(%q<activemodel>, "~> 3.0") s.add_dependency(%q<activemodel>, "~> 3.0")
s.add_dependency(%q<tzinfo>, "~> 0.3.22") s.add_dependency(%q<tzinfo>, "~> 0.3.22")
s.add_dependency(%q<railties>, "~> 3.0")
s.add_development_dependency(%q<rspec>, ">= 2.0.0") s.add_development_dependency(%q<rspec>, ">= 2.0.0")
s.add_development_dependency(%q<rack-test>, ">= 0.5.7") s.add_development_dependency(%q<rack-test>, ">= 0.5.7")
# s.add_development_dependency("jruby-openssl", ">= 0.7.3") # s.add_development_dependency("jruby-openssl", ">= 0.7.3")