update Bourbon to 4.3.4 -> 5.0.0

pom.xml

@@ -144,7 +144,7 @@
 		<jruby.version>9.1.15.0</jruby.version>
 		<maven-libs.version>3.5.2</maven-libs.version>
 		<scss-lint.version>0.56.0</scss-lint.version>
-		<bourbon.version>4.3.4</bourbon.version>
+		<bourbon.version>5.0.0</bourbon.version>
 		<maven.version />
 		<debug>true</debug>
 		<github.username />
@@ -302,6 +302,10 @@
 					<exclude>**/test/**</exclude>
 					<exclude>**/examples/**</exclude>
 					<exclude>**/src/**</exclude>
+					<exclude>.github/**</exclude>
+					<exclude>**/*.json</exclude>
+					<exclude>**/*.md</exclude>
+					<exclude>**/*.js</exclude>
 				</excludes>
 			</resource>
 			<resource>

src/main/java/nl/geodienstencentrum/maven/plugin/sass/AbstractSassMojo.java

@@ -59,6 +59,9 @@
  */
 public abstract class AbstractSassMojo extends AbstractMojo {
 
+	private static final String BOURBON_GEM_PATH = "core";
+	private static final String BOURBON_DEST_PATH = "bourbon";
+
 	/**
 	 * Build directory for the plugin.
 	 *
@@ -274,7 +277,7 @@ protected void buildBasicSassScript(final StringBuilder sassScript)
 			/* remove trailing comma+\n */
 			sassScript.setLength(sassScript.length() - 2);
 			// TODO
-			// quick fix for the deprecation message coming from Gem.paths, this should be cleaned up; 
+			// quick fix for the deprecation message coming from Gem.paths, this should be cleaned up;
 			// there's a round trip of splitting into array in java and then unsplitting the array in ruby...
 			// see #118
 			sassScript.append("\n].uniq.join(File::PATH_SEPARATOR) }\n");
@@ -338,12 +341,11 @@ protected void buildBasicSassScript(final StringBuilder sassScript)
 
 		if (this.useBourbon) {
 			log.info("Running with Bourbon enabled.");
-			final String bDest = this.buildDirectory + "/bourbon";
+			final String bDest = this.buildDirectory + "/bourbon-lib";
 			this.extractBourbonResources(bDest);
-			// sassScript.append("require 'bourbon'\n");
 			sassScript.append("Sass::Plugin.add_template_location('")
                     .append(bDest)
-                    .append("/app/assets/stylesheets', '")
+                    .append("', '")
                     .append(destination).append("')\n");
 		}
 
@@ -440,21 +442,23 @@ private void extractBourbonResources(String destinationDir) {
 			File jarFile = new File(new URI(jarFileURI));
 			JarFile jar = new JarFile(jarFile);
 
-			// extract app/assets/stylesheets to destinationDir
+			// extract bourbon to destinationDir
 			for (Enumeration<JarEntry> enums = jar.entries(); enums.hasMoreElements();) {
 				JarEntry entry = enums.nextElement();
 
-				if (entry.getName().contains("app/assets/stylesheets")) {
+				if (entry.getName().contains(BOURBON_GEM_PATH) || entry.getName().contains("_bourbon.scss")) {
 					// shorten the path a bit
-					index = entry.getName().indexOf("app/assets/stylesheets");
+					index = entry.getName().indexOf(BOURBON_GEM_PATH);
 					String fileName = destinationDir + File.separator + entry.getName().substring(index);
 
-					File f = new File(fileName);
+					File f = new File(fileName.replace(BOURBON_GEM_PATH,BOURBON_DEST_PATH));
 					if (fileName.endsWith("/")) {
+						log.debug("create Bourbon directory: " + f);
 						f.mkdirs();
 					} else {
 						FileOutputStream fos = new FileOutputStream(f);
 						try {
+							// log.debug("  extract Bourbon file " + entry.getName() + " to " + f);
 							IOUtil.copy(jar.getInputStream(entry), fos);
 						} finally {
 							IOUtil.close(fos);

src/site/apt/releasenotes.apt.vm

@@ -39,6 +39,9 @@ ${project.name} ${project.version} Release Notes
 
 ~~  * Update JRuby to ${project.properties.get("jruby.version")}
 
+  * Update Bourbon to version ${project.properties.get("bourbon.version")}, please check the
+    {{{https://github.com/thoughtbot/bourbon/blob/master/CHANGELOG.md}Bourbon changelog}}
+
   * Update Sass to version ${project.properties.get("sass.version")}, please check
     the {{{http://sass-lang.com/documentation/file.SASS_CHANGELOG.html}Sass changelog}}
 

src/test/projects/maven-bourbon-test/src/main/sass/_using-bourbon.scss

@@ -1,6 +1,24 @@
-@import "bourbon";
-
-@include font-face("Helvetica", "/fonts");
-@include font-face("Verdana", "/assets/fonts", "bold", "italic");
-@include font-face("Georgia", "/assets", "normal", "normal", false);
-@include font-face("Arial", "/", "normal", "normal", false, woff2 svg);
+@import "bourbon/bourbon";
+
+
+@include font-face(
+  "Helvetica",
+  "/fonts"
+);
+
+@include font-face(
+  "Verdana",
+  "/assets/fonts"
+) {
+  font-weight: bold;
+  font-style: italic;
+};
+
+@include font-face(
+  "Arial",
+  "/",
+  ("woff2", "svg")
+) {
+  font-weight: normal;
+  font-style: normal;
+};