kemitix/thorp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bump scala-library from 2.13.0 to 2.13.2 (#439)

Browse source 
* Bump scala-library from 2.13.0 to 2.13.2

Bumps [scala-library](https://github.com/scala/scala) from 2.13.0 to 2.13.2.
- [Release notes](https://github.com/scala/scala/releases)
- [Commits](https://github.com/scala/scala/compare/v2.13.0...v2.13.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update scala syntax from 2.13.0 to 2.13.2 (#443)

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Paul Campbell <pcampbell@kemitix.net>
This commit is contained in:
dependabot-preview[bot] 2020-06-12 17:00:02 +01:00 committed by GitHub
parent d229745305
commit fc00be8707
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
parent/pom.xml
View file

@ -19,7 +19,7 @@
<scala-maven-plugin.version>4.4.0</scala-maven-plugin.version> <scala-maven-plugin.version>4.4.0</scala-maven-plugin.version>
<tiles-maven-plugin.version>2.17</tiles-maven-plugin.version> <tiles-maven-plugin.version>2.17</tiles-maven-plugin.version>
<kemitix-maven-tiles.version>2.7.0</kemitix-maven-tiles.version> <kemitix-maven-tiles.version>2.7.0</kemitix-maven-tiles.version>
<scala-library.version>2.13.0</scala-library.version> <scala-library.version>2.13.2</scala-library.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>

6
storage-aws/src/test/scala/net/kemitix/thorp/storage/aws/CopierTest.scala
View file

@ -24,7 +24,7 @@ class CopierTest extends FreeSpec {
val event = StorageEvent.CopyEvent(sourceKey, targetKey) val event = StorageEvent.CopyEvent(sourceKey, targetKey)
val expected = Right(event) val expected = Right(event)
new AmazonS3ClientTestFixture { new AmazonS3ClientTestFixture {
(fixture.amazonS3Client.copyObject _) (() => fixture.amazonS3Client.copyObject)
.when() .when()
.returns(_ => Task.succeed(Some(new CopyObjectResult))) .returns(_ => Task.succeed(Some(new CopyObjectResult)))
private val result = private val result =
@ -36,7 +36,7 @@ class CopierTest extends FreeSpec {
"when source hash does not match" - { "when source hash does not match" - {
"skip the file with an error" in { "skip the file with an error" in {
new AmazonS3ClientTestFixture { new AmazonS3ClientTestFixture {
(fixture.amazonS3Client.copyObject _) (() => fixture.amazonS3Client.copyObject)
.when() .when()
.returns(_ => Task.succeed(None)) .returns(_ => Task.succeed(None))
private val result = private val result =
@ -59,7 +59,7 @@ class CopierTest extends FreeSpec {
"skip the file with an error" in { "skip the file with an error" in {
new AmazonS3ClientTestFixture { new AmazonS3ClientTestFixture {
private val expectedMessage = "The specified key does not exist" private val expectedMessage = "The specified key does not exist"
(fixture.amazonS3Client.copyObject _) (() => fixture.amazonS3Client.copyObject)
.when() .when()
.returns(_ => Task.fail(new AmazonS3Exception(expectedMessage))) .returns(_ => Task.fail(new AmazonS3Exception(expectedMessage)))
private val result = private val result =

6
storage-aws/src/test/scala/net/kemitix/thorp/storage/aws/DeleterTest.scala
View file

@ -23,7 +23,7 @@ class DeleterTest extends FreeSpec {
"when no errors" in { "when no errors" in {
val expected = Right(DeleteEvent(remoteKey)) val expected = Right(DeleteEvent(remoteKey))
new AmazonS3ClientTestFixture { new AmazonS3ClientTestFixture {
(fixture.amazonS3Client.deleteObject _) (() => fixture.amazonS3Client.deleteObject)
.when() .when()
.returns(_ => UIO.succeed(())) .returns(_ => UIO.succeed(()))
private val result = invoke(fixture.amazonS3Client)(bucket, remoteKey) private val result = invoke(fixture.amazonS3Client)(bucket, remoteKey)
@ -36,7 +36,7 @@ class DeleterTest extends FreeSpec {
Right( Right(
ErrorEvent(ActionSummary.Delete(remoteKey.key), remoteKey, exception)) ErrorEvent(ActionSummary.Delete(remoteKey.key), remoteKey, exception))
new AmazonS3ClientTestFixture { new AmazonS3ClientTestFixture {
(fixture.amazonS3Client.deleteObject _) (() => fixture.amazonS3Client.deleteObject)
.when() .when()
.returns(_ => Task.fail(exception)) .returns(_ => Task.fail(exception))
private val result = invoke(fixture.amazonS3Client)(bucket, remoteKey) private val result = invoke(fixture.amazonS3Client)(bucket, remoteKey)
@ -49,7 +49,7 @@ class DeleterTest extends FreeSpec {
Right( Right(
ErrorEvent(ActionSummary.Delete(remoteKey.key), remoteKey, exception)) ErrorEvent(ActionSummary.Delete(remoteKey.key), remoteKey, exception))
new AmazonS3ClientTestFixture { new AmazonS3ClientTestFixture {
(fixture.amazonS3Client.deleteObject _) (() => fixture.amazonS3Client.deleteObject)
.when() .when()
.returns(_ => Task.fail(exception)) .returns(_ => Task.fail(exception))
private val result = invoke(fixture.amazonS3Client)(bucket, remoteKey) private val result = invoke(fixture.amazonS3Client)(bucket, remoteKey)

10
storage-aws/src/test/scala/net/kemitix/thorp/storage/aws/ListerTest.scala
View file

@ -28,7 +28,7 @@ class ListerTest extends FreeSpec {
val expectedHashMap = Map(MD5Hash(etag) -> RemoteKey(key)) val expectedHashMap = Map(MD5Hash(etag) -> RemoteKey(key))
val expectedKeyMap = Map(RemoteKey(key) -> MD5Hash(etag)) val expectedKeyMap = Map(RemoteKey(key) -> MD5Hash(etag))
new AmazonS3ClientTestFixture { new AmazonS3ClientTestFixture {
(fixture.amazonS3Client.listObjectsV2 _) (() => fixture.amazonS3Client.listObjectsV2)
.when() .when()
.returns(_ => { .returns(_ => {
UIO.succeed(objectResults(nowDate, key, etag, truncated = false)) UIO.succeed(objectResults(nowDate, key, etag, truncated = false))
@ -57,13 +57,13 @@ class ListerTest extends FreeSpec {
) )
new AmazonS3ClientTestFixture { new AmazonS3ClientTestFixture {
(fixture.amazonS3Client.listObjectsV2 _) (() => fixture.amazonS3Client.listObjectsV2)
.when() .when()
.returns(_ => .returns(_ =>
UIO(objectResults(nowDate, key1, etag1, truncated = true))) UIO(objectResults(nowDate, key1, etag1, truncated = true)))
.noMoreThanOnce() .noMoreThanOnce()
(fixture.amazonS3Client.listObjectsV2 _) (() => fixture.amazonS3Client.listObjectsV2)
.when() .when()
.returns(_ => .returns(_ =>
UIO(objectResults(nowDate, key2, etag2, truncated = false))) UIO(objectResults(nowDate, key2, etag2, truncated = false)))
@ -97,7 +97,7 @@ class ListerTest extends FreeSpec {
"when Amazon Service Exception" in { "when Amazon Service Exception" in {
val exception = new AmazonS3Exception("message") val exception = new AmazonS3Exception("message")
new AmazonS3ClientTestFixture { new AmazonS3ClientTestFixture {
(fixture.amazonS3Client.listObjectsV2 _) (() => fixture.amazonS3Client.listObjectsV2)
.when() .when()
.returns(_ => Task.fail(exception)) .returns(_ => Task.fail(exception))
private val result = invoke(fixture.amazonS3Client)(bucket, prefix) private val result = invoke(fixture.amazonS3Client)(bucket, prefix)
@ -107,7 +107,7 @@ class ListerTest extends FreeSpec {
"when Amazon SDK Client Exception" in { "when Amazon SDK Client Exception" in {
val exception = new SdkClientException("message") val exception = new SdkClientException("message")
new AmazonS3ClientTestFixture { new AmazonS3ClientTestFixture {
(fixture.amazonS3Client.listObjectsV2 _) (() => fixture.amazonS3Client.listObjectsV2)
.when() .when()
.returns(_ => Task.fail(exception)) .returns(_ => Task.fail(exception))
private val result = invoke(fixture.amazonS3Client)(bucket, prefix) private val result = invoke(fixture.amazonS3Client)(bucket, prefix)

6
storage-aws/src/test/scala/net/kemitix/thorp/storage/aws/UploaderTest.scala
View file

@ -45,7 +45,7 @@ class UploaderTest extends FreeSpec with MockFactory {
Task(uploadResult) Task(uploadResult)
} }
new AmazonS3ClientTestFixture { new AmazonS3ClientTestFixture {
(fixture.amazonS3TransferManager.upload _) (() => fixture.amazonS3TransferManager.upload)
.when() .when()
.returns(_ => UIO.succeed(inProgress)) .returns(_ => UIO.succeed(inProgress))
private val result = private val result =
@ -67,7 +67,7 @@ class UploaderTest extends FreeSpec with MockFactory {
Task.fail(exception) Task.fail(exception)
} }
new AmazonS3ClientTestFixture { new AmazonS3ClientTestFixture {
(fixture.amazonS3TransferManager.upload _) (() => fixture.amazonS3TransferManager.upload)
.when() .when()
.returns(_ => UIO.succeed(inProgress)) .returns(_ => UIO.succeed(inProgress))
private val result = private val result =
@ -89,7 +89,7 @@ class UploaderTest extends FreeSpec with MockFactory {
Task.fail(exception) Task.fail(exception)
} }
new AmazonS3ClientTestFixture { new AmazonS3ClientTestFixture {
(fixture.amazonS3TransferManager.upload _) (() => fixture.amazonS3TransferManager.upload)
.when() .when()
.returns(_ => UIO.succeed(inProgress)) .returns(_ => UIO.succeed(inProgress))
private val result = private val result =

4
uishell/src/main/scala/net/kemitix/thorp/uishell/ProgressUI.scala
View file

@ -55,8 +55,8 @@ object ProgressUI {
s"${GREEN}Uploading:$RESET ${remoteKey.key}$eraseLineForward" s"${GREEN}Uploading:$RESET ${remoteKey.key}$eraseLineForward"
val line2body = s"($percent%) $transferred of $fileLength " val line2body = s"($percent%) $transferred of $fileLength "
val bar = val bar =
progressBar(state.transferred, progressBar(state.transferred.toDouble,
state.fileLength, state.fileLength.toDouble,
Terminal.width - line2body.length) Terminal.width - line2body.length)
val line2 = s"$GREEN$line2body$RESET$bar$eraseLineForward" val line2 = s"$GREEN$line2body$RESET$bar$eraseLineForward"
Console.putStrLn(line1) *> Console.putStrLn(line1) *>