Merge branch 'master' into exercise-categorisations

Author: macta

config/exercise_readme.go.tmpl

@@ -2,21 +2,24 @@
 
 {{ .Spec.Description -}}
 {{- with .Hints }}
+
 ## Hint
 
 {{ . }}
 {{ end }}
 
 ## Downloading
 
-To download this exercise in Pharo, type: `{{ .Spec.Slug }}` into the `Exercism | Fetch Exercise` package menu prompt (right click on the Exercism package in the Pharo System Browser). You can also submit your solution from the same menu for any selected package. You don't normally need to use the exercism cli (as indicated on the right hand panel).
+To download this exercise in Pharo, type: `{{ .Spec.Slug }}` into the `Exercism | Fetch new exercise` top menu prompt (or right click on any `Exercise@<Name>` package in the Pharo System Browser).
+
+When you are finished writing and testing your solution, and want to submit it, you should right click on the `Exercise@{{ .Spec.MixedCaseName }}` package and choose `Exercism | Submit exercise` in the context menu. You DON'T use the exercism cli (as indicated on the right hand panel).
 
 ## Running The Tests
 
 Tests can be run directly from the Pharo IDE, by clicking on the test orb next to any test.
 The SUnit convention is that the provided `{{ .Spec.MixedCaseName }}Test`, will test the functionality of `{{ .Spec.MixedCaseName }}`.
 
