Get rid of unused Rowan globals: knowRepositories and knowProjects ... defer to image for queries and platforms that can manage with shared globals can implement support in the platform image class:

  58 run, 57 passes, 1 expected defects, 0 failures, 0 errors, 0 unexpected passes

Author: dalehenrich

tonel/Rowan-Core/Rowan.class.st

@@ -8,10 +8,8 @@ Class {
 	#name : 'Rowan',
 	#superclass : 'Object',
 	#classInstVars : [
-		'knownRepositories',
 		'configuration',
-		'platform',
-		'knownProjects'
+		'platform'
 	],
 	#category : 'Rowan-Core'
 }
@@ -24,15 +22,6 @@ Rowan class >> addProject: aRwProjectSpecification [
 	^ self image addProject: aRwProjectSpecification
 ]
 
-{ #category : 'public' }
-Rowan class >> addRepositoryNamed: urlString [
-	"Register a repository.
-	Note that duplicate registrations are ignored, since knownRepositories is a Set"
-
-	knownRepositories
-		add: (CypRepository onUrl: (CypUrl fromString: urlString))
-]
-
 { #category : 'public' }
 Rowan class >> configuration [
 
@@ -79,25 +68,12 @@ Rowan class >> image [
 
 { #category : 'private' }
 Rowan class >> initialize [
-  "Rowan initialize."
-
-  knownRepositories := Set new.
-  platform := RwPlatform current.
-  configuration := platform defaultConfiguration.
-  platform initialize.
-  knownProjects := Dictionary new
-]
 
-{ #category : 'public' }
-Rowan class >> knownProjects [
-
-	^ knownProjects
-]
+	"Rowan initialize."
 
-{ #category : 'public' }
-Rowan class >> knownRepositories [
-
-	^knownRepositories
+	platform := RwPlatform current.
+	configuration := platform defaultConfiguration.
+	platform initialize
 ]
 
 { #category : 'public' }
@@ -134,30 +110,6 @@ Rowan class >> loadedPackagesNamed: someNames [
 	^RwPackageSet withAll: (loadedPackages select: [:each | each notNil])
 ]
 
-{ #category : 'public' }
-Rowan class >> packageNamed: aName [
-	"Answer a PackageReference, if the given package name is unique in all registered repositories. If the name resolves 0 or >=2 times, error."
-
-	| token resolutions |
-	token := 'notFound'.
-	resolutions := (self knownRepositories
-				collect: [:repo | repo packageNamed: aName ifAbsent: [token]])
-					select: [:each | each ~~ token].
-	resolutions isEmpty ifTrue: [self error: 'Named package not found'].
-	resolutions size > 1
-		ifTrue: [self error: 'Package name is not unique in registered repositories.'].
-	^resolutions any
-]
-
-{ #category : 'public' }
-Rowan class >> packagesNamed: someNames [
-	"Create a PackageSet by names only, resolved from known repositories"
-
-	| packageRefs |
-	packageRefs := someNames collect: [:aName | self packageNamed: aName].
-	^RwPackageSet withAll: packageRefs
-]
-
 { #category : 'public tools' }
 Rowan class >> packageTools [
 
@@ -188,6 +140,14 @@ Rowan class >> projectNamed: aString ifAbsent: absentBlock [
 	^ self image projectNamed: aString ifAbsent: absentBlock
 ]
 
+{ #category : 'public' }
+Rowan class >> projectNames [
+
+	"Return list of project names"
+
+	^ self image projectNames
+]
+
 { #category : 'public tools' }
 Rowan class >> projectTools [
 

tonel/Rowan-GemStone/RwGsImage.class.st

@@ -161,6 +161,26 @@ RwGsImage class >> projectNamed: aString ifAbsent: absentBlock [
 			^ absentBlock value ]
 ]
 
+{ #category : 'querying' }
+RwGsImage class >> projectNames [
+
+	"Return list of project names"
+
+	| currentUserId projectNames |
+	currentUserId = self currentUserId.
+	projectNames := Set new.
+	projectNames addAll: self _projectRegistry keys.
+	AllUsers
+		do: [ :userProfile | 
+			| userId |
+			userId := userProfile userId.
+			userId ~= currentUserId
+				ifTrue: [ 
+					(self _projectRegistryForUserId: userId)
+						ifNotNil: [ :projectRegistry | projectNames addAll: projectRegistry keys ] ] ].
+	^ projectNames
+]
+
 { #category : 'querying' }
 RwGsImage class >> removeProject: aRwProjectSpecification [
 

tonel/Rowan-Tode/RwPrjRegistryTool.class.st

@@ -28,12 +28,14 @@ EXAMPLES
 
 { #category : 'smalltalk api' }
 RwPrjRegistryTool >> registeredSpecNames [
-  ^ self registry keys
+
+	^ Rowan projectNames
 ]
 
 { #category : 'smalltalk api' }
 RwPrjRegistryTool >> registeredSpecs [
-  ^ self registry values
+
+	^ Rowan projectNames collect: [ :aString | Rowan projectNamed: aString ]
 ]
 
 { #category : 'smalltalk api' }

tonel/Rowan-Tode/RwSpecification.class.st

@@ -110,5 +110,6 @@ RwSpecification >> registerForced [
 
 { #category : 'registering' }
 RwSpecification >> unregister [
-  Rowan knownProjects removeKey: self specName ifAbsent: [  ]
+
+	Rowan removeProject: self
 ]

tonel/Rowan-Tode/RwUrlTest.class.st

@@ -47,19 +47,20 @@ RwUrlTest >> sampleUrlStrings [
 
 { #category : 'tests' }
 RwUrlTest >> testAsRwRepository [
-  | repos loadSpec repoRoot testRepoPath |
-  loadSpec := Rowan projectTools registry registry at: 'Rowan' ifAbsent: [ ^ self ].
-  repoRoot := loadSpec repoSpec repositoryRootPath.
-  testRepoPath := repoRoot , '/testRepositories'.
-  repos := {('cypress:' , testRepoPath , '/cypress/').
-  ('filetree://' , testRepoPath , '/filetree/').
-  ('tonel:' , testRepoPath , '/tonel/')}
-    collect: [ :urlString | urlString -> urlString asRwRepository ].
-  repos
-    do: [ :assoc | 
-      | repo x y |
-      repo := assoc value.
-      self assert: (x := repo url) = (y := assoc key) ]
+
+	| repos loadSpec repoRoot testRepoPath |
+	loadSpec := Rowan projectNamed: 'Rowan' ifAbsent: [ ^ self ].
+	repoRoot := loadSpec repoSpec repositoryRootPath.
+	testRepoPath := repoRoot , '/testRepositories'.
+	repos := {('cypress:' , testRepoPath , '/cypress/').
+	('filetree://' , testRepoPath , '/filetree/').
+	('tonel:' , testRepoPath , '/tonel/')}
+		collect: [ :urlString | urlString -> urlString asRwRepository ].
+	repos
+		do: [ :assoc | 
+			| repo x y |
+			repo := assoc value.
+			self assert: (x := repo url) = (y := assoc key) ]
 ]
 
 { #category : 'tests' }