buildr 1.4.12-java → 1.4.13-java

data/lib/buildr/java/commands.rb

@@ -43,7 +43,7 @@ module Java
       def java(*args, &block)
         options = Hash === args.last ? args.pop : {}
         options[:verbose] ||= trace?(:java)
-        rake_check_options options, :classpath, :java_args, :properties, :name, :verbose
+        rake_check_options options, :classpath, :java_args, :properties, :name, :verbose, :dir
 
         name = options[:name]
         if name.nil?
@@ -63,7 +63,21 @@ module Java
         end
         cmd_args << path_to_bin('java')
         cp = classpath_from(options)
-        cmd_args << '-classpath' << cp.join(File::PATH_SEPARATOR) unless cp.empty?
+        paths = cp.map do |c|
+          path = File.directory?(c) && !c.end_with?('/') ? "#{c}/" : c.to_s
+          Buildr::Util.win_os? ? "/#{path}" : path
+        end
+        manifest = Buildr::Packaging::Java::Manifest.new([{'Class-Path' => paths.join(" ")}])
+
+        tjar = Tempfile.new(['javacmd', '.jar'])
+        Zip::ZipOutputStream.open(tjar.path) do |zos|
+          zos.put_next_entry('META-INF/MANIFEST.MF')
+          zos.write manifest.to_s
+          zos.write "\n"
+        end
+        tjar.close
+
+        cmd_args << '-classpath' << tjar.path
         options[:properties].each { |k, v| cmd_args << "-D#{k}=#{v}" } if options[:properties]
         cmd_args += (options[:java_args] || (ENV['JAVA_OPTS'] || ENV['JAVA_OPTIONS']).to_s.split).flatten
         cmd_args += args.flatten.compact

data/lib/buildr/java/packaging.rb

@@ -671,8 +671,6 @@ module Buildr #:nodoc:
         end
       end
 
-    protected
-
       def package_as_jar(file_name) #:nodoc:
         Java::JarTask.define_task(file_name).tap do |jar|
           jar.with :manifest=>manifest, :meta_inf=>meta_inf
@@ -687,8 +685,12 @@ module Buildr #:nodoc:
           war.with :classes=>[compile.target, resources.target].compact
           war.with :libs=>compile.dependencies
           # Add included files, or the webapp directory.
-          webapp = path_to(:source, :main, :webapp)
-          war.with webapp if File.exist?(webapp)
+          assets.paths.each do |asset|
+            war.tap do |war|
+              war.enhance([asset])
+            end
+            war.include asset, :as => '.'
+          end
         end
       end
 

data/lib/buildr/java/pom.rb

@@ -179,7 +179,7 @@ module Buildr
         spec[pair.first] = value_of(element[pair.last], substitute) if element[pair.last]
         spec
       }
-      { :type=>"jar" }.merge(hash)
+      {:scope => "compile", :type => "jar"}.merge(hash)
     end
 
   end

data/lib/buildr/java/tests.rb

@@ -233,7 +233,7 @@ module Buildr #:nodoc:
           forking = {}
         when :each
           forking = { :fork=>true, :forkmode=>'perTest' }
-        when true, :once
+        when nil, true, :once
           forking = { :fork=>true, :forkmode=>'once' }
         else
           fail 'Option fork must be :once, :each or false.'
@@ -296,7 +296,7 @@ module Buildr #:nodoc:
   # * :args -- Arguments passed to the TestNG command line runner.
   class TestNG < TestFramework::Java
 
-    VERSION = '6.8'
+    VERSION = '6.8.5'
 
     class << self
       def version
@@ -389,7 +389,7 @@ module Buildr #:nodoc:
       fail "Missing :frameworks option" unless options[:frameworks]
       @frameworks = options[:frameworks].map do |f|
         framework_options = (options[:options] || {})[f.to_sym] || {}
-        f.new(task, options)
+        f.new(task, framework_options)
       end
     end
 

data/lib/buildr/packaging/archive.rb

@@ -312,7 +312,7 @@ module Buildr #:nodoc:
 
       # Make sure we're the last enhancements, so other enhancements can add content.
       enhance do
-        @file_map = {}
+        @file_map = OrderedHash.new
         enhance do
           send 'create' if respond_to?(:create)
           # We're here because the archive file does not exist, or one of the files is newer than the archive contents;
@@ -345,7 +345,8 @@ module Buildr #:nodoc:
     #
     #    package(:jar).clean.include path_to('desired/content')
     def clean
