From 547a550a3ed248359760df0d27af9be5a8db12fb Mon Sep 17 00:00:00 2001 From: Mathew Kurian Date: Tue, 13 Jan 2015 11:54:11 -0600 Subject: [PATCH 1/9] Adding travis --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..ed05f88 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,6 @@ +language: node_js +node_js: + - "0.11" + - "0.10" + - "0.8" + - "0.6" From d07ba84707c27bae0d7f257957e79dc216265f7c Mon Sep 17 00:00:00 2001 From: Mathew Kurian Date: Tue, 13 Jan 2015 11:55:49 -0600 Subject: [PATCH 2/9] Removing old grunt; prepping for tests --- Gruntfile.js | 44 -------------------------------------------- package.json | 12 ------------ 2 files changed, 56 deletions(-) delete mode 100644 Gruntfile.js diff --git a/Gruntfile.js b/Gruntfile.js deleted file mode 100644 index 44125d4..0000000 --- a/Gruntfile.js +++ /dev/null @@ -1,44 +0,0 @@ -'use strict'; - -module.exports = function(grunt) { - - // Project configuration. - grunt.initConfig({ - jshint: { - options: { - jshintrc: '.jshintrc' - }, - gruntfile: { - src: ['scribe.js', 'Gruntfile.js'] - }, - lib: { - src: ['lib/**/*.js', 'examples/**/*.js', 'static/js/**/*.js'] - }, - test: { - src: ['test/**/*.js'] - }, - }, - watch: { - gruntfile: { - files: '<%= jshint.gruntfile.src %>', - tasks: ['jshint:gruntfile'] - }, - lib: { - files: '<%= jshint.lib.src %>', - tasks: ['jshint:lib'] - }, - test: { - files: '<%= jshint.test.src %>', - tasks: ['jshint:test'] - }, - }, - }); - - // These plugins provide necessary tasks. - grunt.loadNpmTasks('grunt-contrib-jshint'); - grunt.loadNpmTasks('grunt-contrib-watch'); - - // Default task. - grunt.registerTask('default', ['jshint']); - -}; diff --git a/package.json b/package.json index 2b75a3d..baa6e8e 100644 --- a/package.json +++ b/package.json @@ -23,18 +23,6 @@ } ], "main": "scribe.js", - "scripts": { - "test": "grunt nodeunit" - }, - "devDependencies": { - "grunt-contrib-jshint": "~0.6.4", - "grunt-contrib-nodeunit": "~0.2.0", - "grunt-contrib-watch": "~0.5.3", - "grunt": "~0.4.5" - }, - "directories": { - "test": "test" - }, "license": "MIT", "dependencies": { "callsite": "^1.0.0", From bf823ce3642e5f73d4cb9110fb6c7d057ffbec16 Mon Sep 17 00:00:00 2001 From: Mathew Kurian Date: Tue, 13 Jan 2015 11:59:53 -0600 Subject: [PATCH 3/9] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b3949be..769a576 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Build Status](https://travis-ci.org/bluejamesbond/Scribe.js.svg?branch=master)](https://travis-ci.org/bluejamesbond/Scribe.js) + ![Logo](https://raw.githubusercontent.com/bluejamesbond/Scribe.js/master/__misc/scribejs%20design%20logo%20%5Ba%5D.png) **Lightweight NodeJS Logging** From a7a2502fa9cb2698b886dc2c0cbe00a394ca65fa Mon Sep 17 00:00:00 2001 From: Mathew Kurian Date: Tue, 13 Jan 2015 12:00:30 -0600 Subject: [PATCH 4/9] Removing older nodejs versions from travis --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ed05f88..18ae2d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,3 @@ language: node_js node_js: - "0.11" - "0.10" - - "0.8" - - "0.6" From eed7986b89c2835cfe5dc51dde26c77f78932303 Mon Sep 17 00:00:00 2001 From: Mathew Kurian Date: Tue, 13 Jan 2015 17:19:21 -0600 Subject: [PATCH 5/9] Adding improved ribbon --- herokuapp/views/index.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/herokuapp/views/index.html b/herokuapp/views/index.html index bc29241..e766001 100644 --- a/herokuapp/views/index.html +++ b/herokuapp/views/index.html @@ -12,9 +12,7 @@ - - Fork me on GitHub - + Fork me on GitHub
From 4ff65f8a647f37ea98cdcc9ed05a31070b91629c Mon Sep 17 00:00:00 2001 From: Mathew Kurian Date: Tue, 13 Jan 2015 17:22:29 -0600 Subject: [PATCH 6/9] Ribbon fix --- herokuapp/views/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/herokuapp/views/index.html b/herokuapp/views/index.html index e766001..e1cc77c 100644 --- a/herokuapp/views/index.html +++ b/herokuapp/views/index.html @@ -12,7 +12,7 @@ - Fork me on GitHub + Fork me on GitHub
From 20e2f8911a24628e194bb94d5833db3530697882 Mon Sep 17 00:00:00 2001 From: Mathew Kurian Date: Tue, 13 Jan 2015 17:30:03 -0600 Subject: [PATCH 7/9] Ribbon fix attempt 2 --- herokuapp/views/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/herokuapp/views/index.html b/herokuapp/views/index.html index e1cc77c..4bf7750 100644 --- a/herokuapp/views/index.html +++ b/herokuapp/views/index.html @@ -12,7 +12,7 @@ - Fork me on GitHub + Fork me on GitHub
From b353b2453edb1efe08448d949ec5fe934080b396 Mon Sep 17 00:00:00 2001 From: Mathew Kurian Date: Wed, 14 Jan 2015 01:08:42 -0600 Subject: [PATCH 8/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 769a576..1ab9540 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/bluejamesbond/Scribe.js.svg?branch=master)](https://travis-ci.org/bluejamesbond/Scribe.js) +[![npm version](https://badge.fury.io/js/scribe-js.svg)](http://badge.fury.io/js/scribe-js) [![Build Status](https://travis-ci.org/bluejamesbond/Scribe.js.svg?branch=master)](https://travis-ci.org/bluejamesbond/Scribe.js) ![Logo](https://raw.githubusercontent.com/bluejamesbond/Scribe.js/master/__misc/scribejs%20design%20logo%20%5Ba%5D.png) From 18e2f1af9e1de76461388def0f787649e79c6ba3 Mon Sep 17 00:00:00 2001 From: Mathew Kurian Date: Sun, 18 Jan 2015 22:30:16 -0600 Subject: [PATCH 9/9] Updating version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index baa6e8e..608f146 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "scribe-js", "description": "Comprehensive logging framework with online interface", - "version": "2.0.3", + "version": "2.0.4", "homepage": "https://github.com/bluejamesbond/Scribe.js", "keywords": [], "author": {