Author: donaldp
Date: Wed Oct 2 00:36:33 2013
New Revision: 1528287
URL: http://svn.apache.org/r1528287
Log:
Rework the release task again and update the tests
Modified:
buildr/trunk/lib/buildr/core/build.rb
buildr/trunk/spec/core/build_spec.rb
Modified: buildr/trunk/lib/buildr/core/build.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/build.rb?rev=1528287&r1=1528286&r2=1528287&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/build.rb (original)
+++ buildr/trunk/lib/buildr/core/build.rb Wed Oct 2 00:36:33 2013
@@ -331,7 +331,8 @@ module Buildr #:nodoc:
@this_version = extract_version
check
with_release_candidate_version do |release_candidate_buildfile|
- args = 'buildr', "_#{Buildr::VERSION}_", '--buildfile',
release_candidate_buildfile
+ args = []
+ args << 'buildr' << '--buildfile' << release_candidate_buildfile
args << '--environment' << Buildr.environment unless
Buildr.environment.to_s.empty?
args << 'clean' << 'upload' << 'DEBUG=no'
sh *args
Modified: buildr/trunk/spec/core/build_spec.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/spec/core/build_spec.rb?rev=1528287&r1=1528286&r2=1528287&view=diff
==============================================================================
--- buildr/trunk/spec/core/build_spec.rb (original)
+++ buildr/trunk/spec/core/build_spec.rb Wed Oct 2 00:36:33 2013
@@ -446,7 +446,7 @@ shared_examples_for 'a release process'
# 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.should_receive(:sh).with('buildr', '--buildfile',
File.expand_path('buildfile.next'),
'--environment', 'development',
'clean', 'upload', 'DEBUG=no')
end
