Merge pull request #25 from douglasduteil/feat-publisher

Feat publisher

Author: douglasduteil

.gitignore

@@ -1,2 +1,4 @@
 bower_components/
 node_modules/
+dist/
+out/

.jshintrc

@@ -1,25 +1,23 @@
 {
-  "immed": true,
-  "newcap": true,
-  "noarg": true,
-  "noempty": true,
-  "nonew": true,
-  "trailing": true,
-  "maxlen": 200,
   "boss": true,
+  "browser": true,
   "eqnull": true,
   "expr": true,
   "globalstrict": true,
+  "immed": true,
   "laxbreak": true,
   "loopfunc": true,
+  "newcap": true,
+  "noarg": true,
+  "noempty": true,
+  "nonew": true,
+  "quotmark": true,
+  "smarttabs": true,
   "sub": true,
+  "trailing": true,
   "undef": true,
-  "browser": true,
-  "quotmark": true,
+  "unused": true,
   "globals": {
-    "module"     : false,
-    "angular"    : false,
-    "require"    : false,
-    "process"    : false
+    "angular": false
   }
 }

.travis.yml

@@ -1,19 +1,17 @@
 ---
 language: node_js
 node_js:
-- '0.8'
+- '0.10'
 before_install:
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
-- npm install -g bower grunt-cli
-- npm install
+- npm install -qg bower grunt-cli
+- npm install -q
 - bower install --force
 - bower install --force
-before_script: ./bower_components/angular-ui-docs/.travis/before_script.sh
-after_success: ./bower_components/angular-ui-docs/.travis/after_success.sh
-branches:
-  only:
-  - master
+after_success:
+- "./node_modules/angular-ui-publisher/travis/authentication.sh || exit 0"
+- "grunt dist build:gh-pages publish:gh-pages build:bower publish:bower"
 script: grunt
 env:
   global:

bower.json

@@ -21,7 +21,6 @@
   },
   "devDependencies": {
     "angular-mocks": "~1.x",
-    "angular-ui-bootstrap-bower": "~0.5.0",
-    "angular-ui-docs": "angular-ui/angular-ui-docs"
+    "angular-ui-bootstrap-bower": "~0.5.0"
   }
 }

demo/demo.html

@@ -1,7 +1,7 @@
 <section id="aces" ng-app="doc.ui-ace">
 
 <!-- =Minimal code
------------------------------------------------------------------------------>
+--------------------------------------------------------------------------- -->
 <div class="row">
     <div class="span12">
       <div class="page-header">
@@ -51,7 +51,7 @@ <h1>Minimal code</h1>
 
 
 <!-- =General options demo
------------------------------------------------------------------------------>
+--------------------------------------------------------------------------- -->
 <div id="demo-general" class="row">
   <div class="span12">
     <div class="page-header">
@@ -124,7 +124,7 @@ <h1>General options</h1>
 </div>
 
 <!-- =Mode-Changing demo
------------------------------------------------------------------------------>
+--------------------------------------------------------------------------- -->
 <div id="demo-mode-changing" class="row">
   <div class="span12" ng-controller="AceCtrl">
     <div class="page-header">

gruntFile.js

