resin 0.3.1 → 0.4.0

data/amber/st/SUnit.st

@@ -14,11 +14,25 @@ result: aTestResult
 ! !
 
 Object subclass: #TestCase
-	instanceVariableNames: 'testSelector'
+	instanceVariableNames: 'testSelector asyncTimeout context'
 	package: 'SUnit'!
+!TestCase commentStamp!
+A TestCase is an implementation of the command pattern to run a test.  
+
+`TestCase` instances are created with the class method `#selector:`, 
+passing the symbol that names the method to be executed when the test case runs.
+
+When you discover a new fixture, subclass `TestCase` and create a `#test...` method for the first test.  
+As that method develops and more `#test...` methods are added, you will find yourself refactoring temps 
+into instance variables for the objects in the fixture and overriding `#setUp` to initialize these variables.  
+As required, override `#tearDown` to nil references, release objects and deallocate.!
 
 !TestCase methodsFor: 'accessing'!
 
+context: aRunningTestContext
+	context := aRunningTestContext
+!
+
 selector
 	^testSelector
 !
@@ -27,6 +41,40 @@ setTestSelector: aSelector
 	testSelector := aSelector
 ! !
 
+!TestCase methodsFor: 'async'!
+
+async: aBlock
+	| c |
+	self errorIfNotAsync: '#async'.
+    c := context.
+    ^ [ self isAsync ifTrue: [ c execute: aBlock ] ]
+!
+
+finished
+	self errorIfNotAsync: '#finished'.
+	asyncTimeout := nil
+!
+
+timeout: aNumber
+	"Set a grace time timeout in milliseconds to run the test asynchronously"
+    
+	asyncTimeout ifNotNil: [ asyncTimeout clearTimeout ].
+    
+     "to allow #async: message send without throwing an error"
+	asyncTimeout := 0.
+    
+	asyncTimeout := (self async: [ 
+    	self assert: false description: 'SUnit grace time exhausted' ])
+        	valueWithTimeout: aNumber
+! !
+
+!TestCase methodsFor: 'error handling'!
+
+errorIfNotAsync: aString
+	self isAsync ifFalse: [ 
+    	self error: aString, ' used without prior #timeout:' ]
+! !
+
 !TestCase methodsFor: 'private'!
 
 signalFailure: aString
@@ -38,14 +86,14 @@ signalFailure: aString
 !TestCase methodsFor: 'running'!
 
 performTest
+	asyncTimeout := nil.
 	self perform: self selector
 !
 
 runCase
-	[	self setUp.
-		self performTest ] ensure: [
-		self tearDown.
-		"self cleanUpInstanceVariables" ]
+	"Runs a test case in isolated context, leaking all errors."
+
+	(TestContext testCase: self) start
 !
 
 setUp
@@ -72,6 +120,10 @@ deny: aBoolean
 	self assert: aBoolean not
 !
 
+isAsync
+	^asyncTimeout notNil
+!
+
 should: aBlock
 	self assert: aBlock value
 !
@@ -126,13 +178,127 @@ shouldInheritSelectors
 	^self ~= self lookupHierarchyRoot
 ! !
 
