Merge pull request #226 from hpi-swa/dev

Minor improvements

pharo/run.sh

@@ -107,6 +107,11 @@ pharo::prepare_vm() {
   local pharo_vm_folder="${SMALLTALK_CI_VMS}/${smalltalk_name}"
   local pharo_zeroconf="${pharo_vm_folder}/zeroconfig"
 
+  # Skip in case vm is already set up
+  if is_file "${SMALLTALK_CI_VM}"; then
+    return 0
+  fi
+
   if ! is_dir "${pharo_vm_folder}"; then
     travis_fold start download_vm "Downloading ${smalltalk_name} vm..."
       timer_start

repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/methodProperties.json

@@ -1,7 +1,5 @@
 {
 	"class" : {
-		"defaultAuthor" : "fn 6/13/2016 11:45",
-		"setAuthor:" : "fn 1/31/2016 20:11",
 		"updateMetacello" : "fn 10/13/2016 16:14" },
 	"instance" : {
 		"baseline" : "fn 1/10/2016 11:44",
@@ -11,11 +9,9 @@
 		"configuration:" : "fn 1/10/2016 11:44",
 		"directory" : "fn 8/28/2016 19:20",
 		"directory:" : "fn 1/10/2016 17:54",
-		"ensureAuthor" : "fn 6/13/2016 13:22",
 		"failOn" : "fn 10/21/2016 22:30",
 		"failOn:" : "fn 10/21/2016 22:24",
 		"getClassesForMetacelloProjectRegistration:" : "fn 6/22/2016 11:46",
-		"initialize" : "fn 6/13/2016 13:22",
 		"isComplete" : "EatebanLorenzano 1/27/2016 13:55",
 		"load" : "fn 1/10/2016 18:27",
 		"load:" : "fn 1/10/2016 11:46",

repository/SmalltalkCI-Core.package/SCITestRunner.class/instance/printProgress..st

@@ -0,0 +1,7 @@
+running
+printProgress: aTestResult
+	SmalltalkCI stdout nextPut: (aTestResult passed
+		ifTrue: [ $. ]
+		ifFalse: [ (aTestResult failed)
+			ifTrue: [ $F ]
+			ifFalse: [ $E ] ])

repository/SmalltalkCI-Core.package/SCITestRunner.class/instance/runCase..st

@@ -9,5 +9,6 @@ runCase: aTestCase
 				result testError: err.
 				aTestCase shouldPass ifTrue: [self serializeError: result testError of: aTestCase].
 				result stack: (self stackTraceString: err of: aTestCase) ] ]).
+	self printProgress: result.
 	(results at: aTestCase class ifAbsentPut: [ OrderedCollection new ])
 		add: result

repository/SmalltalkCI-Core.package/SCITestRunner.class/methodProperties.json

@@ -11,10 +11,11 @@
 		"initializeOn:" : "fn 9/26/2016 21:28",
 		"isSuccessful" : "fn 10/21/2016 14:19",
 		"passingTests" : "fn 9/27/2016 14:23",
+		"printProgress:" : "fn 11/3/2016 17:52",
 		"results" : "fn 7/1/2016 18:03",
 		"run" : "fn 9/28/2016 13:07",
 		"runAll" : "fn 6/30/2016 12:00",
-		"runCase:" : "fn 10/21/2016 15:45",
+		"runCase:" : "fn 11/3/2016 17:52",
 		"serializeError:of:" : "fn 10/4/2016 17:29",
 		"setUp" : "fn 10/10/2016 00:49",
 		"stackTraceString:of:" : "fn 10/4/2016 17:30",

repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/class/defaultAuthor.st → repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/defaultAuthor.st

@@ -1,3 +1,3 @@
 constants
 defaultAuthor
-	^ 'TravisCI'
+	^ 'smalltalkCI'

repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/ensureAuthor.st

@@ -0,0 +1,4 @@
+helpers
+ensureAuthor
+	self getAuthor ifEmpty: [
+		self setAuthor: self defaultAuthor ]

repository/SmalltalkCI-Core.package/SCIMetacelloLoadSpec.class/instance/initialize.st → repository/SmalltalkCI-Core.package/SmalltalkCI.class/instance/initialize.st

@@ -1,3 +1,3 @@
 initialize-release
 initialize
-	self ensureAuthor
+	self class ensureAuthor

