fix: make write_rockspec command write valid rockspec given the rockspec_format argument.

4 files changed, 54 insertions, 26 deletions

diff --git a/spec/init_spec.lua b/spec/init_spec.lua
index ae211706..c193c32d 100644
--- a/spec/init_spec.lua
+++ b/spec/init_spec.lua
@@ -18,7 +18,7 @@ describe("luarocks #init #integration", function()
          lfs.mkdir(myproject)
          lfs.chdir(myproject)
 
-         assert(run.luarocks("init"))
+         assert(run.luarocks_bool("init"))
          if is_win then
             assert.truthy(lfs.attributes(myproject .. "/lua.bat"))
             assert.truthy(lfs.attributes(myproject .. "/luarocks.bat"))
@@ -41,7 +41,7 @@ describe("luarocks #init #integration", function()
          lfs.mkdir(myproject)
          lfs.chdir(myproject)
 
-         assert(run.luarocks("init --no-gitignore"))
+         assert(run.luarocks_bool("init --no-gitignore"))
          if is_win then
             assert.truthy(lfs.attributes(myproject .. "/lua.bat"))
             assert.truthy(lfs.attributes(myproject .. "/luarocks.bat"))
@@ -64,7 +64,7 @@ describe("luarocks #init #integration", function()
          lfs.mkdir(myproject)
          lfs.chdir(myproject)
 
-         assert(run.luarocks("init --no-wrapper-scripts"))
+         assert(run.luarocks_bool("init --no-wrapper-scripts"))
          assert.falsy(lfs.attributes(myproject .. "/lua.bat"))
          assert.falsy(lfs.attributes(myproject .. "/luarocks.bat"))
          assert.falsy(lfs.attributes(myproject .. "/lua"))
@@ -84,7 +84,7 @@ describe("luarocks #init #integration", function()
          lfs.mkdir(myproject)
          lfs.chdir(myproject)
 
-         assert(run.luarocks("init --wrapper-dir=./bin"))
+         assert(run.luarocks_bool("init --wrapper-dir=./bin"))
          if is_win then
             assert.truthy(lfs.attributes(myproject .. "/bin/lua.bat"))
             assert.truthy(lfs.attributes(myproject .. "/bin/luarocks.bat"))
@@ -107,7 +107,7 @@ describe("luarocks #init #integration", function()
          lfs.mkdir(myproject)
          lfs.chdir(myproject)
 
-         assert(run.luarocks("init"))
+         assert(run.luarocks_bool("init"))
          if is_win then
             assert.truthy(lfs.attributes(myproject .. "/lua.bat"))
             assert.truthy(lfs.attributes(myproject .. "/luarocks.bat"))
@@ -146,7 +146,7 @@ describe("luarocks #init #integration", function()
          lfs.mkdir(myproject)
          lfs.chdir(myproject)
 
-         assert(run.luarocks("init customname 1.0"))
+         assert(run.luarocks_bool("init customname 1.0"))
          assert.truthy(lfs.attributes(myproject .. "/customname-1.0-1.rockspec"))
          assert.truthy(run.luarocks_bool("lint " .. myproject ..  "/customname-1.0-1.rockspec"))
       end, finally)
@@ -158,7 +158,7 @@ describe("luarocks #init #integration", function()
          lfs.mkdir(myproject)
          lfs.chdir(myproject)
 
-         assert(run.luarocks("init --lua-versions=5.1,5.2,5.3,5.4,5.5"))
+         assert(run.luarocks_bool("init --lua-versions=5.1,5.2,5.3,5.4,5.5"))
          local rockspec_name = myproject .. "/myproject-dev-1.rockspec"
          assert.truthy(lfs.attributes(rockspec_name))
          local fd = assert(io.open(rockspec_name, "rb"))
@@ -175,7 +175,7 @@ describe("luarocks #init #integration", function()
          copy_dir(testing_paths.fixtures_dir .. "/git_repo", myproject)
          lfs.chdir(myproject)
 
-         assert(run.luarocks("init"))
+         assert(run.luarocks_bool("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\""))
@@ -197,7 +197,7 @@ describe("luarocks #init #integration", function()
          lfs.mkdir(myproject)
          lfs.chdir(myproject)
 
-         assert(run.luarocks("init"))
+         assert(run.luarocks_bool("init"))
          assert.truthy(lfs.attributes(myproject .. "/.luarocks/config-" .. test_env.lua_version .. ".lua"))
          local rockspec_filename = myproject .. "/myproject-dev-1.rockspec"
          assert.truthy(lfs.attributes(rockspec_filename))
@@ -218,14 +218,14 @@ describe("luarocks #init #integration", function()
          ]], finally)
          write_file(tmpdir .. "/my_dependency.lua", "return {}", finally)
 
-         assert.truthy(run.luarocks("build my_dependency-1.0-1.rockspec"))
+         assert.truthy(run.luarocks_bool("build my_dependency-1.0-1.rockspec"))
          assert.truthy(lfs.attributes(myproject .. "/lua_modules/share/lua/" .. test_env.lua_version .."/my_dependency.lua"))
 
          os.remove(rockspec_filename)
          os.remove("my_dependency-1.0-1.rockspec")
 
          -- re-run init
-         assert(run.luarocks("init"))
+         assert(run.luarocks_bool("init"))
 
          -- file is recreated
          assert.truthy(lfs.attributes(rockspec_filename))
diff --git a/spec/write_rockspec_spec.lua b/spec/write_rockspec_spec.lua
index 2ade5986..7a8554bb 100644
--- a/spec/write_rockspec_spec.lua
+++ b/spec/write_rockspec_spec.lua
@@ -55,13 +55,21 @@ describe("luarocks ##write_rockspec tests #integration", function()
          -- TODO check contents
       end)
 
-      it("runs with format flag", function()
-         finally(function() os.remove("testrock-dev-1.rockspec") end)
-         assert.is_true(run.luarocks_bool("write_rockspec git://localhost/testrock --rockspec-format=1.1 --lua-versions=5.1,5.2"))
-         assert.is.truthy(lfs.attributes("testrock-dev-1.rockspec"))
-         assert.truthy(run.luarocks_bool("lint " .. "testrock-dev-1.rockspec"))
-         -- TODO check contents
-      end)
+      local formats = {
+         "1.0",
+         "1.1",
+         "3.0",
+         "3.1",
+      }
+      for i, format in ipairs(formats) do
+         it("runs with format flag " .. format, function()
+            finally(function() os.remove("testrock-dev-1.rockspec") end)
+            assert.is_true(run.luarocks_bool("write_rockspec git://localhost/testrock --rockspec-format=" .. format .. " --lua-versions=5.1,5.2"))
+            assert.is.truthy(lfs.attributes("testrock-dev-1.rockspec"))
+            assert.truthy(run.luarocks_bool("lint " .. "testrock-dev-1.rockspec"))
+            -- TODO check contents
+         end)
+      end
 
       it("runs with full flags", function()
          finally(function() os.remove("testrock-dev-1.rockspec") end)
diff --git a/src/luarocks/cmd/write_rockspec.lua b/src/luarocks/cmd/write_rockspec.lua
index 5710c982..2d663c1a 100644
--- a/src/luarocks/cmd/write_rockspec.lua
+++ b/src/luarocks/cmd/write_rockspec.lua
@@ -264,23 +264,32 @@ local function rockspec_cleanup(rockspec)
    rockspec.source.pathname = nil
    rockspec.variables = nil
    rockspec.name = nil
-   rockspec.format_is_at_least = nil
    rockspec.local_abs_filename = nil
    rockspec.rocks_provided = nil
 
    local dep_lists = {
       dependencies = rockspec.dependencies,
-      build_dependencies = rockspec.build_dependencies,
-      test_dependencies = rockspec.test_dependencies,
    }
+   if rockspec:format_is_at_least("3.0") then
+      dep_lists.build_dependencies = rockspec.build_dependencies
+      dep_lists.test_dependencies = rockspec.test_dependencies
+   else
+      rockspec.build_dependencies = nil
+      rockspec.test_dependencies = nil
+   end
+   rockspec.format_is_at_least = nil
 
    for name, data in pairs(dep_lists) do
       if not next(data) then
          (rockspec)[name] = nil
       else
+         local new_data = {}
          for i, item in ipairs(data) do
-            data[i] = tostring(item)
+            if type(item) == "string" then
+               new_data[i] = tostring(item)
+            end
          end
+         (rockspec)[name] = new_data
       end
    end
 end
@@ -350,6 +359,7 @@ function write_rockspec.command(args)
       },
       build = {},
    })
+
    assert(not err, err)
    rockspec.source.protocol = protocol
 
diff --git a/src/luarocks/cmd/write_rockspec.tl b/src/luarocks/cmd/write_rockspec.tl
index cb48ca3f..2e4df014 100644
--- a/src/luarocks/cmd/write_rockspec.tl
+++ b/src/luarocks/cmd/write_rockspec.tl
@@ -264,23 +264,32 @@ local function rockspec_cleanup(rockspec: Rockspec)
    rockspec.source.pathname = nil
    rockspec.variables = nil
    rockspec.name = nil
-   rockspec.format_is_at_least = nil
    rockspec.local_abs_filename = nil
    rockspec.rocks_provided = nil
 
    local dep_lists: {string: Dependencies} = {
       dependencies = rockspec.dependencies,
-      build_dependencies = rockspec.build_dependencies,
-      test_dependencies = rockspec.test_dependencies,
    }
+   if rockspec:format_is_at_least("3.0") then
+      dep_lists.build_dependencies = rockspec.build_dependencies
+      dep_lists.test_dependencies = rockspec.test_dependencies
+   else
+      rockspec.build_dependencies = nil
+      rockspec.test_dependencies = nil
+   end
+   rockspec.format_is_at_least = nil
 
    for name, data in pairs(dep_lists) do
       if not next(data) then
          (rockspec as {string: Dependencies})[name] = nil
       else
+         local new_data: {string} = {}
          for i, item in ipairs(data) do
-            data[i] = tostring(item)
+            if type(item) == "string" then
+               new_data[i] = tostring(item)
+            end
          end
+         (rockspec as {string: Dependencies})[name] = new_data
       end
    end
 end
@@ -350,6 +359,7 @@ function write_rockspec.command(args: Args): boolean, string
       },
       build = {},
    })
+
    assert(not err, err)
    rockspec.source.protocol = protocol