Skip to content

Commit

Permalink
Moved dependencies from the Gemfile to the gemspec
Browse files Browse the repository at this point in the history
* The Gemfile now contains just the source and a single `gemspec` declaration
* See http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/

* Also had to break out the modules under integrations/rspec into their nested equivalents (load order?)
  • Loading branch information
rmm5t committed Jan 31, 2011
1 parent 4cce6ba commit 9c9580c
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 11 deletions.
8 changes: 1 addition & 7 deletions Gemfile
@@ -1,10 +1,4 @@
source 'http://rubygems.org'

gem 'rails', '3.0.3'
gem 'sqlite3-ruby', :require => 'sqlite3'
gem 'mocha'
gem 'rspec-rails'
gem 'ruby-debug'
gem 'cucumber'
gem "aruba"
gemspec

16 changes: 12 additions & 4 deletions lib/shoulda/matchers/integrations/rspec.rb
Expand Up @@ -9,15 +9,23 @@ module RSpec::Matchers

if defined?(::ActionController)
require 'shoulda/matchers/action_controller'
module RSpec::Rails::ControllerExampleGroup
include Shoulda::Matchers::ActionController
module RSpec
module Rails
module ControllerExampleGroup
include Shoulda::Matchers::ActionController
end
end
end
end

if defined?(::ActionMailer)
require 'shoulda/matchers/action_mailer'
module RSpec::Rails::MailerExampleGroup
include Shoulda::Matchers::ActionMailer
module RSpec
module Rails
module MailerExampleGroup
include Shoulda::Matchers::ActionMailer
end
end
end
end

8 changes: 8 additions & 0 deletions shoulda-matchers.gemspec
Expand Up @@ -19,6 +19,14 @@ Gem::Specification.new do |s|
s.summary = %q{Making tests easy on the fingers and eyes}
s.description = %q{Making tests easy on the fingers and eyes}

s.add_development_dependency("rails", "3.0.3")
s.add_development_dependency("sqlite3-ruby", "~> 1.3.2")
s.add_development_dependency("mocha", "~> 0.9.10")
s.add_development_dependency("rspec-rails", "~> 2.3.0")
s.add_development_dependency("ruby-debug", "~> 0.10.4")
s.add_development_dependency("cucumber", "~> 0.10.0")
s.add_development_dependency("aruba", "~> 0.2.7")

if s.respond_to? :specification_version then
s.specification_version = 3
else
Expand Down

0 comments on commit 9c9580c

Please sign in to comment.