Skip to content

Commit b7c1c57

Browse files
Rename some publish config keys (#1532)
1 parent 9f64f71 commit b7c1c57

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

modules/config/src/main/scala/scala/cli/config/Keys.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import scala.collection.mutable.ListBuffer
77

88
object Keys {
99

10-
val userName = new Key.StringEntry(Seq("user"), "name")
11-
val userEmail = new Key.StringEntry(Seq("user"), "email")
12-
val userUrl = new Key.StringEntry(Seq("user"), "url")
10+
val userName = new Key.StringEntry(Seq("publish", "user"), "name")
11+
val userEmail = new Key.StringEntry(Seq("publish", "user"), "email")
12+
val userUrl = new Key.StringEntry(Seq("publish", "user"), "url")
1313

1414
val ghToken = new Key.PasswordEntry(Seq("github"), "token")
1515

modules/integration/src/test/scala/scala/cli/integration/ConfigTests.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ class ConfigTests extends ScalaCliSuite {
1616
val dirOptions = Seq[os.Shellable]("--home-directory", homeDir)
1717
val name = "Alex"
1818
TestInputs.empty.fromRoot { root =>
19-
val before = os.proc(TestUtil.cli, "config", dirOptions, "user.name").call(cwd = root)
19+
val before = os.proc(TestUtil.cli, "config", dirOptions, "publish.user.name").call(cwd = root)
2020
expect(before.out.trim().isEmpty)
2121

22-
os.proc(TestUtil.cli, "config", dirOptions, "user.name", name).call(cwd = root)
23-
val res = os.proc(TestUtil.cli, "config", dirOptions, "user.name").call(cwd = root)
22+
os.proc(TestUtil.cli, "config", dirOptions, "publish.user.name", name).call(cwd = root)
23+
val res = os.proc(TestUtil.cli, "config", dirOptions, "publish.user.name").call(cwd = root)
2424
expect(res.out.trim() == name)
2525

26-
os.proc(TestUtil.cli, "config", dirOptions, "user.name", "--unset").call(cwd = root)
27-
val after = os.proc(TestUtil.cli, "config", dirOptions, "user.name").call(cwd = root)
26+
os.proc(TestUtil.cli, "config", dirOptions, "publish.user.name", "--unset").call(cwd = root)
27+
val after = os.proc(TestUtil.cli, "config", dirOptions, "publish.user.name").call(cwd = root)
2828
expect(after.out.trim().isEmpty)
2929
}
3030
}

modules/integration/src/test/scala/scala/cli/integration/PublishSetupTests.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ class PublishSetupTests extends ScalaCliSuite {
2020

2121
private def configSetup(homeDir: os.Path, root: os.Path): Unit = {
2222
val dirOptions = Seq[os.Shellable]("--home-directory", homeDir)
23-
os.proc(TestUtil.cli, "config", dirOptions, "user.name", devName)
23+
os.proc(TestUtil.cli, "config", dirOptions, "publish.user.name", devName)
2424
.call(cwd = root, stdout = os.Inherit)
25-
os.proc(TestUtil.cli, "config", dirOptions, "user.email", devMail)
25+
os.proc(TestUtil.cli, "config", dirOptions, "publish.user.email", devMail)
2626
.call(cwd = root, stdout = os.Inherit)
27-
os.proc(TestUtil.cli, "config", dirOptions, "user.url", devUrl)
27+
os.proc(TestUtil.cli, "config", dirOptions, "publish.user.url", devUrl)
2828
.call(cwd = root, stdout = os.Inherit)
2929
os.proc(TestUtil.cli, "config", dirOptions, "sonatype.user", "value:uSeR")
3030
.call(cwd = root, stdout = os.Inherit)

website/docs/commands/misc/config.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Examples of use:
1212
<ChainedSnippets>
1313

1414
```bash
15-
scala-cli config user.name "Alex Me"
16-
scala-cli config user.name
15+
scala-cli config publish.user.name "Alex Me"
16+
scala-cli config publish.user.name
1717
```
1818

1919
```text

website/docs/commands/publishing/publish-setup.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ the sections below show how to use it to configure things for `publish setup`.
3636

3737
Set details with
3838
```sh
39-
scala-cli config user.name "Alex Me"
40-
scala-cli config user.email "[email protected]"
41-
scala-cli config user.url "https://alex.me"
39+
scala-cli config publish.user.name "Alex Me"
40+
scala-cli config publish.user.email "[email protected]"
41+
scala-cli config publish.user.url "https://alex.me"
4242
```
4343

4444
The email can be left empty if you'd rather not put your email in POM files:
4545
```sh
46-
scala-cli config user.email ""
46+
scala-cli config publish.user.email ""
4747
```
4848

4949
### PGP key pair

0 commit comments

Comments
 (0)