dchelimsky-rspec-rails 1.1.99.3 → 1.1.99.4

data/History.txt

@@ -1,4 +1,6 @@
-=== Maintenance
+=== Version 1.1.99.4 (in git)
+
+IMPORTANT: See Upgrade.txt for information about upgrading to rspec-rails-1.1.99.4
 
 IMPORTANT: This release includes the following backwards-compatibility-breaking changes.
 
@@ -32,6 +34,8 @@ IMPORTANT: This release includes the following backwards-compatibility-breaking
   * you no longer *have* to load ActionMailer to get specs to run. Closes #650.
   * query_params are now parsed by Rack::Utils.parse_query in redirect_to matcher. Closes #684.
   * cleaned up spec_server (there was a bunch of pre-rails 2.0 material). Closes #685.
+  * rspec's rake tasks are not loaded when running "rake gems" or any of its subtasks
+  * only warn when rspec is not installed when trying to invoke an rspec rake task
 
 === Version 1.1.12 / 2009-01-11
 

data/Rakefile

@@ -20,7 +20,7 @@ Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
   p.description = "Behaviour Driven Development for Ruby on Rails."
   p.rubyforge_name = 'rspec'
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
-  p.extra_deps = [["dchelimsky-rspec","1.1.99.3"],["rack",">=0.4.0"]]
+  p.extra_deps = [["dchelimsky-rspec","1.1.99.4"],["rack",">=0.4.0"]]
   p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
 end

data/Upgrade.txt

@@ -1,4 +1,11 @@
-=== Upgrade to rspec-rails ????
+=== Upgrade to rspec-rails-1.1.99.4
+
+== update generated files
+
+Be sure to run "script/generate rspec" and allow the following files to be overwritten:
+
+* lib/tasks/rspec.rake
+* script/spec_server
 
 == route_for
 

data/generators/rspec/templates/rspec.rake

@@ -14,147 +14,163 @@ elsif File.exist?(rspec_plugin_dir)
   $LOAD_PATH.unshift("#{rspec_plugin_dir}/lib")
 end
 
+# Don't load rspec if running "rake gems:*"
+unless ARGV.any? {|a| a =~ /^gems/}
+
 begin
   require 'spec/rake/spectask'
-  Rake.application.instance_variable_get('@tasks').delete('default')
-
-  spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop
-  task :noop do
+rescue MissingSourceFile
+  module Spec
+    module Rake
+      class SpecTask
+        def initialize(name)
+          task name do
+            # if rspec-rails is a configured gem, this will output helpful material and exit ...
+            require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
+
+            # ... otherwise, do this:
+            raise <<-MSG
+
+#{"*" * 80}
+*  You are trying to run an rspec rake task defined in
+*  #{__FILE__},
+*  but rspec can not be found in vendor/gems, vendor/plugins or system gems.
+#{"*" * 80}
+MSG
+          end
+        end
+      end
+    end
   end
+end
+
+Rake.application.instance_variable_get('@tasks').delete('default')
+
+spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop
+task :noop do
+end
 
-  task :default => :spec
-  task :stats => "spec:statsetup"
+task :default => :spec
+task :stats => "spec:statsetup"
 
