resin 0.3.0 → 0.3.1

data/amber/st/Kernel-Collections.st

@@ -1487,6 +1487,43 @@ includes: anObject
 	^elements includes: anObject
 ! !
 
+Object subclass: #Queue
+	instanceVariableNames: 'read readIndex write'
+	package: 'Kernel-Collections'!
+
+!Queue methodsFor: 'accessing'!
+
+back: anObject
+	write add: anObject
+!
+
+front
+    ^self frontIfAbsent: [ self error: 'Cannot read from empty Queue.']
+!
+
+frontIfAbsent: aBlock
+	| result |
+	result := read at: readIndex ifAbsent: [
+		write isEmpty ifTrue: [
+			readIndex > 1 ifTrue: [ read := #(). readIndex := 1 ].
+			^aBlock value ].
+    	read := write.
+    	readIndex := 1.
+    	write := OrderedCollection new.
+    	read first ].
+    read at: readIndex put: nil.
+    readIndex := readIndex + 1.
+    ^result
+! !
+
+!Queue methodsFor: 'initialization'!
+
+initialize
+	read := #().
+    readIndex := 1.
+    write := OrderedCollection new
+! !
+
 Object subclass: #RegularExpression
 	instanceVariableNames: ''
 	package: 'Kernel-Collections'!

data/amber/st/Kernel-Methods.st

@@ -56,13 +56,7 @@ applyTo: anObject arguments: aCollection
 !
 
 ensure: aBlock
-	| success |
-	success := false.
-	^[self value. success := true. aBlock value]
-		on: Error
-		do: [:ex |
-			success ifFalse: [aBlock value].
-			ex signal]
+	<try{self()}finally{return aBlock._value()}>
 !
 
 new
@@ -121,6 +115,10 @@ valueWithPossibleArguments: aCollection
 
 !BlockClosure methodsFor: 'timeout/interval'!
 
+fork
+	ForkPool default fork: self
+!
+
 valueWithInterval: aNumber
 	<return setInterval(self, aNumber)>
 !
@@ -162,7 +160,16 @@ category
 !
 
 category: aString
-	self basicAt: 'category' put: aString
+	| oldCategory |
+    oldCategory := self category.
+	self basicAt: 'category' put: aString.
+    
+    self methodClass ifNotNil: [
+    	self methodClass organization addElement: aString.
+    
+		(self methodClass methods 
+    		select: [ :each | each category = oldCategory ])
+        	ifEmpty: [ self methodClass organization removeElement: oldCategory ] ]
 !
 
 fn
@@ -205,6 +212,54 @@ source: aString
 	self basicAt: 'source' put: aString
 ! !
 
+Object subclass: #ForkPool
+	instanceVariableNames: 'poolSize maxPoolSize queue worker'
+	package: 'Kernel-Methods'!
+
+!ForkPool methodsFor: 'action'!
+
+addWorker
+	worker valueWithTimeout: 0.
+    poolSize := poolSize + 1
+!
+
+fork: aBlock
+	poolSize < maxPoolSize ifTrue: [ self addWorker ].
+	queue back: aBlock
+! !
+
+!ForkPool methodsFor: 'initialization'!
+
+initialize
+	| sentinel |
+	poolSize := 0.
+    maxPoolSize := self class defaultMaxPoolSize.
+    queue := Queue new.
+    sentinel := Object new.
+    worker := [
+		| block |
+        poolSize := poolSize - 1.
+		block := queue frontIfAbsent: [ sentinel ].
+        block == sentinel ifFalse: [
+        	[ block value ] ensure: [ self addWorker ]]].
+! !
+
+ForkPool class instanceVariableNames: 'default'!
+
+!ForkPool class methodsFor: 'accessing'!
+
+default
+	^default ifNil: [ default := self new ]
+!
+
+defaultMaxPoolSize
+	^100
+!
+
+resetDefault
+	default := nil
+! !
+
 Object subclass: #Message
 	instanceVariableNames: 'selector arguments'
 	package: 'Kernel-Methods'!

data/amber/st/Kernel-Objects.st

@@ -990,6 +990,24 @@ pi
 	<return Math.PI>
 ! !
 
+Object subclass: #Organizer
+	instanceVariableNames: ''
+	package: 'Kernel-Objects'!
+
+!Organizer methodsFor: 'accessing'!
+
+addElement: anObject
+	<self.addElement(anObject)>
+!
+
+elements
+	^ (self basicAt: 'elements') copy
+!
+
+removeElement: anObject
+	<self.removeElement(anObject)>
+! !
+
 Object subclass: #Package
 	instanceVariableNames: 'commitPathJs commitPathSt'
 	package: 'Kernel-Objects'!
@@ -1047,6 +1065,10 @@ name: aString
 	<self.pkgName = aString>
 !
 
+organization
+	^ self basicAt: 'organization'
+!
+
 properties
 	^Smalltalk current readJSObject: (self basicAt: 'properties')
 !
@@ -1065,8 +1087,7 @@ properties: aDict
 !Package methodsFor: 'classes'!
 
 classes
-	"We need to do a reverse scan."
-	^Smalltalk current classes select: [:c | c package == self]
+	^ self organization elements
 !
 
 sortedClasses
@@ -1373,10 +1394,6 @@ basicParse: aString
 	<return smalltalk.parser.parse(aString)>
 !
 
-classes
-	<return self.classes()>
-!
-
 parse: aString
 	| result | 
 	self try: [result := self basicParse: aString] catch: [:ex | (self parseError: ex parsing: aString) signal].
@@ -1415,6 +1432,10 @@ send: aSelector to: anObject arguments: aCollection
 
 !Smalltalk methodsFor: 'classes'!
 
+classes
+	<return self.classes()>
+!
+
 removeClass: aClass
 	aClass isMetaclass ifTrue: [self error: aClass asString, ' is a Metaclass and cannot be removed!!'].
     
@@ -1424,7 +1445,7 @@ removeClass: aClass
 	aClass class methodDictionary values do: [:each |
 		aClass class removeCompiledMethod: each].
         
-	self basicDelete: aClass name.
+	self deleteClass: aClass.
     
     SystemAnnouncer current
     	announce: (ClassRemoved new
@@ -1492,6 +1513,12 @@ createPackage: packageName properties: aDict
        <return smalltalk.addPackage(packageName, object)>
 !
 
+deleteClass: aClass
+	"Deletes a class by deleting its binding only. Use #removeClass instead"
+    
+	<self.removeClass(aClass)>
+!
+
 deletePackage: packageName
 	"Deletes a package by deleting its binding, but does not check if it contains classes etc.
 	To remove a package, use #removePackage instead."

data/amber/st/Kernel-Tests.st

@@ -13,6 +13,10 @@ testEnsure
 	self assert: ([Error new] ensure: [true])
 !
 
+testEnsureRaises
+	self should: [[Error new signal] ensure: [true]] raise: Error
+!
+
 testNumArgs
 	self assert: [] numArgs equals: 0.
 	self assert: [:a :b | ] numArgs equals: 2
@@ -150,6 +154,12 @@ testLogicKeywords
 		assert: (false or: [ 1 > 0 ]); 
 		assert: ((1 > 0) or: [ false ]); 
 		assert: ((1 > 0) or: [ 1 > 2 ])
+!
+
+testNonBooleanError
+	|b|
+    b := < '' >.
+    self should: [nonBoolean ifTrue: [] ifFalse: []] raise: NonBooleanReceiver
 ! !
 
 TestCase subclass: #ClassBuilderTest

data/amber/st/SUnit.st

@@ -1,4 +1,18 @@
 Smalltalk current createPackage: 'SUnit' properties: #{}!
+Object subclass: #ResultAnnouncement
+	instanceVariableNames: 'result'
+	package: 'SUnit'!
+
+!ResultAnnouncement methodsFor: 'accessing'!
+
+result
+	^result
+!
+
+result: aTestResult
+	result := aTestResult
+! !
+
 Object subclass: #TestCase
 	instanceVariableNames: 'testSelector'
 	package: 'SUnit'!
@@ -23,17 +37,15 @@ signalFailure: aString
 
 !TestCase methodsFor: 'running'!
 
-performTestFor: aResult
-	[[self perform: self selector]
-		on: TestFailure do: [:ex | aResult addFailure: self]]
-		on: Error do: [:ex | aResult addError: self]
+performTest
+	self perform: self selector
 !
 
-runCaseFor: aTestResult
-	self setUp.
-	aTestResult increaseRuns.
-	self performTestFor: aTestResult.
-	self tearDown
+runCase
+	[	self setUp.
+		self performTest ] ensure: [
+		self tearDown.
+		"self cleanUpInstanceVariables" ]
 !
 
 setUp
@@ -180,3 +192,68 @@ initialize
 	total := 0
 ! !
 
+!TestResult methodsFor: 'running'!
+
+nextRunDo: aBlock
+"Runs aBlock with index of next run
+or does nothing if no more runs"
+^self runs == self total
+	ifFalse: [ aBlock value: self runs + 1 ]
+!
+
+runCase: aTestCase
+	[[	self increaseRuns.
+    	aTestCase runCase]
+	on: TestFailure do: [:ex | self addFailure: aTestCase]]
+	on: Error do: [:ex | self addError: aTestCase]
+! !
+
+Object subclass: #TestSuiteRunner
+	instanceVariableNames: 'suite result announcer'
+	package: 'SUnit'!
+
+!TestSuiteRunner methodsFor: 'accessing'!
+
+announcer
+	^announcer
+!
+
+result
+	^result
+!
+
+suite: aCollection
+	suite := aCollection
+! !
+
+!TestSuiteRunner methodsFor: 'actions'!
+
+run
+	| worker |
+	result total: suite size.
+    announcer announce: (ResultAnnouncement new result: result).
+    worker := [ result nextRunDo: [ :index |
+		[ result runCase: (suite at: index) ]
+		ensure: [ worker fork.
+        	announcer announce: (ResultAnnouncement new result: result) ]]].
+	worker fork
+! !
+
+!TestSuiteRunner methodsFor: 'initialization'!
+
+initialize
+	super initialize.
+	announcer := Announcer new.
+    result := TestResult new
+! !
+
+!TestSuiteRunner class methodsFor: 'instance creation'!
+
+new
+	self shouldNotImplement
+!
+
+on: aCollection
+	^super new suite: aCollection
+! !
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &5027820 !ruby/object:Gem::Requirement
+  requirement: &10777680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *5027820
+  version_requirements: *10777680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &5027080 !ruby/object:Gem::Requirement
+  requirement: &10776980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5027080
+  version_requirements: *10776980
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &5026260 !ruby/object:Gem::Requirement
+  requirement: &10776180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5026260
+  version_requirements: *10776180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &5025480 !ruby/object:Gem::Requirement
+  requirement: &10775220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5025480
+  version_requirements: *10775220
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &5024440 !ruby/object:Gem::Requirement
+  requirement: &10774040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5024440
+  version_requirements: *10774040
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &5023260 !ruby/object:Gem::Requirement
+  requirement: &10789120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5023260
+  version_requirements: *10789120
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &5038320 !ruby/object:Gem::Requirement
+  requirement: &10787700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5038320
+  version_requirements: *10787700
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &5036780 !ruby/object:Gem::Requirement
+  requirement: &10786400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5036780
+  version_requirements: *10786400
 description: 
 email: tyler@linux.com
 executables:
@@ -140,6 +140,30 @@ files:
 - amber/js/lib/bootstrap/js/bootstrap.min.js
 - amber/js/lib/bootstrap/js/bootstrap.js
 - amber/js/lib/showdown.js
+- amber/js/lib/es5-shim-2.0.2/es5-sham.js
+- amber/js/lib/es5-shim-2.0.2/es5-shim.min.js
+- amber/js/lib/es5-shim-2.0.2/tests/lib/jasmine.css
+- amber/js/lib/es5-shim-2.0.2/tests/lib/jasmine-html.js
+- amber/js/lib/es5-shim-2.0.2/tests/lib/json2.js
+- amber/js/lib/es5-shim-2.0.2/tests/lib/jasmine.js
+- amber/js/lib/es5-shim-2.0.2/tests/lib/jasmine_favicon.png
+- amber/js/lib/es5-shim-2.0.2/tests/helpers/h-matchers.js
+- amber/js/lib/es5-shim-2.0.2/tests/helpers/h.js
+- amber/js/lib/es5-shim-2.0.2/tests/helpers/h-kill.js
+- amber/js/lib/es5-shim-2.0.2/tests/index.html
+- amber/js/lib/es5-shim-2.0.2/tests/spec/s-string.js
+- amber/js/lib/es5-shim-2.0.2/tests/spec/s-function.js
+- amber/js/lib/es5-shim-2.0.2/tests/spec/s-date.js
+- amber/js/lib/es5-shim-2.0.2/tests/spec/s-object.js
+- amber/js/lib/es5-shim-2.0.2/tests/spec/s-array.js
+- amber/js/lib/es5-shim-2.0.2/es5-shim.js
+- amber/js/lib/es5-shim-2.0.2/CHANGES
+- amber/js/lib/es5-shim-2.0.2/es5-sham.min.js
+- amber/js/lib/es5-shim-2.0.2/minify
+- amber/js/lib/es5-shim-2.0.2/package.json
+- amber/js/lib/es5-shim-2.0.2/CONTRIBUTORS.md
+- amber/js/lib/es5-shim-2.0.2/README.md
+- amber/js/lib/es5-shim-2.0.2/LICENSE
 - amber/js/lib/peg-0.6.2.min.js
 - amber/js/lib/CodeMirror/smalltalk.js
 - amber/js/lib/CodeMirror/codemirror.css
@@ -206,7 +230,6 @@ files:
 - amber/js/Compiler-AST.deploy.js
 - amber/js/Compiler-Tests.js
 - amber/js/Examples.deploy.js
-- amber/js/compat.js
 - amber/js/Documentation.deploy.js
 - amber/js/Kernel-Exceptions.js
 - amber/js/Kernel-Exceptions.deploy.js
@@ -280,7 +303,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3056217880712448120
+      hash: -4232258665751550036
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -289,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3056217880712448120
+      hash: -4232258665751550036
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10