Setting up Travis CI

Author: alademann

.travis.yml

@@ -2,10 +2,16 @@ language: node_js
 node_js:
   - 0.8
 before_script:
+  - gem install sass
+  - gem install compass
+  - gem install nokiri
   - gem install jekyll
   - npm install -g grunt-cli
-env:
-  global:
-  - secure: Besg41eyU+2mfxrywQ4ydOShMdc34ImaO0S0ENP+aCOBuyNBIgP59wy5tBMmyai2/8eInYeVps4Td96mWInMMxzTe3Bar7eTLG5tWVKRSr/wc4NBPZ/ppoPAmCEsz9Y+VptRH9/FO8n7hsL9EFZ+xBKbG+C0SccGoyBDpA5j7/w=
-  - secure: Ptiv7phCImFP3ALIz+sMQzrZg8k7C1gLZbFBhWxjnQr3g06wIfX3Ls5y9OHvxid+lOZZjISui3wzBVgpVHqwHUYf96+r0mo6/mJ+F4ffUmShZANVaIMD/JRTnXhUQJbvntGLvxn1EYWPdNM+2IHJrMipnjHxU9tkgAnlel4Zdew=
-  - TWBS_HAVE_OWN_BROWSERSTACK_KEY: ""
+  - npm install
+script:
+  - grunt
+# env:
+#   global:
+#   - secure: Besg41eyU+2mfxrywQ4ydOShMdc34ImaO0S0ENP+aCOBuyNBIgP59wy5tBMmyai2/8eInYeVps4Td96mWInMMxzTe3Bar7eTLG5tWVKRSr/wc4NBPZ/ppoPAmCEsz9Y+VptRH9/FO8n7hsL9EFZ+xBKbG+C0SccGoyBDpA5j7/w=
+#   - secure: Ptiv7phCImFP3ALIz+sMQzrZg8k7C1gLZbFBhWxjnQr3g06wIfX3Ls5y9OHvxid+lOZZjISui3wzBVgpVHqwHUYf96+r0mo6/mJ+F4ffUmShZANVaIMD/JRTnXhUQJbvntGLvxn1EYWPdNM+2IHJrMipnjHxU9tkgAnlel4Zdew=
+#   - TWBS_HAVE_OWN_BROWSERSTACK_KEY: ""

CONTRIBUTING.md

@@ -31,8 +31,9 @@ As of v3.0.0, Saas Bootstrap's documentation is powered by Jekyll templates and
 
 ## Pull requests
 
-- Try to submit pull requests against the latest `*sass-wip` branch for easier merging
+- CSS changes must be done in `.less` files first, never just the compiled `.css` files
 - If modifying the `.scss` files, always recompile and commit the compiled file `sass-bootstrap.css`
+- Always submit pull requests against the latest `*sass-wip` branch for easier merging
 - Try not to pollute your pull request with unintended changes--keep them simple and small
 - Try to share which browsers your code has been tested in before submitting a pull request
 

Gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'sass', '3.2.12'
+gem 'compass', '0.12.2'
+gem 'nokogiri'
+gem 'jekyll', '1.1.2'
+gem 'rdiscount'
+gem 'rb-fsevent'
+gem 'rake'

Gruntfile.js

