Handle multiple exits by detecting session changes

pharo-contributions · Jun 28, 2018 · 311478c · 311478c
1 parent 8502804
commit 311478c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 6 deletions.
diff --git a/src/Clap-Core/ClapCommand.class.st b/src/Clap-Core/ClapCommand.class.st
@@ -106,7 +106,7 @@ ClapCommand >> matchClass [
 ClapCommand >> runWith: arguments [
 	"Convenience method for running a command in an interactive context"
 	^ (ClapContext with: self)
-		interpret: arguments
+		activateWith: arguments
 ]
 
 { #category : #accessing }

diff --git a/src/Clap-Core/ClapContext.class.st b/src/Clap-Core/ClapContext.class.st
@@ -10,7 +10,8 @@ Class {
 	#superclass : #Object,
 	#instVars : [
 		'commandCandidates',
-		'arguments'
+		'arguments',
+		'session'
 	],
 	#category : #'Clap-Core-Activation'
 }
@@ -47,11 +48,21 @@ ClapContext class >> withPragmaCommands [
 	^ self withAll: self pragmaCommands
 ]
 
+{ #category : #activation }
+ClapContext >> activateWith: args [
+	^ self
+		activateWith: args
+		onExit: [ :exit | self handleExit: exit ]
+]
+
 { #category : #activation }
 ClapContext >> activateWith: args onExit: exitBlock [
-	^ [ self interpret: args ]
-		on: Exit
-		do: exitBlock
+	^ [ self
+			rememberSession;
+			interpret: args
+	]
+	on: Exit
+	do: exitBlock
 ]
 
 { #category : #accessing }
@@ -116,7 +127,20 @@ ClapContext >> exitSuccess: message [
 
 { #category : #activation }
 ClapContext >> handleExit: exit [
-	self notYetImplemented 
+	^ self hasSessionChanged
+		ifTrue: [ self ]
+		ifFalse: [
+			Smalltalk isInteractive
+				ifTrue: [
+					exit isSuccess
+						ifFalse: [ exit resignalAs: (Error new messageText: exit messageText) ] ]
+				ifFalse: [ exit pass ]
+		]
+]
+
+{ #category : #activation }
+ClapContext >> hasSessionChanged [
+	^ session ~~ Smalltalk session
 ]
 
 { #category : #initialization }
@@ -149,6 +173,11 @@ ClapContext >> peek [
 	^ self arguments peek
 ]
 
+{ #category : #activation }
+ClapContext >> rememberSession [
+	session := Smalltalk session
+]
+
 { #category : #accessing }
 ClapContext >> stderr [
 	^ VTermOutputDriver stderr