Author: assaf
Date: Wed Feb 13 15:56:06 2008
New Revision: 627615
URL: http://svn.apache.org/viewvc?rev=627615&view=rev
Log:
BUILDR-41
Modified:
incubator/buildr/trunk/lib/core/common.rb
incubator/buildr/trunk/spec/common_spec.rb
Modified: incubator/buildr/trunk/lib/core/common.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/core/common.rb?rev=627615&r1=627614&r2=627615&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/core/common.rb (original)
+++ incubator/buildr/trunk/lib/core/common.rb Wed Feb 13 15:56:06 2008
@@ -244,7 +244,7 @@
# For example:
# filter.from('src').into('target').using('build'=>Time.now)
def from(*sources)
- @sources |= sources.flatten.map { |dir| file(dir.to_s) }
+ @sources |= sources.flatten.map { |dir| file(File.expand_path(dir.to_s))
}
self
end
Modified: incubator/buildr/trunk/spec/common_spec.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/common_spec.rb?rev=627615&r1=627614&r2=627615&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/common_spec.rb (original)
+++ incubator/buildr/trunk/spec/common_spec.rb Wed Feb 13 15:56:06 2008
@@ -191,7 +191,7 @@
it 'should use the source directories' do
dirs = ['first', 'second']
- filter('first', 'second').sources.should include(*dirs.map { |dir|
file(dir) })
+ filter('first', 'second').sources.should include(*dirs.map { |dir|
file(File.expand_path(dir)) })
end
it 'should accept a file task' do
@@ -219,7 +219,7 @@
it 'should respond to :from and add source directories' do
dirs = ['first', 'second']
@filter.from(*dirs)
- @filter.sources.should include(*dirs.map { |dir| file(dir) })
+ @filter.sources.should include(*dirs.map { |dir|
file(File.expand_path(dir)) })
end
it 'should return source directories as file task' do
@@ -227,7 +227,7 @@
end
it 'should return source directories as expanded path' do
- @filter.from('src').sources.each { |source| source.to_s.should eql('src') }
+ @filter.from('src').sources.each { |source| source.to_s.should
eql(File.expand_path('src')) }
end
it 'should respond to :into and return self' do
