Merge pull request #48 from jrit/master

Fix svg_sprite, Improvements on notifications

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Changelog
 
+
+#### 6.1.1 Bug Fixes, Dep Updates
+
+- Fixes svg_sprite task, updates peer dep as well
+- Includes package name in email and Slack notifications
+
 #### 6.1.0 Add Slack channel notifications
 
 This is not included in deployment by default in this release, so to use, after deployment runs:

grunt/aliases.yaml

@@ -7,6 +7,7 @@ build:
   - less
   - ngtemplates
   - copy
+  - svg_sprite
   - browserify:build
 
 pretest:

grunt/jshint.js

@@ -1,7 +1,7 @@
+"use strict";
+
 module.exports = function ()
 {
-    "use strict";
-
     return {
         dev: {
             options: {

grunt/notification.js

@@ -6,7 +6,9 @@ module.exports = function ( grunt )
 {
     var envConfig = grunt.config( "env" );
     var deployVersion = grunt.config( "version" );
-    var pkgVersion = grunt.file.readJSON( "package.json" ).version || "";
+    var pkg = grunt.file.readJSON( "package.json" );
+    var pkgVersion = pkg.version || "";
+    var pkgName = pkg.name || "App";
 
     grunt.registerTask( "notification", "Notify an email that a deployment is going out", function ()
     {
@@ -36,13 +38,13 @@ module.exports = function ( grunt )
             Message: {
                 Body: {
                     Html: {
-                        Data: "<h1>Version " + pkgVersion + " @" + deployVersion + "</h1>"
+                        Data: "<h1>" + pkgName + " build " + pkgVersion + " @" + deployVersion + "</h1>"
                         + '<p>A new build for <a href="' + host + '">' + host + "</a> "
                         + "should be available in about 10 minutes.</p>"
                     }
                 },
                 Subject: {
-                    Data: "New build for " + host + " @" + deployVersion
+                    Data: pkgName + " build for " + host + " @" + deployVersion
                 }
             },
             Source: emailFrom

grunt/notification_slack.js

@@ -7,7 +7,9 @@ module.exports = function ( grunt )
     var envConfig = grunt.config( "env" );
     var slackApiToken = grunt.config( "slackApiToken" );
     var deployVersion = grunt.config( "version" );
-    var pkgVersion = grunt.file.readJSON( "package.json" ).version || "";
+    var pkg = grunt.file.readJSON( "package.json" );
+    var pkgVersion = pkg.version || "";
+    var pkgName = pkg.name || "App";
 
     grunt.registerTask( "notification_slack", "Notify a Slack channel that a deployment is going out", function ()
     {
@@ -26,7 +28,7 @@ module.exports = function ( grunt )
         var slacker = new Slack( slackApiToken );
 
         slacker.api( "chat.postMessage", {
-            text: "Build " + pkgVersion + " @" + deployVersion + " for " + host
+            text: pkgName + " build " + pkgVersion + " @" + deployVersion + " for " + host
                 + " should be available in about 10 minutes.",
             channel: slackChannel,
             username: "Release Bot"

grunt/svg_sprite.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = {
     css: {
         expand: true,
@@ -33,8 +35,8 @@ module.exports = {
 
         options: {
             mode: {
+                inline: true,
                 symbol: {
-                    inline: true,
                     sprite: "sprite.svg"
                 }
             }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dominatr-grunt",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "description": "Build all the things!",
   "scripts": {
     "test": ""
@@ -40,7 +40,7 @@
     "grunt-newer": "^1.1.1",
     "grunt-postcss": "^0.7.1",
     "grunt-protractor-coverage": "github:mdasberg/grunt-protractor-coverage#ef6a8fb",
-    "grunt-svg-sprite": "^1.2.15",
+    "grunt-svg-sprite": "github:vokal/grunt-svg-sprite.git#8200979a0e",
     "grunt-svgmin": "^3.1.0",
     "grunt-truecolors-less": "1.0.x",
     "jasmine-bail-fast": "0.0.1",