rspec_generator 0.5.13 → 0.5.14

data/lib/rspec_on_rails.rb

@@ -16,6 +16,12 @@ module Spec
 
     class ExecutionContext
       include Spec::ControllerExecution
+      include ActionController::TestProcess
+
+      def tag(*opts)
+        opts = opts.size > 1 ? opts.last.merge({ :tag => opts.first.to_s }) : opts.first
+        tag = find_tag(opts)
+      end
     end
 
     class Context
@@ -68,6 +74,7 @@ end
 module ActionController
   class TestResponse
     def should_render(expected=nil)
+      expected = expected.to_s unless expected.nil?
       rendered = expected ? rendered_file(!expected.include?('/')) : rendered_file
       expected.should_equal rendered
     end

data/rspec_generator.rb

@@ -1,18 +1,31 @@
-# This generator adds the basic spec_helper.rb
+require 'rbconfig'
+
+# This generator adds the basic spec_helper.rb,
+# rails_spec for faster spec invocation
 # and rake tasks required to use RSpec with Rails
 class RspecGenerator < Rails::Generator::Base
+  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
+                              Config::CONFIG['ruby_install_name'])
+
   def initialize(runtime_args, runtime_options = {})
     super
   end
 
   def manifest
     record do |m|
+      script_options     = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
+
+      # The rails_spec runner and client scripts
+      m.file 'script/rails_spec', 'script/rails_spec', script_options
+      m.file 'script/rails_spec_runner', 'script/rails_spec_runner', script_options
+
       # The spec helper and Rake tasks
       m.directory 'spec'
-      m.template 'spec_helper.rb', 'spec/spec_helper.rb'
-      m.file     'test2spec.erb', 'spec/test2spec.erb'
+      m.template  'spec_helper.rb', 'spec/spec_helper.rb'
+      m.file      'test2spec.erb', 'spec/test2spec.erb'
+      m.file      'test2spec_help.rb', 'test/test2spec_help.rb'
       m.directory 'lib/tasks'
-      m.template 'rspec.rake', 'lib/tasks/rspec.rake'
+      m.template  'rspec.rake', 'lib/tasks/rspec.rake'
 
       # Copy out the rspec_model generator
       m.directory 'vendor/generators/rspec_model/templates'

data/templates/rspec.rake

@@ -32,4 +32,17 @@ namespace :spec do
     ]
     t.spec_opts = ["--format", "specdoc"]
   end
+
+  namespace :db do
+    namespace :fixtures do
+      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
+      task :load => :environment do
+        require 'active_record/fixtures'
+        ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+          Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
+        end
+      end
+    end
+  end
 end

data/templates/script/rails_spec

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require "drb/drb"
+
+begin
+  DRb.start_service
+  rails_spec_server = DRbObject.new_with_uri("druby://localhost:8989")
+  rails_spec_server.run(ARGV, STDERR, STDOUT)
+rescue DRb::DRbConnError
+  puts "No rails_spec_runner is running. Please start one via 'script/rails_spec_runner'"
+end

data/templates/script/rails_spec_runner

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../../lib'
+require 'rubygems'
+require 'drb/drb'
+require 'rbconfig'
+require 'spec'
+
+module Spec
+  module Runner
+    class RailsSpecServer
+      def run(args, stderr, stdout)
+puts "HALLO"
+puts self
+        Dispatcher.reset_application!
+    
+        $context_runner = OptionParser.create_context_runner(args, false, stderr, stdout)
+        args.each do |file_or_dir|
+          if File.directory?(file_or_dir)
+            Dir["#{file_or_dir}/**/*.rb"].each do |file| 
+              load file
+            end
+          else
+            load file_or_dir
+          end
+        end
+        $context_runner.run(false) unless args.empty?
+      end
+    end
+  end
+end
+puts "Loading Rails environment"
+
+ENV["RAILS_ENV"] = "test"
+require File.dirname(__FILE__) + '/../config/environment'
+Dependencies.mechanism = :load
+
+def restart_test_server
+  puts "restarting"
+  config       = ::Config::CONFIG
+  ruby         = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
+  command_line = [ruby, $0, ARGV].flatten.join(' ')
+  exec(command_line)
+end  
+
+trap("USR2") { restart_test_server }
+puts "Ready"
+DRb.start_service("druby://localhost:8989", Spec::Runner::RailsSpecServer.new)
+DRb.thread.join

data/templates/spec_helper.rb

@@ -1,6 +1,6 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'rspec_on_rails'
+require File.dirname(__FILE__) + '/../vendor/generators/rspec/lib/rspec_on_rails'
 
 module Spec
   module Runner

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rspec_generator
 version: !ruby/object:Gem::Version 
-  version: 0.5.13
-date: 2006-06-22 00:00:00 -05:00
+  version: 0.5.14
+date: 2006-07-14 00:00:00 -05:00
 summary: RSpec plugin and generator for Ruby on Rails
 require_paths: 
 - lib
@@ -32,12 +32,13 @@ files:
 - lib/controller_mixin.rb
 - lib/fixture_loading.rb
 - lib/rspec_on_rails.rb
-- lib/test2spec_help.rb
 - templates/rspec.rake
 - templates/rspec_controller
 - templates/rspec_model
+- templates/script
 - templates/spec_helper.rb
 - templates/test2spec.erb
+- templates/test2spec_help.rb
 - templates/rspec_controller/rspec_controller_generator.rb
 - templates/rspec_controller/templates
 - templates/rspec_controller/USAGE
@@ -46,6 +47,8 @@ files:
 - templates/rspec_model/templates
 - templates/rspec_model/USAGE
 - templates/rspec_model/templates/model_spec.rb
+- templates/script/rails_spec
+- templates/script/rails_spec_runner
 - CHANGES
 - Rakefile
 - README
@@ -69,5 +72,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.5.13
+        version: 0.5.14
     version: