Merge branch 'grunt-automation'

scottjehl · Apr 9, 2015 · 7d59fd3 · 7d59fd3
2 parents a8c2c6f + 18cfb9b
commit 7d59fd3
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ node_modules
 **/.sass-cache/*
 *.bak
 *.zip
+.grunt
 
diff --git a/gruntfile.js b/gruntfile.js
@@ -19,7 +19,7 @@
         files: [ "dist" ]
       },
       concat: {
-        
+
         dist: {
           options: {
             banner: "<%= banner %>",
@@ -38,7 +38,7 @@
           dest: "dist/picturefill.min.js"
         }
       },
-      
+
       qunit: {
         files: [ "tests/**/*.html" ]
       },
@@ -55,6 +55,20 @@
           src: "<%= jshint.all.src %>"
         }
       },
+      "gh-pages": {
+        options: {
+          base: '.'
+        },
+        src: ["**/*", "!node_modules/**/*", "!test/**/*", "!src/**/*"]
+      },
+      release: {
+        options: {
+          additionalFiles: ["bower.json"],
+          commitMessage: "Picturefill <%= version %>",
+          tagMessage: "Picturefill <%= version %>",
+          afterRelease: ["gh-pages"]
+        }
+      },
       watch: {
         gruntfile: {
           files: [ "Gruntfile.js", "src/*.js", "src/includes/*.js", "tests/*.js" ],
@@ -84,26 +98,27 @@
     grunt.loadNpmTasks("grunt-contrib-uglify");
     grunt.loadNpmTasks("grunt-contrib-watch");
     grunt.loadNpmTasks("grunt-jscs-checker");
-
+    grunt.loadNpmTasks("grunt-gh-pages");
+
     grunt.task.registerTask("support-types", "insert support for image types dev wants to include", function() {
       var supportTypes = "";
       for (var i = 0; i < arguments.length; i++) {
         var arg = arguments[i];
-        
+
         switch ( arg ) {
-          case "webp": 
+          case "webp":
           case "svg":
           case "jxr":
           case "jp2":
           case "apng":
-          
+
             toConcat.push("src/includes/" + arg + ".js");
         }
-        
+
         supportTypes += ":" + arg;
-        
+
       }
-      
+
       if (!supportTypes) {
         supportTypes = supportTypes;
       }
@@ -114,5 +129,6 @@
 	// Default task.
     grunt.registerTask("default", [ "jscs", "test", "clean", "concat", "uglify" ]);
     grunt.registerTask("test", [ "jscs", "jshint", "qunit" ]);
+    grunt.registerTask("publish", [ "gh-pages" ]);
   };
 })();
diff --git a/package.json b/package.json
@@ -1,39 +1,41 @@
 {
-	"name": "picturefill",
-	"description": "A responsive image polyfill.",
-	"version": "2.3.1",
-	"homepage": "https://scottjehl.github.io/picturefill/",
-	"bugs": "https://github.com/scottjehl/picturefill/issues",
-	"license": "MIT",
-	"author": "Scott Jehl <scottjehl@gmail.com>",
-	"repository": {
-		"type": "git",
-		"url": "git@github.com:scottjehl/picturefill.git"
-	},
-	"keywords": [
-		"picturefill",
-		"srcset",
-		"picture",
-		"responsive",
-		"responsive images"
-	],
-	"engines": {
-		"node": ">= 0.8.0"
-	},
-	"main": "./dist/picturefill",
-	"scripts": {
-		"test": "grunt test --verbose"
-	},
-	"devDependencies": {
-		"grunt": "~0.4.2",
-		"grunt-cli": "~0.1",
-		"grunt-contrib-clean": "~0.4.0",
-		"grunt-contrib-concat": "~0.3.0",
-		"grunt-contrib-jshint": "~0.10.0",
-		"grunt-contrib-qunit": "~0.2.0",
-		"grunt-contrib-uglify": "~0.2.0",
-		"grunt-contrib-watch": "~0.6.0",
-		"grunt-jscs-checker": "~0.4.3",
-		"grunt-insert": "~0.1.0"
-	}
+  "name": "picturefill",
+  "description": "A responsive image polyfill.",
+  "version": "2.3.1",
+  "homepage": "https://scottjehl.github.io/picturefill/",
+  "bugs": "https://github.com/scottjehl/picturefill/issues",
+  "license": "MIT",
+  "author": "Scott Jehl <scottjehl@gmail.com>",
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:scottjehl/picturefill.git"
+  },
+  "keywords": [
+    "picturefill",
+    "srcset",
+    "picture",
+    "responsive",
+    "responsive images"
+  ],
+  "engines": {
+    "node": ">= 0.8.0"
+  },
+  "main": "./dist/picturefill",
+  "scripts": {
+    "test": "grunt test --verbose"
+  },
+  "devDependencies": {
+    "grunt": "~0.4.2",
+    "grunt-cli": "~0.1",
+    "grunt-contrib-clean": "~0.4.0",
+    "grunt-contrib-concat": "~0.3.0",
+    "grunt-contrib-jshint": "~0.10.0",
+    "grunt-contrib-qunit": "~0.2.0",
+    "grunt-contrib-uglify": "~0.2.0",
+    "grunt-contrib-watch": "~0.6.0",
+    "grunt-gh-pages": "^0.10.0",
+    "grunt-insert": "~0.1.0",
+    "grunt-jscs-checker": "~0.4.3",
+    "grunt-release": "^0.12.0"
+  }
 }