Merge pull request #13 from DuneSt/development

Release v1.2.0

.smalltalk.ston

@@ -2,8 +2,7 @@ SmalltalkCISpec {
   #loading : [
     SCIMetacelloLoadSpec {
       #baseline : 'MaterialColors',
-      #directory : 'src',
-      #platforms : [ #pharo ]
+      #directory : 'src'
     }
   ]
 }

.travis.yml

@@ -6,5 +6,12 @@ os:
 - osx
 
 smalltalk:
-  - Pharo-6.0
-  - Pharo-5.0
+  - Pharo-7.0
+  - Pharo-6.1
+  - Pharo-5.0
+  - GemStone-3.4.1
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - smalltalk: Pharo-7.0

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)
 

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.

README.md

@@ -6,8 +6,14 @@ 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)
 
 # Documentation
 
@@ -31,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
 ```
 
@@ -45,6 +50,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 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
 

src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/baseline..st

@@ -3,15 +3,17 @@ baseline: spec
 	<baseline>
 	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-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
+	self 
+		pharo: spec;
+		gemStone: spec

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' ] ]
+				package: 'Material-Design-Colors' with: [ spec requires: 'PackageManifest' ];
+				package: 'Material-Design-Colors-Platform-Gemstone' with: [ spec requires: 'Material-Design-Colors' ];
+				package: 'Material-Design-Colors' with: [ spec includes: 'Material-Design-Colors-Platform-Gemstone' ] ]

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' ];
+				package: 'Material-Design-Colors' with: [ spec includes: 'Material-Design-Colors-Platform-Pharo' ] ]

src/Material-Design-Colors-Platform-Gemstone.package/.filetree

@@ -0,0 +1,5 @@
+{
+	"separateMethodMetaAndSource" : false,
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}

src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/README.md

@@ -0,0 +1,4 @@
+Description
+--------------------
+
+I contain the Gemstone specific code of MaterialDesignColors

src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/class/initialize.st

@@ -0,0 +1,3 @@
+initialize-release
+initialize
+	self register

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 <aClass> and categorized in a protocol named <aSymbol>"
+
+	^ aClass allSelectors select: [ :selector | (aClass categoryOfSelector: selector) = aSymbol ]

src/Material-Design-Colors-Platform-Gemstone.package/MaterialColorGemstonePlatform.class/instance/isGemstone.st

@@ -0,0 +1,3 @@
+testing
+isGemstone
+	^ true

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"
+}

src/Material-Design-Colors-Platform-Gemstone.package/monticello.meta/categories.st

@@ -0,0 +1 @@
+SystemOrganization addCategory: #'Material-Design-Colors-Platform-Gemstone'!

src/Material-Design-Colors-Platform-Gemstone.package/monticello.meta/package

@@ -0,0 +1 @@
+(name 'Material-Design-Colors-Platform-Gemstone')

src/Material-Design-Colors-Platform-Gemstone.package/properties.json

@@ -0,0 +1 @@
+{ }

src/Material-Design-Colors-Platform-Pharo.package/.filetree

@@ -0,0 +1,5 @@
+{
+	"separateMethodMetaAndSource" : false,
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}

src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/README.md

@@ -0,0 +1,4 @@
+Description
+--------------------
+
+Platform managing the Pharo specific code of MaterialDesignColors.

src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/class/initialize.st

@@ -0,0 +1,3 @@
+initialize-release
+initialize
+	self register

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 <aClass> and categorized in a protocol named <aSymbol>"
+
+	^ aClass allMethods select: [ :each | each protocol = aSymbol ] thenCollect: #selector

src/Material-Design-Colors-Platform-Pharo.package/MaterialColorPharoPlatform.class/instance/isPharo.st

@@ -0,0 +1,3 @@
+testing
+isPharo
+	^ true

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"
+}

src/Material-Design-Colors-Platform-Pharo.package/monticello.meta/categories.st

@@ -0,0 +1 @@
+SystemOrganization addCategory: #'Material-Design-Colors-Platform-Pharo'!

src/Material-Design-Colors-Platform-Pharo.package/monticello.meta/package

@@ -0,0 +1 @@
+(name 'Material-Design-Colors-Platform-Pharo')

src/Material-Design-Colors-Platform-Pharo.package/properties.json

@@ -0,0 +1 @@
+{ }

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: $) ]

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 ]
+	^ (MaterialColorPlatform current allSelectorsOf: self class from: #'defaults - colors') collect: [ :selector | MDLColor perform: selector ]

src/Material-Design-Colors.package/MDLColor.class/class/amber.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 amber
 	^ self tint: #amber

src/Material-Design-Colors.package/MDLColor.class/class/blue.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 blue
 	^ self tint: #blue

src/Material-Design-Colors.package/MDLColor.class/class/blueGrey.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 blueGrey
 	^ self tint: #blue_grey

src/Material-Design-Colors.package/MDLColor.class/class/brown.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 brown
 	^ self tint: #brown

src/Material-Design-Colors.package/MDLColor.class/class/cyan.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 cyan
 	^ self tint: #cyan

src/Material-Design-Colors.package/MDLColor.class/class/deepOrange.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 deepOrange
 	^ self tint: #deep_orange

src/Material-Design-Colors.package/MDLColor.class/class/deepPurple.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 deepPurple
 	^ self tint: #deep_purple

src/Material-Design-Colors.package/MDLColor.class/class/green.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 green
 	^ self tint: #green

src/Material-Design-Colors.package/MDLColor.class/class/grey.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 grey
 	^ self tint: #grey

src/Material-Design-Colors.package/MDLColor.class/class/indigo.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 indigo
 	^ self tint: #indigo

src/Material-Design-Colors.package/MDLColor.class/class/lightBlue.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 lightBlue
 	^ self tint: #light_blue

src/Material-Design-Colors.package/MDLColor.class/class/lightGreen.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 lightGreen
 	^ self tint: #light_green

src/Material-Design-Colors.package/MDLColor.class/class/lime.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 lime
 	^ self tint: #lime

src/Material-Design-Colors.package/MDLColor.class/class/orange.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 orange
 	^ self tint: #orange

src/Material-Design-Colors.package/MDLColor.class/class/pink.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 pink
 	^ self tint: #pink

src/Material-Design-Colors.package/MDLColor.class/class/purple.st

@@ -1,3 +1,3 @@
-defaults
+defaults - colors
 purple
 	^ self tint: #purple