8 files changed, 161 insertions, 4 deletions

diff --git a/spec/build_spec.lua b/spec/build_spec.lua
index 5f1eefd0..f042cbb9 100644
--- a/spec/build_spec.lua
+++ b/spec/build_spec.lua
@@ -35,13 +35,28 @@ describe("LuaRocks build tests #integration", function()
    end)
 
    describe("LuaRocks build - basic testing set", function()
-      it("LuaRocks build with no flags/arguments", function()
-         assert.is_false(run.luarocks_bool("build"))
-      end)
-      
       it("LuaRocks build invalid", function()
          assert.is_false(run.luarocks_bool("build invalid"))
       end)
+      
+      it("LuaRocks build with no arguments behaves as luarocks make", function()
+         local tmpdir = test_env.get_tmp_path()
+         lfs.mkdir(tmpdir)
+         local olddir = lfs.currentdir()
+         lfs.chdir(tmpdir)
+         test_env.copy(testing_paths.fixtures_dir .. "/c_module-1.0-1.rockspec", tmpdir .. "/c_module-1.0-1.rockspec")
+         test_env.copy(testing_paths.fixtures_dir .. "/c_module.c", tmpdir .. "/c_module.c")
+         
+         assert.is_true(run.luarocks_bool("build"))
+         if test_env.TEST_TARGET_OS == "windows" then
+            assert.truthy(lfs.attributes(tmpdir .. "/c_module.dll"))
+         else
+            assert.truthy(lfs.attributes(tmpdir .. "/c_module.so"))
+         end
+         
+         lfs.chdir(olddir)
+         lfs.rmdir(tmpdir)
+      end)
    end)
 
    describe("LuaRocks build - building lpeg with flags", function()
diff --git a/spec/fixtures/c_module-1.0-1.rockspec b/spec/fixtures/c_module-1.0-1.rockspec
new file mode 100644
index 00000000..2913ecf6
--- /dev/null
+++ b/spec/fixtures/c_module-1.0-1.rockspec
@@ -0,0 +1,11 @@
+package = "c_module"
+version = "1.0-1"
+source = {
+   url = "http://example.com/c_module"
+}
+build = {
+   type = "builtin",
+   modules = {
+      c_module = { "c_module.c" }
+   }
+}
diff --git a/spec/fixtures/c_module.c b/spec/fixtures/c_module.c
new file mode 100644
index 00000000..4c27dda8
--- /dev/null
+++ b/spec/fixtures/c_module.c
@@ -0,0 +1,9 @@
+#include <lua.h>
+#include <lauxlib.h>
+
+int luaopen_c_module(lua_State* L) {
+  lua_newtable(L);
+  lua_pushinteger(L, 1);
+  lua_setfield(L, -2, "c_module");
+  return 1;
+}
diff --git a/spec/fixtures/git_repo/.gitignore b/spec/fixtures/git_repo/.gitignore
new file mode 100644
index 00000000..9e639210
--- /dev/null
+++ b/spec/fixtures/git_repo/.gitignore
@@ -0,0 +1,2 @@
+/.gitignore
+/foo
diff --git a/spec/fixtures/git_repo/LICENSE b/spec/fixtures/git_repo/LICENSE
new file mode 100644
index 00000000..e8c415d1
--- /dev/null
+++ b/spec/fixtures/git_repo/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2018 Test
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/spec/fixtures/git_repo/README.md b/spec/fixtures/git_repo/README.md
new file mode 100644
index 00000000..220327e5
--- /dev/null
+++ b/spec/fixtures/git_repo/README.md
@@ -0,0 +1,3 @@
+
+
+Test repo
diff --git a/spec/init_spec.lua b/spec/init_spec.lua
new file mode 100644
index 00000000..2d28bfe7
--- /dev/null
+++ b/spec/init_spec.lua
@@ -0,0 +1,83 @@
+local test_env = require("spec.util.test_env")
+local run = test_env.run
+local testing_paths = test_env.testing_paths
+local get_tmp_path = test_env.get_tmp_path
+local copy_dir = test_env.copy_dir
+local is_win = test_env.TEST_TARGET_OS == "windows"
+
+test_env.unload_luarocks()
+
+describe("Luarocks init test #integration", function()
+   local tmpdir
+   
+   after_each(function()
+      if tmpdir then
+         lfs.rmdir(tmpdir)
+         tmpdir = nil
+      end
+   end)
+   
+   it("LuaRocks init with no arguments", function()
+      tmpdir = get_tmp_path()
+      lfs.mkdir(tmpdir)
+      local myproject = tmpdir .. "/myproject"
+      lfs.mkdir(myproject)
+      local olddir = lfs.currentdir()
+      lfs.chdir(myproject)
+      
+      assert(run.luarocks("init"))
+      if is_win then
+         assert.truthy(lfs.attributes(myproject .. "/lua.bat"))
+         assert.truthy(lfs.attributes(myproject .. "/luarocks.bat"))
+      else
+         assert.truthy(lfs.attributes(myproject .. "/lua"))
+         assert.truthy(lfs.attributes(myproject .. "/luarocks"))
+      end
+      assert.truthy(lfs.attributes(myproject .. "/lua_modules"))
+      assert.truthy(lfs.attributes(myproject .. "/.luarocks"))
+      assert.truthy(lfs.attributes(myproject .. "/.luarocks/config-" .. test_env.lua_version .. ".lua"))
+      assert.truthy(lfs.attributes(myproject .. "/.gitignore"))
+      assert.truthy(lfs.attributes(myproject .. "/myproject-dev-1.rockspec"))
+      
+      lfs.chdir(olddir)
+   end)
+   
+   it("LuaRocks init with given arguments", function()
+      tmpdir = get_tmp_path()
+      lfs.mkdir(tmpdir)
+      local myproject = tmpdir .. "/myproject"
+      lfs.mkdir(myproject)
+      local olddir = lfs.currentdir()
+      lfs.chdir(myproject)
+      
+      assert(run.luarocks("init customname 1.0"))
+      assert.truthy(lfs.attributes(myproject .. "/customname-1.0-1.rockspec"))
+      
+      lfs.chdir(olddir)
+   end)
+   
+   it("LuaRocks init in a git repo", function()
+      tmpdir = get_tmp_path()
+      lfs.mkdir(tmpdir)
+      local olddir = lfs.currentdir()
+      lfs.chdir(tmpdir)
+      local myproject = tmpdir .. "/myproject"
+      copy_dir(testing_paths.fixtures_dir .. "/git_repo", myproject)
+      lfs.chdir(myproject)
+      
+      assert(run.luarocks("init"))
+      local fd = assert(io.open(myproject .. "/myproject-dev-1.rockspec", "r"))
+      local content = assert(fd:read("*a"))
+      assert.truthy(content:find("summary = \"Test repo\""))
+      assert.truthy(content:find("detailed = .+Test repo.+"))
+      assert.truthy(content:find("license = \"MIT\""))
+      
+      fd = assert(io.open(myproject .. "/.gitignore", "r"))
+      content = assert(fd:read("*a"))
+      assert.truthy(content:find("/foo"))
+      assert.truthy(content:find("/lua"))
+      assert.truthy(content:find("/lua_modules"))
+      
+      lfs.chdir(olddir)
+   end)
+end)
diff --git a/spec/path_spec.lua b/spec/path_spec.lua
index 0b115d5c..3a7dcea2 100644
--- a/spec/path_spec.lua
+++ b/spec/path_spec.lua
@@ -57,4 +57,19 @@ describe("LuaRocks path tests #integration", function()
    it("LuaRocks path with tree", function()
       assert.is_true(run.luarocks_bool("path --tree=lua_modules"))
    end)
+   
+   it("LuaRocks path with project-tree", function()
+      local path1 = "/share/lua/5%." .. test_env.lua_version:sub(3, 3) .. "/%?%.lua"
+      local path2 = "/share/lua/5%." .. test_env.lua_version:sub(3, 3) .. "/%?/init%.lua"
+      
+      local path = run.luarocks("path --project-tree=foo")
+      assert.truthy(path:find("foo" .. path1))
+      assert.truthy(path:find("foo" .. path2))
+      
+      path = run.luarocks("path --project-tree=foo --tree=bar")
+      assert.falsy(path:find("foo" .. path1))
+      assert.falsy(path:find("foo" .. path2))
+      assert.truthy(path:find("bar" .. path1))
+      assert.truthy(path:find("bar" .. path2))
+   end)
 end)