rspec 0.8.2 → 0.9.0

data/CHANGES

@@ -1,5 +1,121 @@
 = RSpec Changelog
 
+== Version 0.9.0
+
+This release introduces #describe and #it (aliased as #context and #specify for
+backwards compatibility). This allows you to express specs like this:
+
+  describe SomeClass do # Creates a Behaviour
+    it "should do something" do # Creates an Example
+    end
+  end
+
+The command line features four new options that give you more control over what specs
+are being run and in what order. This can be used to verify that your specs are
+independent (by running in opposite order with --reverse). It can also be used to cut 
+down feedback time by running the most recently modified specs first (--loadby mtime --reverse).
+
+Further, --example replaces the old --spec option, and it can now take a file name of
+spec names as an alternative to just a spec name. The --format failing_examples:file.txt 
+option allows you to output an --example compatible file, which makes it possible to only 
+rerun the specs that failed in the last run. Spec::Rails uses all of these four options 
+by default to optimise your RSpec experience.
+
+There is now a simple configuration model. For Spec::Rails, you do something like this:
+
+  Spec::Runner.configure do |config|
+    config.use_transactional_fixtures = true
+    config.use_instantiated_fixtures  = false
+    config.fixture_path = RAILS_ROOT + '/spec/fixtures'
+  end
+
+You can now use mocha or flexmock with RSpec if you prefer either to
+RSpec's own mock framework. Just put this:
+
+  Spec::Runner.configure do |config|
+    config.mock_with :mocha
+  end
+  
+or this:
+
+  Spec::Runner.configure do |config|
+    config.mock_with :flexmock
+  end
+
+in a file that is loaded before your specs. You can also
+configure included modules and predicate_matchers:
+
+  Spec::Runner.configure do |config|
+    config.include SomeModule
+    config.predicate_matchers[:does_something?] = :do_something
+  end
+
+See Spec::DSL::Behaviour for more on predicate_matchers
+
+* Sugar FREE!
+* Added [10434 ] Please Make -s synonymous with -e for autotest compat. This is temporary until autotest uses -e instead of -s.
+* Fixed [#10133] custom predicate matchers
+* Applied [#10473] Add should exist (new matcher) - Patch from Bret Pettichord
+* Added another formatter: failing_behaviours. Writes the names of the failing behaviours for use with --example.
+* Applied [#10315] Patch to fix pre_commit bug 10313 - pre_commit_rails: doesn't always build correctly (Patch from Antii Tarvainen)
+* Applied [#10245] Patch to HTML escape the behavior name when using HTML Formatter (Patch from Josh Knowles)
+* Applied [#10410] redirect_to does not behave consistently with regards to query string parameter ordering (Patch from Nicholas Evans)
+* Applied [#9605] Patch for ER 9472, shared behaviour (Patch by Bob Cotton)
+* The '--format rdoc' option no longer causes a dry-run by default. --dry-run must be used explicitly.
+* It's possible to specify the output file in the --format option (See explanation in --help)
+* Several --format options may be specified to output several formats in one run.
+* The --out option is gone. Use --format html:path/to/my.html instead (or similar).
+* Spec::Runner::Formatter::BaseTextFormatter#initialize only takes one argument - an IO. dry_run and color are setters.
+* Made Spec::Ui *much* easier to install. It will be released separately. Check out trunk/spec_ui/examples
+* HTML reports now include a syntax highlighted snippet of the source code where the spec failed (needs the syntax gem)
+* Added [#10262] Better Helper testing of Erb evaluation block helpers
+* Added [#9735] support flexmock (thanks to Jim Weirich for his modifications to flexmock to support this)
+* Spec::Rails controller specs will no longer let mock exception ripple through to the response.
+* Fixed [#9260] IvarProxy does not act like a hash.
+* Applied [#9458] The rspec_resource generator does not take into account class nesting (Patch from Steve Tendon)
+* Applied [#9132] Rakefile spec:doc can fail without preparing database (Patch from Steve Ross)
+* Applied [#9678] Custom runner command line switch, and multi-threaded runner (Patch from Bob Cotton)
+* Applied [#9926] Rakefile - RSPEC_DEPS constant as an Array of Hashes instead of an Array of Arrays (Patch from Scott Taylor)
+* Applied [#9925] Changed ".rhtml" to "template" in REST spec generator (Patch from Scott Taylor)
+* Applied [#9852] Patch for RSpec's Website using Webgen 0.4.2 (Patch from Scott Taylor)
+* Fixed [#6523] Run rspec on rails without a db
+* Fixed [#9295] rake spec should run anything in the spec directory (not just rspec's standard dirs)
+* Added [#9786] infer controller and helper names from the described type
+* Fixed [#7795] form_tag renders action='/view_spec' in view specs
+* Fixed [#9767] rspec_on_rails should not define rescue_action on controllers
+* Fixed [#9421] --line doesn't work with behaviours that use class names
+* Fixed [#9760] rspec generators incompatible with changes to edge rails
+* Added [#9786] infer controller and helper names from the described type
+* Applied a simplified version of [#9282] Change to allow running specs from textmate with rspec installed as a rails plugin (and no rspec gem installed)
+* Applied [#9700] Make Spec::DSL::Example#name public / Add a --timeout switch. A great way to prevent specs from getting slow.
+* In Rails, script/generate rspec will generate a spec.opts file that optimises faster/more efficient running of specs.
+* Added [#9522] support using rspec's expectations with test/unit
+* Moved rspec_on_rails up to the project root, simplifying the download url
+* Fixed [#8103] RSpec not installing spec script correctly.
+* The --spec option is replaced by the --example option.
+* The --loadby option no longer supports a file argument. Use --example file_name instead.
+* The --example option can now take a file name as an argument. The file should contain example names.
+* Internal classes are named Behaviour/Example (rather than Context/Specification).
+* You can now use mocha by saying config.mock_with :mocha in a spec_helper
+* before_context_eval is replaced by before_eval.
+* Applied [#9509] allow spaced options in spec.opts
+* Applied [#9510] Added File for Ruby 1.8.6
+* Applied [#9511] Clarification to README file in spec/
+* Moved all of the Spec::Rails specs down to the plugins directory - now you can run the specs after you install.
+* Updated RSpec.tmbundle to the 0.9 syntax and replaced context/specify with describe/it.
+* Applied [#9232] ActionController::Base#render is sometimes protected (patch from Dan Manges)
+* Added --reverse option, allowing contexts/specs to be run in reverse order. 
+* Added --loadby option, allowing better control over load order for spec files. mtime and file.txt supported.
+* Implemented [#8696] --order option (see --reverse and --loadby)
+* Added describe/it as aliases for context/specify - suggestion from Dan North.
+* Applied [#7637] [PATCH] add skip-migration option to rspec_resource generator
+* Added [#9167] string.should have_tag
+* Changed script/rails_spec_server to script/spec_server and added script/spec (w/ path to vendor/plugins/rspec)
+* Fixed [#8897] Error when mixing controller spec with/without integrated views and using template system other than rhtml
+* Updated sample app specs to 0.9 syntax
+* Updated generated specs to 0.9 syntax
+* Applied [#8994] trunk: generated names for be_ specs (Multiple patches from Yurii Rashkovskii)
+
 == Version 0.8.2
 
 Replaced assert_select fork with an assert_select wrapper for have_tag. This means that "should have_rjs" no longer supports :hide or :effect, but you can still use should_have_rjs for those.
@@ -46,7 +162,7 @@ It also sports myriad new features, bug fixes, patches and general goodness:
 * Fixed [#7754] Command-R fails to run spec in TextMate (added instruction from Luke Redpath to the website)
 * Fixed [#7826] RSpect.tmbundle web page out of date.
 * RSpec on Rails specs are now running against RoR 1.2.1 and 1.2.2
-* rspec_resource now generates specs for views (TODO: make them use the new assert_select, when it's documented)
+* rspec_resource now generates specs for views
 * In a Rails app, RSpec core is only loaded when RAILS_ENV==test (init.rb)
 * Added support for target.should arbitrary_expectation_handler and target.should_not arbitrary_expectation_handler
 * Fixed [#7533] Spec suite fails and the process exits with a code 0
@@ -55,7 +171,7 @@ It also sports myriad new features, bug fixes, patches and general goodness:
 * Fixed [#7409] default fixtures do not appear to run.
 * Fixed [#7507] "render..and return" doesn't return
 * Fixed [#7509] rcov/rspec incorrectly includes boot.rb (Patch from Courtenay)
-* Fixed [#7506] unnecessary complex output on failure of response.should_be_redirect
+* Fixed [#7506] unnecessary complex output on failure of response.should be_redirect
 * Applied [#6098] Make scaffold_resource generator. Based on code from Pat Maddox.
 * The drbspec command is gone. Use spec --drb instead.
 * The drb option is gone from the Rake task. Pass --drb to spec_opts instead.
@@ -160,7 +276,7 @@ Bug fixes and a couple o' new features.
 * Fixed [#6555] should_have_tag does not match documentation
 * Fixed [#6567] SyntaxError should not stop entire run
 * Fixed [#6558] integrated views look for template even when redirected
-* Fixed [#6547] response.should_be_redirect broken in 0.7.0
+* Fixed [#6547] response.should be_redirect broken in 0.7.0
 * Applied [#6471] Easy way to spec routes
 * Applied [#6587] Rspec on Rails displays "Spec::Rails::ContextFactory" as context name
 * Applied [#6514] Document has trivial typos.
@@ -182,7 +298,7 @@ There are a few changes that will require that you change your existing specs.
 RSpec now handles equality exactly like ruby does:
 
 # actual.should_equal(expected) will pass if actual.equal?(expected) returns true
-# actual.should_eql(expected) will pass if actual.eql?(expected) returns true
+# actual.should eql(expected) will pass if actual.eql?(expected) returns true
 # actual.should == expected will pass if actual == expected) returns true
 
 At the high level, eql? implies equivalence, while equal? implies object identity. For more
@@ -206,7 +322,7 @@ Here's what you'll need to do to update your specs:
 # search for "should_equal" and replace with "should_eql"
 # run specs
 
-If any specs still fail, they are probably related to should_be(true) or should_be(false) using
+If any specs still fail, they are probably related to should be_true or should_be_false using
 non-boolean values. Those you'll just have to inspect manually and adjust appropriately (sorry!).
 
 --------------------------------------------------
@@ -307,7 +423,7 @@ Things that may break backwards compatibility:
 * Fixed [#4891] RCOV task failing on windows
 * Fixed [#4896] Shouldn't modify user's $LOAD_PATH (Tip from Gavin Sinclair)
 * Fixed [#5369] ruby -w: warnings in RSpec 0.5.16 (Tip from Suraj Kurapati)
-* Applied [#5141] SpecMatcher doesn't escape strings before matching (Patch from Nikolai Weibull).
+* Applied [#5141] ExampleMatcher doesn't escape strings before matching (Patch from Nikolai Weibull).
 * Fixed [#5224] Move 'require diff-lcs' from test_helper.rb to diff_test.rb (Tip from Chris Roos)
 * Applied [#5449] Rake stats for specs (Patch from Nick Sieger)
 * Applied [#5468, #5058] Fix spec runner to correctly run controller specs (Patch from Daniel Siemssen)
@@ -321,7 +437,7 @@ This release makes an official commitment to underscore_syntax (with no more sup
 * Converted ALL tests to use underscore syntax
 * Fixed all remaining problems with underscores revealed by converting all the tests to underscores
 * Enhanced sugar to support combinations of methods (i.e. once.and_return) 
-* Simplified helper structure taking advantage of dot/underscore combos (i.e. should.be.an_instance_of, which can be expressed as should_be_an_instance_of)
+* Simplified helper structure taking advantage of dot/underscore combos (i.e. should.be.an_instance_of, which can be expressed as should be_an_instance_of)
 * Added support for at_most in mocks
 * Added support for should_not_receive(:msg) (will be removing should_receive(:msg).never some time soon)
 * Added support for should_have_exactly(5).items_in_collection
@@ -347,7 +463,7 @@ a experimental support for faster rails specs.
 
 * Added proc methods for specifying differences (increments and decrements). See difference_test.rb
 * Methods can now be defined alongside specs. This obsoletes the need for defining methods in setup. (Patch #5002 from Brian Takita)
-* Sugar (underscores) now works correctly with should_be_a_kind_of and should_be_an_instance_of
+* Sugar (underscores) now works correctly with should be_a_kind_of and should be_an_instance_of
 * Added support for include and inherit in contexts. (Patch #4971 from Brian Takita)
 * Added rails_spec and rails_spec_server for faster specs on rails (still buggy - help needed)
 * Fixed bug that caused should_render to break if given a :symbol (in Rails)
@@ -564,7 +680,7 @@ This release adds some improvements to the mock API and minor syntax improvement
 
 This release adds some shoulds and improves error reporting
 
-* Added should_be_same_as and should_not_be_same_as.
+* Added should be_same_as and should_not be_same_as.
 * Improved error reporting for comparison expectations.
 
 == Version 0.1.0

data/EXAMPLES.rd

@@ -1,12 +1,21 @@
-# specs with no names
-# * NAME NOT GENERATED
-# * NAME NOT GENERATED
-# * NAME NOT GENERATED
-# * NAME NOT GENERATED
-# A mouse
+# Examples with no descriptions
+# * should equal 5
+# * should be < 5
+# * should include "a"
+# * should respond to #size
+# State created in before(:all)
+# * should be accessible from example
+# * should not have sideffects
+# BehaveAsExample::BluesGuitarist
+# * should behave as guitarist
+# BehaveAsExample::RockGuitarist
+# * should behave as guitarist
+# BehaveAsExample::ClassicGuitarist
+# * should not behave as guitarist
+# Animals::Mouse
 # * should eat cheese
 # * should not eat cat
-# The month march
+# Some integers
 # * The root of 1 square should be 1
 # * The root of 2 square should be 2
 # * The root of 3 square should be 3
@@ -27,6 +36,8 @@
 # An IoProcessor
 # * should raise nothing when the file is exactly 32 bytes
 # * should raise an exception when the file length is less than 32 bytes
+# A legacy spec
+# * should work fine
 # A consumer of a mock
 # * should be able to send messages to the mock
 # a mock
@@ -39,31 +50,39 @@
 # BDD framework
 # * should be adopted quickly
 # * should be intuitive
-# State created in context_setup
-# * should be accessible from spec
-# * should not have sideffects
-# A Stack
+# SharedBehaviourExample::OneThing
+# * should do what things do
+# SharedBehaviourExample::AnotherThing
+# * should do what things do
+# Stack (empty)
+# * should be empty
+# * should not be full
 # * should add to the top when sent #push
+# * should complain when sent #peek
+# * should complain when sent #pop
+# Stack (with one item)
+# * should not be empty
+# * should return the top item when sent #peek
+# * should NOT remove the top item when sent #peek
+# * should return the top item when sent #pop
+# * should remove the top item when sent #pop
+# * should not be full
+# * should add to the top when sent #push
+# Stack (with one item less than capacity)
+# * should not be empty
+# * should return the top item when sent #peek
+# * should NOT remove the top item when sent #peek
+# * should return the top item when sent #pop
+# * should remove the top item when sent #pop
+# * should not be full
+# * should add to the top when sent #push
+# Stack (full)
+# * should be full
+# * should not be empty
 # * should return the top item when sent #peek
 # * should NOT remove the top item when sent #peek
 # * should return the top item when sent #pop
 # * should remove the top item when sent #pop
-# An empty stack
-# * NAME NOT GENERATED
-# * should no longer be empty after #push
-# * should complain when sent #peek
-# * should complain when sent #pop
-# An almost empty stack (with one item)
-# * NAME NOT GENERATED
-# * should remain not empty after #peek
-# * should become empty after #pop
-# An almost full stack (with one item less than capacity)
-# * NAME NOT GENERATED
-# * should become full when sent #push
-# A full stack
-# * NAME NOT GENERATED
-# * should remain full after #peek
-# * should no longer be full after #pop
 # * should complain on #push
 # A consumer of a stub
 # * should be able to stub methods on any Object
@@ -79,3 +98,7 @@
 # * TestCase#setup should be called.
 # * RSpec should be able to access TestCase methods
 # * RSpec should be able to accept included modules
+
+Finished in 0.045999 seconds
+
+74 examples, 0 failures

data/README

@@ -19,7 +19,7 @@ Spec::Mocks supports creating Mock Objects, Stubs, and adding Mock/Stub
 behaviour to your existing objects.
 
 Spec::Runner provides a very small but powerful DSL for writing executable
-specifications.
+examples of how your code should work.
 
 == Installation
 
@@ -47,6 +47,19 @@ In order to run RSpec's full suite of specs (rake pre_commit) you must install t
 * meta_project  # Required in order to make releases at RubyForge
 * heckle        # Required if you use the --heckle switch
 
+Once those are all installed, you should be able to run the suite with the following steps:
+
+svn co svn://rubyforge.org/var/svn/rspec/trunk rspec
+cd rspec
+rake install_dependencies
+cd example_rails_app
+export RSPEC_RAILS_VERSION=1.2.3
+rake rspec:generate_mysql_config
+mysql -u root < db/mysql_setup.sql
+cd ..
+rake pre_commit
+
+
 Note that RSpec itself - once built - doesn't have any dependencies outside the Ruby core 
 and stdlib - with a few exceptions:
 

data/Rakefile

@@ -20,15 +20,30 @@ PKG_FILES = FileList[
   '[A-Z]*',
   'lib/**/*.rb', 
   'spec/**/*.rb', 
-  'examples/**/*'
+  'examples/**/*',
+  'plugins/**/*'
 ]
+FileUtils.touch(File.dirname(__FILE__) + '/previous_failures.txt')
 
-task :default => [:spec, :verify_rcov]
+task :default => [:verify_rcov]
 
 desc "Run all specs"
 Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb', '../RSpec.tmbundle/Support/spec/*_spec.rb']
-  t.spec_opts = ['--color','--backtrace']
+  t.spec_opts = ['--options', 'spec.opts']
+  t.rcov = true
+  t.rcov_dir = '../doc/output/coverage'
+  t.rcov_opts = ['--exclude', 'spec\/spec,bin\/spec,examples']
+end
+
+desc "Run all translated specs"
+Spec::Rake::SpecTask.new('translated_specs') do |t|
+  t.spec_files = FileList['translated_specs/**/*_spec.rb'].exclude( # These translate, but have other quirks
+    'translated_specs/spec/translator_spec.rb',
+    'translated_specs/spec/runner/formatter/html_formatter_spec.rb',
+    'translated_specs/spec/runner/option_parser_spec.rb'
+  )
+  t.spec_opts = ['--options', 'spec.opts']
   t.rcov = true
   t.rcov_dir = '../doc/output/coverage'
   t.rcov_opts = ['--exclude', 'spec\/spec,bin\/spec,examples']
@@ -37,7 +52,7 @@ end
 desc "Run all specs and store html output in doc/output/report.html"
 Spec::Rake::SpecTask.new('spec_html') do |t|
   t.spec_files = FileList['spec/**/*_spec.rb', 'vendor/RSpec.tmbundle/Support/spec/*_spec.rb']
-  t.spec_opts = ['--format html','--backtrace','--out ../doc/output/report.html']
+  t.spec_opts = ['--format html:../doc/output/report.html','--backtrace']
 end
 
 desc "Run all failing examples"
@@ -45,14 +60,6 @@ Spec::Rake::SpecTask.new('failing_examples') do |t|
   t.spec_files = FileList['failing_examples/**/*_spec.rb']
 end
 
-desc 'Verify that no warnings occur'
-task :verify_warnings do
-  `ruby -w #{File.dirname(__FILE__) + '/bin/spec'} --help 2> warnings.txt`
-  warnings = File.open('warnings.txt').read
-  File.rm 'warnings.txt' rescue nil
-  raise "There were warnings:\n#{warnings}" if warnings =~ /warning/n
-end
-
 desc 'Generate HTML documentation for website'
 task :webgen do
   Dir.chdir '../doc' do
@@ -71,7 +78,7 @@ desc 'Generate RDoc'
 rd = Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = '../doc/output/rdoc'
   rdoc.options << '--title' << 'RSpec' << '--line-numbers' << '--inline-source' << '--main' << 'README'
-  rdoc.rdoc_files.include('README', 'CHANGES', 'MIT-LICENSE', 'EXAMPLES.rd', 'RELEASE-PLAN', 'lib/**/*.rb')
+  rdoc.rdoc_files.include('README', 'CHANGES', 'MIT-LICENSE', 'EXAMPLES.rd', 'UPGRADE', 'lib/**/*.rb')
 end
 task :rdoc => :examples_specdoc # We generate EXAMPLES.rd
 
@@ -95,7 +102,7 @@ spec = Gem::Specification.new do |s|
   
   s.autorequire = 'spec'
   s.bindir = 'bin'
-  s.executables = ['spec']
+  s.executables = ['spec', 'spec_translator']
   s.default_executable = 'spec'
   s.author = ["RSpec Development Team"]
   s.email = "rspec-devel@rubyforge.org"
@@ -145,24 +152,28 @@ end
 
 desc "Creates a tag in svn"
 task :tag do
+  from = `svn info #{File.dirname(__FILE__)}`.match(/URL: (.*)\/rspec/n)[1]
+  to = from.gsub(/trunk/, "tags/#{Spec::VERSION::TAG}")
+  tag_cmd = "svn cp #{from} #{to} -m \"Tag release #{Spec::VERSION::FULL_VERSION}\""
+  raise "Can't tag to the same place: #{tag_cmd}" if to == from
   puts "Creating tag in SVN"
-  `svn cp svn+ssh://#{ENV['RUBYFORGE_USER']}@rubyforge.org/var/svn/rspec/trunk svn+ssh://#{ENV['RUBYFORGE_USER']}@rubyforge.org/var/svn/rspec/tags/#{Spec::VERSION::TAG} -m "Tag release #{Spec::VERSION::STRING}"`
-  puts "Done!"
+  `#{tag_cmd}`
+  raise "Tagging failed" unless $? == 0
 end
 
 desc "Run this task before you commit. You should see 'OK TO COMMIT'"
 task :pre_commit => [
-  :verify_warnings, 
   :website,
   :examples,
-  :failing_examples_with_html, 
+  :translated_specs,
+  :failing_examples_with_html
 ]
 
 desc "Build the website, but do not publish it"
 task :website => [:clobber, :verify_rcov, :spec_html, :webgen, :failing_examples_with_html, :examples_specdoc, :rdoc, :rdoc_rails]
 
 task :rdoc_rails do
-  Dir.chdir '../rspec_on_rails/vendor/plugins/rspec_on_rails' do
+  Dir.chdir '../rspec_on_rails' do
     rake = (PLATFORM == "i386-mswin32") ? "rake.cmd" : "rake"
     `#{rake} rdoc`
   end
@@ -174,50 +185,92 @@ end
 
 desc "Upload Website to RubyForge"
 task :publish_website => [:verify_user, :website] do
-  publisher = Rake::SshDirPublisher.new(
-    "rspec-website@rubyforge.org",
-    "/var/www/gforge-projects/#{PKG_NAME}",
-    "../doc/output"
-  )
-
-  publisher.upload
+  unless Spec::VERSION::RELEASE_CANDIDATE
+    publisher = Rake::SshDirPublisher.new(
+      "rspec-website@rubyforge.org",
+      "/var/www/gforge-projects/#{PKG_NAME}",
+      "../doc/output"
+    )
+    publisher.upload
+  else
+    puts "** Not publishing packages to RubyForge - this is a prerelease"
+  end
 end
 
 desc "Package the RSpec.tmbundle"
-task :package_tmbundle => :pkg do
-  rm_rf 'pkg/RSpec.tmbundle'
+task :package_tmbundle do
+  mkdir 'pkg' rescue nil
+  rm_rf 'pkg/RSpec.tmbundle' rescue nil
   `svn export ../RSpec.tmbundle pkg/RSpec.tmbundle`
   Dir.chdir 'pkg' do
     `tar cvzf RSpec-#{PKG_VERSION}.tmbundle.tgz RSpec.tmbundle`
   end
 end
-task :package => :package_tmbundle
+task :pkg => :package_tmbundle
+
+desc "Package the Spec::Ui gem"
+task :package_spec_ui do
+  Dir.chdir '../spec_ui' do
+    `rake clobber gem`
+  end
+end
+task :pkg => :package_spec_ui
 
 desc "Publish gem+tgz+zip on RubyForge. You must make sure lib/version.rb is aligned with the CHANGELOG file"
 task :publish_packages => [:verify_user, :package] do
-  require 'meta_project'
-  require 'rake/contrib/xforge'
+  require File.dirname(__FILE__) + '/../spec_ui/lib/spec/ui/version'
   release_files = FileList[
     "pkg/#{PKG_FILE_NAME}.gem",
     "pkg/#{PKG_FILE_NAME}.tgz",
     "pkg/#{PKG_FILE_NAME}.zip",
-    "pkg/RSpec-#{PKG_VERSION}.tmbundle.tgz"
+    "pkg/RSpec-#{PKG_VERSION}.tmbundle.tgz",
+    "../spec_ui/pkg/spec_ui-#{Spec::Ui::VERSION::STRING}.gem"
   ]
+  unless Spec::VERSION::RELEASE_CANDIDATE
+    require 'meta_project'
+    require 'rake/contrib/xforge'
+
+    Rake::XForge::Release.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |xf|
+      # Never hardcode user name and password in the Rakefile!
+      xf.user_name = ENV['RUBYFORGE_USER']
+      xf.files = release_files.to_a
+      xf.release_name = "RSpec #{PKG_VERSION}"
+    end
+  else
+    puts "SINCE THIS IS A PRERELEASE, FILES ARE UPLOADED WITH SSH, NOT TO THE RUBYFORGE FILE SECTION"
+    puts "YOU MUST TYPE THE PASSWORD #{release_files.length} TIMES..."
+
+    host = "rspec-website@rubyforge.org"
+    remote_dir = "/var/www/gforge-projects/#{PKG_NAME}"
 
-  Rake::XForge::Release.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |xf|
-    # Never hardcode user name and password in the Rakefile!
-    xf.user_name = ENV['RUBYFORGE_USER']
-    xf.files = release_files.to_a
-    xf.release_name = "RSpec #{PKG_VERSION}"
+    publisher = Rake::SshFilePublisher.new(
+      host,
+      remote_dir,
+      File.dirname(__FILE__),
+      *release_files
+    )
+    publisher.upload
+    
+    puts "UPLADED THE FOLLOWING FILES:"
+    release_files.each do |file|
+      name = file.match(/pkg\/(.*)/)[1]
+      puts "* http://rspec.rubyforge.org/#{name}"
+    end
+
+    puts "They are not linked to anywhere, so don't forget to tell people!"
   end
 end
 
 desc "Publish news on RubyForge"
 task :publish_news => [:verify_user] do
-  require 'meta_project'
-  require 'rake/contrib/xforge'
-  Rake::XForge::NewsPublisher.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |news|
-    # Never hardcode user name and password in the Rakefile!
-    news.user_name = ENV['RUBYFORGE_USER']
+  unless Spec::VERSION::RELEASE_CANDIDATE
+    require 'meta_project'
+    require 'rake/contrib/xforge'
+    Rake::XForge::NewsPublisher.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |news|
+      # Never hardcode user name and password in the Rakefile!
+      news.user_name = ENV['RUBYFORGE_USER']
+    end
+  else
+    puts "** Not publishing news to RubyForge - this is a prerelease"
   end
 end