Permalink
Browse files

Remove whitespace [Gun.io WhitespaceBot]

  • Loading branch information...
Gun.io Whitespace Robot
Gun.io Whitespace Robot committed Oct 30, 2011
1 parent 5b4de2d commit baa0d44e00382f53767d2f61ce8dffcafc7aed41
View
@@ -0,0 +1,20 @@
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+*.pyc
+
+# Logs and databases #
+######################
+*.log
+
+# OS generated files #
+######################
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
View
@@ -23,9 +23,9 @@ apiLinuxLibc6Callout: aCommand
apiMacOSXCallout: aCommand
<cdecl: long 'system' (char*) module: 'libSystem.dylib'>
| errCode |
- errCode := ExternalFunction getLastError.
+ errCode := ExternalFunction getLastError.
^ errCode = 13 "Unable to find function address. dylibs are not searched"
- ifTrue: [self error: 'Cannot call libSystem.dylib.
+ ifTrue: [self error: 'Cannot call libSystem.dylib.
Please set "SqueakPluginsBuiltInOrLocalOnly" in your VM''s Info.plist to false']
ifFalse: [self externalCallFailed]! !
@@ -38,9 +38,9 @@ apiWindowsCallout: aCommand
callout: aCommand
^ (Smalltalk classNamed: 'OSProcess')
- ifNil: [(self calloutDict
+ ifNil: [(self calloutDict
at: SmalltalkImage current platformName asLowercase
- ifAbsent: [[:cmd | self error: 'Callouts not implemented for your platform!!']])
+ ifAbsent: [[:cmd | self error: 'Callouts not implemented for your platform!!']])
value: aCommand]
ifNotNilDo: [:class | class waitForCommand: aCommand].! !
@@ -57,15 +57,15 @@ calloutDict
!GCCallout class methodsFor: 'callout' stamp: 'tfel 6/14/2010 15:36'!
linuxCallout: aCommand
"Try with new libc6 and older libc5"
- [self apiLinuxLibc6Callout: aCommand]
+ [self apiLinuxLibc6Callout: aCommand]
on: Error
do: [self apiLinuxLibc5Callout: aCommand]! !
!GCCallout class methodsFor: 'callout' stamp: 'tfel 6/14/2010 15:36'!
windowsCallout: aCommand
"Escape newlines for Windows CmdLine"
| escapedCommand |
- escapedCommand := ((aCommand
- copyReplaceAll: Character cr asString with: ' ')
+ escapedCommand := ((aCommand
+ copyReplaceAll: Character cr asString with: ' ')
copyReplaceAll: Character lf asString with: ' ').
self apiWindowsCallout: escapedCommand.! !
View
@@ -4,7 +4,7 @@ Object subclass: #GCMapper
poolDictionaries: ''
category: 'Gitocello-Core'!
!GCMapper commentStamp: 'tfel 9/10/2009 11:56' prior: 0!
-I am used to file out a package to a repository. I do not care at all what kind of repository.
+I am used to file out a package to a repository. I do not care at all what kind of repository.
'repoDir' and 'packageName' are the only options that should be set on me.
You can use my 'files' field to find out which files I have filed out during my lifetime.
@@ -35,9 +35,9 @@ fileOutCategory: aCategory
| subfolder |
subfolder := (aCategory asString findBetweenSubStrs: '-') last.
self createFolder: subfolder.
- (systemOrganizer superclassOrder: aCategory) do: [:each |
- self
- fileOutClass: each
+ (systemOrganizer superclassOrder: aCategory) do: [:each |
+ self
+ fileOutClass: each
in: (repoDir directoryNamed: subfolder) pathName]! !
!GCMapper methodsFor: 'fileOut' stamp: 'tfel 9/10/2009 11:53'!
@@ -55,16 +55,16 @@ fileOutExtensions: extensionMethods
| dict |
self createFolder: 'Extensions'.
dict := Dictionary new.
- extensionMethods do: [:each |
+ extensionMethods do: [:each |
dict at: each classSymbol ifAbsentPut: OrderedCollection new.
(dict at: each classSymbol) add: each methodSymbol].
dict keysDo: [:key || stream file |
stream := WriteStream on: (String new: 1000).
- file := (repoDir directoryNamed: 'Extensions') pathName,
- FileDirectory pathNameDelimiter asString,
+ file := (repoDir directoryNamed: 'Extensions') pathName,
+ FileDirectory pathNameDelimiter asString,
key asString.
(dict at: key) do: [:method |
- (Smalltalk classNamed: key)
+ (Smalltalk classNamed: key)
printMethodChunk: method withPreamble: true
on: stream moveSource: false toFile: 0].
self writeSourceCodeFrom: stream to: file]! !
@@ -75,15 +75,15 @@ fileOutPackage
| packageInfo |
packageInfo := PackageInfo named: self packageName.
packageInfo systemCategories do: [:category | self fileOutCategory: category].
- packageInfo extensionMethods
+ packageInfo extensionMethods
ifNotEmpty: [self fileOutExtensions: packageInfo extensionMethods].
! !
!GCMapper methodsFor: 'fileOut' stamp: 'mh 5/12/2010 15:57'!
writeSourceCodeFrom: aStream to: aFile
"This writes the source code and adds to files"
| converter f fileName |
- aStream contents isAsciiString
+ aStream contents isAsciiString
ifTrue: [converter := MacRomanTextConverter new]
ifFalse: [converter := UTF8TextConverter new].
fileName := aFile, (FileDirectory dot, FileStream st).
View
@@ -6,7 +6,7 @@ Object subclass: #GCPackage
!GCPackage methodsFor: 'accessing' stamp: 'tfel 9/20/2009 14:31'!
classes
- "This converts, then sorts the class names, then finds the classes. Expensive, but run basically
+ "This converts, then sorts the class names, then finds the classes. Expensive, but run basically
only on intialization of the package and for the browser, which is slow anyway"
| packageInfo |
packageInfo := (PackageInfo named: self packageName).
View
@@ -6,7 +6,7 @@ Object subclass: #GCRegistry
!GCRegistry commentStamp: 'tfel 9/10/2009 11:56' prior: 0!
In my class I keep all the information on where to create/find git repositories in the file system (RepositoryRoot) and which Repositories have been created and how far they are along compared to their Monticello history.
-My instance (of which there is only one) is used to create, remove and update repositories
+My instance (of which there is only one) is used to create, remove and update repositories
through the interface exposed in the 'commands' category.
I am well aware of the conversion to Gnu Smalltalk going on here, and I call the appropriate classes to do the conversion.!
@@ -43,7 +43,7 @@ commit: aPackage
Character cr asString, 'and will combine the commit messages']
ifNotNilDo: [:version |
version load.
- self
+ self
createFilesFor: aPackage;
run: #add
in: aPackage asString
@@ -90,15 +90,15 @@ removeRepositoryFor: aPackage
commitMessagesFor: aPackage
"Creates a git-commit-msg from the non-commited Monticello versions"
| messages ancestors |
- ancestors := ((MCPackage named: aPackage)
- workingCopy ancestry breadthFirstAncestors
+ ancestors := ((MCPackage named: aPackage)
+ workingCopy ancestry breadthFirstAncestors
copyUpTo: (self at: aPackage) lastCommit).
(ancestors size > 1 and: [self confirm: 'There are ', ancestors size, ' commits difference between the image and the Git repository. Should I commit all messages as one?'])
ifTrue: [messages := self commitMessagesForAncestors: ancestors]
ifFalse: [messages := self commitMessagesForAncestors:
(ancestors ifEmpty: [{}] ifNotEmpty: [{ancestors at: 1}])].
(self at: aPackage)
- lastCommit: ((MCPackage named: aPackage) workingCopy ancestry ancestors
+ lastCommit: ((MCPackage named: aPackage) workingCopy ancestry ancestors
ifEmpty: [nil]
ifNotEmpty: [:o | o first]).
^ self escapeForBash: messages contents
@@ -122,7 +122,7 @@ commitMessagesForAncestors: aCollection
!GCRegistry methodsFor: 'monticello-helpers' stamp: 'tfel 9/10/2009 09:41'!
escapeForBash: aString
- ^ (((aString
+ ^ (((aString
replaceAll: Character cr with: Character lf)
replaceAll: $!! with: $.)
replaceAll: $" with: $')
@@ -134,7 +134,7 @@ storeVersion: aWorkingCopy
| package |
package := aWorkingCopy package name.
- self
+ self
pull: package;
commit: package;
push: package.
@@ -164,16 +164,16 @@ initialize
!GCRegistry methodsFor: 'helpers' stamp: 'tfel 9/8/2009 19:57'!
run: aGitCommand in: aPackage
-
+
self run: aGitCommand in: aPackage with: (Array new: 0)
! !
!GCRegistry methodsFor: 'helpers' stamp: 'tfel 9/8/2009 19:57'!
run: aGitCommand in: aPackage with: anArgumentsArray
"Set the details we need and run"
- git
- localPath: RepositoryRoot pathName,
- FileDirectory pathNameDelimiter asString,
+ git
+ localPath: RepositoryRoot pathName,
+ FileDirectory pathNameDelimiter asString,
aPackage;
perform: aGitCommand withArguments: anArgumentsArray
! !
@@ -203,23 +203,23 @@ createDirectoryStructure: aString
!GCRegistry class methodsFor: 'class initialization' stamp: 'mh 5/10/2010 15:27'!
initialize
-
+
super initialize.
- Smalltalk addToStartUpList: self.
+ Smalltalk addToStartUpList: self.
self startUp.
self instance: nil.! !
!GCRegistry class methodsFor: 'class initialization' stamp: 'tfel 9/9/2009 13:44'!
new
"One global Registry is enough"
- ^ self instance
+ ^ self instance
ifNil: [instance := super new]
ifNotNil: [instance]! !
!GCRegistry class methodsFor: 'class initialization' stamp: 'mh 5/10/2010 15:28'!
startUp
- self
+ self
repositoryRoot: 'package-cache', FileDirectory slash, 'git-repositories'.
(self repositories keys copy do: [:each |
(self repositoryRoot directoryNames includes: each)
@@ -230,20 +230,20 @@ startUp
doesNotUnderstand: aMessage
(self new respondsTo: aMessage selector)
- ifTrue: [^ self instance
- perform: aMessage selector
+ ifTrue: [^ self instance
+ perform: aMessage selector
withArguments: aMessage arguments].
^ super doesNotUnderstand: aMessage! !
!GCRegistry class methodsFor: 'class variables' stamp: 'tfel 9/7/2009 03:31'!
instance
-
+
^ instance! !
!GCRegistry class methodsFor: 'class variables' stamp: 'tfel 9/7/2009 03:31'!
instance: anObject
-
+
instance := anObject! !
!GCRegistry class methodsFor: 'class variables' stamp: 'mh 5/10/2010 15:23'!
@@ -265,7 +265,7 @@ repositoryRoot
!GCRegistry class methodsFor: 'class variables' stamp: 'tfel 9/7/2009 03:12'!
repositoryRoot: aStringOrDirectory
"Set the FileDirectory either directly or from String"
- RepositoryRoot := aStringOrDirectory isString
+ RepositoryRoot := aStringOrDirectory isString
ifTrue: [self createDirectoryStructure: aStringOrDirectory]
ifFalse: [self createDirectoryStructure: aStringOrDirectory pathName]
! !
@@ -9,8 +9,8 @@ saveVersion
[:v |
(MCVersionInspector new version: v) show.
Cursor wait showWhile: [repo storeVersion: v].
- MCCacheRepository default cacheAllFileNamesDuring:
- [repo cacheAllFileNamesDuring:
+ MCCacheRepository default cacheAllFileNamesDuring:
+ [repo cacheAllFileNamesDuring:
[v allAvailableDependenciesDo:
[:dep |
(repo includesVersionNamed: dep info name)
View
@@ -32,18 +32,18 @@ basicConvert: aFilepath from: input to: output
GCCallout callout: stream contents.
filename := FileDirectory localNameFor: aFilepath.
FileDirectory deleteFilePath: aFilepath.
- (FileDirectory forFileName: aFilepath)
+ (FileDirectory forFileName: aFilepath)
rename: filename, '.converted' toBe: filename.! !
!GCGstConvertCommand class methodsFor: 'callouts' stamp: 'tfel 6/14/2010 17:18'!
flip: aString with: anotherString on: aFilepath
| filename |
- (GCCallout callout: 'tr ', aString, ' ', anotherString, ' < "', aFilepath,
+ (GCCallout callout: 'tr ', aString, ' ', anotherString, ' < "', aFilepath,
'" > "', aFilepath, '.converted"') = 0 ifTrue: [
filename := FileDirectory localNameFor: aFilepath.
FileDirectory deleteFilePath: aFilepath.
- (FileDirectory forFileName: aFilepath)
+ (FileDirectory forFileName: aFilepath)
rename: filename, '.converted' toBe: filename].! !
@@ -101,8 +101,8 @@ gstBidirectional
"Reverse all bidirectional rules to apply them for squeak -> gst conversion"
^ (self allMethodsIn: 'bidirectional-rules')
inject: OrderedCollection new
- into: [:list :method |
- list union: ((self perform: method)
+ into: [:list :method |
+ list union: ((self perform: method)
collect: [:each | each value -> each key])]! !
@@ -191,9 +191,9 @@ squeakStatements
writeRules: someRules to: aStream
someRules do: [:each |
- aStream
+ aStream
nextPutAll: '-r';
nextPut: $';
- nextPutAll: (each printString copyWithout: $');
+ nextPutAll: (each printString copyWithout: $');
nextPut: $';
nextPut: Character space]! !
View
@@ -14,7 +14,7 @@ classFilePathFor: aClass
"Find the path to the classes fileOut"
| subfolder |
subfolder := (aClass theNonMetaClass category asString findBetweenSubStrs: '-') last.
- ^ subfolder, FileDirectory pathNameDelimiter asString,
+ ^ subfolder, FileDirectory pathNameDelimiter asString,
aClass name asString, FileDirectory dot, FileStream st! !
!GCGstPackageWriter methodsFor: 'stream-writing' stamp: 'tfel 9/20/2009 13:07'!
@@ -26,7 +26,7 @@ classes
createPackageXml
self packageXmlStream reset.
- self
+ self
preamble;
requires;
tests;
@@ -42,16 +42,16 @@ fileIn: aClass
!GCGstPackageWriter methodsFor: 'stream-writing' stamp: 'tfel 9/10/2009 14:17'!
fileIns
- self classes
+ self classes
reject: [:class | class allSuperclasses includes: TestCase]
thenDo: [:class | self fileIn: class]! !
!GCGstPackageWriter methodsFor: 'stream-writing' stamp: 'tfel 9/10/2009 14:15'!
files
- self classes do: [:class |
- self
- putAttribute: 'file'
+ self classes do: [:class |
+ self
+ putAttribute: 'file'
with: (self classFilePathFor: class)
]! !
@@ -61,7 +61,7 @@ preamble
{'<package>' . '<!!-- THIS FILE IS GENERATED!! EDITS _WILL_ BE LOST ON UPDATE!! -->'. ''}
do: [:s | self packageXmlStream nextPutAll: s]
separatedBy: [self packageXmlStream nextPut: newline].
- self
+ self
putAttribute: 'name' with: self packageName;
putAttribute: 'namespace' with: self packageName.! !
@@ -108,7 +108,7 @@ fileOutPackageXml
| fileName converter file |
self class writePackageXml ifTrue: [
self createPackageXml.
- self packageXmlStream contents isAsciiString
+ self packageXmlStream contents isAsciiString
ifTrue: [converter := MacRomanTextConverter new]
ifFalse: [converter := UTF8TextConverter new].
fileName := self repoDir, FileDirectory pathNameDelimiter asString, 'package.xml'.
View
@@ -1,4 +1,4 @@
-Copyright (C) 2009 by Tim Felgentreff
+Copyright (C) 2009 by Tim Felgentreff
All rights reserved.
@@ -9,7 +9,7 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
-The above copyright notice shall be included in all copies or substantial
+The above copyright notice shall be included in all copies or substantial
portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
Oops, something went wrong.

0 comments on commit baa0d44

Please sign in to comment.