Conform memory stream truncate to StandardFileStream

j4yk · j4yk · commit 1c9c31d8e13f · 2020-12-14T00:27:28.000+01:00
...and Pharo's BinaryFileStream.

Also add truncate: in FSWriteStream.

truncate on FSWriteStream still does not truncate to 0,
although this should probably also be changed at some point.
Need to evaluate compatiblity concerns first (with Pharo, with existing code).
diff --git a/src/FS-AnsiStreams.package/.squot-contents b/src/FS-AnsiStreams.package/.squot-contents
@@ -1,4 +1,5 @@
 SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
+	#objectsReplacedByNames : true,
 	#serializer : #SquotCypressCodeSerializer
 }
diff --git a/src/FS-AnsiStreams.package/FSWriteStream.class/instance/truncate..st b/src/FS-AnsiStreams.package/FSWriteStream.class/instance/truncate..st
@@ -0,0 +1,3 @@
+file
+truncate: anInteger
+	self truncateTo: anInteger.
diff --git a/src/FS-AnsiStreams.package/FSWriteStream.class/methodProperties.json b/src/FS-AnsiStreams.package/FSWriteStream.class/methodProperties.json
@@ -30,4 +30,5 @@
 		"store:" : "CamilloBruni 1/24/2012 13:42",
 		"tab:" : "CamilloBruni 8/12/2011 14:24",
 		"truncate" : "jr 4/13/2017 15:45",
+		"truncate:" : "jr 12/13/2020 23:49",
 		"truncateTo:" : "cwp 10/15/2009 21:49" } }
diff --git a/src/FS-Memory.package/.squot-contents b/src/FS-Memory.package/.squot-contents
@@ -1,4 +1,5 @@
-{
+SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
+	#objectsReplacedByNames : true,
 	#serializer : #SquotCypressCodeSerializer
 }
diff --git a/src/FS-Memory.package/FSMemoryFileStream.class/instance/close.st b/src/FS-Memory.package/FSMemoryFileStream.class/instance/close.st
@@ -3,4 +3,4 @@ close
 	
 	store 
 		replaceFile: path 
-		in: [ :bytes | collection first: position ]
+		in: [ :bytes | self binary; contents ]
diff --git a/src/FS-Memory.package/FSMemoryFileStream.class/instance/truncate..st b/src/FS-Memory.package/FSMemoryFileStream.class/instance/truncate..st
@@ -1,4 +1,4 @@
 writing
 truncate: aPosition
-	position := position min: aPosition.
-	"bytes in the MemoryStore are replaced with my collection up to position anyway"
+	position := readLimit := aPosition.
+	position > collection size ifTrue: [self growTo: aPosition].
diff --git a/src/FS-Memory.package/FSMemoryFileStream.class/instance/truncate.st b/src/FS-Memory.package/FSMemoryFileStream.class/instance/truncate.st
@@ -0,0 +1,3 @@
+writing
+truncate
+	self truncate: 0.
diff --git a/src/FS-Memory.package/FSMemoryFileStream.class/methodProperties.json b/src/FS-Memory.package/FSMemoryFileStream.class/methodProperties.json
@@ -2,7 +2,8 @@
 	"class" : {
 		 },
 	"instance" : {
-		"close" : "jr 6/5/2017 22:27",
+		"close" : "jr 12/14/2020 00:11",
 		"growTo:" : "cwp 2/19/2011 01:20",
 		"pastEndPut:" : "cwp 2/19/2011 01:20",
-		"truncate:" : "jr 6/5/2017 22:55" } }
+		"truncate" : "jr 12/13/2020 23:49",
+		"truncate:" : "jr 12/14/2020 00:23" } }
diff --git a/src/FS-Tests-AnsiStreams.package/.squot-contents b/src/FS-Tests-AnsiStreams.package/.squot-contents
@@ -1,4 +1,5 @@
 SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
+	#objectsReplacedByNames : true,
 	#serializer : #SquotCypressCodeSerializer
 }
