9 files changed, 53 insertions, 16 deletions

diff --git a/.codecov.yml b/.codecov.yml
new file mode 100644
index 00000000..f3b71395
--- /dev/null
+++ b/.codecov.yml
@@ -0,0 +1,6 @@
+coverage:
+  notify:
+    gitter:
+      default:
+        url: "https://webhooks.gitter.im/e/c8ee7e8a380f711aea39"
+        threshold: 1%
diff --git a/.travis.yml b/.travis.yml
index e651cb98..852f9b46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,3 +63,9 @@ notifications:
   email:
     on_success: change
     on_failure: change
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/3320fc3f28abbb06e1d8
+    on_success: change
+    on_failure: always
+    on_start: never
diff --git a/README.md b/README.md
index 3df3c853..cfe10e05 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-<p align="center"><a href="http://luarocks.org"><img border="0" src="http://keplerproject.github.io/luarocks/luarocks.png" alt="LuaRocks" width="500px"></a></p>
+<p align="center"><a href="http://luarocks.org"><img border="0" src="http://luarocks.github.io/luarocks/luarocks.png" alt="LuaRocks" width="500px"></a></p>
 
 A package manager for Lua modules.
 
-[![Build Status](https://travis-ci.org/keplerproject/luarocks.svg?branch=master)](https://travis-ci.org/keplerproject/luarocks)
+[![Build Status](https://travis-ci.org/luarocks/luarocks.svg?branch=master)](https://travis-ci.org/luarocks/luarocks)
 [![Build Status](https://ci.appveyor.com/api/projects/status/4x4630tcf64da48i/branch/master?svg=true)](https://ci.appveyor.com/project/hishamhm/luarocks/branch/master)
-[![Coverage Status](https://codecov.io/gh/keplerproject/luarocks/coverage.svg?branch=master)](https://codecov.io/gh/keplerproject/luarocks/branch/master)
-[![Join the chat at https://gitter.im/keplerproject/luarocks](https://badges.gitter.im/keplerproject/luarocks.svg)](https://gitter.im/keplerproject/luarocks?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Coverage Status](https://codecov.io/gh/luarocks/luarocks/coverage.svg?branch=master)](https://codecov.io/gh/luarocks/luarocks/branch/master)
+[![Join the chat at https://gitter.im/luarocks/luarocks](https://badges.gitter.im/luarocks/luarocks.svg)](https://gitter.im/luarocks/luarocks)
 
 Main website: [luarocks.org](http://www.luarocks.org)
 
diff --git a/install.bat b/install.bat
index ddbc39c2..118abfc7 100644
--- a/install.bat
+++ b/install.bat
@@ -459,7 +459,7 @@ local function get_windows_sdk_directory()
         assert(type(vars.LUA_RUNTIME) == "string", "requires vars.LUA_RUNTIME to be set before calling this function.")

         -- Only v7.1 and v6.1 shipped with compilers

         -- Other versions requires a separate  installation of Visual Studio.

-        -- see https://github.com/keplerproject/luarocks/pull/443#issuecomment-152792516

+        -- see https://github.com/luarocks/luarocks/pull/443#issuecomment-152792516

         local wsdks = {

                 ["MSVCR100"] = "v7.1", -- shipped with Visual Studio 2010 compilers.

                 ["MSVCR100D"] = "v7.1", -- shipped with Visual Studio 2010 compilers.

diff --git a/spec/make_spec.lua b/spec/make_spec.lua
index 89036d26..ab2d49a3 100644
--- a/spec/make_spec.lua
+++ b/spec/make_spec.lua
@@ -9,6 +9,7 @@ test_env.unload_luarocks()
 local extra_rocks = {
    "/luasocket-3.0rc1-2.src.rock",
    "/luasocket-3.0rc1-2.rockspec",
+   "/lpeg-0.12-1.src.rock",
    "/lxsh-0.8.6-2.src.rock",
    "/lxsh-0.8.6-2.rockspec"
 }
@@ -100,11 +101,11 @@ describe("LuaRocks make tests #blackbox #b_make", function()
    end)
 
    describe("LuaRocks make upgrading rockspecs with mixed deploy types", function()
-      setup(function()
+      before_each(function()
          test_env.copy_dir(testing_paths.testing_dir .. "/testfiles/mixed_deploy_type", "mdt")
       end)
 
-      teardown(function()
+      after_each(function()
          test_env.remove_dir("mdt")
          os.remove("mdt."..test_env.lib_extension)
       end)
diff --git a/spec/upload_spec.lua b/spec/upload_spec.lua
index ff39cb96..6ec8e302 100644
--- a/spec/upload_spec.lua
+++ b/spec/upload_spec.lua
@@ -5,8 +5,6 @@ local testing_paths = test_env.testing_paths
 test_env.unload_luarocks()
 
 local extra_rocks = {
-   "/lua-cjson-2.1.0-1.src.rock",
-   
    -- rocks needed for mock-server
    "/copas-2.0.1-1.src.rock",
    "/coxpcall-1.16.0-1.src.rock",
@@ -42,18 +40,17 @@ describe("LuaRocks upload tests #blackbox #b_upload", function()
    end)
    
    it("LuaRocks upload api key invalid and skip-pack", function()
-      assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --skip-pack luacov-0.11.0-1.rockspec"))
+      assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --skip-pack " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec"))
    end)
    
    it("LuaRocks upload force #unix", function()
-      assert.is_true(run.luarocks_bool("install lua-cjson"))
-      assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --force luacov-0.11.0-1.rockspec"))
-      assert.is_true(run.luarocks_bool("install lua-cjson"))
+      assert.is_true(test_env.need_rock("dkjson"))
+      assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --force " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec"))
    end)
 
    describe("LuaRocks upload tests with Xavante server #mock", function()
       before_each(function()
-         assert.is.truthy(test_env.need_rock("restserver-xavante"))
+         assert.is_true(test_env.need_rock("restserver-xavante"))
          local final_command = test_env.execute_helper(testing_paths.lua .. " " .. testing_paths.testing_dir .. "/mock-server.lua &", true, test_env.env_variables)
          os.execute(final_command)
       end)
diff --git a/src/luarocks/cmd/make.lua b/src/luarocks/cmd/make.lua
index d3d02814..bfdddb37 100644
--- a/src/luarocks/cmd/make.lua
+++ b/src/luarocks/cmd/make.lua
@@ -31,6 +31,9 @@ This command is useful as a tool for debugging rockspecs.
 To install rocks, you'll normally want to use the "install" and
 "build" commands. See the help on those for details.
 
+NB: Use `luarocks install` with the `--only-deps` flag if you want to install
+only dependencies of the rockspec (see `luarocks help install`).
+
 --pack-binary-rock  Do not install rock. Instead, produce a .rock file
                     with the contents of compilation in the current
                     directory.
diff --git a/src/luarocks/repos.lua b/src/luarocks/repos.lua
index 14c26313..1abb5628 100644
--- a/src/luarocks/repos.lua
+++ b/src/luarocks/repos.lua
@@ -446,4 +446,26 @@ function repos.which(name, version, item_type, item_name, repo)
    return deploy_path
 end
 
+--- Find full path to a file providing a module or a command
+-- in a package.
+-- @param name string: name of package.
+-- @param version string: exact package version in string format.
+-- @param item_type string: "module" or "command".
+-- @param item_name string: module or command name.
+-- @param root string or nil: A local root dir for a rocks tree. If not given, the default is used.
+-- @return string: absolute path to the file providing given module
+-- or command.
+function repos.which(name, version, item_type, item_name, repo)
+   local deploy_type, file_path = manif.get_providing_file(name, version, item_type, item_name, repo)
+   local non_versioned, versioned = get_deploy_paths(name, version, deploy_type, file_path, repo)
+   local cur_name, cur_version = manif.get_current_provider(item_type, item_name)
+   local deploy_path = (name == cur_name and version == cur_version) and non_versioned or versioned
+
+   if deploy_type == "bin" and cfg.wrapper_suffix and cfg.wrapper_suffix ~= "" then
+      deploy_path = find_suffixed(deploy_path, cfg.wrapper_suffix) or deploy_path
+   end
+
+   return deploy_path
+end
+
 return repos
diff --git a/test/test_environment.lua b/test/test_environment.lua
index f60835a0..6b160140 100644
--- a/test/test_environment.lua
+++ b/test/test_environment.lua
@@ -285,7 +285,7 @@ end
 -- @param save_path string: path to directory, where to download rocks/rockspecs
 -- @return make_manifest boolean: true if new rocks downloaded
 local function download_rocks(urls, save_path)
-   local luarocks_repo = "https://www.luarocks.org"   
+   local luarocks_repo = "https://luarocks.org"
    local make_manifest = false
 
    for _, url in ipairs(urls) do
@@ -533,7 +533,9 @@ function test_env.setup_specs(extra_rocks)
    end
 end
 
---- Test if required rock is installed if not, install it
+--- Test if required rock is installed and if not, install it.
+-- Return `true` if the rock is already installed or has been installed successfully,
+-- `false` if installation failed.
 function test_env.need_rock(rock)
    print("Check if " .. rock .. " is installed")
    if test_env.run.luarocks_noprint_nocov(test_env.quiet("show " .. rock)) then