Merge pull request #17 from froots/bower-dependencies

Remove included dependencies

.gitignore

@@ -1 +1,2 @@
 node_modules
+bower_components

.travis.yml

@@ -3,6 +3,7 @@ node_js:
   - "0.10"
   - "0.8"
 before_script:
-  - npm install -g grunt-cli
+  - npm install -g grunt-cli bower
+  - bower install
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start

Gruntfile.js

@@ -1,11 +1,12 @@
-'use strict';
-
 module.exports = function(grunt) {
 
+  'use strict';
+
   grunt.initConfig({
     jasmine_node: {
       forceExit: true,
-      isVerbose: true
+      isVerbose: false,
+      projectRoot: 'spec'
     },
 
     jshint: {
@@ -17,7 +18,7 @@ module.exports = function(grunt) {
 
     karma: {
       options: {
-        configFile: 'karma.conf.js'
+        configFile: 'karma.conf.coffee'
       },
       dev: {
         reporters: 'dots'
@@ -30,7 +31,7 @@ module.exports = function(grunt) {
   });
 
   grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-karma-0.9.1');
+  grunt.loadNpmTasks('grunt-karma');
   grunt.loadNpmTasks('grunt-jasmine-node');
 
   grunt.registerTask('test', ['jshint', 'karma:ci', 'jasmine_node']);

bower.json

@@ -1,10 +1,14 @@
 {
   "name": "jasmine-sinon",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "lib/jasmine-sinon.js",
   "ignore": [
     "**/.*",
     "node_modules",
     "components"
-  ]
+  ],
+  "dependencies": {
+    "jasmine": "~1.3.1",
+    "sinonjs": "~1.7.1"
+  }
 }

karma.conf.coffee

@@ -0,0 +1,17 @@
+module.exports = (config) ->
+  config.set
+    basePath: ''
+    frameworks: ['jasmine']
+    files: [
+      'bower_components/sinonjs/sinon.js'
+      'lib/jasmine-sinon.js'
+      'spec/*.spec.js'
+    ]
+    reporters: ['progress']
+    runnerPort: 9100
+    browsers: ['Chrome', 'Firefox'],
+    plugins: [
+      'karma-jasmine'
+      'karma-chrome-launcher'
+      'karma-firefox-launcher'
+    ]