[squeak-dev] The Trunk: Installer-Core-cmm.370.mcz

commits at source.squeak.org commits at source.squeak.org
Sat May 4 22:24:09 UTC 2013


Chris Muller uploaded a new version of Installer-Core to project The Trunk:
http://source.squeak.org/trunk/Installer-Core-cmm.370.mcz

==================== Summary ====================

Name: Installer-Core-cmm.370
Author: cmm
Time: 4 May 2013, 5:23:43.356 pm
UUID: d393827d-917d-4b66-b807-72bf05f2bc12
Ancestors: Installer-Core-cmm.366, Installer-Core-fbs.369

Allow any MCRepositoryGroup to be specified as the "repository" from which Installer will install from, employing MCRepositoryGroup default as the default when no other is specified.

=============== Diff against Installer-Core-fbs.369 ===============

Item was changed:
  ----- Method: InstallerMonticello>>cache (in category 'instance creation') -----
  cache
+ 	
+ 	mc := self classMCCacheRepository default.
+ 	root := mc directory localName
+  !
- 	| cache |
- 	cache := self classMCCacheRepository default.
- 	mc addRepository: cache.
- 	root := cache directory localName.!

Item was removed:
- ----- Method: InstallerMonticello>>classMCRepositoryGroup (in category 'class references') -----
- classMCRepositoryGroup
- 
- 	^Smalltalk at: #MCRepositoryGroup ifAbsent: [ self error: 'Monticello not present' ]
- 	!

Item was changed:
  ----- Method: InstallerMonticello>>directory: (in category 'instance creation') -----
  directory: dir
+ 
  	| directory |
  	directory := dir isString 
  		ifTrue: [  FileDirectory on: (FileDirectory default fullNameFor: dir) ]
  		ifFalse: [ dir ].
  		
+ 	mc := self classMCDirectoryRepository new directory: directory; yourself.
- 	mc addRepository: (self classMCDirectoryRepository new directory: directory; yourself).
   	root := dir
  	
   !

Item was changed:
  ----- Method: InstallerMonticello>>ftp:directory:user:password: (in category 'instance creation') -----
  ftp: host directory: dir user: name password: secret
  	"Installer mc ftp: 'mc.gjallar.se' directory: '' user: 'gjallar' password: secret."
  	
+ 	mc := self classMCFtpRepository host: host directory: dir user: name password: secret.
- 	mc addRepository: (self classMCFtpRepository host: host directory: dir user: name password: secret; yourself).
  	root :=  dir.	
   !

Item was changed:
  ----- Method: InstallerMonticello>>goods:port: (in category 'instance creation') -----
  goods: host port: aport
  	
+ 	mc := (self classMCGOODSRepository new) host: host port: aport; yourself
- 	mc addRepository: ((self classMCGOODSRepository new) host: host port: aport; yourself)
   !

Item was changed:
  ----- Method: InstallerMonticello>>http:user:password: (in category 'instance creation') -----
  http: aUrl user: name password: secret
+ 	| url |
- 	| url http |
  	url := (aUrl includesSubString: '://')
  		ifTrue: [aUrl]
  		ifFalse: ['http://', aUrl].
+ 	mc := self classMCHttpRepository location: url user: name password: secret.
+ 	root := mc locationWithTrailingSlash	
- 	http := self classMCHttpRepository location: url user: name password: secret.
- 	mc addRepository: http.
- 	root := http locationWithTrailingSlash	
   !

Item was changed:
  ----- Method: InstallerMonticello>>initialize (in category 'public interface') -----
  initialize
  	super initialize.
+ 	mc := MCRepositoryGroup default!
- 	mc := MCRepositoryGroup new.!

Item was changed:
  ----- Method: InstallerMonticello>>label (in category 'accessing') -----
  label
+ 	^ 'repository:''', mc description, ''''!
- 	^ 'repositories: #(',
- 	((mc repositories allButFirst
- 		collect: [:repo | repo description surroundedBySingleQuotes])
- 			reduce: [:acc :each | acc, ' ', each]),
- 	');'.!

Item was changed:
  ----- Method: InstallerMonticello>>magma:port: (in category 'instance creation') -----
  magma: host port: aport
  	
+ 	mc := (self classMCMagmaRepository new) host: host port: aport; yourself
- 	mc addRepository: ((self classMCMagmaRepository new) host: host port: aport; yourself)
   !

Item was changed:
  ----- Method: InstallerMonticello>>mc (in category 'accessing') -----
  mc
+ 
- 	"Return the GROUP of Monticello repositories."
  	^ mc!

Item was changed:
  ----- Method: InstallerMonticello>>mc: (in category 'accessing') -----
  mc: aRepo
+ 
+ 	mc := aRepo!
- 	mc addRepository: aRepo!

Item was changed:
  ----- Method: InstallerMonticello>>normalizedRepositories (in category 'monticello') -----
  normalizedRepositories
  "Find an existing instance of any active repository so that we use whatever name and password the user usually uses. If not found, answer a copy"
  	^ mc repositories replace: [:repo |
+ 		(MCRepositoryGroup default repositories includes: repo)
- 		(self classMCRepositoryGroup default repositories includes: repo)
  			ifTrue: [repo]
  			ifFalse: [repo copy]]!



More information about the Squeak-dev mailing list