Fix Rails 3.1 generator breakage and update to latest RSpec.

riak-ripple · Jan 12, 2012 · c4a2454 · c4a2454
1 parent ec0d916
commit c4a2454
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,7 +24,7 @@ doc
 .yardoc
 .bundle
 spec/support/test_server.yml
-Gemfile.lock
+Gemfile*.lock
 **/bin
 *.rbc
 .rvmrc

diff --git a/.rspec b/.rspec
@@ -0,0 +1 @@
+--color
diff --git a/lib/rails/generators/ripple_generator.rb b/lib/rails/generators/ripple_generator.rb
@@ -1,3 +1,4 @@
+require 'rails/generators'
 require "rails/generators/named_base"
 require "rails/generators/active_model"
 

diff --git a/ripple.gemspec b/ripple.gemspec
@@ -12,8 +12,8 @@ Gem::Specification.new do |gem|
   gem.authors = ["Sean Cribbs"]
 
   # Deps
-  gem.add_development_dependency "rspec", "~>2.6.0"
-  gem.add_development_dependency 'rake', '~> 0.8.7'
+  gem.add_development_dependency "rspec", "~>2.8.0"
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'ammeter', '~>0.2.2'
   gem.add_dependency "riak-client", "~>#{Ripple::VERSION}"
   gem.add_dependency "activesupport", [">= 3.0.0", "< 3.2.0"]

diff --git a/spec/support/generator_setup.rb b/spec/support/generator_setup.rb
@@ -1,7 +1,10 @@
+require 'ammeter/init'
+require 'fileutils'
+
 module GeneratorSetup
+  include FileUtils
   def self.included(group)
     group.destination File.expand_path(File.join('..','..','..','tmp'), __FILE__)
-    group.send :include, FileUtils
     group.before(:each){ Dir.chdir destination_root }
   end
 end