rspec-rails 2.0.0.a3 → 2.0.0.a4

data/example_app_template.rb

@@ -10,24 +10,21 @@ module ExampleApp
     config.generators do |g|
       g.test_framework   :rspec,
                          :fixtures => false,
-                         :integration_tool => false,
-                         :routes => true,
+                         :routes => false,
                          :views => false
-   
-      g.integration_tool :rspec
     end
   end
 end
 CODE
 
-run('gem bundle')
+run('bundle install')
 
-generate('rspec:install')
-generate('model', 'thing', 'name:string')
-generate('controller', 'widgets', 'index')
-generate('integration_test', 'widgets')
+run('script/rails g rspec:install')
+run('script/rails g model thing name:string')
+run('script/rails g controller widgets index')
+run('script/rails g integration_test widgets')
 
 run('rake db:migrate')
 run('rake db:test:prepare')
-run('script/rspec spec')
+run('bin/rspec spec')
 run('rake spec')

data/lib/generators/rspec/controller/templates/view_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
+require 'spec_helper'
 
 describe "/<%= file_name %>/<%= @action %>.html.<%= options[:template_engine] %>" do
   before(:each) do

data/lib/generators/rspec/install/install_generator.rb

@@ -16,10 +16,10 @@ DESC
         directory 'lib'
       end
 
-      def copy_script_files
-        directory "script"
-        chmod "script/rspec", 0755, :verbose => false
-      end
+      # def copy_script_files
+        # directory "script"
+        # chmod "script/rspec", 0755, :verbose => false
+      # end
 
       def copy_spec_files
         directory 'spec'

data/lib/generators/rspec/scaffold/templates/edit_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
+require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/edit.html.<%= options[:template_engine] %>" do

data/lib/generators/rspec/scaffold/templates/index_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
+require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/index.html.<%= options[:template_engine] %>" do

data/lib/generators/rspec/scaffold/templates/new_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
+require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/new.html.<%= options[:template_engine] %>" do

data/lib/generators/rspec/scaffold/templates/show_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
+require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/show.html.<%= options[:template_engine] %>" do

data/lib/rspec/rails/version.rb

@@ -5,7 +5,7 @@ module Rspec # :nodoc:
         MAJOR  = 2
         MINOR  = 0
         TINY   = 0
-        PRE    = 'a3'
+        PRE    = 'a4'
 
         STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 

data/rspec-rails.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.a3"
+  s.version = "2.0.0.a4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-01-24}
+  s.date = %q{2010-02-04}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
      "lib/generators/rspec/helper/templates/helper_spec.rb",
      "lib/generators/rspec/install/install_generator.rb",
      "lib/generators/rspec/install/templates/lib/tasks/rspec.rake",
-     "lib/generators/rspec/install/templates/script/rspec.tt",
      "lib/generators/rspec/install/templates/spec/rcov.opts",
      "lib/generators/rspec/install/templates/spec/spec.opts",
      "lib/generators/rspec/install/templates/spec/spec_helper.rb",
@@ -51,6 +50,7 @@ Gem::Specification.new do |s|
      "lib/generators/rspec/scaffold/templates/new_spec.rb",
      "lib/generators/rspec/scaffold/templates/routing_spec.rb",
      "lib/generators/rspec/scaffold/templates/show_spec.rb",
+     "lib/rspec-rails.rb",
      "lib/rspec/rails.rb",
      "lib/rspec/rails/example.rb",
      "lib/rspec/rails/example/controller_example_group.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.a3
+  version: 2.0.0.a4
 platform: ruby
 authors: 
 - David Chelimsky
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 -06:00
+date: 2010-02-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,6 @@ files:
 - lib/generators/rspec/helper/templates/helper_spec.rb
 - lib/generators/rspec/install/install_generator.rb
 - lib/generators/rspec/install/templates/lib/tasks/rspec.rake
-- lib/generators/rspec/install/templates/script/rspec.tt
 - lib/generators/rspec/install/templates/spec/rcov.opts
 - lib/generators/rspec/install/templates/spec/spec.opts
 - lib/generators/rspec/install/templates/spec/spec_helper.rb
@@ -78,6 +77,7 @@ files:
 - lib/generators/rspec/scaffold/templates/new_spec.rb
 - lib/generators/rspec/scaffold/templates/routing_spec.rb
 - lib/generators/rspec/scaffold/templates/show_spec.rb
+- lib/rspec-rails.rb
 - lib/rspec/rails.rb
 - lib/rspec/rails/example.rb
 - lib/rspec/rails/example/controller_example_group.rb

data/lib/generators/rspec/install/templates/script/rspec.tt

@@ -1,4 +0,0 @@
-<%= shebang %>
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path('../../config/environment', __FILE__)
-require 'rspec/autorun'