@@ -14,6 +14,8 @@ module.exports = function(grunt) {
 
   modules.livereload = require('./assets/js/grunts/livereload')(modules);
 
+  RegExp.quote = require('regexp-quote')
+
   // Project configuration.
   grunt.initConfig({
 
@@ -26,11 +28,11 @@ module.exports = function(grunt) {
               '*\n' +
               '* Designed and built with all the love in the world by @alademann, @mdo and @fat.\n' +
               '*/\n',
-    jqueryCheck: 'if (!jQuery) { throw new Error(\"Sass Bootstrap requires jQuery\") }\n\n',
+    jqueryCheck: 'if (typeof jQuery === "undefined") { throw new Error(\"Sass Bootstrap requires jQuery\") }\n\n',
 
     // Task configuration.
     clean: {
-      dist: ['dist', '<%= pkg.name %>-dist.zip']
+      dist: ['dist', '_gh_pages', '<%= pkg.name %>-dist.zip']
     },
 
     jshint: {
@@ -80,7 +82,8 @@ module.exports = function(grunt) {
 
     uglify: {
       options: {
-        banner: '<%= banner %>'
+        banner: '<%= banner %>',
+        report: 'min'
       },
       bootstrap: {
         src: ['<%= concat.bootstrap.dest %>'],
@@ -174,7 +177,12 @@ module.exports = function(grunt) {
 
     validation: {
       options: {
-        reset: false
+        reset: true,
+        maxTry: 1,
+        relaxerror: [
+            "Bad value X-UA-Compatible for attribute http-equiv on element meta.",
+            "Element img is missing required attribute src.",
+        ]
       },
       files: {
         src: ["_gh_pages/**/*.html"]
@@ -234,43 +242,57 @@ module.exports = function(grunt) {
           livereload: true
         }
       }
+    },
+
+    sed: {
+      versionNumber: {
+        pattern: (function () {
+          var old = grunt.option('oldver')
+          return old ? RegExp.quote(old) : old
+        })(),
+        replacement: grunt.option('newver'),
+        recursive: true
+      }
     }
   });
 
 
   // These plugins provide necessary tasks.
-  grunt.loadNpmTasks('grunt-contrib-connect');
+  // grunt.loadNpmTasks('browserstack-runner');
   grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-compass');
+  grunt.loadNpmTasks('grunt-contrib-compress');
+  grunt.loadNpmTasks('grunt-css');
   grunt.loadNpmTasks('grunt-contrib-cssmin');
   grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-compress');
+  grunt.loadNpmTasks('grunt-contrib-connect');
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-qunit');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-html-validation');
-  grunt.loadNpmTasks('grunt-css');
   grunt.loadNpmTasks('grunt-jekyll');
+  grunt.loadNpmTasks('grunt-contrib-compass');
+  grunt.loadNpmTasks('grunt-sed');
+
 
   grunt.registerTask('lr', modules.livereload);
 
   // Docs HTML validation task
-  grunt.registerTask('validate-html', ['jekyll', 'validation']);
+  grunt.registerTask('validate-html', ['clean', 'jekyll', 'validation']);
 
   // Test task.
-  grunt.registerTask('testSubtasks', ['jshint', 'qunit', 'validate-html']);
-  grunt.registerTask('testSubtasksNoValidation', ['jshint', 'qunit']);
-  grunt.registerTask('test', 
-    function() {
-      if(grunt.option('validate')) {
-        grunt.task.run('testSubtasks');
-      } else {
-        grunt.task.run('testSubtasksNoValidation');
-      }
-    }
-  );
+  var testSubtasks = ['dist-css', 'jshint', 'qunit', 'validate-html'];
+  var testSubtasksNoHTMLValidation = ['dist-css', 'jshint', 'qunit'];
+  // Only run BrowserStack tests under Travis
+  // if (process.env.TRAVIS) {
+  //   // Only run BrowserStack tests if this is a mainline commit in twbs/bootstrap, or you have your own BrowserStack key
+  //   if ((process.env.TRAVIS_REPO_SLUG === 'alademann/sass-bootstrap' && process.env.TRAVIS_PULL_REQUEST === 'false') || process.env.ALADEMANN_HAVE_OWN_BROWSERSTACK_KEY) {
+  //     testSubtasks.push('browserstack_runner');
+  //   }
+  // }
+  grunt.registerTask('test', testSubtasks);
+  grunt.registerTask('test-no-html', testSubtasksNoHTMLValidation);
 
   // JS distribution task.
   grunt.registerTask('dist-js', ['concat', 'uglify']);
@@ -285,20 +307,21 @@ module.exports = function(grunt) {
   grunt.registerTask('dist', ['clean', 'dist-fonts', 'dist-css', 'dist-js', 'compress:dist']);
 
   // Default task.
-  grunt.registerTask('default', ['test', 'dist']);
+  grunt.registerTask('default', ['test-no-html', 'dist']);
 
-  // Default task that runs jekyll server, delivers uncompressed css and watch capabilities
+  // Dev 'default' task that runs jekyll server, delivers uncompressed css and watch capabilities
   grunt.registerTask('dev', 
     [
-      'lr', 
-      'connect:docs', 
-      'dist-fonts', 
-      'dist-css', 
-      'test',
-      'dist-js', 
-      'compress:dist',
+      'lr',
+      'connect:docs',
+      'default',
       'watch'
     ]
   );
 
-};
+  // Version numbering task.
+  // grunt change-version-number --oldver=A.B.C --newver=X.Y.Z
+  // This can be overzealous, so its changes should always be manually reviewed!
+  grunt.registerTask('change-version-number', ['sed']);
+
+};

package.json

@@ -5,7 +5,7 @@
   , "keywords": ["bootstrap", "css", "sass", "scss"]
   , "homepage": "http://alademann.github.io/sass-bootstrap/"
   , "author": "Aaron Lademann and Twitter Inc."
-  , "scripts": { "dist": "grunt dist" }
+  , "scripts": { "test": "grunt test" }
   , "repository": {
       "type": "git"
     , "url": "https://github.com/alademann/sass-bootstrap.git"
@@ -18,21 +18,23 @@
   ]
   , "devDependencies": {
         "grunt": "~0.4.1" 
-      , "qunitjs": "~1.12.0"
-      , "grunt-contrib-qunit": "~0.2.2"
-      , "grunt-lib-phantomjs": "~0.3.1"
-      , "grunt-contrib-jshint": "~0.6.0"
       , "grunt-contrib-clean": "~0.5.0"
-      , "grunt-contrib-connect": "~0.3.0"
       , "grunt-contrib-concat": "~0.3.0"
-      , "grunt-contrib-copy": "~0.4.0"
-      , "grunt-contrib-uglify": "~0.2.2"
-      , "grunt-contrib-watch": "~0.5.1"
-      , "grunt-contrib-compress": "0.5.2"
+      , "grunt-contrib-connect": "~0.3.0"
+      , "grunt-contrib-copy": "~0.4.1"
+      , "grunt-contrib-jshint": "~0.7.0"
+      , "grunt-lib-phantomjs": "~0.3.1"
+      , "qunitjs": "~1.12.0"
+      , "grunt-contrib-qunit": "~0.3.0"
+      , "grunt-contrib-uglify": "~0.2.4"
+      , "grunt-contrib-watch": "~0.5.3"
+      , "grunt-html-validation": "~0.1.6"
+      , "grunt-jekyll": "~0.4.0"
       , "grunt-contrib-compass": "~0.2.0"
+      , "grunt-contrib-compress": "0.5.2"
       , "grunt-contrib-cssmin": "~0.6.1"
-      , "grunt-html-validation": "~0.1.4"
       , "grunt-css": "~0.5.4"
-      , "grunt-jekyll": "~0.3.8"
+      , "grunt-sed": "~0.1.1"
+      , "regexp-quote": "~0.0.0"
   }
 }