+Object subclass: #TestContext
+	instanceVariableNames: 'testCase'
+	package: 'SUnit'!
+!TestContext commentStamp!
+TestContext governs running a particular test case.
+
+It's main added value is `#execute:` method which runs a block
+as a part of test case (restores context, nilling it afterwards,
+cleaning/calling tearDown as appropriate for sync/async scenario).!
+
+!TestContext methodsFor: 'accessing'!
+
+testCase: aTestCase
+	testCase := aTestCase
+! !
+
+!TestContext methodsFor: 'running'!
+
+execute: aBlock
+	| failed |
+    
+    testCase context: self.
+    [ 
+    	failed := true. 
+        aBlock value. 
+        failed := false 
+	] 
+    	ensure: [
+        	testCase context: nil.
+            
+        	(failed and: [ testCase isAsync ]) ifTrue: [ 
+            	testCase finished ].
+        	testCase isAsync ifFalse: [ 
+        		testCase tearDown ] ]
+!
+
+start
+	self execute: [ 
+    	testCase setUp. 
+        testCase performTest ]
+! !
+
+!TestContext class methodsFor: 'instance creation'!
+
+testCase: aTestCase
+	^self new
+        testCase: aTestCase;
+        yourself
+! !
+
+TestContext subclass: #ReportingTestContext
+	instanceVariableNames: 'finished result'
+	package: 'SUnit'!
+!ReportingTestContext commentStamp!
+ReportingTestContext adds `TestResult` reporting
+to `TestContext`.
+
+Errors are caught and save into a `TestResult`,
+When test case is finished (which can be later for async tests),
+a callback block is executed; this is used by a `TestSuiteRunner`.!
+
+!ReportingTestContext methodsFor: 'accessing'!
+
+finished: aBlock
+	finished := aBlock
+!
+
+result: aTestResult
+	result := aTestResult
+! !
+
+!ReportingTestContext methodsFor: 'private'!
+
+withErrorReporting: aBlock
+ 	[ aBlock
+		on: TestFailure 
+		do: [ :ex | result addFailure: testCase ] 
+	]
+    	on: Error 
+        do: [ :ex | result addError: testCase ]
+! !
+
+!ReportingTestContext methodsFor: 'running'!
+
+execute: aBlock
+    [ 
+    	self withErrorReporting: [ super execute: aBlock ] 
+	]
+    	ensure: [ 
+        	testCase isAsync ifFalse: [ 
+            	result increaseRuns. finished value ] ]
+! !
+
+!ReportingTestContext class methodsFor: 'instance creation'!
+
+testCase: aTestCase result: aTestResult finished: aBlock
+	^(super testCase: aTestCase)
+        result: aTestResult;
+        finished: aBlock;
+        yourself
+! !
+
 Error subclass: #TestFailure
 	instanceVariableNames: ''
 	package: 'SUnit'!
+!TestFailure commentStamp!
+The test framework distinguishes between failures and errors.  
+A failure is an event whose possibiity is explicitly anticipated and checked for in an assertion, 
+whereas an error is an unanticipated problem like a division by 0 or an index out of bounds.  
+
+TestFailure is raised when the boolean parameter of an #`assert:` or `#deny:` call is the opposite of what the assertion claims.!
 
 Object subclass: #TestResult
 	instanceVariableNames: 'timestamp runs errors failures total'
 	package: 'SUnit'!
+!TestResult commentStamp!
+A TestResult implements the collecting parameter pattern for running a bunch of tests.  
+
+A TestResult holds tests that have run, sorted into the result categories of passed, failures and errors.
+
+TestResult is an interesting object to subclass or substitute. `#runCase:` is the external protocol you need to reproduce!
 
 !TestResult methodsFor: 'accessing'!
 
@@ -209,7 +375,7 @@ runCase: aTestCase
 ! !
 
 Object subclass: #TestSuiteRunner
-	instanceVariableNames: 'suite result announcer'
+	instanceVariableNames: 'suite result announcer runNextTest'
 	package: 'SUnit'!
 
 !TestSuiteRunner methodsFor: 'accessing'!
@@ -228,15 +394,14 @@ suite: aCollection
 
 !TestSuiteRunner methodsFor: 'actions'!
 
+resume
+	runNextTest fork.
+    announcer announce: (ResultAnnouncement new result: result)
+!
+
 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
+	self resume
 ! !
 
 !TestSuiteRunner methodsFor: 'initialization'!
@@ -244,7 +409,14 @@ run
 initialize
 	super initialize.
 	announcer := Announcer new.
-    result := TestResult new
+    result := TestResult new.
+    runNextTest := [ | runs | runs := result runs. runs < result total ifTrue: [ (self contextOf: runs + 1) start ]].
+! !
+
+!TestSuiteRunner methodsFor: 'private'!
+
+contextOf: anInteger
+   	^ReportingTestContext testCase: (suite at: anInteger) result: result finished: [ self resume ]
 ! !
 
 !TestSuiteRunner class methodsFor: 'instance creation'!

data/bin/resin

