Merge branch 'development'

Author: jecisc

CHANGELOG.md

@@ -1,8 +1,12 @@
 <!--
-git log --pretty="* %s ([%h](https://github.com/jecisc/TinyLogger/commit/%H))" v1.1.4...HEAD --grep="Merge pull" 
+git log --pretty="* %s ([%h](https://github.com/jecisc/TinyLogger/commit/%H))" v1.1.5...HEAD --grep="Merge pull" 
 ('Content' copyWithRegex: 'Merge pull request #[0-9]+ from [^/]+/[0-9]*' matchesReplacedWith: '') copyReplaceAll: '-' with: ' '
 -->
 
+# [v1.1.5](https://github.com/jecisc/TinyLogger/compare/v1.1.4...v1.1.5) (2020-03-16)
+
+* Manage errors inside action logging ([172a181](https://github.com/jecisc/TinyLogger/commit/172a1818df984b08b1ab6ebe60646c0aaf160771))
+
 # [v1.1.4](https://github.com/jecisc/TinyLogger/compare/v1.1.3...v1.1.4) (2019-11-15)
 
 ## Bug fix

src/TinyLogger-Tests/TinyLoggerTest.class.st

@@ -191,6 +191,37 @@ No time : 	End: This is a new test
 			stream close ]
 ]
 
+{ #category : #test }
+TinyLoggerTest >> testExecuteRecordedAsKeepRightIndentation [
+	| contents stream |
+	self skipInPharo6.
+	logger
+		timestampFormatBlock: [ :s | s nextPutAll: 'No time' ];
+		removeAllLoggers;
+		addStdoutLogger.
+	stream := '' writeStream.
+	[ Stdio stub stdout willReturn: stream.
+	TinyCurrentLogger
+		value: logger
+		during: [ [ Object new execute: [ Error signal ] recordedAs: 'This is a new test' ]
+				on: Error
+				do: [ "nothing" ].
+			Object new execute: [ 'test' record ] recordedAs: 'This is a new test' ].
+	contents := Stdio stdout contents asString.
+	"Ensure we have the right indentation."
+	self
+		assert: contents withUnixLineEndings
+		equals:
+			'No time : 	Begin: This is a new test
+No time : 	End with error: This is a new test
+No time : 	Begin: This is a new test
+No time : 		test
+No time : 	End: This is a new test
+' withUnixLineEndings ]
+		ensure: [ Stdio recoverFromGHMutation.
+			stream close ]
+]
+
 { #category : #test }
 TinyLoggerTest >> testFileLoggers [
 	logger

src/TinyLogger/TinyLogger.class.st

@@ -184,7 +184,11 @@ TinyLogger >> execute: aBlock recordedAs: aString [
 	self increaseDepthLevel.
 	self record: 'Begin: ' , aString.
 	self increaseDepthLevel.
-	aBlock cull: aString.
+	[ aBlock cull: aString ]
+		ifCurtailed: [ "If there is an error, we ensure we keep the right indentation and we print an end of action with error."
+			self decreaseDepthLevel.
+			self record: 'End with error: ' , aString.
+			self decreaseDepthLevel ].
 	self decreaseDepthLevel.
 	self record: 'End: ' , aString.
 	self decreaseDepthLevel