[Pkg] Installer: Installer-Core-kph.235.mcz

[squeak-dev-noreply at lists.squeakfoundation.org]

A new version of Installer-Core was added to project Installer:
http://www.squeaksource.com/Installer/Installer-Core-kph.235.mcz

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

Name: Installer-Core-kph.235
Author: kph
Time: 11 October 2008, 5:07:15 pm
UUID: 6183955b-841b-4686-971b-204708f1d8f4
Ancestors: Installer-Core-mtf.234

attempt to apply retrying to files obtained from PBWiki as well as web pages

=============== Diff against Installer-Core-mtf.234 ===============

Item was added:
+ ----- Method: InstallerWeb>>urlToDownload (in category 'web install') -----
+ urlToDownload
+ 
+ 	"while we look for a url which returns what we are looking for, we  get the data anyway"
+ 	
+ 	| delay retry |
+ 	delay := 0.
+ 	self class webSearchPath 
+ 		do: [ :pathSpec | 
+ 				| potentialUrl readPathSpec  |
+ 				readPathSpec := pathSpec value readStream.
+ 				potentialUrl := (readPathSpec upTo: $*), self package, (readPathSpec upToEnd ifNil: [ '' ]).
+ 				[ retry := false. pageDataStream := self urlGet: potentialUrl ] 
+ 						doWhileTrue: [ 	
+ 								self wasPbwikiSpeedWarning
+ 									ifTrue: [ retry := true ]
+ 									ifFalse: [ self hasPage ifTrue: [ pageDataStream reset. 
+ 																^ potentialUrl ] ].
+ 								(Delay forSeconds: (delay := delay + 5)) wait.
+ 								retry ]].
+ 	^nil
+ !

Item was changed:
  ----- Method: InstallerWeb>>basicBrowse (in category 'basic interface') -----
  basicBrowse
   
+  	 self thing size > 0 
-  	 self webThing size > 0 
  		ifTrue: [ self browse: url from: pageDataStream ]
  		ifFalse: [ self logCR: 'NO DATA ',url,' was empty' ].
  	 !

Item was changed:
  ----- Method: InstallerUrl>>urlThing (in category 'url') -----
  urlThing
   
+ 	| retry delay |
+ 	
  	self logCR: 'retrieving ', self urlToDownload , ' ...'.
+ 	
+ 	delay := 0.
+ 	[ retry := false. pageDataStream := self urlGet: self urlToDownload ] 
+ 		doWhileTrue: [  	
+ 				self wasPbwikiSpeedWarning ifTrue: [ retry := true. (Delay forSeconds: (delay := delay + 5)) wait ].
+ 											
+ 				retry ].
+ 		
+ 	pageDataStream ifNil: [ self error: 'unable to contact host' ].
- 	(pageDataStream := self urlGet: self urlToDownload) 
- 		ifNil: [ self error: 'unable to contact host' ].
  	 
  	^ pageDataStream
  	!

Item was changed:
  ----- Method: InstallerWeb>>basicInstall (in category 'basic interface') -----
  basicInstall
   
+  	 self thing size > 0 
-  	 self webThing size > 0 
  		ifTrue: [ self install: url from: pageDataStream ]
  		ifFalse: [ url ifNil: [ ^ self logCR: self package, ' not found on webSearchPath' ].
  				  self logCR: '...',url,' was empty' ].
  	 !

Item was added:
+ ----- Method: InstallerInternetBased>>wasPbwikiSpeedWarning (in category 'url') -----
+ wasPbwikiSpeedWarning
+ 		
+ 		^ self hasPage and: [pageDataStream contents includesSubString: 'Please slow down a bit' ] 
+  
+ !

Item was added:
+ ----- Method: InstallerWeb>>thing (in category 'web install') -----
+ thing
+  
+  	url := self urlToDownload.
+ 	url ifNil: [ self logCR: 'page ', self package, ' not found on path' ]
+ 		ifNotNil: [ self logCR: 'found ',  url, ' ...'.   ].
+ 	^ pageDataStream!

Item was changed:
  ----- Method: InstallerWeb>>action:reportOn: (in category 'action report') -----
  action: line reportOn: report
  	
  	self package: (line readStream upTo: $' ; upTo: $').
  
  	self reportSection: line on: report.
  	
+  	url := self urlToDownload.
-  	url := self webFindUrlToDownload.
  	
  	self reportFor: line page: pageDataStream on: report !

Item was added:
+ ----- Method: InstallerInternetBased>>hasPage (in category 'url') -----
+ hasPage
+ 
+ 	^ pageDataStream notNil and: [ pageDataStream size > 0 ]
+ 			!

Item was changed:
  ----- Method: InstallerWeb>>basicView (in category 'basic interface') -----
  basicView
   
+  	 self thing size > 0 
-  	 self webThing size > 0 
  		ifTrue: [ self view: url from: pageDataStream ]
  		ifFalse: [ self logCR: 'NO DATA ',url,' was empty' ].
  	 !

Item was removed:
- ----- Method: InstallerWeb>>webThing (in category 'web install') -----
- webThing
-  
-  	url := self webFindUrlToDownload.
- 	url ifNil: [ self logCR: 'page ', self package, ' not found on path' ]
- 		ifNotNil: [ self logCR: 'found ',  url, ' ...'.   ].
- 	^ pageDataStream!

Item was removed:
- ----- Method: InstallerWeb>>webFindUrlToDownload (in category 'web install') -----
- webFindUrlToDownload
- 
- 	| delay retry |
- 	delay := 0.
- 	self class webSearchPath 
- 		do: [ :pathSpec | 
- 				| potentialUrl readPathSpec  |
- 				readPathSpec := pathSpec value readStream.
- 				potentialUrl := (readPathSpec upTo: $*), self package, (readPathSpec upToEnd ifNil: [ '' ]).
- 				[ retry := false. pageDataStream := self urlGet: potentialUrl ] 
- 						doWhileTrue: [ 	
- 								(pageDataStream notNil and: [ pageDataStream size > 0 ]) 
- 									ifTrue: [ (pageDataStream contents includesSubString: 'Please slow down a bit') 
- 													ifTrue: [ retry := true ]
- 													ifFalse: [ pageDataStream reset. 
- 																^ potentialUrl ] ].
- 								(Delay forSeconds: (delay := delay + 5)) wait.
- 								retry ]].
- 	^nil
- !