Skip to content

Commit 78268eb

Browse files
committed
Rename use-compression config option to enable-compression
1 parent 46b5500 commit 78268eb

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/main/scala/com/decodified/scalassh/HostConfig.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ case class HostConfig(
2626
connectTimeout: Option[Int] = None,
2727
connectionTimeout: Option[Int] = None,
2828
commandTimeout: Option[Int] = None,
29-
useCompression: Boolean = false,
29+
enableCompression: Boolean = false,
3030
hostKeyVerifier: HostKeyVerifier = KnownHosts.right.toOption.getOrElse(DontVerify),
3131
sshjConfig: Config = HostConfig.DefaultSshjConfig
3232
)
@@ -46,7 +46,7 @@ abstract class FromStringsHostConfigProvider extends HostConfigProvider {
4646
optIntSetting("connect-timeout", settings, source).right.flatMap { connectTimeout =>
4747
optIntSetting("connection-timeout", settings, source).right.flatMap { connectionTimeout =>
4848
optIntSetting("command-timeout", settings, source).right.flatMap { commandTimeout =>
49-
optBoolSetting("use-compression", settings, source).right.flatMap { useCompression =>
49+
optBoolSetting("enable-compression", settings, source).right.flatMap { enableCompression =>
5050
setting("fingerprint", settings, source).right.map(forFingerprint).left.flatMap(_ => KnownHosts).right.map { verifier =>
5151
HostConfig(
5252
login,
@@ -55,7 +55,7 @@ abstract class FromStringsHostConfigProvider extends HostConfigProvider {
5555
connectTimeout = connectTimeout,
5656
connectionTimeout = connectionTimeout,
5757
commandTimeout = commandTimeout,
58-
useCompression = useCompression.getOrElse(false),
58+
enableCompression = enableCompression.getOrElse(false),
5959
hostKeyVerifier = verifier
6060
)}}}}}}}}}
6161
}

src/main/scala/com/decodified/scalassh/SshClient.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class SshClient(val config: HostConfig) {
3333
config.connectTimeout.foreach(client.setConnectTimeout(_))
3434
config.connectionTimeout.foreach(client.setTimeout(_))
3535
client.addHostKeyVerifier(config.hostKeyVerifier)
36-
if (config.useCompression) client.useCompression()
36+
if (config.enableCompression) client.useCompression()
3737
}
3838
}
3939

src/test/resources/password.com

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
login-type = password
33
username = bob
44
password = 123
5-
use-compression = yes
5+
enable-compression = yes

src/test/scala/com/decodified/scalassh/HostFileConfigSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class HostFileConfigSpec extends Specification { def is =
66

77
"Depending on the host file the HostFileConfig should produce a proper" ^
88
"PasswordLogin" ! {
9-
config("password.com") mustEqual Right(HostConfig(PasswordLogin("bob", "123"), "password.com", useCompression = true))
9+
config("password.com") mustEqual Right(HostConfig(PasswordLogin("bob", "123"), "password.com", enableCompression = true))
1010
} ^
1111
"unencrypted PublicKeyLogin" ! {
1212
config("keyfile.com") mustEqual Right(HostConfig(PublicKeyLogin("alice", "/some/file"), "xyz.special.com", port = 30))

0 commit comments

Comments
 (0)