-      @paths = { '' => Path.new(self, '') }
+      @paths = OrderedHash.new
+      @paths[''] = Path.new(self, '')
       @prepares = []
       self
     end
@@ -469,7 +470,7 @@ module Buildr #:nodoc:
       @prepares.each { |prepare| prepare.call(self) }
       @prepares.clear
 
-      file_map = {}
+      file_map = OrderedHash.new
       @paths.each do |name, path|
         path.add_files(file_map)
       end

data/lib/buildr/packaging/package.rb

@@ -214,8 +214,6 @@ module Buildr #:nodoc:
       @packages ||= []
     end
 
-  protected
-
     def package_as_zip(file_name) #:nodoc:
       ZipTask.define_task(file_name)
     end

data/lib/buildr/packaging/ziptask.rb

@@ -27,7 +27,7 @@ module Buildr #:nodoc:
   # See Buildr#zip and ArchiveTask.
   class ZipTask < ArchiveTask
 
-    # Compression leve for this Zip.
+    # Compression level for this Zip.
     attr_accessor :compression_level
 
     def initialize(*args) #:nodoc:

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr #:nodoc:
-  VERSION = '1.4.12'.freeze
-end
+  VERSION = '1.4.13'.freeze
+end

data/rakelib/rspec.rake

@@ -17,7 +17,7 @@ require 'rspec/core/rake_task'
 directory '_reports'
 
 def default_spec_opts
-  default = %w{--format documentation --out _reports/specs.txt --backtrace}
+  default = %w{--order random:123 --format documentation --out _reports/specs.txt --backtrace}
   default << '--colour' if $stdout.isatty && !(RbConfig::CONFIG['host_os'] =~ /mswin|win32|dos/i)
   default
 end
@@ -34,24 +34,13 @@ end
 desc 'Run all specs'
 RSpec::Core::RakeTask.new :spec => ['_reports', :compile] do |task|
   ENV['USE_FSC'] = 'no'
