From a8e215f642da1e4255a8917ec4df43bc79d1c3f7 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Wed, 4 Jul 2018 16:48:03 +0200 Subject: [PATCH 01/20] Init CONTRIBUTING file --- CONTRIBUTING.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..6b51ed7 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,31 @@ +# Contribution + +This file is currently not complete but will be improve step by step. + +# Release management + +This project use semantic versionning to define the releases. This mean that each stable release of the project will get associate a version number of the form `vX.Y.Z`. + +- **X** define the major version number +- **Y** define the minor version number +- **Z** define the patch version number + +When a release contains only bug fixes, the patch number increase. When the release contains new features backward compatibles, the minor version increase. When the release contains breaking changes, the major version increase. + +Thus, it should be safe to depend on a fixed major version and moving minor version of this project. + +# Branch management + +This project use gitflow management. + +This project contains two main branches: +- **master** : This branch is a stable branch. Each version on this branch should be a stable release of Material Design Lite for Seaside, and idealy each commit modifying the source code of the project should be tagged with a version number. +- **development** : This branch contains the current development of this project. + +## New feature + +When a new feature will take some time to implement, this feature should be developed in a specific branch. Once done, it will be merged in development before the next release of Material Design Lite for Seaside. + +## Hot fix + +If a bug is found in a stable version and the correction is backward compatible, it should be corrected in an hotfix branch. Once the correction is finished the hotfix branch should be merged into master and development and a new bugfix release should be done. \ No newline at end of file From e211e60cfa617b3b97cb378d54beabe435a6a100 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Wed, 4 Jul 2018 16:51:09 +0200 Subject: [PATCH 02/20] Enable Gemstone in the CI Fixes https://github.com/DuneSt/MaterialColors/issues/6 --- .travis.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec429bc..477414e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,5 +6,13 @@ os: - osx smalltalk: - - Pharo-6.0 - - Pharo-5.0 \ No newline at end of file + - Pharo-7.0 + - Pharo-6.1 + - Pharo-5.0 + - GemStone-3.4.1 + - GemStone-3.3.7 + +matrix: + fast_finish: true + allow_failures: + - smalltalk: Pharo-7.0 \ No newline at end of file From 3b42d29284b68804e146f4a07ae95ac2635628e0 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Wed, 4 Jul 2018 17:00:23 +0200 Subject: [PATCH 03/20] Remove pharo specification for loading the project --- .smalltalk.ston | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.smalltalk.ston b/.smalltalk.ston index b3aab5d..5253f4f 100644 --- a/.smalltalk.ston +++ b/.smalltalk.ston @@ -2,8 +2,7 @@ SmalltalkCISpec { #loading : [ SCIMetacelloLoadSpec { #baseline : 'MaterialColors', - #directory : 'src', - #platforms : [ #pharo ] + #directory : 'src' } ] } \ No newline at end of file From a78b5faa29f38e90b6bfba02656990cfd97128d3 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Wed, 4 Jul 2018 17:18:04 +0200 Subject: [PATCH 04/20] Remove dependency on Ring. Fixes https://github.com/DuneSt/MaterialColors/issues/10 --- .../MDLColor.class/class/allDefaultsColors.st | 2 +- .../MDLColor.class/class/amber.st | 2 +- src/Material-Design-Colors.package/MDLColor.class/class/blue.st | 2 +- .../MDLColor.class/class/blueGrey.st | 2 +- .../MDLColor.class/class/brown.st | 2 +- src/Material-Design-Colors.package/MDLColor.class/class/cyan.st | 2 +- .../MDLColor.class/class/deepOrange.st | 2 +- .../MDLColor.class/class/deepPurple.st | 2 +- .../MDLColor.class/class/green.st | 2 +- src/Material-Design-Colors.package/MDLColor.class/class/grey.st | 2 +- .../MDLColor.class/class/indigo.st | 2 +- .../MDLColor.class/class/lightBlue.st | 2 +- .../MDLColor.class/class/lightGreen.st | 2 +- src/Material-Design-Colors.package/MDLColor.class/class/lime.st | 2 +- .../MDLColor.class/class/orange.st | 2 +- src/Material-Design-Colors.package/MDLColor.class/class/pink.st | 2 +- .../MDLColor.class/class/purple.st | 2 +- src/Material-Design-Colors.package/MDLColor.class/class/red.st | 2 +- src/Material-Design-Colors.package/MDLColor.class/class/teal.st | 2 +- .../MDLColor.class/class/yellow.st | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/allDefaultsColors.st b/src/Material-Design-Colors.package/MDLColor.class/class/allDefaultsColors.st index 7f7a8f8..30ffff3 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/allDefaultsColors.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/allDefaultsColors.st @@ -1,3 +1,3 @@ accessing allDefaultsColors - ^ (self class methodsInProtocol: #defaults) collect: [ :m | MDLColor perform: m selector ] \ No newline at end of file + ^ self class allMethods select: [ :each | each protocol = #'defaults - colors' ] thenCollect: [ :m | MDLColor perform: m selector ] \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/amber.st b/src/Material-Design-Colors.package/MDLColor.class/class/amber.st index e868bfc..7b2dae5 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/amber.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/amber.st @@ -1,3 +1,3 @@ -defaults +defaults - colors amber ^ self tint: #amber \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/blue.st b/src/Material-Design-Colors.package/MDLColor.class/class/blue.st index 0ab8e1f..fe661fc 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/blue.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/blue.st @@ -1,3 +1,3 @@ -defaults +defaults - colors blue ^ self tint: #blue \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/blueGrey.st b/src/Material-Design-Colors.package/MDLColor.class/class/blueGrey.st index 1e7b94c..b66fc90 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/blueGrey.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/blueGrey.st @@ -1,3 +1,3 @@ -defaults +defaults - colors blueGrey ^ self tint: #blue_grey \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/brown.st b/src/Material-Design-Colors.package/MDLColor.class/class/brown.st index 0a48475..cc0c46d 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/brown.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/brown.st @@ -1,3 +1,3 @@ -defaults +defaults - colors brown ^ self tint: #brown \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/cyan.st b/src/Material-Design-Colors.package/MDLColor.class/class/cyan.st index dac5151..1e06fb3 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/cyan.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/cyan.st @@ -1,3 +1,3 @@ -defaults +defaults - colors cyan ^ self tint: #cyan \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/deepOrange.st b/src/Material-Design-Colors.package/MDLColor.class/class/deepOrange.st index 3e3e39d..7429c30 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/deepOrange.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/deepOrange.st @@ -1,3 +1,3 @@ -defaults +defaults - colors deepOrange ^ self tint: #deep_orange \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/deepPurple.st b/src/Material-Design-Colors.package/MDLColor.class/class/deepPurple.st index 779f3e5..92c8273 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/deepPurple.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/deepPurple.st @@ -1,3 +1,3 @@ -defaults +defaults - colors deepPurple ^ self tint: #deep_purple \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/green.st b/src/Material-Design-Colors.package/MDLColor.class/class/green.st index 481bbac..ec87f8a 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/green.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/green.st @@ -1,3 +1,3 @@ -defaults +defaults - colors green ^ self tint: #green \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/grey.st b/src/Material-Design-Colors.package/MDLColor.class/class/grey.st index f89635a..6a3ed12 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/grey.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/grey.st @@ -1,3 +1,3 @@ -defaults +defaults - colors grey ^ self tint: #grey \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/indigo.st b/src/Material-Design-Colors.package/MDLColor.class/class/indigo.st index e5a6e94..312539e 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/indigo.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/indigo.st @@ -1,3 +1,3 @@ -defaults +defaults - colors indigo ^ self tint: #indigo \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/lightBlue.st b/src/Material-Design-Colors.package/MDLColor.class/class/lightBlue.st index f215401..e7ccdc9 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/lightBlue.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/lightBlue.st @@ -1,3 +1,3 @@ -defaults +defaults - colors lightBlue ^ self tint: #light_blue \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/lightGreen.st b/src/Material-Design-Colors.package/MDLColor.class/class/lightGreen.st index f84dfe6..c5c27a4 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/lightGreen.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/lightGreen.st @@ -1,3 +1,3 @@ -defaults +defaults - colors lightGreen ^ self tint: #light_green \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/lime.st b/src/Material-Design-Colors.package/MDLColor.class/class/lime.st index 0d10d92..a0b9e93 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/lime.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/lime.st @@ -1,3 +1,3 @@ -defaults +defaults - colors lime ^ self tint: #lime \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/orange.st b/src/Material-Design-Colors.package/MDLColor.class/class/orange.st index c77bb69..a1e0b5f 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/orange.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/orange.st @@ -1,3 +1,3 @@ -defaults +defaults - colors orange ^ self tint: #orange \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/pink.st b/src/Material-Design-Colors.package/MDLColor.class/class/pink.st index 2fdc8ca..2ae4af2 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/pink.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/pink.st @@ -1,3 +1,3 @@ -defaults +defaults - colors pink ^ self tint: #pink \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/purple.st b/src/Material-Design-Colors.package/MDLColor.class/class/purple.st index b50ecfb..ffc8519 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/purple.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/purple.st @@ -1,3 +1,3 @@ -defaults +defaults - colors purple ^ self tint: #purple \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/red.st b/src/Material-Design-Colors.package/MDLColor.class/class/red.st index 7bc6396..95e8284 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/red.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/red.st @@ -1,3 +1,3 @@ -defaults +defaults - colors red ^ self tint: #red \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/teal.st b/src/Material-Design-Colors.package/MDLColor.class/class/teal.st index 29b5a38..37baf3b 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/teal.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/teal.st @@ -1,3 +1,3 @@ -defaults +defaults - colors teal ^ self tint: #teal \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/yellow.st b/src/Material-Design-Colors.package/MDLColor.class/class/yellow.st index 545202a..b452261 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/yellow.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/yellow.st @@ -1,3 +1,3 @@ -defaults +defaults - colors yellow ^ self tint: #yellow \ No newline at end of file From 5de8297c9b9aa3d0c1292a054b48cdd3ae418928 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Wed, 4 Jul 2018 18:14:05 +0200 Subject: [PATCH 05/20] Add a compatibility system via Platform classes. --- .../instance/baseline..st | 11 +++++++---- .../instance/gemStone..st | 4 +++- .../instance/pharo..st | 7 +++++++ .../.filetree | 5 +++++ .../MaterialColorGemstonePlatform.class/README.md | 4 ++++ .../class/initialize.st | 3 +++ .../instance/allSelectorsOf.from..st | 5 +++++ .../properties.json | 11 +++++++++++ .../monticello.meta/categories.st | 1 + .../monticello.meta/initializers.st | 0 .../monticello.meta/package | 1 + .../properties.json | 1 + .../.filetree | 5 +++++ .../MaterialColorPharoPlatform.class/README.md | 4 ++++ .../class/initialize.st | 3 +++ .../instance/allSelectorsOf.from..st | 5 +++++ .../properties.json | 11 +++++++++++ .../monticello.meta/categories.st | 1 + .../monticello.meta/initializers.st | 0 .../monticello.meta/package | 1 + .../properties.json | 1 + .../.filetree | 5 +++++ .../MaterialColorPlatform.class/README.md | 12 ++++++++++++ .../MaterialColorPlatform.class/class/current.st | 3 +++ .../MaterialColorPlatform.class/class/register.st | 3 +++ .../instance/allSelectorsOf.from..st | 5 +++++ .../MaterialColorPlatform.class/properties.json | 13 +++++++++++++ .../monticello.meta/categories.st | 1 + .../monticello.meta/initializers.st | 0 .../monticello.meta/package | 1 + .../properties.json | 1 + .../MDLColor.class/class/allDefaultsColors.st | 2 +- 32 files changed, 124 insertions(+), 6 deletions(-) create mode 100644 src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/pharo..st create mode 100644 src/Material-Design-Colors-Platform-Gemstone.package/.filetree create mode 100644 src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/README.md create mode 100644 src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/class/initialize.st create mode 100644 src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/instance/allSelectorsOf.from..st create mode 100644 src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/properties.json create mode 100644 src/Material-Design-Colors-Platform-Gemstone.package/monticello.meta/categories.st create mode 100644 src/Material-Design-Colors-Platform-Gemstone.package/monticello.meta/initializers.st create mode 100644 src/Material-Design-Colors-Platform-Gemstone.package/monticello.meta/package create mode 100644 src/Material-Design-Colors-Platform-Gemstone.package/properties.json create mode 100644 src/Material-Design-Colors-Platform-Pharo.package/.filetree create mode 100644 src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/README.md create mode 100644 src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/class/initialize.st create mode 100644 src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/instance/allSelectorsOf.from..st create mode 100644 src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/properties.json create mode 100644 src/Material-Design-Colors-Platform-Pharo.package/monticello.meta/categories.st create mode 100644 src/Material-Design-Colors-Platform-Pharo.package/monticello.meta/initializers.st create mode 100644 src/Material-Design-Colors-Platform-Pharo.package/monticello.meta/package create mode 100644 src/Material-Design-Colors-Platform-Pharo.package/properties.json create mode 100644 src/Material-Design-Colors-Platform.package/.filetree create mode 100644 src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/README.md create mode 100644 src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/current.st create mode 100644 src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/register.st create mode 100644 src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/instance/allSelectorsOf.from..st create mode 100644 src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/properties.json create mode 100644 src/Material-Design-Colors-Platform.package/monticello.meta/categories.st create mode 100644 src/Material-Design-Colors-Platform.package/monticello.meta/initializers.st create mode 100644 src/Material-Design-Colors-Platform.package/monticello.meta/package create mode 100644 src/Material-Design-Colors-Platform.package/properties.json diff --git a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/baseline..st b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/baseline..st index 8225d11..d90214f 100644 --- a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/baseline..st +++ b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/baseline..st @@ -3,15 +3,18 @@ baseline: spec spec for: #common - do: [ + do: [ "Packages" spec - package: 'Material-Design-Colors'; - package: 'Material-Design-Tests-Colors' with: [ spec requires: #('Material-Design-Colors') ]. + package: 'Material-Design-Colors-Platform'; + package: 'Material-Design-Colors' with: [ spec requires: 'Material-Design-Colors-Platform' ]; + package: 'Material-Design-Tests-Colors' with: [ spec requires: 'Material-Design-Colors' ]. "Groups" spec group: 'Core' with: #('Material-Design-Colors'); group: 'all' with: #('default'); group: 'Tests' with: #('Material-Design-Tests-Colors') ]. - self gemStone: spec \ No newline at end of file + self + pharo: spec; + gemStone: spec \ No newline at end of file diff --git a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/gemStone..st b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/gemStone..st index a94c58b..6de8fee 100644 --- a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/gemStone..st +++ b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/gemStone..st @@ -4,4 +4,6 @@ gemStone: spec for: #gemstone do: [ spec package: 'PackageManifest' with: [ spec repository: 'http://smalltalkhub.com/mc/pdebruic/PackageManifest/main' ]; - package: 'Material-Design-Colors' with: [ spec requires: 'PackageManifest' ] ] \ No newline at end of file + package: 'Material-Design-Colors' with: [ spec requires: 'PackageManifest' ]; + package: 'Material-Design-Colors-Platform-Gemstone' with: [ spec requires: 'Material-Design-Colors-Platform' ]; + package: 'Material-Design-Colors-Platform' with: [ spec includes: 'Material-Design-Colors-Platform-Gemstone' ] ] \ No newline at end of file diff --git a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/pharo..st b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/pharo..st new file mode 100644 index 0000000..aac100f --- /dev/null +++ b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/pharo..st @@ -0,0 +1,7 @@ +baseline +pharo: spec + spec + for: #pharo + do: [ spec + package: 'Material-Design-Colors-Platform-Pharo' with: [ spec requires: 'Material-Design-Colors-Platform' ]; + package: 'Material-Design-Colors-Platform' with: [ spec includes: 'Material-Design-Colors-Platform-Pharo' ] ] \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Gemstone.package/.filetree b/src/Material-Design-Colors-Platform-Gemstone.package/.filetree new file mode 100644 index 0000000..57a6797 --- /dev/null +++ b/src/Material-Design-Colors-Platform-Gemstone.package/.filetree @@ -0,0 +1,5 @@ +{ + "separateMethodMetaAndSource" : false, + "noMethodMetaData" : true, + "useCypressPropertiesFile" : true +} \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/README.md b/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/README.md new file mode 100644 index 0000000..392cf52 --- /dev/null +++ b/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/README.md @@ -0,0 +1,4 @@ +Description +-------------------- + +I contain the Gemstone specific code of MaterialDesignColors \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/class/initialize.st b/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/class/initialize.st new file mode 100644 index 0000000..deeb0ea --- /dev/null +++ b/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/class/initialize.st @@ -0,0 +1,3 @@ +initialize-release +initialize + self register \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/instance/allSelectorsOf.from..st b/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/instance/allSelectorsOf.from..st new file mode 100644 index 0000000..ecd9292 --- /dev/null +++ b/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/instance/allSelectorsOf.from..st @@ -0,0 +1,5 @@ +accessing +allSelectorsOf: aClass from: aSymbol + "Return the lists of selectors understood by and categorized in a protocol named " + + ^ aClass allSelectors select: [ :selector | (aClass categoryOfSelector: selector) = aSymbol ] \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/properties.json b/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/properties.json new file mode 100644 index 0000000..90adcd9 --- /dev/null +++ b/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/properties.json @@ -0,0 +1,11 @@ +{ + "commentStamp" : "CyrilFerlicot 7/4/2018 18:07", + "super" : "MaterialColorPlatform", + "category" : "Material-Design-Colors-Platform-Gemstone", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "MaterialColorGemstonePlatform", + "type" : "normal" +} \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Gemstone.package/monticello.meta/categories.st b/src/Material-Design-Colors-Platform-Gemstone.package/monticello.meta/categories.st new file mode 100644 index 0000000..327c2b3 --- /dev/null +++ b/src/Material-Design-Colors-Platform-Gemstone.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #'Material-Design-Colors-Platform-Gemstone'! diff --git a/src/Material-Design-Colors-Platform-Gemstone.package/monticello.meta/initializers.st b/src/Material-Design-Colors-Platform-Gemstone.package/monticello.meta/initializers.st new file mode 100644 index 0000000..e69de29 diff --git a/src/Material-Design-Colors-Platform-Gemstone.package/monticello.meta/package b/src/Material-Design-Colors-Platform-Gemstone.package/monticello.meta/package new file mode 100644 index 0000000..91613af --- /dev/null +++ b/src/Material-Design-Colors-Platform-Gemstone.package/monticello.meta/package @@ -0,0 +1 @@ +(name 'Material-Design-Colors-Platform-Gemstone') \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Gemstone.package/properties.json b/src/Material-Design-Colors-Platform-Gemstone.package/properties.json new file mode 100644 index 0000000..6f31cf5 --- /dev/null +++ b/src/Material-Design-Colors-Platform-Gemstone.package/properties.json @@ -0,0 +1 @@ +{ } \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Pharo.package/.filetree b/src/Material-Design-Colors-Platform-Pharo.package/.filetree new file mode 100644 index 0000000..57a6797 --- /dev/null +++ b/src/Material-Design-Colors-Platform-Pharo.package/.filetree @@ -0,0 +1,5 @@ +{ + "separateMethodMetaAndSource" : false, + "noMethodMetaData" : true, + "useCypressPropertiesFile" : true +} \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/README.md b/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/README.md new file mode 100644 index 0000000..6fe707d --- /dev/null +++ b/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/README.md @@ -0,0 +1,4 @@ +Description +-------------------- + +Platform managing the Pharo specific code of MaterialDesignColors. \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/class/initialize.st b/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/class/initialize.st new file mode 100644 index 0000000..deeb0ea --- /dev/null +++ b/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/class/initialize.st @@ -0,0 +1,3 @@ +initialize-release +initialize + self register \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/instance/allSelectorsOf.from..st b/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/instance/allSelectorsOf.from..st new file mode 100644 index 0000000..296cf73 --- /dev/null +++ b/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/instance/allSelectorsOf.from..st @@ -0,0 +1,5 @@ +accessing +allSelectorsOf: aClass from: aSymbol + "Return the lists of selectors understood by and categorized in a protocol named " + + ^ aClass allMethods select: [ :each | each protocol = aSymbol ] thenCollect: #selector \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/properties.json b/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/properties.json new file mode 100644 index 0000000..f0e97e8 --- /dev/null +++ b/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/properties.json @@ -0,0 +1,11 @@ +{ + "commentStamp" : "CyrilFerlicot 7/4/2018 18:05", + "super" : "MaterialColorPlatform", + "category" : "Material-Design-Colors-Platform-Pharo", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "MaterialColorPharoPlatform", + "type" : "normal" +} \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Pharo.package/monticello.meta/categories.st b/src/Material-Design-Colors-Platform-Pharo.package/monticello.meta/categories.st new file mode 100644 index 0000000..09ec5b8 --- /dev/null +++ b/src/Material-Design-Colors-Platform-Pharo.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #'Material-Design-Colors-Platform-Pharo'! diff --git a/src/Material-Design-Colors-Platform-Pharo.package/monticello.meta/initializers.st b/src/Material-Design-Colors-Platform-Pharo.package/monticello.meta/initializers.st new file mode 100644 index 0000000..e69de29 diff --git a/src/Material-Design-Colors-Platform-Pharo.package/monticello.meta/package b/src/Material-Design-Colors-Platform-Pharo.package/monticello.meta/package new file mode 100644 index 0000000..ed95eef --- /dev/null +++ b/src/Material-Design-Colors-Platform-Pharo.package/monticello.meta/package @@ -0,0 +1 @@ +(name 'Material-Design-Colors-Platform-Pharo') \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Pharo.package/properties.json b/src/Material-Design-Colors-Platform-Pharo.package/properties.json new file mode 100644 index 0000000..6f31cf5 --- /dev/null +++ b/src/Material-Design-Colors-Platform-Pharo.package/properties.json @@ -0,0 +1 @@ +{ } \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform.package/.filetree b/src/Material-Design-Colors-Platform.package/.filetree new file mode 100644 index 0000000..57a6797 --- /dev/null +++ b/src/Material-Design-Colors-Platform.package/.filetree @@ -0,0 +1,5 @@ +{ + "separateMethodMetaAndSource" : false, + "noMethodMetaData" : true, + "useCypressPropertiesFile" : true +} \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/README.md b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/README.md new file mode 100644 index 0000000..522c775 --- /dev/null +++ b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/README.md @@ -0,0 +1,12 @@ +Description +-------------------- + +A MaterialColorPlatform is a class managing the differences in code between different platform such as Pharo and Gemestone. + +Each subclasses will be in a specific package loaded only for this language. During the loading the subclass will register itself as the current platform. + +Examples +-------------------- + + MaterialColorPlatform current methodsIn: aClass from: aProtocol + diff --git a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/current.st b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/current.st new file mode 100644 index 0000000..294036c --- /dev/null +++ b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/current.st @@ -0,0 +1,3 @@ +accessing +current + ^ Current ifNil: [ self error: 'No platform registered' ] \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/register.st b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/register.st new file mode 100644 index 0000000..e64ac32 --- /dev/null +++ b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/register.st @@ -0,0 +1,3 @@ +accessing +register + Current := self new \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/instance/allSelectorsOf.from..st b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/instance/allSelectorsOf.from..st new file mode 100644 index 0000000..878b806 --- /dev/null +++ b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/instance/allSelectorsOf.from..st @@ -0,0 +1,5 @@ +accessing +allSelectorsOf: aClass from: aSymbol + "Return the lists of selectors understood by and categorized in a protocol named " + + ^ self subclassResponsibility \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/properties.json b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/properties.json new file mode 100644 index 0000000..ee105df --- /dev/null +++ b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/properties.json @@ -0,0 +1,13 @@ +{ + "commentStamp" : "CyrilFerlicot 7/4/2018 17:57", + "super" : "Color", + "category" : "Material-Design-Colors-Platform", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ + "Current" + ], + "instvars" : [ ], + "name" : "MaterialColorPlatform", + "type" : "normal" +} \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform.package/monticello.meta/categories.st b/src/Material-Design-Colors-Platform.package/monticello.meta/categories.st new file mode 100644 index 0000000..0131376 --- /dev/null +++ b/src/Material-Design-Colors-Platform.package/monticello.meta/categories.st @@ -0,0 +1 @@ +SystemOrganization addCategory: #'Material-Design-Colors-Platform'! diff --git a/src/Material-Design-Colors-Platform.package/monticello.meta/initializers.st b/src/Material-Design-Colors-Platform.package/monticello.meta/initializers.st new file mode 100644 index 0000000..e69de29 diff --git a/src/Material-Design-Colors-Platform.package/monticello.meta/package b/src/Material-Design-Colors-Platform.package/monticello.meta/package new file mode 100644 index 0000000..f9a95bb --- /dev/null +++ b/src/Material-Design-Colors-Platform.package/monticello.meta/package @@ -0,0 +1 @@ +(name 'Material-Design-Colors-Platform') \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform.package/properties.json b/src/Material-Design-Colors-Platform.package/properties.json new file mode 100644 index 0000000..6f31cf5 --- /dev/null +++ b/src/Material-Design-Colors-Platform.package/properties.json @@ -0,0 +1 @@ +{ } \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/allDefaultsColors.st b/src/Material-Design-Colors.package/MDLColor.class/class/allDefaultsColors.st index 30ffff3..b3e7b20 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/allDefaultsColors.st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/allDefaultsColors.st @@ -1,3 +1,3 @@ accessing allDefaultsColors - ^ self class allMethods select: [ :each | each protocol = #'defaults - colors' ] thenCollect: [ :m | MDLColor perform: m selector ] \ No newline at end of file + ^ (MaterialColorPlatform current allSelectorsOf: self class from: #'defaults - colors') collect: [ :selector | MDLColor perform: selector ] \ No newline at end of file From 37e9e7f5abb403bd742ef5bf36abcfcd79129b0a Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Wed, 4 Jul 2018 18:26:21 +0200 Subject: [PATCH 06/20] Correct superclass of platform --- .../MaterialColorPlatform.class/properties.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/properties.json b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/properties.json index ee105df..d605bd3 100644 --- a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/properties.json +++ b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "CyrilFerlicot 7/4/2018 17:57", - "super" : "Color", + "super" : "Object", "category" : "Material-Design-Colors-Platform", "classinstvars" : [ ], "pools" : [ ], From 15b07973d510ec40e2dcddf609d6aa669a072755 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 5 Jul 2018 13:25:21 +0200 Subject: [PATCH 07/20] Add logs to find a Gemstone problem --- .../BaselineOfMaterialColors.class/instance/baseline..st | 1 + .../BaselineOfMaterialColors.class/instance/logs.st | 7 +++++++ .../MaterialColorPlatform.class/class/register.st | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/logs.st diff --git a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/baseline..st b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/baseline..st index d90214f..786b95a 100644 --- a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/baseline..st +++ b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/baseline..st @@ -4,6 +4,7 @@ baseline: spec spec for: #common do: [ + spec postLoadDoIt: #logs. "Packages" spec package: 'Material-Design-Colors-Platform'; diff --git a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/logs.st b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/logs.st new file mode 100644 index 0000000..17db0ec --- /dev/null +++ b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/logs.st @@ -0,0 +1,7 @@ +baseline +logs + "Temporary logs to find a problem on Gemstone." + + Transcript + show: MaterialColorPlatform class selectors; + cr \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/register.st b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/register.st index e64ac32..102eb0f 100644 --- a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/register.st +++ b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/register.st @@ -1,3 +1,3 @@ -accessing +initialization register Current := self new \ No newline at end of file From 8065525e4e6a6f8b978f799dc29430140a66405c Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 5 Jul 2018 13:41:43 +0200 Subject: [PATCH 08/20] Move abstract platform to main package. --- .../instance/baseline..st | 4 +--- .../instance/gemStone..st | 4 ++-- .../BaselineOfMaterialColors.class/instance/logs.st | 7 ------- .../instance/pharo..st | 4 ++-- .../MaterialColorPlatform.class/README.md | 12 ++++++++++++ .../MaterialColorPlatform.class/class/current.st | 3 +++ .../MaterialColorPlatform.class/class/register.st | 3 +++ .../instance/allSelectorsOf.from..st | 5 +++++ .../MaterialColorPlatform.class/properties.json | 13 +++++++++++++ 9 files changed, 41 insertions(+), 14 deletions(-) delete mode 100644 src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/logs.st create mode 100644 src/Material-Design-Colors.package/MaterialColorPlatform.class/README.md create mode 100644 src/Material-Design-Colors.package/MaterialColorPlatform.class/class/current.st create mode 100644 src/Material-Design-Colors.package/MaterialColorPlatform.class/class/register.st create mode 100644 src/Material-Design-Colors.package/MaterialColorPlatform.class/instance/allSelectorsOf.from..st create mode 100644 src/Material-Design-Colors.package/MaterialColorPlatform.class/properties.json diff --git a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/baseline..st b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/baseline..st index 786b95a..c9ea221 100644 --- a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/baseline..st +++ b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/baseline..st @@ -4,11 +4,9 @@ baseline: spec spec for: #common do: [ - spec postLoadDoIt: #logs. "Packages" spec - package: 'Material-Design-Colors-Platform'; - package: 'Material-Design-Colors' with: [ spec requires: 'Material-Design-Colors-Platform' ]; + package: 'Material-Design-Colors'; package: 'Material-Design-Tests-Colors' with: [ spec requires: 'Material-Design-Colors' ]. "Groups" diff --git a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/gemStone..st b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/gemStone..st index 6de8fee..86974e6 100644 --- a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/gemStone..st +++ b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/gemStone..st @@ -5,5 +5,5 @@ gemStone: spec do: [ spec package: 'PackageManifest' with: [ spec repository: 'http://smalltalkhub.com/mc/pdebruic/PackageManifest/main' ]; package: 'Material-Design-Colors' with: [ spec requires: 'PackageManifest' ]; - package: 'Material-Design-Colors-Platform-Gemstone' with: [ spec requires: 'Material-Design-Colors-Platform' ]; - package: 'Material-Design-Colors-Platform' with: [ spec includes: 'Material-Design-Colors-Platform-Gemstone' ] ] \ No newline at end of file + package: 'Material-Design-Colors-Platform-Gemstone' with: [ spec requires: 'Material-Design-Colors' ]; + package: 'Material-Design-Colors' with: [ spec includes: 'Material-Design-Colors-Platform-Gemstone' ] ] \ No newline at end of file diff --git a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/logs.st b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/logs.st deleted file mode 100644 index 17db0ec..0000000 --- a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/logs.st +++ /dev/null @@ -1,7 +0,0 @@ -baseline -logs - "Temporary logs to find a problem on Gemstone." - - Transcript - show: MaterialColorPlatform class selectors; - cr \ No newline at end of file diff --git a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/pharo..st b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/pharo..st index aac100f..be743ce 100644 --- a/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/pharo..st +++ b/src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/pharo..st @@ -3,5 +3,5 @@ pharo: spec spec for: #pharo do: [ spec - package: 'Material-Design-Colors-Platform-Pharo' with: [ spec requires: 'Material-Design-Colors-Platform' ]; - package: 'Material-Design-Colors-Platform' with: [ spec includes: 'Material-Design-Colors-Platform-Pharo' ] ] \ No newline at end of file + package: 'Material-Design-Colors-Platform-Pharo' with: [ spec requires: 'Material-Design-Colors' ]; + package: 'Material-Design-Colors' with: [ spec includes: 'Material-Design-Colors-Platform-Pharo' ] ] \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MaterialColorPlatform.class/README.md b/src/Material-Design-Colors.package/MaterialColorPlatform.class/README.md new file mode 100644 index 0000000..522c775 --- /dev/null +++ b/src/Material-Design-Colors.package/MaterialColorPlatform.class/README.md @@ -0,0 +1,12 @@ +Description +-------------------- + +A MaterialColorPlatform is a class managing the differences in code between different platform such as Pharo and Gemestone. + +Each subclasses will be in a specific package loaded only for this language. During the loading the subclass will register itself as the current platform. + +Examples +-------------------- + + MaterialColorPlatform current methodsIn: aClass from: aProtocol + diff --git a/src/Material-Design-Colors.package/MaterialColorPlatform.class/class/current.st b/src/Material-Design-Colors.package/MaterialColorPlatform.class/class/current.st new file mode 100644 index 0000000..294036c --- /dev/null +++ b/src/Material-Design-Colors.package/MaterialColorPlatform.class/class/current.st @@ -0,0 +1,3 @@ +accessing +current + ^ Current ifNil: [ self error: 'No platform registered' ] \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MaterialColorPlatform.class/class/register.st b/src/Material-Design-Colors.package/MaterialColorPlatform.class/class/register.st new file mode 100644 index 0000000..102eb0f --- /dev/null +++ b/src/Material-Design-Colors.package/MaterialColorPlatform.class/class/register.st @@ -0,0 +1,3 @@ +initialization +register + Current := self new \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MaterialColorPlatform.class/instance/allSelectorsOf.from..st b/src/Material-Design-Colors.package/MaterialColorPlatform.class/instance/allSelectorsOf.from..st new file mode 100644 index 0000000..878b806 --- /dev/null +++ b/src/Material-Design-Colors.package/MaterialColorPlatform.class/instance/allSelectorsOf.from..st @@ -0,0 +1,5 @@ +accessing +allSelectorsOf: aClass from: aSymbol + "Return the lists of selectors understood by and categorized in a protocol named " + + ^ self subclassResponsibility \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MaterialColorPlatform.class/properties.json b/src/Material-Design-Colors.package/MaterialColorPlatform.class/properties.json new file mode 100644 index 0000000..ab84f73 --- /dev/null +++ b/src/Material-Design-Colors.package/MaterialColorPlatform.class/properties.json @@ -0,0 +1,13 @@ +{ + "commentStamp" : "CyrilFerlicot 7/4/2018 17:57", + "super" : "Object", + "category" : "Material-Design-Colors", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ + "Current" + ], + "instvars" : [ ], + "name" : "MaterialColorPlatform", + "type" : "normal" +} \ No newline at end of file From 1440d9c47ee8c51a343d02851ebebc7dd561ac13 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 5 Jul 2018 14:49:39 +0200 Subject: [PATCH 09/20] Add new tests --- .../MDLColorTests.class/instance/testIsAccentuated.st | 4 ++++ .../MDLColorTests.class/instance/testTint.st | 6 ++++++ .../MDLColorTests.class/instance/testTintCode.st | 6 ++++++ 3 files changed, 16 insertions(+) create mode 100644 src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testIsAccentuated.st create mode 100644 src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testTint.st create mode 100644 src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testTintCode.st diff --git a/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testIsAccentuated.st b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testIsAccentuated.st new file mode 100644 index 0000000..5cfeb88 --- /dev/null +++ b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testIsAccentuated.st @@ -0,0 +1,4 @@ +tests +testIsAccentuated + self deny: (MDLColor tint: #orange code: '500') isAccentuated. + self assert: (MDLColor tint: #orange code: 'A400' ) isAccentuated \ No newline at end of file diff --git a/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testTint.st b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testTint.st new file mode 100644 index 0000000..f675b50 --- /dev/null +++ b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testTint.st @@ -0,0 +1,6 @@ +tests +testTint + self assert: (MDLColor tint: #orange) equals: MDLColor orange. + "Ensure String and Symbol works" + self assert: (MDLColor tint: 'orange') equals: MDLColor orange. + self assert: (MDLColor tint: #orange) asRGBA equals: 'rgba(255,152,0,1)' \ No newline at end of file diff --git a/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testTintCode.st b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testTintCode.st new file mode 100644 index 0000000..2449a29 --- /dev/null +++ b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testTintCode.st @@ -0,0 +1,6 @@ +tests +testTintCode + self assert: (MDLColor tint: #orange code: #'800') asRGBA equals: 'rgba(239,108,0,1)'. + "Ensure String and Symbol works" + self assert: (MDLColor tint: 'orange' code: #'800') asRGBA equals: 'rgba(239,108,0,1)'. + self assert: (MDLColor tint: 'orange' code: '800') asRGBA equals: 'rgba(239,108,0,1)'. \ No newline at end of file From 8bbc9ccc33564fb2afac39ba98e0837780102adc Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 5 Jul 2018 14:52:36 +0200 Subject: [PATCH 10/20] Remove unused package --- .../.filetree | 5 ----- .../MaterialColorPlatform.class/README.md | 12 ------------ .../MaterialColorPlatform.class/class/current.st | 3 --- .../MaterialColorPlatform.class/class/register.st | 3 --- .../instance/allSelectorsOf.from..st | 5 ----- .../MaterialColorPlatform.class/properties.json | 13 ------------- .../monticello.meta/categories.st | 1 - .../monticello.meta/initializers.st | 0 .../monticello.meta/package | 1 - .../properties.json | 1 - 10 files changed, 44 deletions(-) delete mode 100644 src/Material-Design-Colors-Platform.package/.filetree delete mode 100644 src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/README.md delete mode 100644 src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/current.st delete mode 100644 src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/register.st delete mode 100644 src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/instance/allSelectorsOf.from..st delete mode 100644 src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/properties.json delete mode 100644 src/Material-Design-Colors-Platform.package/monticello.meta/categories.st delete mode 100644 src/Material-Design-Colors-Platform.package/monticello.meta/initializers.st delete mode 100644 src/Material-Design-Colors-Platform.package/monticello.meta/package delete mode 100644 src/Material-Design-Colors-Platform.package/properties.json diff --git a/src/Material-Design-Colors-Platform.package/.filetree b/src/Material-Design-Colors-Platform.package/.filetree deleted file mode 100644 index 57a6797..0000000 --- a/src/Material-Design-Colors-Platform.package/.filetree +++ /dev/null @@ -1,5 +0,0 @@ -{ - "separateMethodMetaAndSource" : false, - "noMethodMetaData" : true, - "useCypressPropertiesFile" : true -} \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/README.md b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/README.md deleted file mode 100644 index 522c775..0000000 --- a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/README.md +++ /dev/null @@ -1,12 +0,0 @@ -Description --------------------- - -A MaterialColorPlatform is a class managing the differences in code between different platform such as Pharo and Gemestone. - -Each subclasses will be in a specific package loaded only for this language. During the loading the subclass will register itself as the current platform. - -Examples --------------------- - - MaterialColorPlatform current methodsIn: aClass from: aProtocol - diff --git a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/current.st b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/current.st deleted file mode 100644 index 294036c..0000000 --- a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/current.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -current - ^ Current ifNil: [ self error: 'No platform registered' ] \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/register.st b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/register.st deleted file mode 100644 index 102eb0f..0000000 --- a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/class/register.st +++ /dev/null @@ -1,3 +0,0 @@ -initialization -register - Current := self new \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/instance/allSelectorsOf.from..st b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/instance/allSelectorsOf.from..st deleted file mode 100644 index 878b806..0000000 --- a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/instance/allSelectorsOf.from..st +++ /dev/null @@ -1,5 +0,0 @@ -accessing -allSelectorsOf: aClass from: aSymbol - "Return the lists of selectors understood by and categorized in a protocol named " - - ^ self subclassResponsibility \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/properties.json b/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/properties.json deleted file mode 100644 index d605bd3..0000000 --- a/src/Material-Design-Colors-Platform.package/MaterialColorPlatform.class/properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "commentStamp" : "CyrilFerlicot 7/4/2018 17:57", - "super" : "Object", - "category" : "Material-Design-Colors-Platform", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ - "Current" - ], - "instvars" : [ ], - "name" : "MaterialColorPlatform", - "type" : "normal" -} \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform.package/monticello.meta/categories.st b/src/Material-Design-Colors-Platform.package/monticello.meta/categories.st deleted file mode 100644 index 0131376..0000000 --- a/src/Material-Design-Colors-Platform.package/monticello.meta/categories.st +++ /dev/null @@ -1 +0,0 @@ -SystemOrganization addCategory: #'Material-Design-Colors-Platform'! diff --git a/src/Material-Design-Colors-Platform.package/monticello.meta/initializers.st b/src/Material-Design-Colors-Platform.package/monticello.meta/initializers.st deleted file mode 100644 index e69de29..0000000 diff --git a/src/Material-Design-Colors-Platform.package/monticello.meta/package b/src/Material-Design-Colors-Platform.package/monticello.meta/package deleted file mode 100644 index f9a95bb..0000000 --- a/src/Material-Design-Colors-Platform.package/monticello.meta/package +++ /dev/null @@ -1 +0,0 @@ -(name 'Material-Design-Colors-Platform') \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform.package/properties.json b/src/Material-Design-Colors-Platform.package/properties.json deleted file mode 100644 index 6f31cf5..0000000 --- a/src/Material-Design-Colors-Platform.package/properties.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file From c9a6b566aa80d606e4f1367f1681365420831cce Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 5 Jul 2018 15:17:24 +0200 Subject: [PATCH 11/20] Gemstone compatibility of #tint: and #code: --- .../MDLColor.class/class/tint.code..st | 2 +- .../MDLColor.class/instance/code..st | 4 ++-- .../MDLColor.class/instance/storeOn..st | 11 +++++++---- .../MDLColor.class/instance/tint..st | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/Material-Design-Colors.package/MDLColor.class/class/tint.code..st b/src/Material-Design-Colors.package/MDLColor.class/class/tint.code..st index 2b1b671..e8cac31 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/class/tint.code..st +++ b/src/Material-Design-Colors.package/MDLColor.class/class/tint.code..st @@ -1,3 +1,3 @@ accessing tint: aTint code: aCode - ^ (self colors at: aTint) at: aCode \ No newline at end of file + ^ (self colors at: aTint asSymbol) at: aCode asSymbol \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/instance/code..st b/src/Material-Design-Colors.package/MDLColor.class/instance/code..st index 4ee7776..a902904 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/instance/code..st +++ b/src/Material-Design-Colors.package/MDLColor.class/instance/code..st @@ -1,3 +1,3 @@ accessing -code: anObject - code := anObject \ No newline at end of file +code: aSymbol + code := aSymbol asSymbol "In case we gave a string" \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/instance/storeOn..st b/src/Material-Design-Colors.package/MDLColor.class/instance/storeOn..st index 8119f85..4242ab0 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/instance/storeOn..st +++ b/src/Material-Design-Colors.package/MDLColor.class/instance/storeOn..st @@ -1,7 +1,10 @@ printing storeOn: aStream aStream - nextPutAll: '(' , self class name; - nextPutAll: ' tint: '; print: (self tint); - nextPutAll: ' code: '; print: (self code); - nextPutAll: ')'. + nextPut: $(; + nextPutAll: self class name; + nextPutAll: ' tint: '; + print: self tint; + nextPutAll: ' code: '; + print: self code; + nextPut: $) \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/instance/tint..st b/src/Material-Design-Colors.package/MDLColor.class/instance/tint..st index 0c494d8..9034841 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/instance/tint..st +++ b/src/Material-Design-Colors.package/MDLColor.class/instance/tint..st @@ -1,3 +1,3 @@ accessing -tint: anObject - tint := anObject \ No newline at end of file +tint: aSymbol + tint := aSymbol asSymbol "In case we gave a string" \ No newline at end of file From bab679f71c5ce6dc357fbc1d7ce85512bd5672ba Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 5 Jul 2018 15:29:24 +0200 Subject: [PATCH 12/20] Gemstone compatibility. Do not use Stream>>#<< --- .../Color.extension/instance/asRGBA.st | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Material-Design-Colors.package/Color.extension/instance/asRGBA.st b/src/Material-Design-Colors.package/Color.extension/instance/asRGBA.st index 1c3f1b5..8106149 100644 --- a/src/Material-Design-Colors.package/Color.extension/instance/asRGBA.st +++ b/src/Material-Design-Colors.package/Color.extension/instance/asRGBA.st @@ -8,11 +8,11 @@ asRGBA ifTrue: [ alph := alph allButLast: 2 ]. s nextPutAll: 'rgba('; - << (self red * 255) ceiling; + print: (self red * 255) ceiling; nextPut: $,; - << (self green * 255) ceiling; + print: (self green * 255) ceiling; nextPut: $,; - << (self blue * 255) ceiling; + print: (self blue * 255) ceiling; nextPut: $,; - << alph; + nextPutAll: alph; nextPut: $) ] \ No newline at end of file From 5efd08b3b84dfa072816263cb1dfdd57d8b89fe6 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 5 Jul 2018 21:01:36 +0200 Subject: [PATCH 13/20] Test #storeOn: and skip testAsString on Gemstone. --- .../instance/isGemstone.st | 3 +++ .../MaterialColorPharoPlatform.class/instance/isPharo.st | 3 +++ .../MaterialColorPlatform.class/instance/isGemstone.st | 3 +++ .../MaterialColorPlatform.class/instance/isPharo.st | 3 +++ .../MDLColorTests.class/instance/testAsString.st | 2 ++ .../MDLColorTests.class/instance/testStoreOn.st | 5 +++++ 6 files changed, 19 insertions(+) create mode 100644 src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/instance/isGemstone.st create mode 100644 src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/instance/isPharo.st create mode 100644 src/Material-Design-Colors.package/MaterialColorPlatform.class/instance/isGemstone.st create mode 100644 src/Material-Design-Colors.package/MaterialColorPlatform.class/instance/isPharo.st create mode 100644 src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testStoreOn.st diff --git a/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/instance/isGemstone.st b/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/instance/isGemstone.st new file mode 100644 index 0000000..55a2204 --- /dev/null +++ b/src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/instance/isGemstone.st @@ -0,0 +1,3 @@ +testing +isGemstone + ^ true \ No newline at end of file diff --git a/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/instance/isPharo.st b/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/instance/isPharo.st new file mode 100644 index 0000000..a86b73e --- /dev/null +++ b/src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/instance/isPharo.st @@ -0,0 +1,3 @@ +testing +isPharo + ^ true \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MaterialColorPlatform.class/instance/isGemstone.st b/src/Material-Design-Colors.package/MaterialColorPlatform.class/instance/isGemstone.st new file mode 100644 index 0000000..5fc40fc --- /dev/null +++ b/src/Material-Design-Colors.package/MaterialColorPlatform.class/instance/isGemstone.st @@ -0,0 +1,3 @@ +accessing +isGemstone + ^ false \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MaterialColorPlatform.class/instance/isPharo.st b/src/Material-Design-Colors.package/MaterialColorPlatform.class/instance/isPharo.st new file mode 100644 index 0000000..308ea00 --- /dev/null +++ b/src/Material-Design-Colors.package/MaterialColorPlatform.class/instance/isPharo.st @@ -0,0 +1,3 @@ +testing +isPharo + ^ false \ No newline at end of file diff --git a/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testAsString.st b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testAsString.st index de19f2d..4151beb 100644 --- a/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testAsString.st +++ b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testAsString.st @@ -1,5 +1,7 @@ tests testAsString + MaterialColorPlatform current isGemstone ifTrue: [ self skip ]. + self assert: MDLColor yellow asString equals: '(MDLColor tint: #yellow code: #''500'')'. self assert: MDLColor blue lighter lighter asString equals: '(MDLColor tint: #blue code: #''300'')'. self assert: MDLColor brown darker asString equals: '(MDLColor tint: #brown code: #''600'')' \ No newline at end of file diff --git a/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testStoreOn.st b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testStoreOn.st new file mode 100644 index 0000000..4572075 --- /dev/null +++ b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testStoreOn.st @@ -0,0 +1,5 @@ +tests +testStoreOn + self assert: (String streamContents: [ :s | MDLColor yellow storeOn: s ]) equals: '(MDLColor tint: #yellow code: #''500'')'. + self assert: (String streamContents: [ :s | MDLColor blue lighter lighter storeOn: s ]) equals: '(MDLColor tint: #blue code: #''300'')'. + self assert: (String streamContents: [ :s | MDLColor brown darker storeOn: s ]) equals: '(MDLColor tint: #brown code: #''600'')' \ No newline at end of file From a25d49e6d2908f341b7b67fb3435b353fcd0aba7 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 5 Jul 2018 21:32:55 +0200 Subject: [PATCH 14/20] New try to make colors Gemstone compatible. --- .../MDLColor.class/instance/printOn..st | 3 +++ .../MDLColor.class/instance/storeOn..st | 10 +++++----- .../MDLColorTests.class/instance/testAsString.st | 10 ++++------ .../MDLColorTests.class/instance/testStoreOn.st | 10 +++++++--- 4 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 src/Material-Design-Colors.package/MDLColor.class/instance/printOn..st diff --git a/src/Material-Design-Colors.package/MDLColor.class/instance/printOn..st b/src/Material-Design-Colors.package/MDLColor.class/instance/printOn..st new file mode 100644 index 0000000..d316172 --- /dev/null +++ b/src/Material-Design-Colors.package/MDLColor.class/instance/printOn..st @@ -0,0 +1,3 @@ +printing +printOn: aStream + self storeOn: aStream \ No newline at end of file diff --git a/src/Material-Design-Colors.package/MDLColor.class/instance/storeOn..st b/src/Material-Design-Colors.package/MDLColor.class/instance/storeOn..st index 4242ab0..d012b21 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/instance/storeOn..st +++ b/src/Material-Design-Colors.package/MDLColor.class/instance/storeOn..st @@ -3,8 +3,8 @@ storeOn: aStream aStream nextPut: $(; nextPutAll: self class name; - nextPutAll: ' tint: '; - print: self tint; - nextPutAll: ' code: '; - print: self code; - nextPut: $) \ No newline at end of file + nextPutAll: ' tint: #'''; + nextPutAll: self tint; + nextPutAll: ''' code: #'''; + nextPutAll: self code; + nextPutAll: ''')' \ No newline at end of file diff --git a/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testAsString.st b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testAsString.st index 4151beb..acab3cd 100644 --- a/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testAsString.st +++ b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testAsString.st @@ -1,7 +1,5 @@ tests -testAsString - MaterialColorPlatform current isGemstone ifTrue: [ self skip ]. - - self assert: MDLColor yellow asString equals: '(MDLColor tint: #yellow code: #''500'')'. - self assert: MDLColor blue lighter lighter asString equals: '(MDLColor tint: #blue code: #''300'')'. - self assert: MDLColor brown darker asString equals: '(MDLColor tint: #brown code: #''600'')' \ No newline at end of file +testAsString + self assert: MDLColor yellow asString equals: '(MDLColor tint: #''yellow'' code: #''500'')'. + self assert: MDLColor blue lighter lighter asString equals: '(MDLColor tint: #''blue'' code: #''300'')'. + self assert: MDLColor brown darker asString equals: '(MDLColor tint: #''brown'' code: #''600'')' \ No newline at end of file diff --git a/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testStoreOn.st b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testStoreOn.st index 4572075..57a1ba3 100644 --- a/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testStoreOn.st +++ b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testStoreOn.st @@ -1,5 +1,9 @@ tests testStoreOn - self assert: (String streamContents: [ :s | MDLColor yellow storeOn: s ]) equals: '(MDLColor tint: #yellow code: #''500'')'. - self assert: (String streamContents: [ :s | MDLColor blue lighter lighter storeOn: s ]) equals: '(MDLColor tint: #blue code: #''300'')'. - self assert: (String streamContents: [ :s | MDLColor brown darker storeOn: s ]) equals: '(MDLColor tint: #brown code: #''600'')' \ No newline at end of file + self assert: (String streamContents: [ :s | MDLColor yellow storeOn: s ]) equals: '(MDLColor tint: #''yellow'' code: #''500'')'. + self assert: (String streamContents: [ :s | MDLColor lightGreen storeOn: s ]) equals: '(MDLColor tint: #''light_green'' code: #''500'')'. + self assert: (String streamContents: [ :s | MDLColor blue lighter lighter storeOn: s ]) equals: '(MDLColor tint: #''blue'' code: #''300'')'. + self assert: (String streamContents: [ :s | MDLColor brown darker storeOn: s ]) equals: '(MDLColor tint: #''brown'' code: #''600'')'. + + self assert: (Object readFromString: (String streamContents: [ :s | MDLColor yellow storeOn: s ])) equals: MDLColor yellow. + self assert: (Object readFromString: (String streamContents: [ :s | MDLColor blue lighter lighter storeOn: s ])) equals: MDLColor blue lighter lighter \ No newline at end of file From 5645b71ab6b7b530583179ed74be59af7e5db55c Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 5 Jul 2018 21:43:05 +0200 Subject: [PATCH 15/20] With this we should be good for Gemstone compatibility --- .../MDLColorTests.class/instance/testAsString.st | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testAsString.st b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testAsString.st index acab3cd..d948985 100644 --- a/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testAsString.st +++ b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testAsString.st @@ -1,5 +1,8 @@ tests -testAsString - self assert: MDLColor yellow asString equals: '(MDLColor tint: #''yellow'' code: #''500'')'. - self assert: MDLColor blue lighter lighter asString equals: '(MDLColor tint: #''blue'' code: #''300'')'. - self assert: MDLColor brown darker asString equals: '(MDLColor tint: #''brown'' code: #''600'')' \ No newline at end of file +testAsString + "Skip test on Gemstone because it manage the #asString for colors differently." + MaterialColorPlatform current isGemstone ifTrue: [ ^ self ]. + + self assert: MDLColor yellow asString equals: '(MDLColor tint: #yellow code: #''500'')'. + self assert: MDLColor blue lighter lighter asString equals: '(MDLColor tint: #blue code: #''300'')'. + self assert: MDLColor brown darker asString equals: '(MDLColor tint: #brown code: #''600'')' \ No newline at end of file From b97473b551939adf10106e8c15968e10223b54b0 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 5 Jul 2018 21:55:38 +0200 Subject: [PATCH 16/20] No need of double quotes for the storeOn: when no name have a space in it. --- .../MDLColor.class/instance/storeOn..st | 4 ++-- .../MDLColorTests.class/instance/testStoreOn.st | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Material-Design-Colors.package/MDLColor.class/instance/storeOn..st b/src/Material-Design-Colors.package/MDLColor.class/instance/storeOn..st index d012b21..68b4943 100644 --- a/src/Material-Design-Colors.package/MDLColor.class/instance/storeOn..st +++ b/src/Material-Design-Colors.package/MDLColor.class/instance/storeOn..st @@ -3,8 +3,8 @@ storeOn: aStream aStream nextPut: $(; nextPutAll: self class name; - nextPutAll: ' tint: #'''; + nextPutAll: ' tint: #'; nextPutAll: self tint; - nextPutAll: ''' code: #'''; + nextPutAll: ' code: #'''; nextPutAll: self code; nextPutAll: ''')' \ No newline at end of file diff --git a/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testStoreOn.st b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testStoreOn.st index 57a1ba3..213901e 100644 --- a/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testStoreOn.st +++ b/src/Material-Design-Tests-Colors.package/MDLColorTests.class/instance/testStoreOn.st @@ -1,9 +1,9 @@ tests testStoreOn - self assert: (String streamContents: [ :s | MDLColor yellow storeOn: s ]) equals: '(MDLColor tint: #''yellow'' code: #''500'')'. - self assert: (String streamContents: [ :s | MDLColor lightGreen storeOn: s ]) equals: '(MDLColor tint: #''light_green'' code: #''500'')'. - self assert: (String streamContents: [ :s | MDLColor blue lighter lighter storeOn: s ]) equals: '(MDLColor tint: #''blue'' code: #''300'')'. - self assert: (String streamContents: [ :s | MDLColor brown darker storeOn: s ]) equals: '(MDLColor tint: #''brown'' code: #''600'')'. + self assert: (String streamContents: [ :s | MDLColor yellow storeOn: s ]) equals: '(MDLColor tint: #yellow code: #''500'')'. + self assert: (String streamContents: [ :s | MDLColor lightGreen storeOn: s ]) equals: '(MDLColor tint: #light_green code: #''500'')'. + self assert: (String streamContents: [ :s | MDLColor blue lighter lighter storeOn: s ]) equals: '(MDLColor tint: #blue code: #''300'')'. + self assert: (String streamContents: [ :s | MDLColor brown darker storeOn: s ]) equals: '(MDLColor tint: #brown code: #''600'')'. self assert: (Object readFromString: (String streamContents: [ :s | MDLColor yellow storeOn: s ])) equals: MDLColor yellow. self assert: (Object readFromString: (String streamContents: [ :s | MDLColor blue lighter lighter storeOn: s ])) equals: MDLColor blue lighter lighter \ No newline at end of file From f2778cbb4b4e8f5a0c638d405e4130ad9f2eb27e Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 5 Jul 2018 22:33:44 +0200 Subject: [PATCH 17/20] Gemstone 3.3.7 has a weird failure. I removed it from the CI since the current stable is 3.4.1 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 477414e..a794440 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ smalltalk: - Pharo-6.1 - Pharo-5.0 - GemStone-3.4.1 - - GemStone-3.3.7 matrix: fast_finish: true From 64a0fdefbf03e34274e0b5a25bd18426b254b2f3 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 5 Jul 2018 23:39:57 +0200 Subject: [PATCH 18/20] Add compatibility and other infos to the README Fixes https://github.com/DuneSt/MaterialColors/issues/7 --- README.md | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index abd1d0c..a596e4b 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,16 @@ Master: [![Build Status](https://travis-ci.org/DuneSt/MaterialColors.svg?branch= #### Windows builds Master: [![Build status](https://ci.appveyor.com/api/projects/status/3dn6m0k68jjenk6v/branch/master?svg=true)](https://ci.appveyor.com/project/jecisc/materialcolors/branch/master) | Latest commit: [![Build status](https://ci.appveyor.com/api/projects/status/3dn6m0k68jjenk6v?svg=true)](https://ci.appveyor.com/project/jecisc/materialcolors) -A project to extends Pharo colors's classes with the Material Design recommandations +A project to extends Pharo colors's classes with the [Material Design](https://en.wikipedia.org/wiki/Material_Design) recommandations. + +- [Documentation](#documentation) + * [Version management](#version-management) + * [Install MaterialColors](#install-materialcolors) + * [Resources](#resources) + * [Smalltalk versions compatibility](#smalltalk-versions-compatibility) + * [Contact](#contact) + +Table of contents generated with markdown-toc # Documentation @@ -45,6 +54,21 @@ To add MaterialColors to your baseline just add this: Note that you can replace the #master by another branch as #development or a tag as #v1.0.0 or #v1.0.? or #v1.x.x . +## Resources + +This project aim to help the developers to follow Material Design recommandations about colors. + +To learn those recommandation please refer to [https://material.io/design/color/](https://material.io/design/color/) + +## Smalltalk versions compatibility + +| MDL version | Compatible Pharo versions | Compatible Gemstone versions | +|------------- |--------------------------- |--------------------------- | +| 1.0.x | Pharo 50, 60, 61 | None | +| 1.1.x | Pharo 50, 60, 61 | None | +| 1.2.x | Pharo 50, 60, 61 | Gemstone 3.4.x (*) | + +(*) This version of Gemstone is tested. Older versions might work but we did not tested it. ## Contact From f6629bb4d7f725c41d8427ba585cb21bcdc1a3b0 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 5 Jul 2018 23:42:58 +0200 Subject: [PATCH 19/20] Small cleaning --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index a596e4b..497971e 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,6 @@ A project to extends Pharo colors's classes with the [Material Design](https://e * [Smalltalk versions compatibility](#smalltalk-versions-compatibility) * [Contact](#contact) -Table of contents generated with markdown-toc - - # Documentation ## Version management @@ -40,7 +37,6 @@ To install MaterialColors on your Pharo image you can just execute the following Metacello new githubUser: 'DuneSt' project: 'MaterialColors' commitish: 'master' path: 'src'; baseline: 'MaterialColors'; - onWarningLog; load ``` @@ -56,7 +52,7 @@ Note that you can replace the #master by another branch as #development or a tag ## Resources -This project aim to help the developers to follow Material Design recommandations about colors. +This project aim to help developers to follow Material Design recommandations about colors. To learn those recommandation please refer to [https://material.io/design/color/](https://material.io/design/color/) From 1c3903f2e93b36e3c63726aa8335768e4b9bc2f9 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Thu, 5 Jul 2018 23:54:37 +0200 Subject: [PATCH 20/20] Prepare release v1.2.0 --- CHANGELOG.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25697da..1fe4337 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,25 @@ +# [v1.2.0](https://github.com/DuneSt/MaterialColors/compare/v1.1.0...v1.2.0) (2018-07-05) + +## Features + +* **Make MaterialColors compatible with Gemstone** ([b71565a](https://github.com/DuneSt/MaterialColors/commit/b71565a0d2deb4cb6ce94269260a0e1b2186e73e)) + +## Infrastructure + +* **Create a development branch to not use master for development** ([a8e215f](https://github.com/DuneSt/MaterialColors/commit/a8e215f642da1e4255a8917ec4df43bc79d1c3f7)) +* **Add Gemstone to the CI** ([1a85638](https://github.com/DuneSt/MaterialColors/commit/1a85638bdaede6f43df752c292999076bb3a27d6)) +* **Add compatibility infos to the README** ([64a0fde](https://github.com/DuneSt/MaterialColors/commit/64a0fdefbf03e34274e0b5a25bd18426b254b2f3)) + +## Cleaning + +* **Cut dependency on Ring** ([a78b5fa](https://github.com/DuneSt/MaterialColors/commit/a78b5faa29f38e90b6bfba02656990cfd97128d3)) +* **Add some more tests** ([1440d9c](https://github.com/DuneSt/MaterialColors/commit/1440d9c47ee8c51a343d02851ebebc7dd561ac13)) + # [v1.1.0](https://github.com/DuneSt/MaterialColors/compare/v1.0.2...v1.1.0) (2018-03-31) ## Features -* **Add #asRGBA** on colors to help with style ([ b9e1eca](https://github.com/DuneSt/MaterialColors/commit/b9e1ecad7924e3efc5db20657b1db11231d86fbc)) +* **Add #asRGBA** on colors to help with style ([b9e1eca](https://github.com/DuneSt/MaterialColors/commit/b9e1ecad7924e3efc5db20657b1db11231d86fbc)) # [v1.0.2](https://github.com/DuneSt/MaterialColors/compare/v1.0.1...v1.0.2) (2017-07-01)