-If you are still stuck, the track documentation has more detailed help on [running tests](https://exercism.io/tracks/pharo/tests).
+If you are still stuck, the track documentation has detailed help for [running tests](https://exercism.io/tracks/pharo/tests).
 
 ## Language and Environment Help
 

dev/src/Exercise@Die/DieHandleTest.class.st

@@ -37,22 +37,22 @@ DieHandleTest >> testRoll [
 
 { #category : #tests }
 DieHandleTest >> testSimpleHandle [
-	self assert: 2 D20 diceNumber equals: 2.
+	self assert: 2 d20 diceNumber equals: 2.
 ]
 
 { #category : #tests }
 DieHandleTest >> testSumming [
 
 	| handle |
-	handle := 2 D20 + 3 D10.
+	handle := 2 d20 + 3 d10.
 	self assert: handle diceNumber equals: 5.
 ]
 
 { #category : #tests }
 DieHandleTest >> testSummingAndRolling [
 
 	| handle |
-	handle := 2 D20 + 3 D10.
+	handle := 2 d20 + 3 d10.
 	self assert: handle diceNumber equals: 5.
 	100 timesRepeat: 
 		[ handle roll between: 5 and: 70 ]

dev/src/Exercise@Die/Integer.extension.st

@@ -1,32 +1,32 @@
 Extension { #name : #Integer }
 
 { #category : #'*Exercise@Die' }
-Integer >> D10 [
-	^ self D: 10
+Integer >> d10 [
+	^ self d: 10
 ]
 
 { #category : #'*Exercise@Die' }
-Integer >> D2 [
-	^ self D: 3
+Integer >> d2 [
+	^ self d: 3
 ]
 
 { #category : #'*Exercise@Die' }
-Integer >> D20 [
-	^ self D: 20
+Integer >> d20 [
+	^ self d: 20
 ]
 
 { #category : #'*Exercise@Die' }
-Integer >> D4 [
-	^ self D: 4
+Integer >> d4 [
+	^ self d: 4
 ]
 
 { #category : #'*Exercise@Die' }
-Integer >> D6 [
-	^ self D: 6
+Integer >> d6 [
+	^ self d: 6
 ]
 
 { #category : #'*Exercise@Die' }
-Integer >> D: anInteger [
+Integer >> d: anInteger [
 
 	| handle |
 	handle := DieHandle new.

dev/src/Exercise@HelloWorld/HelloWorldTest.class.st

@@ -20,7 +20,7 @@ If everything goes well, you will be ready to fetch your first real exercise
 If you are editting this file in a text editor and not in Pharo - 
 please review the [Getting Started](https://exercism.io/tracks/pharo/installation) section. 
 
-While you can use a text editor, the Pharo IDE is partly what makes the langauge so special.
+While you can use a text editor, the Pharo IDE is partly what makes the language so special.
 
 In Pharo you can run code (including tests) with broken methods and missing classes.  When the VM encounters broken code, it raises a debugger which lets you explore the problem a little better.  
 

dev/src/ExercismDev/ExercismExerciseGenerator.class.st

@@ -330,8 +330,11 @@ ExercismExerciseGenerator >> generateTestMethodsOn: testClass calling: testVaria
 { #category : #generation }
 ExercismExerciseGenerator >> generateTestNamed: testName in: aClass variable: variableName selector: aSelectorPrefix parameters: testParameters expecting: testResults [ 
 	| output src |
+
 	output := (WriteStream on: '').
-	output nextPutAll: testName; cr; tab; nextPutAll: '| result |'; cr; cr.
+	output << testName; crlf.
+	testCounter = 1 ifTrue: [ output tab << '"Tip: Remember to review the class [Comment] tab"' ; crlf].
+	output tab << '| result |'; crlf; crlf.
 
 	(self isErrorAssertion: testResults) 
 		ifTrue: [ self 

dev/src/ExercismTests/ExercismExerciseTest.class.st

@@ -204,7 +204,7 @@ ExercismExerciseTest >> testUnlockReference [
 { #category : #tests }
 ExercismExerciseTest >> testUnlockedExercises [
 
-	self assertCollection: HelloWorldTest exercise unlockedExercises asArray equals: {DieTest exercise }.
+	self assertCollection: HelloWorldTest exercise unlockedExercises asArray equals: {} .
 	self assertCollection: TwoFerTest exercise unlockedExercises asArray 
 				includesAll: {ResistorColorDuoTest exercise. SpaceAgeTest exercise}.
 ]

docs/INSTALLATION.md

@@ -1,10 +1,10 @@
 ## Installation
 
 The simplest way to install [Pharo](http://pharo.org) is to use a [zero conf](http://pharo.org/download#//*[@id="main"]/div/h2[3]) download from a terminal command line. 
-<br/>_Note: If you are trying to upgrade an existing installation see the [upgrade instructions](https://github.com/exercism/pharo-smalltalk/blob/master/docs/UPGRADE.md).
+<br/>_Note: If you are trying to upgrade an existing installation see the [upgrade instructions](https://github.com/exercism/pharo-smalltalk/blob/master/docs/UPGRADE.md)._
 
 Windows users who do not have a UNIX style shell installed should skip to the [Windows Installation](#windows-installation-skip-for-osxlinux) instructions (below).<br/>
-More advanced Linux users may also want to refer to the [Linux Hackers Installation](#linux-hackers-installation-for-advanced-linux-use-only) (below).
+More advanced Linux users may want to refer to the [Linux Hackers Installation](https://github.com/exercism/pharo-smalltalk/blob/master/docs/LINUX.md).
 
 ### Linux/OSX Installation
 
@@ -75,39 +75,8 @@ Then evaluate the pasted code by highlighting all of it, right clicking then sel
 
 If everything is working properly, you should see loading progress bars flicker across the screen, and then a System Browser window will appear.
 
-Now you can you can proceed below to **[Getting Started](#getting-started)**.
 
-### Linux Hackers Installation (for advanced Linux use only)
-
-We are still working out the best instructions here, but we know (and appreciate) that many Linux developers are very discerning when it comes to what they install and where things should go.
-
-The following instructions are very WIP and based on ArchLinux but may apply to your distro (and if they don't help us figure out improvements, and possibly upstream Pharo requests too). _Note: its not yet clear if these instructions work reliably, so we would appreciate any help to improve them._
-
-- Install a Pharo VM into your preferred location. You might be able to use one in AUR or equivalent if pharo 7 is listed in there, OR alternatively download one from: [https://files.pharo.org/vm/pharo-spur64/linux/] (and choose a stable-timer vm)
-- You next need to extract a Pharo.image file to place in your exercism directory. You can obtain this from: [https://files.pharo.org/image/70/] and pick the latest 64 bit zip file.
-- Now try a simple command line test to verify if the VM and Image are working: `pharo Pharo.image eval "100 factorial"`. If all is well, you should get an answer.
-- Now try the "load script" described in the OSX section. You may find you get an error mentioning `libgit2`, if this is the case you should also install it and try again. We have also had reports that installing `libcurl-gnutls` can help (but this is not yet proven)
-- We have also had reports that for some libgit2 failures there is an internal loadModule change that we may backport from the development pharo. In this case you need to replace the method `unixModuleName` in Class `LGitLibrary` as follows:
-  1. Launch a headfull Pharo by typing `pharo-ui Pharo.image`
-  1. Press Ctrl-Space and type `unixModuleName`
-  1. Select the `LGitLibrary >> unixModuleName` entry and press enter
-  1. In the resulting browser, replace the method source for `unixModuleName` with the following (copy and paste it), press save (ctrl-s), and finally save and exit pharo.
-```
-LGitLibrary >> unixModuleName
-	| pluginDir |
-	pluginDir := Smalltalk vm binary parent.
-	#('libgit2.so' 'libgit2.so.0')
-		detect: [ :each | (pluginDir / each) exists ] 
-		ifFound: [ :libName | ^ (pluginDir / libName) fullName ].
-
-	self error: 'Module not found.' 
- ```
-
-Now retry the aforementioned OSX exercism "load script". If everything is working properly, you should see loading progress bars flicker across the screen, and then a System Browser window will appear. If not, please visit the Pharo Discord (as outlined above).
-
-Now you can you can proceed below to **[Getting Started](#getting-started)**.
-
-## Getting Started
+## Getting Started (ALL)
 
 When you launch Pharo, you will see a Welcome project, in a [System Browser](https://medium.com/@richardeng/pharo-quick-start-5bab70944ce2#3099) (_tip:_ if you ever lose this window you can open a new one from the Tools|System Browser menu).
 

docs/LINUX.md

@@ -0,0 +1,31 @@
+## Linux Hackers Installation (for advanced Linux use only)
+
+We are still working out the best instructions here, but we know (and appreciate) that many Linux developers are very discerning when it comes to what they install and where things should go.
+
+_If you do want to stick to a standard install, just return and follow [the normal setup](https://exercism.io/tracks/pharo-smalltalk/installation)._
+
+The following instructions are very WIP and based on ArchLinux but may apply to your distro (and if they don't help us figure out improvements, and possibly upstream Pharo requests too). _Note: its not yet clear if these instructions work reliably, so we would appreciate any help to improve them._
+
+- Install a Pharo VM into your preferred location. You might be able to use one in AUR or equivalent if pharo 7 is listed in there, OR alternatively download one from: [https://files.pharo.org/vm/pharo-spur64/linux/] (and choose a stable-timer vm)
+- You next need to extract a Pharo.image file to place in your exercism directory. You can obtain this from: [https://files.pharo.org/image/70/] and pick the latest 64 bit zip file.
+- Now try a simple command line test to verify if the VM and Image are working: `pharo Pharo.image eval "100 factorial"`. If all is well, you should get an answer.
+- Now try the "load script" described in the OSX section. You may find you get an error mentioning `libgit2`, if this is the case you should also install it and try again. We have also had reports that installing `libcurl-gnutls` can help (but this is not yet proven)
+- We have also had reports that for some libgit2 failures there is an internal loadModule change that we may backport from the development pharo. In this case you need to replace the method `unixModuleName` in Class `LGitLibrary` as follows:
+  1. Launch a headfull Pharo by typing `pharo-ui Pharo.image`
+  1. Press Ctrl-Space and type `unixModuleName`
+  1. Select the `LGitLibrary >> unixModuleName` entry and press enter
+  1. In the resulting browser, replace the method source for `unixModuleName` with the following (copy and paste it), press save (ctrl-s), and finally save and exit pharo.
+```
+LGitLibrary >> unixModuleName
+	| pluginDir |
+	pluginDir := Smalltalk vm binary parent.
+	#('libgit2.so' 'libgit2.so.0')
+		detect: [ :each | (pluginDir / each) exists ] 
+		ifFound: [ :libName | ^ (pluginDir / libName) fullName ].
+
+	self error: 'Module not found.' 
+ ```
+
+Now retry the aforementioned OSX exercism "load script". If everything is working properly, you should see loading progress bars flicker across the screen, and then a System Browser window will appear. If not, please visit the Pharo Discord (as outlined above).
+
+Now you should return and follow the remaining [Getting Started Instructions](https://exercism.io/tracks/pharo-smalltalk/installation).

exercises/acronym/README.md

@@ -7,21 +7,24 @@ Techies love their TLA (Three Letter Acronyms)!
 Help generate some jargon by writing a program that converts a long name
 like Portable Network Graphics to its acronym (PNG).
 
+
 ## Hint
 
 Try to find a way to split up a String and then iterate over the resulting sections to output a result.
 
 
 ## Downloading
 
-To download this exercise in Pharo, type: `acronym` into the `Exercism | Fetch Exercise` package menu prompt (right click on the Exercism package in the Pharo System Browser). You can also submit your solution from the same menu for any selected package. You don't normally need to use the exercism cli (as indicated on the right hand panel).
+To download this exercise in Pharo, type: `acronym` into the `Exercism | Fetch new exercise` top menu prompt (or right click on any `Exercise@<Name>` package in the Pharo System Browser).
+
+When you are finished writing and testing your solution, and want to submit it, you should right click on the `Exercise@Acronym` package and choose `Exercism | Submit exercise` in the context menu. You DON'T use the exercism cli (as indicated on the right hand panel).
 
 ## Running The Tests
 
 Tests can be run directly from the Pharo IDE, by clicking on the test orb next to any test.
 The SUnit convention is that the provided `AcronymTest`, will test the functionality of `Acronym`.
 
-If you are still stuck, the track documentation has more detailed help on [running tests](https://exercism.io/tracks/pharo/tests).
+If you are still stuck, the track documentation has detailed help for [running tests](https://exercism.io/tracks/pharo/tests).
 
 ## Language and Environment Help
 

exercises/allergies/README.md

@@ -29,21 +29,24 @@ allergens that score 256, 512, 1024, etc.).  Your program should
 ignore those components of the score.  For example, if the allergy
 score is 257, your program should only report the eggs (1) allergy.
 
+
 ## Hint
 
 Notice how each of the items is a power of 2, a property that you should be able to leverage.
 
 
 ## Downloading
 
-To download this exercise in Pharo, type: `allergies` into the `Exercism | Fetch Exercise` package menu prompt (right click on the Exercism package in the Pharo System Browser). You can also submit your solution from the same menu for any selected package. You don't normally need to use the exercism cli (as indicated on the right hand panel).
+To download this exercise in Pharo, type: `allergies` into the `Exercism | Fetch new exercise` top menu prompt (or right click on any `Exercise@<Name>` package in the Pharo System Browser).
+
+When you are finished writing and testing your solution, and want to submit it, you should right click on the `Exercise@Allergies` package and choose `Exercism | Submit exercise` in the context menu. You DON'T use the exercism cli (as indicated on the right hand panel).
 
 ## Running The Tests
 
 Tests can be run directly from the Pharo IDE, by clicking on the test orb next to any test.
 The SUnit convention is that the provided `AllergiesTest`, will test the functionality of `Allergies`.
 
-If you are still stuck, the track documentation has more detailed help on [running tests](https://exercism.io/tracks/pharo/tests).
+If you are still stuck, the track documentation has detailed help for [running tests](https://exercism.io/tracks/pharo/tests).
 
 ## Language and Environment Help