Author: boisvert
Date: Thu Sep 30 04:27:49 2010
New Revision: 1002946
URL: http://svn.apache.org/viewvc?rev=1002946&view=rev
Log:
BUILDR-519 Load repositories.release_to from build settings (Peter Donald)
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/packaging/artifact.rb
buildr/trunk/spec/packaging/artifact_spec.rb
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1002946&r1=1002945&r2=1002946&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Thu Sep 30 04:27:49 2010
@@ -1,4 +1,5 @@
1.4.3 (Pending)
+* Fixed: BUILDR-519 Load repositories.release_to from build settings (Peter
Donald)
* Fixed: BUILDR-520 Scaladoc 2.8 no longer support -windowtitle, use
-doc-title instead.
* Fixed: BUILDR-512 Buildr::Util.ruby invokes non existent method (Peter
Donald)
* Fixed: BUILDR-513 --trace fails with NoMethodError : undefined method
Modified: buildr/trunk/lib/buildr/packaging/artifact.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/packaging/artifact.rb?rev=1002946&r1=1002945&r2=1002946&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/packaging/artifact.rb (original)
+++ buildr/trunk/lib/buildr/packaging/artifact.rb Thu Sep 30 04:27:49 2010
@@ -706,7 +706,8 @@ module Buildr
# repositories.release_to[:password] = 'secret'
def release_to
unless @release_to
- value = Buildr.settings.user['repositories'] &&
Buildr.settings.user['repositories']['release_to']
+ value = (Buildr.settings.user['repositories'] &&
Buildr.settings.user['repositories']['release_to']) \
+ || (Buildr.settings.build['repositories'] &&
Buildr.settings.build['repositories']['release_to'])
@release_to = Hash === value ? value.inject({}) { |hash, (key, value)|
hash.update(key.to_sym=>value) } : { :url=>Array(value).first }
end
@release_to
Modified: buildr/trunk/spec/packaging/artifact_spec.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/spec/packaging/artifact_spec.rb?rev=1002946&r1=1002945&r2=1002946&view=diff
==============================================================================
--- buildr/trunk/spec/packaging/artifact_spec.rb (original)
+++ buildr/trunk/spec/packaging/artifact_spec.rb Thu Sep 30 04:27:49 2010
@@ -451,6 +451,14 @@ describe Repositories, 'release_to' do
repositories.release_to.should == { :url=>'http://john:[email protected]'
}
end
+ it 'should load URL from build settings file' do
+ write 'build.yaml', <<-YAML
+ repositories:
+ release_to: http://john:[email protected]
+ YAML
+ repositories.release_to.should == { :url=>'http://john:[email protected]'
}
+ end
+
it 'should load URL, username and password from settings file' do
write 'home/.buildr/settings.yaml', <<-YAML
repositories:
