[Pkg] The Trunk: SystemReporter-laza.16.mcz

[commits at source.squeak.org]

Alexander Lazarević uploaded a new version of SystemReporter to project The Trunk:
http://source.squeak.org/trunk/SystemReporter-laza.16.mcz

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

Name: SystemReporter-laza.16
Author: laza
Time: 15 February 2011, 10:51:44.582 am
UUID: 89adb003-d578-4cf2-97f3-dbccbcc34dee
Ancestors: SystemReporter-laza.15

- Created utility method to include text file contents safely
- Made reportWin32VMConfig use above
- Created reportLinuxOSDetails which shows the contents of '/etc/issue', '/etc/lsb-version' (and when it works '/proc/version')

=============== Diff against SystemReporter-laza.15 ===============

Item was changed:
  ----- Method: SystemReporter>>initialize (in category 'initialize-release') -----
  initialize
  	self
  		add: #Image method: #reportImage;
  		add: #'Image Parameters' method: #reportImageParameters;
  		add: #'Image Sources' method: #reportSources;
  		add: #'Image Preferences' method: #reportPreferences;
  		add: #'MC Repositories' method: #reportRepositories;
  		add: #'MC Working Copies' method: #reportWorkingCopies;
  		add: #'VM General' method: #reportVM;
  		add: #'VM Options' method: #reportVMOptions;
  		add: #'VM Modules' method: #reportModules;
  		add: #'VM Parameters' method: #reportVMParameters;
  		add: #'VM Stats' method: #reportVMStats.
  	Smalltalk os platformName = 'Win32' ifTrue: [
  		self
  			add: #'VM Configuration' method: #reportWin32VMConfig.
  		].
  	self
  		add: #'OS General' method: #reportOS.
  	Smalltalk os platformName = 'Win32' ifTrue: [
  		self
  			add: #'OS Details' method: #reportWin32OSDetails;
  			add: #'Hardware Details' method: #reportWin32HardwareDetails;
  			add: #'GFX Hardware Details' method: #reportWin32GFXDetails.
  		].
+ 	Smalltalk os osVersion = 'linux' ifTrue: [
+ 		self
+ 			add: #'OS Details' method: #reportLinuxOSDetails
+ 	].
  	self
  		add: #'Tiny Benchmarks' method: #reportTinyBenchmarks;
  		add: #'SUnit' method: #reportTestRunner;
  		add: #'Debug Log' method: #reportDebugLog.
  	categoriesSelected := Set with: #Image with: #'VM General'.
  	self updateReport
  !

Item was added:
+ ----- Method: SystemReporter>>reportLinuxOSDetails: (in category 'reporting') -----
+ reportLinuxOSDetails: aStream
+ 	self header: 'Operating System Details' on: aStream.
+ 	{
+ 		'/etc/issue'.
+ 		'/etc/lsb-release'.
+ 		"'/proc/version'." "Squeak can't read this?!!"
+ 	} do: [:path|
+ 		self writeContentsSafelyFromFile: path on: aStream]!

Item was changed:
  ----- Method: SystemReporter>>reportWin32VMConfig: (in category 'reporting') -----
  reportWin32VMConfig: aStream
+ 	| exePath iniPath |
- 	| exePath iniData iniPath |
  	self header: 'VM Configuration' on: aStream.
  	exePath := Smalltalk vm vmFileName.
  	iniPath := (exePath copyUpToLast: $.), '.ini'.
  	aStream nextPutAll: iniPath; cr.
+ 	self writeContentsSafelyFromFile: iniPath on: aStream.
+ !
- 	iniData := [
- 		(FileStream readOnlyFileNamed: iniPath)
- 			 contentsOfEntireFile
- 	] on: Error do:[:ex| ex return: ex printString].
- 	aStream
- 		nextPutAll: iniData!

Item was added:
+ ----- Method: SystemReporter>>writeContentsSafelyFromFile:on: (in category 'private') -----
+ writeContentsSafelyFromFile: osPath on: aStream
+ 	aStream nextPutAll:
+ 		([
+ 			(FileStream readOnlyFileNamed: osPath) contentsOfEntireFile
+ 		 ] on: Error do: [:ex| ex return: ex printString])!