Merge branch 'master' into luarocks-3

6 files changed, 86 insertions, 51 deletions

diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index f3b054d2..7808bce9 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -429,13 +429,13 @@ function build.command(flags, name, version)
       ok, err = do_build(name, version, deps.get_deps_mode(flags), flags["only-deps"])
       if not ok then return nil, err end
       name, version = ok, err
-      if flags["only-deps"] then
-         return name, version
-      end
-      if (not flags["keep"]) and not cfg.keep_other_versions then
+
+      if (not flags["only-deps"]) and (not flags["keep"]) and not cfg.keep_other_versions then
          local ok, err = remove.remove_other_versions(name, version, flags["force"], flags["force-fast"])
          if not ok then util.printerr(err) end
       end
+
+      writer.check_dependencies(nil, deps.get_deps_mode(flags))
       return name, version
    end
 end
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index acbf1dd6..d9419ec3 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -230,6 +230,28 @@ local function rock_status(name, deps_mode, rocks_provided)
    return installed and installed.." "..installation_type or "not installed"
 end
 
+--- Check depenendencies of a package and report any missing ones.
+-- @param name string: package name.
+-- @param version string: package version.
+-- @param dependencies table: array of dependencies.
+-- @param deps_mode string: Which trees to check dependencies for:
+-- "one" for the current default tree, "all" for all trees,
+-- "order" for all trees with priority >= the current default, "none" for no trees.
+function deps.report_missing_dependencies(name, version, dependencies, deps_mode)
+   local first_missing_dep = true
+
+   for _, dep in ipairs(dependencies) do
+      if not match_dep(dep, nil, deps_mode) then
+         if first_missing_dep then
+            util.printout(("Missing dependencies for %s %s:"):format(name, version))
+            first_missing_dep = false
+         end
+
+         util.printout(("   %s (%s)"):format(deps.show_dep(dep), rock_status(dep.name, deps_mode)))
+      end
+   end
+end
+
 --- Check dependencies of a rock and attempt to install any missing ones.
 -- Packages are installed using the LuaRocks "install" command.
 -- Aborts the program if a dependency could not be fulfilled.
@@ -270,20 +292,9 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
       end
    end
 
-   local first_missing_dep = true
+   deps.report_missing_dependencies(rockspec.name, rockspec.version, rockspec.dependencies, deps_mode)
 
-   for _, dep in ipairs(rockspec.dependencies) do
-      if not match_dep(dep, nil, deps_mode, rockspec.rocks_provided) then
-         if first_missing_dep then
-            util.printout(("Missing dependencies for %s %s:"):format(rockspec.name, rockspec.version))
-            first_missing_dep = false
-         end
-
-         util.printout(("   %s (%s)"):format(deps.show_dep(dep), rock_status(dep.name, deps_mode, rockspec.rocks_provided)))
-      end
-   end
-
-   first_missing_dep = true
+   local first_missing_dep = true
 
    for _, dep in ipairs(rockspec.dependencies) do
       if not match_dep(dep, nil, deps_mode, rockspec.rocks_provided) then
@@ -505,17 +516,15 @@ function deps.check_external_deps(rockspec, mode)
    return true
 end
 
---- Recursively scan dependencies, to build a transitive closure of all
--- dependent packages.
--- @param results table: The results table being built.
--- @param missing table: The table of missing dependencies being recursively built.
+--- Recursively add satisfied dependencies of a package to a table,
+-- to build a transitive closure of all dependent packages.
+-- Additionally ensures that `dependencies` table of the manifest is up-to-date.
+-- @param results table: The results table being built, maps package names to versions.
 -- @param manifest table: The manifest table containing dependencies.
 -- @param name string: Package name.
 -- @param version string: Package version.
--- @return (table, table): The results and a table of missing dependencies.
-function deps.scan_deps(results, missing, manifest, name, version, deps_mode)
+function deps.scan_deps(results, manifest, name, version, deps_mode)
    assert(type(results) == "table")
-   assert(type(missing) == "table")
    assert(type(manifest) == "table")
    assert(type(name) == "string")
    assert(type(version) == "string")
@@ -523,7 +532,7 @@ function deps.scan_deps(results, missing, manifest, name, version, deps_mode)
    local fetch = require("luarocks.fetch")
 
    if results[name] then
-      return results, missing
+      return
    end
    if not manifest.dependencies then manifest.dependencies = {} end
    local dependencies = manifest.dependencies
@@ -533,9 +542,9 @@ function deps.scan_deps(results, missing, manifest, name, version, deps_mode)
    local rockspec, err
    if not deplist then
       rockspec, err = fetch.load_local_rockspec(path.rockspec_file(name, version), false)
-      if err then
-         missing[name.." "..version] = err
-         return results, missing
+      if not rockspec then
+         util.printerr("Couldn't load rockspec for "..name.." "..version..": "..err)
+         return
       end
       dependencies_name[version] = rockspec.dependencies
    else
@@ -544,18 +553,11 @@ function deps.scan_deps(results, missing, manifest, name, version, deps_mode)
          rocks_provided = setmetatable({}, { __index = cfg.rocks_provided_3_0 })
       }
    end
-   local matched, failures = deps.match_deps(rockspec, nil, deps_mode)
-   results[name] = results
+   local matched = deps.match_deps(rockspec, nil, deps_mode)
+   results[name] = version
    for _, match in pairs(matched) do
-      results, missing = deps.scan_deps(results, missing, manifest, match.name, match.version, deps_mode)
+      deps.scan_deps(results, manifest, match.name, match.version, deps_mode)
    end
