diff --git a/lib/motion/project/config.rb b/lib/motion/project/config.rb index 33fe4933..f49de294 100644 --- a/lib/motion/project/config.rb +++ b/lib/motion/project/config.rb @@ -1,15 +1,15 @@ # Copyright (c) 2012, HipByte SPRL and contributors # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # 1. Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -205,9 +205,9 @@ module Motion; module Project def files_dependencies(deps_hash) res_path = lambda do |x| - path = /^\.?\//.match(x) ? x : File.join('.', x) + path = /^\.{0,2}\//.match(x) ? x : File.join('.', x) unless @files.flatten.include?(path) - App.fail "Can't resolve dependency `#{x}'" + App.fail "Can't resolve dependency `#{path}'" end path end @@ -233,10 +233,10 @@ module Motion; module Project if deps deps = deps.map { |x| file_dependencies(x) } else - deps = [] + deps = [] end deps << file - deps + deps end def ordered_build_files