Merge branch 'rover' into templating

3scale · Oct 12, 2017 · b9f3d68 · b9f3d68
2 parents b401321 + 335112d
commit b9f3d68
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -129,10 +129,10 @@ rover: $(ROVER)
 	@echo $(ROVER)
 
 dependencies: $(ROVER)
-	$(ROVER) install
+	$(ROVER) install --roverfile=apicast/Roverfile
 
 lua_modules/bin/rover:
-	@LUAROCKS_CONFIG=luarocks.config luarocks install --server=http://luarocks.org/dev lua-rover --tree lua_modules 1>&2
+	@LUAROCKS_CONFIG=apicast/config-5.1.lua luarocks install --server=http://luarocks.org/dev lua-rover --tree lua_modules 1>&2
 
 clean-containers: apicast-source
 	$(DOCKER_COMPOSE) down --volumes

diff --git a/Roverfile → apicast/Roverfile b/Roverfile → apicast/Roverfile
@@ -1,18 +1,21 @@
 luarocks {
 
-    rockspec 'apicast/apicast-0.1-0.rockspec',
+    rockspec 'apicast-0.1-0.rockspec',
 
     module { 'liquid' },
     module { 'argparse' },
     module { 'ansicolors' },
     module { 'penlight' },
 
+
     group 'testing' {
         module { 'busted' },
     },
 
     group 'development' {
-        rockspec 'rockspec',
+        module {'ldoc'},
+        module {'lua-resty-repl'},
+        module {'lua-resty-iputils', '0.3.0'},
     }
 }
 
diff --git a/Roverfile.lock → apicast/Roverfile.lock b/Roverfile.lock → apicast/Roverfile.lock
diff --git a/apicast/config-5.1.lua b/apicast/config-5.1.lua
@@ -0,0 +1,4 @@
+-- vim: set ft=lua:
+rocks_trees = {
+   {  name = 'rover', root = [[lua_modules]] },
+}
diff --git a/luarocks.config b/luarocks.config