-   if next(failures) then
-      for _, failure in pairs(failures) do
-         missing[deps.show_dep(failure)] = "failed"
-      end
-   end
-   results[name] = version
-   return results, missing
 end
 
 local valid_deps_modes = {
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index c9b085f5..3a33fcae 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -164,10 +164,13 @@ function install.command(flags, name, version)
       end
       if not ok then return nil, err end
       name, version = ok, err
+
       if (not flags["only-deps"]) and (not flags["keep"]) and not cfg.keep_other_versions then
          local ok, err = remove.remove_other_versions(name, version, flags["force"], flags["force-fast"])
          if not ok then util.printerr(err) end
       end
+
+      writer.check_dependencies(nil, deps.get_deps_mode(flags))
       return name, version
    else
       local search = require("luarocks.search")
diff --git a/src/luarocks/make.lua b/src/luarocks/make.lua
index eb38bff0..d3d02814 100644
--- a/src/luarocks/make.lua
+++ b/src/luarocks/make.lua
@@ -13,6 +13,7 @@ local fetch = require("luarocks.fetch")
 local pack = require("luarocks.pack")
 local remove = require("luarocks.remove")
 local deps = require("luarocks.deps")
+local writer = require("luarocks.manif.writer")
 
 make.help_summary = "Compile package in current directory using a rockspec."
 make.help_arguments = "[--pack-binary-rock] [<rockspec>]"
@@ -75,10 +76,13 @@ function make.command(flags, rockspec)
       ok, err = build.build_rockspec(rockspec, false, true, deps.get_deps_mode(flags))
       if not ok then return nil, err end
       local name, version = ok, err
+
       if (not flags["keep"]) and not cfg.keep_other_versions then
          local ok, err = remove.remove_other_versions(name, version, flags["force"], flags["force-fast"])
          if not ok then util.printerr(err) end
       end
+
+      writer.check_dependencies(nil, deps.get_deps_mode(flags))
       return name, version
    end
 end
diff --git a/src/luarocks/manif/writer.lua b/src/luarocks/manif/writer.lua
index daa6b005..cf35f38d 100644
--- a/src/luarocks/manif/writer.lua
+++ b/src/luarocks/manif/writer.lua
@@ -82,21 +82,11 @@ local function update_dependencies(manifest, deps_mode)
    
    for pkg, versions in pairs(manifest.repository) do
       for version, repositories in pairs(versions) do
-         local current = pkg.." "..version
          for _, repo in ipairs(repositories) do
             if repo.arch == "installed" then
-               local missing
-               repo.dependencies, missing = deps.scan_deps({}, {}, manifest, pkg, version, deps_mode)
+               repo.dependencies = {}
+               deps.scan_deps(repo.dependencies, {}, manifest, pkg, version, deps_mode)
                repo.dependencies[pkg] = nil
-               if missing then
-                  for miss, err in pairs(missing) do
-                     if miss == current then
-                        util.printerr("Tree inconsistency detected: "..current.." has no rockspec. "..err)
-                     elseif deps_mode ~= "none" then
-                        util.printerr("Missing dependency for "..pkg.." "..version..": "..miss)
-                     end
-                  end
-               end
             end
          end
       end
@@ -414,4 +404,33 @@ function writer.remove_from_manifest(name, version, repo, deps_mode)
    return save_table(rocks_dir, "manifest", manifest)
 end
 
+--- Report missing dependencies for all rocks installed in a repository.
+-- @param repo string or nil: Pathname of a local repository. If not given,
+-- the default local repository is used.
+-- @param deps_mode string: Dependency mode: "one" for the current default tree,
+-- "all" for all trees, "order" for all trees with priority >= the current default,
+-- "none" for using the default dependency mode from the configuration.
+function writer.check_dependencies(repo, deps_mode)
+   local rocks_dir = path.rocks_dir(repo or cfg.root_dir)
+   assert(type(deps_mode) == "string")
+   if deps_mode == "none" then deps_mode = cfg.deps_mode end
+
+   local manifest = manif.load_local_manifest(rocks_dir)
+   if not manifest then
+      return
+   end
+
+   for name, versions in util.sortedpairs(manifest.repository) do
+      for version, version_entries in util.sortedpairs(versions, deps.compare_versions) do
+         for _, entry in ipairs(version_entries) do
+            if entry.arch == "installed" then
+               if manifest.dependencies[name] and manifest.dependencies[name][version] then
+                  deps.report_missing_dependencies(name, version, manifest.dependencies[name][version], deps_mode)
+               end
+            end
+         end
+      end
+   end
+end
+
 return writer
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index e7f37604..08b5bd5e 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -11,6 +11,7 @@ local path = require("luarocks.path")
 local util = require("luarocks.util")
 local cfg = require("luarocks.core.cfg")
 local fs = require("luarocks.fs")
+local writer = require("luarocks.manif.writer")
 
 remove.help_summary = "Uninstall a rock."
 remove.help_arguments = "[--force|--force-fast] <name> [<version>]"
@@ -159,7 +160,13 @@ function remove.command(flags, name, version)
       return nil, "Could not find rock '"..name..(version and " "..version or "").."' in "..path.rocks_tree_to_string(cfg.root_dir)
    end
 
-   return remove.remove_search_results(results, name, deps_mode, flags["force"], flags["force-fast"])
+   local ok, err = remove.remove_search_results(results, name, deps_mode, flags["force"], flags["force-fast"])
+   if not ok then
+      return nil, err
+   end
+
+   writer.check_dependencies(nil, deps.get_deps_mode(flags))
+   return true
 end
 
 return remove