[cli] resolve template includes to current directory too

CHANGELOG.md

@@ -26,7 +26,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Deprecated `Configuration.extract_usage` in favor of `Service.get_usage` [PR #531](https://github.com/3scale/apicast/pull/531)
 - Extract Test::APIcast to own package on CPAN [PR #528](https://github.com/3scale/apicast/pull/528)
 - Load policies by the APIcast loader instead of changing load path [PR #532](https://github.com/3scale/apicast/pull/532), [PR #536](https://github.com/3scale/apicast/pull/536)
-- Load policies by the APIcast loader instead of changing load path [PR #532](https://github.com/3scale/apicast/pull/532)
 - Add `src` directory to the Lua load path when using CLI [PR #533](https://github.com/3scale/apicast/pull/533)
 
 ## [3.2.0-alpha2] - 2017-11-30

gateway/src/apicast/cli/template.lua

@@ -4,6 +4,7 @@ local setmetatable = setmetatable
 local insert = table.insert
 local assert = assert
 local pairs = pairs
+local ipairs = ipairs
 local sub = string.sub
 local len = string.len
 local pack = table.pack
@@ -71,11 +72,17 @@ function _M:interpret(str)
 
     filter_set:add_filter('filesystem', function(pattern)
         local files = {}
+        local included = {}
 
-        for filename, dir in pl.dir.dirtree(self.root) do
-            local file = pl.path.relpath(filename, self.root)
-            if pl.dir.fnmatch(file, pattern) and not dir then
-                insert(files, file)
+        for _, root in ipairs({ self.root, pl.path.currentdir() }) do
+            for filename, dir in pl.dir.dirtree(root) do
+                local file = pl.path.relpath(filename, root)
+
+                if pl.dir.fnmatch(file, pattern) and not dir and not included[filename] and not included[file] then
+                    insert(files, filename)
+                    included[filename] = true
+                    included[file] = true
+                end
             end
         end