Fixes #89

instantiations · Jul 7, 2021 · f76bd37 · f76bd37
1 parent 7bb8eba
commit f76bd37
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 25 deletions.
diff --git a/docs/strategies.md b/docs/strategies.md
@@ -35,6 +35,33 @@ This strategy uses the prequisites specified in the metadata plus the ones compu
 aTonelLoader useComputedPrerequisites
 ```
 
+
+### `TonelLoaderApplicationPrereqsTableStrategy`
+
+This strategy allows to specify mappings between a Tonel package name and ENVY applications that will be set as application prerequisites.
+
+```smalltalk
+"Enable it by evaluating"
+aTonelLoader useApplicationPrerequisitesTable
+  at: 'Seaside-Core' put: #('Kernel' 'GreaseCoreApp')
+```
+
+### Common prerequisites strategy options
+
+#### Prerequisites mismatch
+There might be the case where the computed prerequisites or the specified prequisites are redundant after all the classes and application editions have been created, for that, there is the option to fix any mismatch at the end of the load of the application.
+
+
+```smalltalk
+aTonelLoader useApplicationPrerequisitesTable
+  at: 'Seaside-Core' put: #('Kernel' 'GreaseCoreApp' 'SUnit');
+  fixMismatchs
+```
+
+In the example above, `Seaside-Core` should  only depend on `GreaseCoreApp` since this one already depends on `Kernel`, and should not depend on `SUnit` because there is no real dependency to it. So enabling this options will remove redundant or unnecessary  dependencies.
+
+
+
 ## Version strategy
 
 The version strategy handles both the versioning, and also the creation of editions prior to versioning.

diff --git a/source/.configmaps b/source/.configmaps
@@ -1,7 +1,7 @@
 [
 	{
 		#conditions : [ ],
-		#ts : 3803108852,
+		#ts : 3803117976,
 		#comment : '',
 		#formatVersion : '1.1',
 		#applications : OrderedCollection [
@@ -22,8 +22,8 @@
 			},
 			{
 				#name : 'TonelLoaderModel',
-				#versionName : 'strategies-19',
-				#ts : 3803107495
+				#versionName : 'strategies-20',
+				#ts : 3803114237
 			},
 			{
 				#name : 'TonelReaderModel',
@@ -42,7 +42,7 @@
 			}
 		],
 		#name : 'ENVY/Image Tonel',
-		#versionName : '2021/07/07 A'
+		#versionName : '2021/07/07 B'
 	},
 	{
 		#conditions : [ ],

diff --git a/source/TonelLoaderModel/TonelApplicationLoader.class.st b/source/TonelLoaderModel/TonelApplicationLoader.class.st
@@ -121,6 +121,7 @@ TonelApplicationLoader >> createAndLoadApplication [
 		deleteRemovedClasses;
 		loadApplication;
 		deleteRemovedSubApplications;
+		fixPrerequisitesMismatch;
 		versionApplication;
 		markAsLoaded
 
@@ -212,6 +213,12 @@ TonelApplicationLoader >> detectAllRootSuperclassesWithinApp [
 	^superclasses
 ]
 
+{ #category : 'loading-internal' }
+TonelApplicationLoader >> fixPrerequisitesMismatch [
+
+	self loader prerequisitesStrategy fixPrerequisitesMismatchOf: self tonelApplication
+]
+
 { #category : 'testing' }
 TonelApplicationLoader >> hasVersionName [
 

diff --git a/source/TonelLoaderModel/TonelLoaderApplicationPrereqStrategy.class.st b/source/TonelLoaderModel/TonelLoaderApplicationPrereqStrategy.class.st
@@ -1,6 +1,9 @@
 Class {
 	#name : 'TonelLoaderApplicationPrereqStrategy',
 	#superclass : 'TonelLoaderStrategy',
+	#instVars : [
+		'fixesMismatchs'
+	],
 	#category : 'TonelLoaderModel'
 }
 
@@ -18,10 +21,37 @@ TonelLoaderApplicationPrereqStrategy >> concretePrerequisitesOf: aTonelApplicati
 	self subclassResponsibility
 ]
 
-{ #category : 'testing' }
+{ #category : 'accessing' }
 TonelLoaderApplicationPrereqStrategy >> fixesMismatchs [
+	^fixesMismatchs
+]
+
+{ #category : 'accessing' }
+TonelLoaderApplicationPrereqStrategy >> fixesMismatchs: aBoolean [
+	fixesMismatchs := aBoolean
+]
+
+{ #category : 'configuring' }
+TonelLoaderApplicationPrereqStrategy >> fixMismatchs [
 
-	^false
+	self fixesMismatchs: true
+]
+
+{ #category : 'api' }
+TonelLoaderApplicationPrereqStrategy >> fixPrerequisitesMismatchOf: tonelApplication [
+
+	self fixesMismatchs
+		ifTrue: [
+			tonelApplication emApplication
+				prerequisites: (self reducedPrerequisitesOf: tonelApplication)]
+]
+
+{ #category : 'initializing',
+  #vaVisibility : 'private' }
+TonelLoaderApplicationPrereqStrategy >> initialize [
+
+	super initialize.
+	fixesMismatchs := false
 ]
 
 { #category : 'api' }
@@ -30,25 +60,13 @@ TonelLoaderApplicationPrereqStrategy >> prerequisitesFor: tonelApplication curre
 	self subclassResponsibility
 ]
 
-{ #category : 'api' }
-TonelLoaderApplicationPrereqStrategy >> reducePrerequisitesOf: tonelApplication current: currentPrereqs [
-
-	| requiredPrereqs allRequired anApp |
-
-	anApp := tonelApplication emApplication.
-	requiredPrereqs := EmInterface current requiredDependentApplicationsIncludingReferencesFor: anApp.
-	allRequired := Set new.
-	currentPrereqs do: [:each | allRequired addAll: each withAllPrerequisites].
-	requiredPrereqs do: [:each |
-		((allRequired includes: each) not and: [self fixesMismatchs])
-			ifTrue: [
-				allRequired addAll: (
-					self
-						requiredDependentApplicationsIncludingReferencesFor: anApp
-						reportInApps: (Array with: each))]].
-
-	currentPrereqs do: [:r | (requiredPrereqs includes: r) ifFalse: [allRequired remove: r]].
-	^allRequired
+{ #category : 'api',
+  #vaVisibility : 'private' }
+TonelLoaderApplicationPrereqStrategy >> reducedPrerequisitesOf: tonelApplication [
+
+	^(EmInterface current
+		requiredDependentApplicationsIncludingReferencesFor: tonelApplication emApplication)
+			asOrderedCollection
 ]
 
 { #category : 'lookup',