-  task.rspec_files = FileList['spec/**/*_spec.rb']
-  task.rspec_files.exclude('spec/groovy/*') if RUBY_PLATFORM[/java/]
-  task.rspec_opts = default_spec_opts
-  task.rspec_opts = %w{--format html --out _reports/specs.html --backtrace}
+  files = FileList['spec/**/*_spec.rb']
+  files = files.delete_if {|f| f =~ /^spec\/groovy\//} if RUBY_PLATFORM[/java/]
+  task.rspec_files = files
+  task.rspec_opts = %w{--order random:123 --format html --out _reports/specs.html --backtrace}
 end
 file('_reports/specs.html') { task(:spec).invoke }
 
-desc 'Run RSpec and generate Spec and coverage reports (slow)'
-RSpec::Core::RakeTask.new :coverage => ['_reports', :compile] do |task|
-  ENV['USE_FSC'] = 'no'
-  task.rspec_files = FileList['spec/**/*_spec.rb']
-  task.rspec_files.exclude('spec/groovy/*') if RUBY_PLATFORM[/java/]
-  task.rspec_opts = default_spec_opts
-  task.rcov = true
-  task.rcov_opts = %w{-o _reports/coverage --exclude / --include-file ^lib --text-summary}
-end
-file('_reports/coverage') { task(:coverage).invoke }
-
 task :load_ci_reporter do
   gem 'ci_reporter'
   ENV['CI_REPORTS'] = '_reports/ci'
@@ -64,39 +53,6 @@ end
 desc 'Run all specs with CI reporter'
 task 'ci' => %w(clobber load_ci_reporter spec)
 
-def rvm_run_in(version, command)
-  if !(RbConfig::CONFIG['host_os'] =~ /mswin|win32|dos/i)
-    cmd_prefix = "rvm #{version} exec"
-    sh "rm -f Gemfile.lock; #{cmd_prefix} bundle install; #{cmd_prefix} bundle exec #{command}"
-  else
-    sh "#{version =~ /jruby/ ? "j" : ""}ruby -S #{command}"
-  end
-end
-
-# Useful for testing with JRuby when using Ruby and vice versa.
-namespace 'spec' do
-  desc 'Run all specs specifically with Ruby 1.9'
-  task 'ruby_1_9' do
-    puts 'Running test suite using Ruby ...'
-    rvm_run_in('ruby-1.9.2-p320@buildr', 'rake spec')
-  end
-
-  desc 'Run all specs specifically with Ruby 1.8'
-  task 'ruby_1_8' do
-    puts 'Running test suite using Ruby ...'
-    rvm_run_in('ruby-1.8.7-p358@buildr', 'rake spec')
-  end
-
-  desc 'Run all specs specifically with JRuby'
-  task 'jruby' do
-    puts 'Running test suite using JRuby ...'
-    rvm_run_in('jruby-1.6.7@buildr', 'rake spec')
-  end
-
-  desc 'Run all specs across various rubies'
-  task 'all' => %w(jruby ruby_1_8 ruby_1_9)
-end
-
 task 'clobber' do
   rm_f 'failed'
   rm_rf '_reports'

data/rakelib/stage.rake

@@ -19,6 +19,8 @@ require 'digest/sha1'
 
 gpg_cmd = 'gpg2'
 
+STAGE_DATE = '2013-10-02'
+
 task 'prepare' do |task, args|
   gpg_arg = args.gpg || ENV['gpg']
 
@@ -45,12 +47,12 @@ task 'prepare' do |task, args|
     git = `git status -s`
     fail "Cannot release unless all local changes are in Git:\n#{git}" if git[/^ M/] && ENV["IGNORE_GIT"].nil?
     puts '[X] There are no local changes, everything is in source control'
-  end.call
+  end.call if false
 
   # Make sure we have a valid CHANGELOG entry for this release.
   lambda do
     puts 'Checking that CHANGELOG indicates most recent version and today''s date ... '
-    expecting = "#{spec.version} (#{Time.now.strftime('%Y-%m-%d')})"
+    expecting = "#{spec.version} (#{STAGE_DATE})"
     header = File.readlines('CHANGELOG').first.chomp
     fail "Expecting CHANGELOG to start with #{expecting}, but found #{header} instead" unless expecting == header
     puts '[x] CHANGELOG indicates most recent version and today''s date'
@@ -59,7 +61,7 @@ task 'prepare' do |task, args|
   # Make sure we have a valid CHANGELOG entry for this release.
   lambda do
     puts 'Checking that doc/index.textile indicates most recent version and today''s date ... '
-    expecting = "Highlights from Buildr #{spec.version} (#{Time.now.strftime('%Y-%m-%d')})"
+    expecting = "Highlights from Buildr #{spec.version} (#{STAGE_DATE})"
     content = IO.read('doc/index.textile')
     fail "Expecting doc/index.textile to contain #{expecting}" unless content.include?(expecting)
     puts '[x] doc/index.textile indicates most recent version and today''s date'
@@ -116,7 +118,7 @@ task 'stage' => %w(clobber prepare) do |task, args|
     current = changes[spec.version.to_s]
     fail "No changeset found for version #{spec.version}" unless current
     File.open '_staged/CHANGES', 'w' do |file|
-      file.write "#{spec.version} (#{Time.now.strftime('%Y-%m-%d')})\n"
+      file.write "#{spec.version} (#{STAGE_DATE})\n"
       file.write current
     end
     puts '[X] Listed most recent changed in _staged/CHANGES'
@@ -151,7 +153,7 @@ task 'stage' => %w(clobber prepare) do |task, args|
       %{| "#{name}":#{mirror}/#{name} | "#{md5}":#{official}/#{name}.md5 | "Sig":#{official}/#{name}.asc |}
     }
     textile = <<-TEXTILE
-h3. #{spec.name} #{spec.version} (#{Time.now.strftime('%Y-%m-%d')})
+h3. #{spec.name} #{spec.version} (#{STAGE_DATE})
 
 |_. Package |_. MD5 Checksum |_. PGP |
 #{rows.join("\n")}

data/spec/addon/jaxb_xjc_spec.rb

@@ -13,9 +13,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
-
 require File.expand_path('../spec_helpers', File.dirname(__FILE__))
+
+if Java.java.lang.System.getProperty("java.runtime.version") >= "1.6"
 Sandbox.require_optional_extension 'buildr/jaxb_xjc'
 
 XSD_CONTENT = <<XSD

data/spec/core/application_spec.rb

@@ -33,7 +33,7 @@ describe Buildr::Application do
     it 'should execute *_load methods in order' do
       order = [:load_gems, :load_artifact_ns, :load_tasks, :raw_load_buildfile]
       order.each { |method| Buildr.application.should_receive(method).ordered }
-      Buildr.application.stub!(:exit) # With this, shows the correct error instead of SystemExit.
+      Buildr.application.stub(:exit) # With this, shows the correct error instead of SystemExit.
       Buildr.application.run
     end
 
@@ -43,7 +43,7 @@ describe Buildr::Application do
         Buildr.application.should_receive(:load_imports)
         method.call
       end
-      Buildr.application.stub!(:exit) # With this, shows the correct error instead of SystemExit.
+      Buildr.application.stub(:exit) # With this, shows the correct error instead of SystemExit.
       Buildr.application.run
     end
 
@@ -51,7 +51,7 @@ describe Buildr::Application do
       Buildr.application.should_receive(:load_imports) do
         Buildr.should_receive(:projects)
       end
-      Buildr.application.stub!(:exit) # With this, shows the correct error instead of SystemExit.
+      Buildr.application.stub(:exit) # With this, shows the correct error instead of SystemExit.
       Buildr.application.run
     end
   end
@@ -174,7 +174,7 @@ describe Buildr::Application do
         spec.name = 'buildr-foo'
         spec.version = '1.2'
       end
-      $stdout.stub!(:isatty).and_return(true)
+      $stdout.stub(:isatty).and_return(true)
     end
 
     it 'should do nothing if no gems specified' do
@@ -495,19 +495,19 @@ describe Buildr, 'settings' do
     end
 
     it 'should have the same timestamp as the buildfile' do
-      Buildr.application.buildfile.timestamp.should be_close(@buildfile_time, 1)
+      Buildr.application.buildfile.timestamp.should be_within(1).of(@buildfile_time)
     end
 
     it 'should have the same timestamp as build.yaml if the latter is newer' do
       write 'build.yaml'; File.utime(@buildfile_time + 5, @buildfile_time + 5, 'build.yaml')
       Buildr.application.run
-      Buildr.application.buildfile.timestamp.should be_close(@buildfile_time + 5, 1)
+      Buildr.application.buildfile.timestamp.should be_within(1).of(@buildfile_time + 5)
     end
 
     it 'should have the same timestamp as the buildfile if build.yaml is older' do
       write 'build.yaml'; File.utime(@buildfile_time - 5, @buildfile_time - 5, 'build.yaml')
       Buildr.application.run
-      Buildr.application.buildfile.timestamp.should be_close(@buildfile_time, 1)
+      Buildr.application.buildfile.timestamp.should be_within(1).of(@buildfile_time)
     end
 
     it 'should have the same timestamp as build.rb in home dir if the latter is newer (until version 1.6)' do
@@ -530,7 +530,7 @@ describe Buildr, 'settings' do
     def buildfile_should_have_same_timestamp_as(file)
       write file; File.utime(@buildfile_time + 5, @buildfile_time + 5, file)
       Buildr.application.send :load_tasks
-      Buildr.application.buildfile.timestamp.should be_close(@buildfile_time + 5, 1)
+      Buildr.application.buildfile.timestamp.should be_within(1).of(@buildfile_time + 5)
     end
   end
 end

data/spec/core/build_spec.rb

@@ -335,16 +335,16 @@ end # of Git
 describe Svn do
   describe '#tag' do
     it 'should remove any existing tag with the same name' do
-      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
-      Svn.stub!(:copy)
+      Svn.stub(:repo_url).and_return('http://my.repo.org/foo/trunk')
+      Svn.stub(:copy)
       Svn.should_receive(:remove).with('http://my.repo.org/foo/tags/1.0.0', 'Removing old copy')
 
       Svn.tag '1.0.0'
     end
 
     it 'should do an svn copy with the release version' do
-      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
-      Svn.stub!(:remove)
+      Svn.stub(:repo_url).and_return('http://my.repo.org/foo/trunk')
+      Svn.stub(:remove)
       Svn.should_receive(:copy).with(Dir.pwd, 'http://my.repo.org/foo/tags/1.0.0', 'Release 1.0.0')
 
       Svn.tag '1.0.0'
@@ -444,47 +444,47 @@ shared_examples_for 'a release process' do
     before do
       write 'buildfile', "VERSION_NUMBER = '1.0.0-SNAPSHOT'"
       # Prevent a real call to a spawned buildr process.
-      @release.stub!(:buildr)
-      @release.stub!(:check)
-      @release.should_receive(:ruby).with('-S', 'buildr', "_#{Buildr::VERSION}_", '--buildfile', File.expand_path('buildfile.next'),
+      @release.stub(:buildr)
+      @release.stub(:check)
+      @release.should_receive(:sh).with('buildr', '--buildfile', File.expand_path('buildfile.next'),
                                           '--environment', 'development', 'clean', 'upload', 'DEBUG=no')
     end
 
     it 'should tag a release with the release version' do
-      @release.stub!(:update_version_to_next)
+      @release.stub(:update_version_to_next)
       @release.should_receive(:tag_release).with('1.0.0')
       @release.make
     end
 
     it 'should not alter the buildfile before tagging' do
-      @release.stub!(:update_version_to_next)
+      @release.stub(:update_version_to_next)
       @release.should_receive(:tag_release).with('1.0.0')
       @release.make
       file('buildfile').should contain('VERSION_NUMBER = "1.0.0"')
     end
 
     it 'should update the buildfile with the next version number' do
-      @release.stub!(:tag_release)
+      @release.stub(:tag_release)
       @release.make
       file('buildfile').should contain('VERSION_NUMBER = "1.0.1-SNAPSHOT"')
     end
 
     it 'should keep leading zeros in the next version number' do
       write 'buildfile', "VERSION_NUMBER = '1.0.001-SNAPSHOT'"
-      @release.stub!(:tag_release)
+      @release.stub(:tag_release)
       @release.make
       file('buildfile').should contain('VERSION_NUMBER = "1.0.002-SNAPSHOT"')
     end
 
     it 'should commit the updated buildfile' do
-      @release.stub!(:tag_release)
+      @release.stub(:tag_release)
       @release.make
       file('buildfile').should contain('VERSION_NUMBER = "1.0.1-SNAPSHOT"')
     end
 
     it 'should not consider "-rc" as "-SNAPSHOT"' do
       write 'buildfile', "VERSION_NUMBER = '1.0.0-rc1'"
-      @release.stub!(:tag_release)
+      @release.stub(:tag_release)
       @release.make
       file('buildfile').should contain('VERSION_NUMBER = "1.0.0-rc1"')
     end
@@ -492,7 +492,7 @@ shared_examples_for 'a release process' do
     it 'should only commit the updated buildfile if the version changed' do
       write 'buildfile', "VERSION_NUMBER = '1.0.0-rc1'"
       @release.should_not_receive(:update_version_to_next)
-      @release.stub!(:tag_release)
+      @release.stub(:tag_release)
       @release.make
     end
   end
@@ -631,7 +631,7 @@ shared_examples_for 'a release process' do
 
   describe '#resolve_tag' do
     before do
-      @release.stub!(:extract_version).and_return('1.0.0')
+      @release.stub(:extract_version).and_return('1.0.0')
     end
 
     it 'should return tag specified by tag_name' do
@@ -648,7 +648,7 @@ shared_examples_for 'a release process' do
 
   describe '#tag_release' do
     it 'should inform the user' do
-      @release.stub!(:extract_version).and_return('1.0.0')
+      @release.stub(:extract_version).and_return('1.0.0')
       lambda { @release.tag_release('1.0.0') }.should show_info('Tagging release 1.0.0')
     end
   end
@@ -682,7 +682,7 @@ shared_examples_for 'a release process' do
 
   describe '#with_release_candidate_version' do
     before do
-      Buildr.application.stub!(:buildfile).and_return(file('buildfile'))
+      Buildr.application.stub(:buildfile).and_return(file('buildfile'))
       write 'buildfile', "THIS_VERSION = '1.1.0-SNAPSHOT'"
     end
 
@@ -741,7 +741,7 @@ shared_examples_for 'a release process' do
   describe '#check' do
     before { @release.send(:this_version=, "1.0.0-SNAPSHOT") }
     it 'should fail if THIS_VERSION equals the next_version' do
-      @release.stub!(:resolve_next_version).and_return('1.0.0-SNAPSHOT')
+      @release.stub(:resolve_next_version).and_return('1.0.0-SNAPSHOT')
       lambda { @release.check }.should raise_error("The next version can't be equal to the current version 1.0.0-SNAPSHOT.\nUpdate THIS_VERSION/VERSION_NUMBER, specify Release.next_version or use NEXT_VERSION env var")
     end
   end
@@ -754,9 +754,9 @@ describe HgRelease do
   before do
     write 'buildfile', "VERSION_NUMBER = '1.0.0-SNAPSHOT'"
     @release = HgRelease.new
-    Hg.stub!(:hg)
-    Hg.stub!(:remote).and_return('https://bitbucket.org/sample-repo')
-    Hg.stub!(:current_branch).and_return('default')
+    Hg.stub(:hg)
+    Hg.stub(:remote).and_return('https://bitbucket.org/sample-repo')
+    Hg.stub(:current_branch).and_return('default')
   end
 
   describe '#applies_to?' do
@@ -806,8 +806,8 @@ describe GitRelease do
   before do
     write 'buildfile', "VERSION_NUMBER = '1.0.0-SNAPSHOT'"
     @release = GitRelease.new
-    Git.stub!(:git)
-    Git.stub!(:current_branch).and_return('master')
+    Git.stub(:git)
+    Git.stub(:current_branch).and_return('master')
   end
 
   describe '#applies_to?' do
@@ -866,13 +866,13 @@ EOF
   describe '#tag_release' do
     before do
       @release = GitRelease.new
-      @release.stub!(:extract_version).and_return('1.0.1')
-      @release.stub!(:resolve_tag).and_return('TEST_TAG')
-      Git.stub!(:git).with('tag', '-a', 'TEST_TAG', '-m', '[buildr] Cutting release TEST_TAG')
-      Git.stub!(:git).with('push', 'origin', 'tag', 'TEST_TAG')
-      Git.stub!(:commit)
-      Git.stub!(:push)
-      Git.stub!(:remote).and_return('origin')
+      @release.stub(:extract_version).and_return('1.0.1')
+      @release.stub(:resolve_tag).and_return('TEST_TAG')
+      Git.stub(:git).with('tag', '-a', 'TEST_TAG', '-m', '[buildr] Cutting release TEST_TAG')
+      Git.stub(:git).with('push', 'origin', 'tag', 'TEST_TAG')
+      Git.stub(:commit)
+      Git.stub(:push)
+      Git.stub(:remote).and_return('origin')
     end
 
     it 'should delete any existing tag with the same name' do
@@ -895,7 +895,7 @@ EOF
     end
 
     it 'should NOT push the tag if no remote is tracked' do
-      Git.stub!(:remote).and_return(nil)
+      Git.stub(:remote).and_return(nil)
       Git.should_not_receive(:git).with('push', 'origin', 'tag',  'TEST_TAG')
       @release.tag_release 'TEST_TAG'
     end
@@ -909,9 +909,9 @@ describe SvnRelease do
   before do
     write 'buildfile', "VERSION_NUMBER = '1.0.0-SNAPSHOT'"
     @release = SvnRelease.new
-    Svn.stub!(:svn)
-    Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
-    Svn.stub!(:tag)
+    Svn.stub(:svn)
+    Svn.stub(:repo_url).and_return('http://my.repo.org/foo/trunk')
+    Svn.stub(:tag)
   end
 
   describe '#applies_to?' do
@@ -927,34 +927,34 @@ describe SvnRelease do
 
   describe '#check' do
     before do
-      Svn.stub!(:uncommitted_files).and_return([])
+      Svn.stub(:uncommitted_files).and_return([])
       @release = SvnRelease.new
       @release.send(:this_version=, "1.0.0-SNAPSHOT")
     end
 
     it 'should accept to release from the trunk' do
-      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
+      Svn.stub(:repo_url).and_return('http://my.repo.org/foo/trunk')
       lambda { @release.check }.should_not raise_error
     end
 
     it 'should accept to release from a branch' do
-      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/branches/1.0')
+      Svn.stub(:repo_url).and_return('http://my.repo.org/foo/branches/1.0')
       lambda { @release.check }.should_not raise_error
     end
 
     it 'should reject releasing from a tag' do
-      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/tags/1.0.0')
+      Svn.stub(:repo_url).and_return('http://my.repo.org/foo/tags/1.0.0')
       lambda { @release.check }.should raise_error(RuntimeError, "SVN URL must contain 'trunk' or 'branches/...'")
     end
 
     it 'should reject a non standard repository layout' do
-      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/bar')
+      Svn.stub(:repo_url).and_return('http://my.repo.org/foo/bar')
       lambda { @release.check }.should raise_error(RuntimeError, "SVN URL must contain 'trunk' or 'branches/...'")
     end
 
     it 'should reject an uncommitted file' do
-      Svn.stub!(:repo_url).and_return('http://my.repo.org/foo/trunk')
-      Svn.stub!(:uncommitted_files).and_return(['foo.rb'])
+      Svn.stub(:repo_url).and_return('http://my.repo.org/foo/trunk')
+      Svn.stub(:uncommitted_files).and_return(['foo.rb'])
       lambda { @release.check }.should raise_error(RuntimeError,
         "Uncommitted files violate the First Principle Of Release!\n" +
         "foo.rb")