@@ -0,0 +1,6 @@
+#!/usr/env/bin ruby
+
+require 'rubygems'
+require 'resin/cli'
+
+Resin::CLI.start

data/lib/resin/cli.rb

@@ -0,0 +1,19 @@
+require 'thor'
+
+module Resin
+  class CLI < Thor
+    desc 'start', 'Run the current Resin application'
+    def start
+      require 'sinatra/base'
+      require 'sinatra/resin'
+      Sinatra::Application.run!
+    end
+
+
+    desc 'compile', 'Compile all the Amber and JavaScripts together'
+    def compile
+      require 'resin/compiler'
+      Resin::Compiler.run
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resin
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10777680 !ruby/object:Gem::Requirement
+  requirement: &12090640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *10777680
+  version_requirements: *12090640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10776980 !ruby/object:Gem::Requirement
+  requirement: &12090020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10776980
+  version_requirements: *12090020
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &10776180 !ruby/object:Gem::Requirement
+  requirement: &12088380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10776180
+  version_requirements: *12088380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10775220 !ruby/object:Gem::Requirement
+  requirement: &12087040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10775220
+  version_requirements: *12087040
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &10774040 !ruby/object:Gem::Requirement
+  requirement: &12086040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10774040
+  version_requirements: *12086040
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &10789120 !ruby/object:Gem::Requirement
+  requirement: &12085480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10789120
+  version_requirements: *12085480
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &10787700 !ruby/object:Gem::Requirement
+  requirement: &12102380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10787700
+  version_requirements: *12102380
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &10786400 !ruby/object:Gem::Requirement
+  requirement: &12101680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,21 +98,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10786400
+  version_requirements: *12101680
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &12100420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *12100420
 description: 
 email: tyler@linux.com
 executables:
-- runresin
-- resin-compile
+- resin
 extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
-- bin/runresin
-- bin/resin-compile
+- bin/resin
 - lib/sinatra/resin/helpers.rb
 - lib/sinatra/resin.rb
 - lib/resin/helpers.rb
+- lib/resin/cli.rb
 - lib/resin/compiler.rb
 - lib/resin.rb
 - lib/resin/views/index.haml
@@ -164,7 +174,7 @@ files:
 - 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/peg-0.7.0.min.js
 - amber/js/lib/CodeMirror/smalltalk.js
 - amber/js/lib/CodeMirror/codemirror.css
 - amber/js/lib/CodeMirror/amber.css
@@ -202,10 +212,13 @@ files:
 - amber/js/Helios-Environments.deploy.js
 - amber/js/Helios-Layout.js
 - amber/js/Kernel-Methods.deploy.js
+- amber/js/SUnit-Tests.js
 - amber/js/Compiler-Inlining.deploy.js
 - amber/js/Spaces.deploy.js
+- amber/js/Compiler-Interpreter.deploy.js
 - amber/js/Helios-Browser.js
 - amber/js/Canvas.js
+- amber/js/SUnit-Tests.deploy.js
 - amber/js/Benchfib.js
 - amber/js/Compiler.deploy.js
 - amber/js/boot.js
@@ -229,6 +242,7 @@ files:
 - amber/js/IDE.js
 - amber/js/Compiler-AST.deploy.js
 - amber/js/Compiler-Tests.js
+- amber/js/Compiler-Interpreter.js
 - amber/js/Examples.deploy.js
 - amber/js/Documentation.deploy.js
 - amber/js/Kernel-Exceptions.js
@@ -244,10 +258,12 @@ files:
 - amber/st/Examples.st
 - amber/st/Documentation.st
 - amber/st/Compiler-Semantic.st
+- amber/st/Compiler-Interpreter.st
 - amber/st/Compiler-Exceptions.st
 - amber/st/SUnit.st
 - amber/st/Helios-Browser.st
 - amber/st/Compiler-Core.st
+- amber/st/SUnit-Tests.st
 - amber/st/Canvas.st
 - amber/st/Kernel-Tests.st
 - amber/st/Helios-Core.st
@@ -303,7 +319,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4232258665751550036
+      hash: 541069464667052529
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -312,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4232258665751550036
+      hash: 541069464667052529
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10