Rakefile in authkit-0.5.0 vs Rakefile in authkit-0.7.0

@@ -3,17 +3,18 @@
 
 gem_name = :authkit
 
 RSpec::Core::RakeTask.new(spec: ["generator:cleanup", "generator:prepare", "generator:#{gem_name}"]) do |task|
   task.pattern = "spec/**/*_spec.rb"
-  task.rspec_opts = "--color --drb"
+  task.rspec_opts = "--color"
   task.verbose = true
 end
 
 namespace :spec do
   RSpec::Core::RakeTask.new(database: ["generator:cleanup", "generator:prepare", "generator:database", "generator:#{gem_name}"]) do |task|
     task.pattern = "spec/**/*_spec.rb"
+    task.rspec_opts = "--color"
     task.verbose = true
   end
 end
 
 # When using sed to replace in place, don't rely on -i for POSIX compatibility
@@ -32,37 +33,43 @@
     next if Dir.exist?("spec/tmp/sample")
 
     FileUtils.mkdir_p("spec/tmp")
 
     system "cd spec/tmp && rails new sample --skip-spring"
+    system "cp .ruby-version spec/tmp/sample"
 
     # bundle
     gem_root = File.expand_path(File.dirname(__FILE__))
     system "echo \"gem 'rspec-rails'\" >> spec/tmp/sample/Gemfile"
     system "echo \"gem '#{gem_name}', :path => '#{gem_root}'\" >> spec/tmp/sample/Gemfile"
-    system "cd spec/tmp/sample && bundle install"
-    system "cd spec/tmp/sample && rails g rspec:install"
 
+    system "cd spec/tmp/sample; bundle install"
+    system "cd spec/tmp/sample; bin/rails g rspec:install"
+
+    # Make sure rails helper loads the factory girl support file
+    sed("s/# Dir/Dir/", "spec/tmp/sample/spec/rails_helper.rb")
+
     # Open up the root route for specs
-    sed("s/# root/root/", "spec/tmp/sample/config/routes.rb")
+    sed("s/#/root to: \"sessions#new\" #/", "spec/tmp/sample/config/routes.rb")
 
     # Make a thing
-    system "cd spec/tmp/sample && rails g scaffold thing name:string mood:string"
+    # system "cd spec/tmp/sample; bin/rails g scaffold thing name:string mood:string --no-controller-specs --no-view-specs --no-helper-specs --no-routing-specs"
+    # system "rm spec/tmp/sample/spec/models/thing_spec.rb"
   end
 
   # This task is not used unless you need to test the generator with an alternate database
   # such as mysql or postgres. By default the sample application utilize sqlite3
   desc "Prepares the application with an alternate database"
   task :database do
     puts "==  Configuring the database =================================================="
     system "cp config/database.yml.example spec/tmp/sample/config/database.yml"
-    system "cd spec/tmp/sample && rake db:migrate:reset"
+    system "cd spec/tmp/sample && bundle exec rake db:migrate:reset"
   end
 
   desc "Run the #{gem_name} generator"
   task gem_name do
-    system "cd spec/tmp/sample && rails g #{gem_name}:install --force #{'--oauth --google' if ENV['SKIP_OAUTH'].nil?}  #{'--skip-username' unless ENV['SKIP_USERNAME'].nil?} && rake db:migrate"
-    system "cd spec/tmp/sample && rake db:migrate RAILS_ENV=test"
+    system "cd spec/tmp/sample && rails g #{gem_name}:install --force #{'--oauth --google' if ENV['SKIP_OAUTH'].nil?}  #{'--skip-username' unless ENV['SKIP_USERNAME'].nil?} && bundle exec rake db:migrate"
+    system "cd spec/tmp/sample && bundle exec rake db:migrate RAILS_ENV=test"
   end
 
 end
 
 task :default => :spec