@@ -2,31 +2,42 @@
 
 module.exports = function (grunt) {
 
-  var _ = grunt.util._;
-
   require('load-grunt-tasks')(grunt);
 
   // Default task.
   grunt.registerTask('default', ['jshint', 'karma:unit']);
-  grunt.registerTask('serve', ['karma:continuous', 'watch']);
-  grunt.registerTask('build-doc', ['uglify', 'copy']);
+  grunt.registerTask('serve', ['karma:continuous', 'dist', 'build:gh-pages', 'connect:continuous', 'watch']);
+  grunt.registerTask('dist', ['ngmin', 'uglify']);
+
+
+  // HACK TO ACCESS TO THE COMPONENT-PUBLISHER
+  function fakeTargetTask(prefix){
+    return function(){
+
+      if (this.args.length !== 1) return grunt.log.fail('Just give the name of the ' + prefix + ' you want like :\ngrunt ' + prefix + ':bower');
+
+      var done = this.async();
+      var spawn = require('child_process').spawn;
+      spawn('./node_modules/.bin/gulp', [ prefix, '--branch='+this.args[0] ].concat(grunt.option.flags()), {
+        cwd : './node_modules/angular-ui-publisher',
+        stdio: 'inherit'
+      }).on('close', done);
+    };
+  }
+
+  grunt.registerTask('build', fakeTargetTask('build'));
+  grunt.registerTask('publish', fakeTargetTask('publish'));
+  //
+
 
   var testConfig = function (configFile, customOptions) {
     var options = { configFile: configFile, singleRun: true };
     var travisOptions = process.env.TRAVIS && { browsers: [ 'Firefox', 'PhantomJS'], reporters: ['dots'] };
     return grunt.util._.extend(options, customOptions, travisOptions);
   };
 
-  // Demo dependencies
-  var js_dependencies = [
-    '<%= bower %>/angular-ui-bootstrap-bower/ui-bootstrap-tpls.min.js',
-    '<%= bower %>/ace-builds/src-min-noconflict/ace.js'
-  ];
-
   // Project configuration.
   grunt.initConfig({
-    bower: 'bower_components',
-    dist : '<%= bower %>/angular-ui-docs',
     pkg: grunt.file.readJSON('package.json'),
     meta: {
       banner: ['/**',
@@ -35,66 +46,95 @@ module.exports = function (grunt) {
         ' * @link <%= pkg.homepage %>',
         ' * @license <%= pkg.license %>',
         ' */',
-        ''].join('\n'),
-      view : {
-        humaName : 'UI Ace',
-        repoName : 'ui-ace',
-        demoHTML : grunt.file.read('demo/demo.html'),
-        demoJS : grunt.file.read('demo/demo.js'),
-        css: ['assets/css/demo.css'],
-        js: js_dependencies.concat(['build/ui-ace.min.js'])
-      }
+        ''].join('\n')
     },
+
     watch: {
-      karma: {
-        files: ['ui-ace.js', 'demo/**/*.js', 'gruntFile.js'],
-        tasks: ['jshint', 'karma:unit:run'] //NOTE the :run flag
+      src: {
+        files: ['src/*'],
+        tasks: ['jshint:src', 'karma:unit:run', 'dist', 'build:gh-pages']
+      },
+      test: {
+        files: ['test/*.js'],
+        tasks: ['jshint:test', 'karma:unit:run']
+      },
+      demo: {
+        files: ['demo/*', 'publish.js'],
+        tasks: ['jshint', 'build:gh-pages']
+      },
+      livereload: {
+        files: ['out/built/gh-pages/**/*'],
+        options: { livereload: true }
       }
     },
+
     karma: {
       unit: testConfig('test/karma.conf.js'),
-      start: {configFile: 'test/karma.conf.js'},
-      continuous: {configFile: 'test/karma.conf.js', background: true }
+      server: {configFile: 'test/karma.conf.js'},
+      continuous: {configFile: 'test/karma.conf.js',  background: true }
     },
-    jshint:{
-      files:['ui-ace.js', 'demo/**/*.js', 'gruntFile.js'],
-      options: { jshintrc: '.jshintrc' }
+
+    connect: {
+      options: {
+        base : 'out/built/gh-pages',
+        open: true,
+        livereload: true
+      },
+      server: { options: { keepalive: true } },
+      continuous: { options: { keepalive: false } }
     },
+
+
+    jshint: {
+      src: {
+        files:{ src : ['src/*.js', 'demo/**/*.js'] },
+        options: { jshintrc: '.jshintrc' }
+      },
+      test: {
+        files:{ src : [ 'test/*.spec.js', 'gruntFile.js'] },
+        options: grunt.util._.extend({}, grunt.file.readJSON('.jshintrc'), {
+          node: true,
+          globals: {
+            angular: false,
+            inject: false,
+            jQuery: false,
+
+            jasmine: false,
+            afterEach: false,
+            beforeEach: false,
+            ddescribe: false,
+            describe: false,
+            expect: false,
+            iit: false,
+            it: false,
+            spyOn: false,
+            xdescribe: false,
+            xit: false
+          }
+        })
+      }
+    },
+
     uglify: {
       options: {banner: '<%= meta.banner %>'},
       build: {
-        files: {
-          '<%= dist %>/build/<%= meta.view.repoName %>.min.js': ['<%= meta.view.repoName %>.js']
-        }
+        expand: true,
+        cwd: 'dist',
+        src: ['*.js'],
+        ext: '.min.js',
+        dest: 'dist'
       }
     },
-    copy: {
+
+    ngmin: {
       main: {
-        files: [
-          {src: ['<%= meta.view.repoName %>.js'], dest: '<%= dist %>/build/<%= meta.view.repoName %>.js', filter: 'isFile'},
-          {src: ['demo/demo.html'], dest: '<%= dist %>/demos.html', filter: 'isFile'},
-          {src: ['<%= bower %>/ace-builds/src-min-noconflict/ace.js'], dest: '<%= dist %>/<%= bower %>/ace-builds/src-min-noconflict/ace.js', filter: 'isFile'}
-        ]
-      },
-      template : {
-        options : {processContent : function(content){
-          return grunt.template.process(content);
-        }},
-        files: [
-          {src: ['<%= dist %>/.tmpl/index.tmpl'], dest: '<%= dist %>/index.html'},
-          {src: ['demo/demo.css'], dest: '<%= dist %>/assets/css/demo.css'}
-        ]
-          .concat(
-            _.map(js_dependencies.concat([
-              '<%= bower %>/ace-builds/src-min-noconflict/theme-twilight.js',
-              '<%= bower %>/ace-builds/src-min-noconflict/mode-markdown.js',
-              '<%= bower %>/ace-builds/src-min-noconflict/mode-scheme.js',
-              '<%= bower %>/ace-builds/src-min-noconflict/worker-javascript.js'
-            ]), function (f) {
-              return {src: [f], dest: '<%= dist %>/' + f, filter: 'isFile'};
-            }))
+        expand: true,
+        cwd: 'src',
+        src: ['*.js'],
+        dest: 'dist'
       }
     },
+
     changelog: {
       options: {
         dest: 'CHANGELOG.md'

package.json

@@ -9,6 +9,7 @@
   "main": "./ui-ace.js",
   "dependencies": {},
   "devDependencies": {
+    "angular-ui-publisher": "~1.x",
     "grunt": "~0.4.2",
     "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-jshint": "~0.7.2",
@@ -26,7 +27,9 @@
     "karma-requirejs": "~0.2.0",
     "karma-phantomjs-launcher": "~0.1.1",
     "karma": "~0.10.8",
-    "grunt-conventional-changelog": "~1.0.0"
+    "grunt-conventional-changelog": "~1.0.0",
+    "grunt-ngmin": "0.0.3",
+    "grunt-contrib-connect": "~0.5.0"
   },
   "scripts": {},
   "repository": {

publish.js

@@ -0,0 +1,35 @@
+/* jshint node:true */
+
+'use strict';
+
+var fs = require('fs');
+var path = require('path');
+
+module.exports = function() {
+
+  var js_dependencies =[
+    'bower_components/angular-ui-bootstrap-bower/ui-bootstrap-tpls.min.js',
+    'bower_components/ace-builds/src-min-noconflict/ace.js',
+  ];
+
+  var css_dependencies = [
+    'bower_components/ace-builds/src-min-noconflict/theme-twilight.js',
+    'bower_components/ace-builds/src-min-noconflict/mode-markdown.js',
+    'bower_components/ace-builds/src-min-noconflict/mode-scheme.js',
+    'bower_components/ace-builds/src-min-noconflict/worker-javascript.js'
+  ];
+
+  function putThemInVendorDir (filepath) {
+    return 'vendor/' + path.basename(filepath);
+  }
+
+  return {
+    humaName : 'UI.Ace',
+    repoName : 'ui-ace',
+    inlineHTML : fs.readFileSync(__dirname + '/demo/demo.html'),
+    inlineJS : fs.readFileSync(__dirname + '/demo/demo.js'),
+    css: css_dependencies.map(putThemInVendorDir).concat(['demo/demo.css']),
+    js : js_dependencies.map(putThemInVendorDir).concat(['dist/ui-ace.min.js']),
+    tocopy : css_dependencies.concat(js_dependencies)
+  };
+};