Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
19958 Find and Replace dialog uses black text color in dark theme https://pharo.fogbugz.com/f/cases/19958 19963 Improvement of TravisIntegrationHelp https://pharo.fogbugz.com/f/cases/19963 19977 Menu failure on right click in code pane when coming from MessageBrowser https://pharo.fogbugz.com/f/cases/19977 http://files.pharo.org/image/60/60470.zip
- Loading branch information
Jenkins Build Server
authored and
ci
committed
Apr 26, 2017
1 parent
899b874
commit 625bfb8
Showing
17 changed files
with
141 additions
and
54 deletions.
There are no files selected for viewing
17 changes: 12 additions & 5 deletions
17
AST-Core.package/RBProgramNode.class/instance/querying/bestNodeFor_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,16 @@ | ||
bestNodeFor: anInterval | ||
|
||
| selectedChildren | | ||
|
||
anInterval ifNil: [ ^ nil ]. | ||
|
||
(self intersectsInterval: anInterval) ifFalse: [^nil]. | ||
(self containedBy: anInterval) ifTrue: [^self]. | ||
selectedChildren := self children | ||
select: [:each | each intersectsInterval: anInterval]. | ||
^selectedChildren size == 1 | ||
ifTrue: [selectedChildren first bestNodeFor: anInterval] | ||
ifFalse: [self] | ||
|
||
selectedChildren := self children select: [:each | | ||
each intersectsInterval: anInterval | ||
]. | ||
|
||
^ selectedChildren size = 1 | ||
ifTrue: [ selectedChildren first bestNodeFor: anInterval ] | ||
ifFalse: [ self ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 0 additions & 14 deletions
14
ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60469.st
This file was deleted.
Oops, something went wrong.
12 changes: 12 additions & 0 deletions
12
ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60470.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
update60470 | ||
"self new update60470" | ||
self withUpdateLog: '19958 Find and Replace dialog uses black text color in dark theme | ||
https://pharo.fogbugz.com/f/cases/19958 | ||
19963 Improvement of TravisIntegrationHelp | ||
https://pharo.fogbugz.com/f/cases/19963 | ||
19977 Menu failure on right click in code pane when coming from MessageBrowser | ||
https://pharo.fogbugz.com/f/cases/19977'. | ||
self loadTogether: self script60470 merge: false. | ||
self flushCaches. |
12 changes: 6 additions & 6 deletions
12
ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
commentForCurrentUpdate | ||
^ '19960 Comments in changed code in Diff tool | ||
https://pharo.fogbugz.com/f/cases/19960 | ||
^ '19958 Find and Replace dialog uses black text color in dark theme | ||
https://pharo.fogbugz.com/f/cases/19958 | ||
19962 Watery theme is broken because SimpleButtonMorph does not understand isDefault | ||
https://pharo.fogbugz.com/f/cases/19962 | ||
19963 Improvement of TravisIntegrationHelp | ||
https://pharo.fogbugz.com/f/cases/19963 | ||
19970 Formatting methods recently introduced for WelcomeHelp should be accessible to all Help classes | ||
https://pharo.fogbugz.com/f/cases/19970' | ||
19977 Menu failure on right click in code pane when coming from MessageBrowser | ||
https://pharo.fogbugz.com/f/cases/19977' |
2 changes: 1 addition & 1 deletion
2
TravisIntegrationHelp.package/TravisIntegrationHelp.class/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
Please comment me using the following template inspired by Class Responsibility Collaborator (CRC) design:For the Class part: State a one line summary. For example, "I represent a paragraph of text".For the Responsibility part: Three sentences about my main responsibilities - what I do, what I know.For the Collaborators Part: State my main collaborators and one line about how I interact with them. Public API and Key Messages- message one - message two - (for bonus points) how to create instances. One simple example is simply gorgeous. Internal Representation and Key Implementation Points. Implementation Points | ||
Help for getting Travis running with Pharo. |
3 changes: 1 addition & 2 deletions
3
TravisIntegrationHelp.package/TravisIntegrationHelp.class/class/accessing/bookName.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,2 @@ | ||
bookName | ||
"the character zero is a hack to display it always first" | ||
^ (Character value: 0) asString, 'Travis Integration' | ||
^ 'Travis Integration' |
2 changes: 1 addition & 1 deletion
2
TravisIntegrationHelp.package/TravisIntegrationHelp.class/class/accessing/pages.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
pages | ||
^ #(introduction step01 step02 step03 step04 step05 moreInformation) | ||
^ #(introduction step01 step02 step03 step04 step05 matrix moreInformation) |
4 changes: 3 additions & 1 deletion
4
TravisIntegrationHelp.package/TravisIntegrationHelp.class/class/pages/introduction.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
TravisIntegrationHelp.package/TravisIntegrationHelp.class/class/pages/matrix.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
matrix | ||
^ HelpTopic | ||
title: 'Matrix Configuration' | ||
contents: | ||
(self heading: 'Matrix Configuration'), | ||
'It may happen that you need different configuration. For example, having a development configuration and a stable one. The development configuration usually consider the latest version of your packages, while the stable uses particular versions. | ||
You would need to create a new ', (self bold: '.smalltalk.ston'), ' file. To follow with our example, we have introduced this file in Step 04. We will now define a new file, called ', (self bold: '.smalltalk_stable.ston'), ' with the following content: | ||
', | ||
(self bold: ' | ||
SmalltalkCISpec { | ||
#loading : [ | ||
SCIMetacelloLoadSpec { | ||
#configuration : ''Roassal2'', | ||
#repository : ''http://smalltalkhub.com/mc/ObjectProfile/Roassal2/main/'', | ||
#load : [ ''default'' ], | ||
#platforms : [ #pharo ], | ||
#version: #stable | ||
} | ||
], | ||
#testing : { | ||
#coverage : { | ||
#categories : [ ''Roassal2-AttachPoint-Tests'', ''Roassal2-Builder-AnimatedScatterPlot'', ''Roassal2-Builder-ApplicationMatrix'', ''Roassal2-Builder-CircularMap'', ''Roassal2-Builder-Common'', ''Roassal2-Builder-Composer'', ''Roassal2-Builder-DSM'', ''Roassal2-Builder-Explora'', ''Roassal2-Builder-Grapher-Decorators-Tests'', ''Roassal2-Builder-Grapher-Scaling-Tests'', ''Roassal2-Builder-Grapher-Tests'', ''Roassal2-Builder-Kiviat'', ''Roassal2-Builder-Legend'', ''Roassal2-Builder-Map-Tests'', ''Roassal2-Builder-Mondrian'', ''Roassal2-Builder-MondrianOLD'', ''Roassal2-Builder-NameCloud'', ''Roassal2-Builder-PieChart'', ''Roassal2-Builder-ScrollBar'', ''Roassal2-Builder-Simon'', ''Roassal2-Builder-Spectrograph'', ''Roassal2-Builder-StackBarPlot'', ''Roassal2-Builder-TextBuilder'', ''Roassal2-Builder-Timeline-Tests'', ''Roassal2-Builder-TreeMap'', ''Roassal2-Builder-UI-Slider'', ''Roassal2-Builder-UML'', ''Roassal2-ColorNormalizer-Tests'', ''Roassal2-Core-Tests'', ''Roassal2-Exporter-SVG'', ''Roassal2-Interactions'', ''Roassal2-Exporter-PNG'', ''Roassal2-Exporter-HTML5'', ''Roassal2-Interactions-Resize-Tests'', ''Roassal2-Layouts-Tests'', | ||
''Roassal2-LineDecorations'', ''Roassal2-MorphSpecific'', ''Roassal2-OpenStreetMap'', ''Roassal2-Plugins'', ''Roassal2-Sparkline'', ''Roassal2-Table'', ''Roassal2-Tests'', ''Roassal2-Utility'', ''Trachel-MorphSpecific'', ''Trachel-Tests'', ''Trachel-Viva'', ''Roassal2GT-Glamour'', ''Roassal2GT-Glamour-Actions'', ''Roassal2GT-Glamour-Context'', ''Roassal2GT-Glamour-Roassal-Interaction'', ''Roassal2GT-Tests-Examples'' | ||
] | ||
}, | ||
#exclude : { | ||
#classes : [ #RTCacheTest , #Roassal2VWTest ] | ||
} | ||
} | ||
} | ||
'), | ||
' | ||
The principal difference between this file and ', (self bold: '.smalltalk.ston'), ' is the ', (self bold: ' #version: #stable'), | ||
' | ||
We are now ready to tell to Travis that we want to use this new file in some particular conditions, defined with a matrix. | ||
The ', (self bold: '.travis.yml'), ' should be: | ||
', | ||
(self bold: | ||
'language: smalltalk | ||
os: | ||
- osx | ||
- linux | ||
smalltalk: | ||
- Pharo-6.0 | ||
- Pharo-5.0 | ||
matrix: | ||
include: | ||
- smalltalk: Pharo-6.0 | ||
smalltalk_config: .smalltalk_stable.ston | ||
os: osx | ||
- smalltalk: Pharo-5.0 | ||
smalltalk_config: .smalltalk_stable.ston | ||
os: osx | ||
- smalltalk: Pharo-6.0 | ||
smalltalk_config: .smalltalk_stable.ston | ||
os: linux | ||
- smalltalk: Pharo-5.0 | ||
smalltalk_config: .smalltalk_stable.ston | ||
os: linux | ||
'), | ||
' | ||
With this new content, Travis will run different configurations.' |
17 changes: 8 additions & 9 deletions
17
TravisIntegrationHelp.package/TravisIntegrationHelp.class/class/pages/moreInformation.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,15 @@ | ||
moreInformation | ||
^ HelpTopic | ||
title: 'More information' | ||
contents: ' | ||
Currently, there is no automatic way to start a build by simply committing to SmalltalkHub. The CronJob will run the test every 24 hours. You can manually run the build by either clicking on "start build" in Travis, or doing a commit in the git repository. | ||
Personally, I have created a short shell script, called update.sh, that simply does | ||
git commit --allow-empty -m "Trigger" && git push | ||
contents: | ||
(self heading: 'More information'), | ||
'Currently, there is no automatic way to start a build by simply committing to SmalltalkHub. The CronJob will run the test every 24 hours. You can manually run the build by either clicking on "start build" in Travis, or doing a commit in the git repository. | ||
Personally, I have created a short shell script, called update.sh, that simply does', | ||
(self bold: 'git commit --allow-empty -m "Trigger" && git push'), | ||
' | ||
This help is written by Alexandre Bergel (http://bergel.eu) with the help of Juraj Kubelka. | ||
Big thanks to the HPI team that has produced the Pharo support. More information about the Pharo support on Travis may be found on: | ||
https://github.com/hpi-swa/smalltalkCI | ||
' | ||
Big thanks to the HPI team that has produced the Pharo support. More information about the Pharo support on Travis may be found on: ', | ||
(self url: 'https://github.com/hpi-swa/smalltalkCI') |
6 changes: 4 additions & 2 deletions
6
TravisIntegrationHelp.package/TravisIntegrationHelp.class/class/pages/step01.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,10 @@ | ||
step01 | ||
^ HelpTopic | ||
title: 'Step 01 - Configuration' | ||
contents: 'You need a configuration for your project. A configuration contains the necessary to load your application, and Travis has to know about it. | ||
contents: | ||
(self heading: 'Step 01 - Configuration'), | ||
'You need a configuration for your project. A configuration contains the necessary to load your application, and Travis has to know about it. | ||
Before moving to the next step, you need to have a working configuration. Note that it does not matter where your configuration is located (e.g., in your SmalltalkHub repository, or in MetaRepoForPharoXX). | ||
In this help, we will use the ConfigurationOfRoassal2 located in http://smalltalkhub.com/mc/Pharo/MetaRepoForPharo60/main' | ||
In this help, we will use the ConfigurationOfRoassal2 located in ', (self url: 'http://smalltalkhub.com/mc/Pharo/MetaRepoForPharo60/main') |
4 changes: 3 additions & 1 deletion
4
TravisIntegrationHelp.package/TravisIntegrationHelp.class/class/pages/step02.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
step02 | ||
^ HelpTopic | ||
title: 'Step 02 - GitHub repository' | ||
contents: 'You need a GitHub repository that will contains some configuration files. Even if your code is stored in SmalltalkHub, you need a GitHub repository. | ||
contents: | ||
(self heading: 'Step 02 - GitHub repository'), | ||
'You need a GitHub repository that will contains some configuration files. Even if your code is stored in SmalltalkHub, you need a GitHub repository. | ||
You can have a look at the Roassal2 GitHub repository: https://github.com/ObjectProfile/Roassal2 | ||
' |
4 changes: 3 additions & 1 deletion
4
TravisIntegrationHelp.package/TravisIntegrationHelp.class/class/pages/step03.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
TravisIntegrationHelp.package/TravisIntegrationHelp.class/class/pages/step04.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters