Bower support and small fixes

mawrkus · mawrkus · commit 91b76f442639 · 2014-05-10T19:24:27.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+.DS_Store
+.bower.json
+npm-debug.log
+/node_modules
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,11 @@
+May 10, 2014 - v1.0.2
+
+* Added bower.json and updated package.json (devDependencies, ...)
+* Added .gitignore
+* Build : renamed Footer.js and Header.js to Outro.js and Intro.js.
+* Grunt : changed banner position with (uglify task).
+* Doc : fixed a typo.
+
 November 30, 2013 - v1.0.1
 
 * Build : reorganized the files, added Footer.js and Header.js to optimize the final build file and minification.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -8,12 +8,12 @@ module.exports = function ( grunt )
 			core:
 			{
 				src: [
-						'src/Header.js',
+						'src/Intro.js',
 						'src/TinyCore.Utils.js',
 						'src/TinyCore.Toolbox.js',
 						'src/TinyCore.Error.js',
 						'src/TinyCore.Module.js',
-						'src/Footer.js'
+						'src/Outro.js'
 					],
 				dest: 'build/TinyCore.js'
 			},
@@ -72,7 +72,7 @@ module.exports = function ( grunt )
 			core:
 			{
 				options : {
-					footer: '/*! TinyCore v<%= pkg.version %> (<%= grunt.template.today("yyyy-mm-dd") %>) | (c) 2013 Marc Mignonsin | <%= pkg.license %> license */\n'
+					banner: '/*! TinyCore v<%= pkg.version %> (<%= grunt.template.today("yyyy-mm-dd") %>) | (c) 2013 Marc Mignonsin | <%= pkg.license %> license */\n'
 				},
 				files:
 				{
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 # TinyCore.js
 
-`Version 1.0.1`
+`Version 1.0.2`
 
 ## Overview
 
-A tiny JavaScript modular architecture library.
+TinyCore is a lightweight library that provides you a modular JavaScript architecture to create scalable, maintainable and fully tested web applications.
 
 Main sources of inspiration :
 
@@ -295,7 +295,7 @@ TinyCore comes with a set of built-in utilities functions that are used internal
 
 ```js
 TinyCore.Utils.extend( obj1, obj2 /*, ... */ )
-TinyCore.Utils.forEach( obj, callback )
+TinyCore.Utils.forIn( obj, callback )
 TinyCore.Utils.isClass( mixed, sClassName )
 TinyCore.Utils.isArray( mixed )
 TinyCore.Utils.isFunction( mixed )
diff --git a/bower.json b/bower.json
@@ -0,0 +1,21 @@
+{
+  "name": "TinyCore.js",
+  "description": "A JavaScript library providing a modular and decoupled architecture that helps you create scalable and easy-to-maintain Web applications.",
+  "version": "1.0.2",
+  "main": "build/TinyCore.js",
+  "license": "MIT",
+  "ignore": [
+    "node_modules"
+  ],
+  "keywords": [
+    "js","architecture","module","scalable","spa"
+  ],
+  "authors": [
+    "Marc Mignonsin"
+  ],
+  "homepage": "https://github.com/mawrkus/tinycore",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mawrkus/TinyCore.git"
+  }
+}
diff --git a/build/TinyCore.js b/build/TinyCore.js
@@ -23,7 +23,7 @@
 		 * Current version
 		 * @type {String}
 		 */
-		version : '1.0.1',
+		version : '1.0.2',
 		/**
 		 * Debug mode : if true, error in modules methods and topics subscribers will not be caught,
 		 * if false, errors will be caught and logged using the error handler.
@@ -521,8 +521,13 @@
 	// Add TinyCore to the environment.
 	oEnv.TinyCore = TinyCore;
 
-	if ( oEnv.define )
+	if ( oEnv.define && oEnv.define.amd )
 	{
 		oEnv.define( 'TinyCore', TinyCore );
 	}
+
+	if ( oEnv.module && oEnv.module.exports )
+	{
+		oEnv.module.exports = TinyCore;
+	}
 } ( this ) );
diff --git a/build/TinyCore.min.js b/build/TinyCore.min.js
diff --git a/package.json b/package.json
@@ -1,12 +1,13 @@
 {
-  "name": "TinyCore",
-  "version": "1.0.1",
+  "name": "TinyCore.js",
+  "version": "1.0.2",
   "description": "A JavaScript library providing a modular and decoupled architecture that helps you create scalable and easy-to-maintain Web applications.",
   "keywords": [
     "js",
+    "architecture",
     "module",
-    "decoupled architecture",
-    "scalable"
+    "scalable",
+    "spa"
   ],
   "author": "Marc Mignonsin",
   "homepage": "https://github.com/mawrkus/tinycore",
@@ -20,22 +21,27 @@
     "requirejs": "~2.1.4"
   },
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-uglify": "~0.2.6",
-    "grunt-contrib-jshint": "~0.7.1",
-    "karma-script-launcher": "~0.1.0",
-    "karma-firefox-launcher": "~0.1.0",
-    "karma-html2js-preprocessor": "~0.1.0",
-    "karma-chrome-launcher": "~0.1.0",
-    "karma-jasmine": "~0.1.3",
-    "karma-requirejs": "~0.1.0",
-    "karma-coffee-preprocessor": "~0.1.0",
-    "karma-phantomjs-launcher": "~0.1.0",
-    "karma": "~0.10.4",
-    "grunt-karma": "~0.6.2",
-    "karma-opera-launcher": "~0.1.0",
-    "karma-safari-launcher": "~0.1.1",
-    "grunt-contrib-clean": "~0.5.0"
+    "grunt": "~0.4.4",
+    "grunt-cli": "^0.1.13",
+    "grunt-contrib-clean": "~0.5.0",
+    "grunt-contrib-concat": "~0.4.0",
+    "grunt-contrib-jshint": "~0.10.0",
+    "grunt-contrib-uglify": "^0.4.0",
+    "grunt-karma": "^0.8.3",
+    "karma": "^0.12.15",
+    "karma-chrome-launcher": "^0.1.3",
+    "karma-firefox-launcher": "^0.1.3",
+    "karma-jasmine": "^0.1.5",
+    "karma-opera-launcher": "^0.1.0",
+    "karma-phantomjs-launcher": "^0.1.4",
+    "karma-requirejs": "^0.2.1",
+    "karma-safari-launcher": "^0.1.1",
+    "karma-script-launcher": "^0.1.0"
+  },
+  "engines": {
+    "node": ">=0.10"
+  },
+  "scripts": {
+    "test": "node node_modules/karma/bin/karma start test/karma/core.conf.js --single-run --browsers PhantomJS"
   }
 }
diff --git a/src/Intro.js b/src/Intro.js
@@ -23,7 +23,7 @@
 		 * Current version
 		 * @type {String}
 		 */
-		version : '1.0.1',
+		version : '1.0.2',
 		/**
 		 * Debug mode : if true, error in modules methods and topics subscribers will not be caught,
 		 * if false, errors will be caught and logged using the error handler.
diff --git a/src/Outro.js b/src/Outro.js
@@ -1,8 +1,13 @@
 	// Add TinyCore to the environment.
 	oEnv.TinyCore = TinyCore;
 
-	if ( oEnv.define )
+	if ( oEnv.define && oEnv.define.amd )
 	{
 		oEnv.define( 'TinyCore', TinyCore );
 	}
+
+	if ( oEnv.module && oEnv.module.exports )
+	{
+		oEnv.module.exports = TinyCore;
+	}
 } ( this ) );
diff --git a/src/extensions/AMD/TinyCore.AMD.js b/src/extensions/AMD/TinyCore.AMD.js
@@ -85,7 +85,7 @@
 		},
 		/**
 		 * Loads asynchronously modules/scripts.
-		 * @param {Array|String} aResourcesNames
+		 * @param {Array} aResourcesNames
 		 * @param {Function} fpCallback The function to call when all modules are loaded, it receives the array of modules names
 		 */
 		require : function ( aResourcesNames, fpCallback )
diff --git a/test/karma/shared.conf.js b/test/karma/shared.conf.js
@@ -34,7 +34,7 @@ module.exports = function( config )
 
 		// level of logging
 		// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
-		logLevel: 'LOG_INFO',
+		logLevel: config.LOG_INFO,
 
 		// enable / disable watching file and executing tests whenever any file changes
 		autoWatch: false,
@@ -52,6 +52,10 @@ module.exports = function( config )
 		// If browser does not capture in given timeout [ms], kill it
 		captureTimeout: 60000,
 
+		// report which specs are slower than 500ms
+		// CLI --report-slower-than 500
+		reportSlowerThan: 500,
+
 		// Continuous Integration mode
 		// if true, it capture browsers, run tests and exit
 		singleRun: true/*,

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,13 @@`
`1`	`1`	`// Add TinyCore to the environment.`
`2`	`2`	`oEnv.TinyCore = TinyCore;`
`3`	`3`
`4`		`- if ( oEnv.define )`
	`4`	`+ if ( oEnv.define && oEnv.define.amd )`
`5`	`5`	`{`
`6`	`6`	`oEnv.define( 'TinyCore', TinyCore );`
`7`	`7`	`}`
	`8`	`+`
	`9`	`+ if ( oEnv.module && oEnv.module.exports )`
	`10`	`+ {`
	`11`	`+ oEnv.module.exports = TinyCore;`
	`12`	`+ }`
`8`	`13`	`} ( this ) );`