repository/SmalltalkCI-Core.package/SmalltalkCI.class/methodProperties.json

@@ -23,7 +23,9 @@
 		"classesWithCategoryNames:" : "fn 6/21/2016 23:42",
 		"classesWithPackageNames:" : "fn 6/21/2016 23:42",
 		"codeCoverageClass" : "fn 10/8/2016 14:56",
+		"defaultAuthor" : "fn 11/3/2016 18:23",
 		"deleteFile:" : "fn 10/16/2016 15:58",
+		"ensureAuthor" : "fn 11/3/2016 18:23",
 		"escape" : "fn 9/26/2016 16:12",
 		"exportBuildStatus:" : "fn 10/21/2016 22:36",
 		"fileExists:" : "fn 4/14/2016 00:56",
@@ -61,6 +63,7 @@
 		"resolveAll:with:" : "fn 6/22/2016 09:42",
 		"saveAndQuitImage" : "fn 10/11/2016 21:34",
 		"saveImage" : "fn 7/2/2016 17:21",
+		"setAuthor:" : "fn 11/3/2016 18:22",
 		"shutdown:" : "fn 10/21/2016 22:38",
 		"shutdownHeadful:" : "fn 10/21/2016 22:38",
 		"shutdownHeadless:" : "fn 10/21/2016 22:38",
@@ -87,6 +90,7 @@
 		"explicitTestKeys" : "fn 6/22/2016 13:06",
 		"finishUpAfterLoading" : "fn 6/14/2016 19:14",
 		"imageInfo" : "fn 10/21/2016 16:18",
+		"initialize" : "fn 11/3/2016 18:27",
 		"isCoverageTestingEnabled" : "fn 10/8/2016 18:48",
 		"load" : "fn 10/21/2016 16:28",
 		"performMetacelloLoad:" : "fn 4/15/2016 10:47",

repository/SmalltalkCI-Tests.package/SCIMetacelloLoadSpecTest.class/methodProperties.json

@@ -3,6 +3,5 @@
 		 },
 	"instance" : {
 		"setUp" : "fniep 1/10/2016 16:10",
-		"testAuthor" : "fn 6/13/2016 13:31",
 		"testIsComplete" : "fn 6/9/2016 09:53",
 		"testSimple" : "fn 10/13/2016 17:19" } }

repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testAuthor.st

@@ -0,0 +1,11 @@
+testing
+testAuthor
+	| currentAuthor |
+	currentAuthor := SmalltalkCI getAuthor.
+
+	[
+	SmalltalkCI basicNew initialize.
+	self deny: SmalltalkCI defaultAuthor isNil.
+	] ensure: [
+		SmalltalkCI setAuthor: currentAuthor.
+		self assert: SmalltalkCI getAuthor equals: currentAuthor ]

repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/methodProperties.json

@@ -6,6 +6,7 @@
 		"sci:" : "fn 4/14/2016 22:02",
 		"setUp" : "fn 4/14/2016 22:02",
 		"testAppVeyorDetection" : "fn 10/16/2016 17:48",
+		"testAuthor" : "fn 11/3/2016 18:30",
 		"testClassesForCategories" : "fn 6/22/2016 00:20",
 		"testClassesForPackages" : "fn 6/22/2016 00:19",
 		"testClassesFrom" : "fn 6/24/2016 19:36",

run.sh

@@ -190,6 +190,10 @@ select_smalltalk() {
                 GemStone-3.3.0 GemStone-3.2.12 GemStone-3.1.0.6
                 Moose-trunk Moose-6.1 Moose-6.0"
 
+  if is_not_empty "${config_smalltalk}"; then
+    return
+  fi
+
   if is_travis_build || is_appveyor_build; then
     config_smalltalk="${TRAVIS_SMALLTALK_VERSION:-${SMALLTALK}}"
     return

squeak/run.sh

@@ -176,6 +176,11 @@ squeak::prepare_vm() {
   local download_url
   local target
 
+  # Skip in case vm is already set up
+  if is_file "${SMALLTALK_CI_VM}"; then
+    return 0
+  fi
+
   is_spur_image "${SMALLTALK_CI_IMAGE}" && require_spur=1
   vm_details=$(squeak::get_vm_details "$(uname -s)" "${require_spur}")
   set_vars vm_filename vm_path "${vm_details}"