-  desc "Run all specs in spec directory (excluding plugin specs)"
-  Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
+desc "Run all specs in spec directory (excluding plugin specs)"
+Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
+  t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+  t.spec_files = FileList['spec/**/*/*_spec.rb']
+end
+
+namespace :spec do
+  desc "Run all specs in spec directory with RCov (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:rcov) do |t|
     t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
     t.spec_files = FileList['spec/**/*/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = lambda do
+      IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+    end
   end
 
-  namespace :spec do
-    desc "Run all specs in spec directory with RCov (excluding plugin specs)"
-    Spec::Rake::SpecTask.new(:rcov) do |t|
-      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-      t.spec_files = FileList['spec/**/*/*_spec.rb']
-      t.rcov = true
-      t.rcov_opts = lambda do
-        IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
-      end
-    end
+  desc "Print Specdoc for all specs (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList['spec/**/*/*_spec.rb']
+  end
 
-    desc "Print Specdoc for all specs (excluding plugin specs)"
-    Spec::Rake::SpecTask.new(:doc) do |t|
-      t.spec_opts = ["--format", "specdoc", "--dry-run"]
-      t.spec_files = FileList['spec/**/*/*_spec.rb']
-    end
+  desc "Print Specdoc for all plugin examples"
+  Spec::Rake::SpecTask.new(:plugin_doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*')
+  end
 
-    desc "Print Specdoc for all plugin examples"
-    Spec::Rake::SpecTask.new(:plugin_doc) do |t|
-      t.spec_opts = ["--format", "specdoc", "--dry-run"]
-      t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*')
+  [:models, :controllers, :views, :helpers, :lib].each do |sub|
+    desc "Run the code examples in spec/#{sub}"
+    Spec::Rake::SpecTask.new(sub => spec_prereq) do |t|
+      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+      t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
     end
+  end
 
-    [:models, :controllers, :views, :helpers, :lib].each do |sub|
-      desc "Run the code examples in spec/#{sub}"
-      Spec::Rake::SpecTask.new(sub => spec_prereq) do |t|
-        t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-        t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
-      end
-    end
+  desc "Run the code examples in vendor/plugins (except RSpec's own)"
+  Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t|
+    t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+    t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*")
+  end
 
-    desc "Run the code examples in vendor/plugins (except RSpec's own)"
-    Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t|
+  namespace :plugins do
+    desc "Runs the examples for rspec_on_rails"
+    Spec::Rake::SpecTask.new(:rspec_on_rails) do |t|
       t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-      t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*")
-    end
-
-    namespace :plugins do
-      desc "Runs the examples for rspec_on_rails"
-      Spec::Rake::SpecTask.new(:rspec_on_rails) do |t|
-        t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
-        t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*/*_spec.rb']
-      end
+      t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*/*_spec.rb']
     end
+  end
 
-    # Setup specs for stats
-    task :statsetup do
-      require 'code_statistics'
-      ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
-      ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
-      ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
-      ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
-      ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
-      ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
-      ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
-      ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
-      ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
-      ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
-      ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
-    end
+  # Setup specs for stats
+  task :statsetup do
+    require 'code_statistics'
+    ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
+    ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
+    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
+    ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
+    ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
+    ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
+    ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
+    ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
+    ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
+    ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
+    ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
+  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. Load from subdirectory in test/fixtures using FIXTURES_DIR=z."
-        task :load => :environment do
-          ActiveRecord::Base.establish_connection(Rails.env)
-          base_dir = File.join(Rails.root, 'spec', 'fixtures')
-          fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir
-          
-          (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file|
-            Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*'))
-          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. Load from subdirectory in test/fixtures using FIXTURES_DIR=z."
+      task :load => :environment do
+        ActiveRecord::Base.establish_connection(Rails.env)
+        base_dir = File.join(Rails.root, 'spec', 'fixtures')
+        fixtures_dir = ENV['FIXTURES_DIR'] ? File.join(base_dir, ENV['FIXTURES_DIR']) : base_dir
+        
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/).map {|f| File.join(fixtures_dir, f) } : Dir.glob(File.join(fixtures_dir, '*.{yml,csv}'))).each do |fixture_file|
+          Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*'))
         end
       end
     end
+  end
 
-    namespace :server do
-      daemonized_server_pid = File.expand_path("#{RAILS_ROOT}/tmp/spec_server.pid")
-      
-      desc "start spec_server."
-      task :start do
-        if File.exist?(daemonized_server_pid)
-          $stderr.puts "spec_server is already running."
-        else
-          $stderr.puts %Q{Starting up spec_server ...}
-          system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
-        end
+  namespace :server do
+    daemonized_server_pid = File.expand_path("#{RAILS_ROOT}/tmp/spec_server.pid")
+    
+    desc "start spec_server."
+    task :start do
+      if File.exist?(daemonized_server_pid)
+        $stderr.puts "spec_server is already running."
+      else
+        $stderr.puts %Q{Starting up spec_server ...}
+        system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
       end
+    end
 
-      desc "stop spec_server."
-      task :stop do
-        unless File.exist?(daemonized_server_pid)
-          $stderr.puts "No server running."
-        else
-          $stderr.puts "Shutting down spec_server ..."
-          system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && 
-          File.delete(daemonized_server_pid)
-        end
+    desc "stop spec_server."
+    task :stop do
+      unless File.exist?(daemonized_server_pid)
+        $stderr.puts "No server running."
+      else
+        $stderr.puts "Shutting down spec_server ..."
+        system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && 
+        File.delete(daemonized_server_pid)
       end
+    end
 
-      desc "restart spec_server."
-      task :restart => [:stop, :start]
-      
-      desc "check if spec server is running"
-      task :status do
-        if File.exist?(daemonized_server_pid)
-          $stderr.puts %Q{spec_server is running (PID: #{File.read(daemonized_server_pid).gsub("\n","")})}
-        else
-          $stderr.puts "No server running."
-        end
+    desc "restart spec_server."
+    task :restart => [:stop, :start]
+    
+    desc "check if spec server is running"
+    task :status do
+      if File.exist?(daemonized_server_pid)
+        $stderr.puts %Q{spec_server is running (PID: #{File.read(daemonized_server_pid).gsub("\n","")})}
+      else
+        $stderr.puts "No server running."
       end
     end
   end
-rescue MissingSourceFile
-  # if rspec-rails is a configured gem, this will output helpful material and exit ...
-  require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
-
-  # ... otherwise, do this:
-  raise <<-MSG
-
-  You have rspec rake tasks installed in
-  #{__FILE__},
-  but rspec can not be found in vendor/gems, vendor/plugins or on the system.
-
-MSG
 end
 
+end

data/lib/spec/rails/version.rb

@@ -5,7 +5,7 @@ module Spec
         MAJOR  = 1
         MINOR  = 1
         TINY   = 99
-        MINESCULE = 3
+        MINESCULE = 4
 
         STRING = [MAJOR, MINOR, TINY, MINESCULE].compact.join('.')
 

data/rspec-rails.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "1.1.99.3"
+  s.version = "1.1.99.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RSpec Development Team"]
@@ -17,23 +17,23 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.1}
-  s.summary = %q{rspec-rails 1.1.99.3}
+  s.summary = %q{rspec-rails 1.1.99.4}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.3"])
+      s.add_runtime_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.4"])
       s.add_runtime_dependency(%q<rack>, [">= 0.4.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0.1.13"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.3"])
     else
-      s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.3"])
+      s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.4"])
       s.add_dependency(%q<rack>, [">= 0.4.0"])
     end
   else
-    s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.3"])
+    s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.4"])
     s.add_dependency(%q<rack>, [">= 0.4.0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dchelimsky-rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.99.3
+  version: 1.1.99.4
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.99.3
+        version: 1.1.99.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -234,6 +234,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.1.99.3
+summary: rspec-rails 1.1.99.4
 test_files: []