Merge pull request #5 from angular-adaptive/canary

v0.2.0
janantala · Nov 12, 2013 · 4805ae3 · 4805ae3
2 parents 8416118 + 0dc5435
commit 4805ae3
Show file tree

Hide file tree

Showing 9 changed files with 564 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
-<a name="v0.1.0"></a>
-## v0.1.0 (2013-11-10)
+<a name="v0.2.0"></a>
+## v0.2.0 (2013-11-12)
+
+
+#### Features
+
+* **GruntFile:** add concated and uglified version ([92fecaed](https://github.com/angular-adaptive/adaptive-motion/commit/92fecaed4f0365b8987a0a848921447081bdc349))
+* **conventional-changelog:** adds grunt-conventional-changelog ([432cf774](https://github.com/angular-adaptive/adaptive-motion/commit/432cf7742466b7152250869b930b9627e1e53661))
+
+
+#### Breaking Changes
+
+* src/adaptive-motion.js is now renamed into src/angular-adaptive-motion.js
+ ([92fecaed](https://github.com/angular-adaptive/adaptive-motion/commit/92fecaed4f0365b8987a0a848921447081bdc349))
 
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,42 +1,70 @@
 module.exports = function (grunt) {
-    require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
+  require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
 
-    // Default task.
-    grunt.registerTask('default', ['karma', 'jshint']);
+  // Default task.
+  grunt.registerTask('default', ['karma', 'jshint']);
+  grunt.registerTask('build', ['karma', 'jshint', 'concat', 'uglify']);
 
-    var karmaConfig = function(configFile, customOptions) {
-        var options = { configFile: configFile, keepalive: true };
-        var travisOptions = process.env.TRAVIS && { browsers: ['Firefox'], reporters: 'dots' };
-        return grunt.util._.extend(options, customOptions, travisOptions);
-    };
+  var karmaConfig = function(configFile, customOptions) {
+    var options = { configFile: configFile, keepalive: true };
+    var travisOptions = process.env.TRAVIS && { browsers: ['Firefox'], reporters: 'dots' };
+    return grunt.util._.extend(options, customOptions, travisOptions);
+  };
 
-    // Project configuration.
-    grunt.initConfig({
-        karma: {
-            unit: {
-            options: karmaConfig('test/test.conf.js')
-            }
-        },
-        jshint:{
-            files:['src/**/*.js', 'test/**/*.js'],
-            options: {
-                curly:true,
-                eqeqeq:true,
-                immed:true,
-                latedef:true,
-                newcap:true,
-                noarg:true,
-                sub:true,
-                boss:true,
-                eqnull:true,
-                devel:true,
-                globals:{}
-            }
-        },
-        changelog: {
-          options: {
-            dest: 'CHANGELOG.md'
-          }
-        }
-    });
-}
+  // Project configuration.
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('bower.json'),
+    meta: {
+      banner: '/*!\n' +
+        ' * <%= pkg.name %> v<%= pkg.version %>\n' +
+        ' * The MIT License\n' +
+        ' * Copyright (c) 2013 Jan Antala\n' +
+        ' */'
+    },
+    uglify: {
+      options: {
+        preserveComments: 'some'
+      },
+      dist: {
+        src: '<%= pkg.name %>.js',
+        dest: '<%= pkg.name %>.min.js'
+      }
+    },
+    concat: {
+      options: {
+        process: true,
+        banner: '<%= meta.banner %>\n\n'
+      },
+      dist: {
+        src: 'src/<%= pkg.name %>.js',
+        dest: '<%= pkg.name %>.js'
+      }
+    },
+    karma: {
+      unit: {
+        options: karmaConfig('test/test.conf.js')
+      }
+    },
+    jshint:{
+      files:['src/**/*.js', 'test/**/*.js'],
+      options: {
+        curly:true,
+        eqeqeq:true,
+        immed:true,
+        latedef:true,
+        newcap:true,
+        noarg:true,
+        sub:true,
+        boss:true,
+        eqnull:true,
+        devel:true,
+        globals:{}
+      }
+    },
+    changelog: {
+      options: {
+        dest: 'CHANGELOG.md'
+      }
+    },
+  });
+};
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# adaptive-motion v0.1.0 [![Build Status](https://travis-ci.org/angular-adaptive/adaptive-motion.png?branch=master)](https://travis-ci.org/angular-adaptive/adaptive-motion)
+# adaptive-motion v0.2.0 [![Build Status](https://travis-ci.org/angular-adaptive/adaptive-motion.png?branch=master)](https://travis-ci.org/angular-adaptive/adaptive-motion)
 
 This module allows you to control an AngularJS app using web camera.
 
@@ -25,8 +25,8 @@ To your `bower.json` file. Then run
 
 This will copy the angular-adaptive-motion files into your `bower_components` folder, along with its dependencies. Load the script files in your application:
 
-    <script type="text/javascript" src="components/angular/angular.js"></script>
-    <script type="text/javascript" src="components/angular-adaptive-motion/src/adaptive-motion.js"></script>
+    <script type="text/javascript" src="bower_components/angular/angular.js"></script>
+    <script type="text/javascript" src="bower_components/angular-adaptive-motion/angular-adaptive-motion.js"></script>
 
 Add the **adaptive.motion** module as a dependency to your application module:
 

diff --git a/src/adaptive-motion.js → angular-adaptive-motion.js b/src/adaptive-motion.js → angular-adaptive-motion.js
@@ -1,7 +1,7 @@
-/**
- * angular-adaptive-motion v0.1.0
+/*!
+ * angular-adaptive-motion v0.2.0
  * The MIT License
- * Copyright (c) 2013 Jan Antala http://janantala.com
+ * Copyright (c) 2013 Jan Antala
  */
 
 (function () {

diff --git a/angular-adaptive-motion.min.js b/angular-adaptive-motion.min.js
diff --git a/bower.json b/bower.json
@@ -1,11 +1,20 @@
 {
   "name": "angular-adaptive-motion",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "This module allows you to control an angular app using your body.",
   "author": "https://github.com/angular-adaptive/adaptive-motion/graphs/contributors",
   "license": "MIT",
+  "keywords": [
+    "angular",
+    "adaptive",
+    "motion"
+  ],
   "homepage": "http://angular-adaptive.github.io",
-  "main": "./src/adaptive-motion.js",
+  "main": "./src/angular-adaptive-motion.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/angular-adaptive/adaptive-motion.git"
+  },
   "ignore": [
     "**/.*",
     "node_modules",

diff --git a/package.json b/package.json
@@ -1,22 +1,29 @@
 {
   "name": "angular-adaptive-motion",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "This module allows you to control an angular app using your body.",
   "author": "https://github.com/angular-adaptive/adaptive-motion/graphs/contributors",
   "license": "MIT",
+  "keywords": [
+    "angular",
+    "adaptive",
+    "motion"
+  ],
   "homepage": "http://angular-adaptive.github.io",
-  "main": "./src/adaptive-motion.js",
+  "main": "./src/angular-adaptive-motion.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/angular-adaptive/adaptive-motion.git"
+  },
   "dependencies": {},
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-karma": "*",
     "grunt-contrib-jshint": "~0.2.0",
     "grunt-conventional-changelog": "~1.0.0",
+    "grunt-contrib-uglify": "~0.2.2",
+    "grunt-contrib-concat": "~0.3.0",
     "matchdep": "~0.3.0"
   },
-  "scripts": {},
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/angular-adaptive/adaptive-motion.git"
-  }
+  "scripts": {}
 }