diff --git a/src/FS-Tests-AnsiStreams.package/FSWriteStreamTest.class/instance/testTruncateToCurrentPosition.st b/src/FS-Tests-AnsiStreams.package/FSWriteStreamTest.class/instance/testTruncateToCurrentPosition.st
@@ -0,0 +1,8 @@
+tests
+testTruncateToCurrentPosition
+	stream 
+		nextPutAll: #(42 43 44 45 46);
+		flush;
+		position: 3;
+		truncate: stream position.
+	self assert: self contents = #(42 43 44) asByteArray
diff --git a/src/FS-Tests-AnsiStreams.package/FSWriteStreamTest.class/methodProperties.json b/src/FS-Tests-AnsiStreams.package/FSWriteStreamTest.class/methodProperties.json
@@ -22,4 +22,5 @@
 		"testTruncate" : "jr 4/13/2017 15:47",
 		"testTruncateEmpty" : "jr 6/15/2020 00:29",
 		"testTruncateTo" : "cwp 10/15/2009 21:50",
+		"testTruncateToCurrentPosition" : "jr 12/13/2020 23:52",
 		"testTruncateToEmpty" : "jr 6/15/2020 00:30" } }
diff --git a/src/FS-Tests-Core.package/.squot-contents b/src/FS-Tests-Core.package/.squot-contents
@@ -1,4 +1,5 @@
 SquotTrackedObjectMetadata {
 	#objectClassName : #PackageInfo,
+	#objectsReplacedByNames : true,
 	#serializer : #SquotCypressCodeSerializer
 }
diff --git a/src/FS-Tests-Core.package/FileSystemTest.class/instance/testFileStreamTruncate.st b/src/FS-Tests-Core.package/FileSystemTest.class/instance/testFileStreamTruncate.st
@@ -0,0 +1,7 @@
+tests-references
+testFileStreamTruncate
+	| reference |
+	self delete: (reference := filesystem workingDirectory / 'griffle').
+	reference fileStreamDo: [ :stream | stream nextPutAll: 'griffle' ].
+	self assert: (reference fileStreamDo: [ :stream | stream truncate: 3. true ]).
+	self assert: 'gri' equals: (reference readStreamDo: [ :stream | stream contents ]).
diff --git a/src/FS-Tests-Core.package/FileSystemTest.class/instance/testWriteStreamTruncate.st b/src/FS-Tests-Core.package/FileSystemTest.class/instance/testWriteStreamTruncate.st
@@ -0,0 +1,7 @@
+tests-references
+testWriteStreamTruncate
+	| reference |
+	self delete: (reference := filesystem workingDirectory / 'griffle').
+	reference writeStreamDo: [ :stream | stream nextPutAll: 'griffle' ].
+	self assert: (reference writeStreamDo: [ :stream | stream truncate: 3. true ]).
+	self assert: 'gri' equals: (reference readStreamDo: [ :stream | stream contents ]).
diff --git a/src/FS-Tests-Core.package/FileSystemTest.class/methodProperties.json b/src/FS-Tests-Core.package/FileSystemTest.class/methodProperties.json
@@ -28,6 +28,7 @@
 		"testFile" : "CamilloBruni 1/20/2012 13:23",
 		"testFileNames" : "sd 2/11/2011 18:21",
 		"testFileStreamDo" : "sd 2/11/2011 18:21",
+		"testFileStreamTruncate" : "jr 12/14/2020 00:20",
 		"testReadStream" : "jr 3/5/2017 13:16",
 		"testReadStreamDo" : "jr 3/5/2017 13:16",
 		"testReadStreamDoIfAbsent" : "sd 2/11/2011 18:21",
@@ -43,4 +44,5 @@
 		"testWriteStream" : "sd 2/11/2011 18:21",
 		"testWriteStreamDo" : "sd 2/11/2011 18:21",
 		"testWriteStreamDoIfPresent" : "sd 2/11/2011 18:21",
-		"testWriteStreamIfPresent" : "sd 2/11/2011 18:21" } }
+		"testWriteStreamIfPresent" : "sd 2/11/2011 18:21",
+		"testWriteStreamTruncate" : "jr 12/14/2020 00:23" } }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`SquotTrackedObjectMetadata {`
`2`	`2`	`#objectClassName : #PackageInfo,`
	`3`	`+ #objectsReplacedByNames : true,`
`3`	`4`	`#serializer : #SquotCypressCodeSerializer`
`4`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+file`
	`2`	`+truncate: anInteger`
	`3`	`+ self truncateTo: anInteger.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-{`
	`1`	`+SquotTrackedObjectMetadata {`
`2`	`2`	`#objectClassName : #PackageInfo,`
	`3`	`+ #objectsReplacedByNames : true,`
`3`	`4`	`#serializer : #SquotCypressCodeSerializer`
`4`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+writing`
	`2`	`+truncate`
	`3`	`+ self truncate: 0.`