openstack
/
fuel-web
Code Issues Proposed changes

Grunt: The JavaScript Task Runner 

Change-Id: Ibab5789050ea2a14e02fad8c0aa7877cb39521bb
This commit is contained in:
Vitaly Kramskikh 2013-11-25 21:22:00 +04:00
parent 268d4a036b
commit 977defd486
13 changed files with 106 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -21,6 +21,8 @@ nosetests.xml
nailgun.log
lock
node_modules
.idea
.DS_Store

18
docs/develop/env.rst
View File

@ -73,12 +73,18 @@ Setup for Nailgun Unit Tests
Setup for Web UI Tests
----------------------
#. Install NodeJS (on Debian, you may need to use 'apt-get install -t
experimental' to get the latest npm, on Ubuntu 12.04, use nodejs package
instead of nodejs-legacy)) and CasperJS::
#. Install NodeJS and JS dependencies::
sudo apt-get install npm nodejs-legacy phantomjs
sudo npm install -g jslint requirejs
sudo add-apt-repository ppa:chris-lea/node.js
sudo apt-get update
sudo apt-get install nodejs
sudo npm install -g grunt-cli
cd nailgun
npm install
#. Install CasperJS::
sudo apt-get install phantomjs
cd ~
git clone git://github.com/n1k0/casperjs.git
cd casperjs
@ -113,7 +119,7 @@ Running Nailgun in Fake Mode
#. (optional) To create a compressed version of UI and put it into static_compressed dir::
r.js -o build.js dir=static_compressed
grunt build --static-dir=static_compressed
Astute and Naily
----------------

56
nailgun/Gruntfile.js Normal file
View File

@ -0,0 +1,56 @@
/*
* Copyright 2013 Mirantis, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License. You may obtain
* a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
**/
module.exports = function(grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
requirejs: {
compile: {
options: {
baseUrl: '.',
appDir: 'static',
dir: grunt.option('static-dir') || '/tmp/static_compressed',
mainConfigFile: 'static/js/main.js',
modules: [{name: 'js/main'}],
waitSeconds: 60,
optimize: 'uglify2',
}
}
},
jslint: {
client: {
src: [
'static/js/*.js',
'static/js/views/*.js',
],
directives: {
predef: ['requirejs', 'require', 'define', 'app', 'Backbone', '$', '_'],
ass: true,
browser: true,
unparam: true,
nomen: true,
eqeq: true,
vars: true,
white: true,
es5: false
}
}
}
});
grunt.loadNpmTasks('grunt-contrib-requirejs');
grunt.loadNpmTasks('grunt-jslint');
grunt.registerTask('build', ['requirejs']);
};

24
nailgun/build.js
View File

@ -1,24 +0,0 @@
/*
* Copyright 2013 Mirantis, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License. You may obtain
* a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
**/
({
baseUrl: ".",
appDir: "static",
dir: "/tmp/static",
mainConfigFile: "static/js/main.js",
modules: [{name: "js/main"}],
waitSeconds: 60,
optimize: "uglify2"
})

18
nailgun/package.json Normal file
View File

@ -0,0 +1,18 @@
{
"name": "fuel-web",
"version": "0.0.1",
"repository": {
"type": "git",
"url": "https://github.com/stackforge/fuel-web.git"
},
"devDependencies": {
"grunt": "~0.4.2",
"jslint": "~0.2.5",
"requirejs": "~2.1.9",
"uglifyjs": "~2.3.6",
"less": "~1.5.1",
"grunt-jslint": "~1.1.1",
"grunt-contrib-requirejs": "~0.4.1",
"grunt-contrib-less": "~0.8.2"
}
}

2
nailgun/static/js/app.js
View File

@ -83,7 +83,7 @@ function(Coccyx, coccyxMixins, models, commonViews, ClusterPage, NodesTab, Clust
app.page.tab.routeScreen(tabOptions);
return;
}
} catch(e) {}
} catch (ignore) {}
}
var cluster, tasks;

3
nailgun/static/js/main.js
View File

@ -13,7 +13,6 @@
* License for the specific language governing permissions and limitations
* under the License.
**/
'use strict';
requirejs.config({
baseUrl: 'static',
urlArgs: '_=' + (new Date()).getTime(),
@ -63,6 +62,7 @@ requirejs.config({
i18next: {
deps: ['text!i18n/translation.json', 'jquery'],
init: function(translation, $) {
'use strict';
$.i18n.init({resStore: JSON.parse(translation)});
}
},
@ -85,5 +85,6 @@ require([
'jquery', 'underscore', 'backbone', 'stickit', 'deepModel', 'coccyx', 'i18next', 'bootstrap', 'retina', 'jquery-checkbox', 'jquery-timeout', 'jquery-ui', 'jquery-autoNumeric',
'app'
], function() {
'use strict';
require('app').initialize();
});

5
nailgun/static/js/models.js
View File

@ -17,7 +17,6 @@ define(['utils', 'deepModel'], function(utils) {
'use strict';
var models = {};
var collections = {};
models.Release = Backbone.Model.extend({
constructorName: 'Release',
@ -133,7 +132,7 @@ define(['utils', 'deepModel'], function(utils) {
} else if (resourceName == 'interfaces') {
resource = this.get('meta').interfaces.length;
}
} catch (e) {}
} catch (ignore) {}
if (_.isNaN(resource)) {
resource = 0;
}
@ -203,7 +202,7 @@ define(['utils', 'deepModel'], function(utils) {
var id;
try {
id = this.get('result').release_info.release_id;
} catch(e) {}
} catch (ignore) {}
return id;
}
});

9
nailgun/static/js/utils.js
View File

@ -37,15 +37,6 @@ define(['require'], function(require) {
var urlRegexp = /(?:https?:\/\/([\-\w\.]+)+(:\d+)?(\/([\w\/_\-\.]*(\?\S+)?)?)?)/g;
return utils.linebreaks(text).replace(urlRegexp, utils.composeLink);
},
forceWebkitRedraw: function(el) {
if (window.isWebkit) {
el.each(function() {
this.style.webkitTransform = 'scale(1)';
var dummy = this.offsetHeight;
this.style.webkitTransform = '';
});
}
},
showErrorDialog: function(options, parentView) {
parentView = parentView || app.page;
var dialogViews = require('views/dialogs'); // avoid circular dependencies

2
nailgun/static/js/views/cluster_page_tabs/nodes_tab.js
View File

@ -816,7 +816,7 @@ function(utils, models, commonViews, dialogViews, nodesManagementPanelTemplate,
var operatingSystem;
try {
operatingSystem = this.node.collection.cluster.get('release').get('operating_system');
} catch(e){}
} catch (ignore) {}
operatingSystem = operatingSystem || 'OS';
var labels = {
offline: $.t('cluster_page.nodes_tab.node.status.offline'),

1
nailgun/static/js/views/common.js
View File

@ -39,7 +39,6 @@ function(utils, models, dialogViews, navbarTemplate, nodesStatsTemplate, notific
app.navbar.setActive(_.result(this, 'navbarActiveElement'));
},
updateBreadcrumbs: function() {
var breadcrumbsPath = _.isFunction(this.breadcrumbsPath) ? this.breadcrumbsPath() : this.breadcrumbsPath;
app.breadcrumbs.setPath(_.result(this, 'breadcrumbsPath'));
},
updateTitle: function() {

16
nailgun/static/js/views/dialogs.js
View File

@ -56,7 +56,7 @@ function(require, utils, models, simpleMessageTemplate, createClusterWizardTempl
var options = {type: 'local', source: 'api', level: 'error'};
logsLink = '#cluster/' + app.page.model.id + '/logs/' + utils.serializeTabOptions(options);
}
} catch(e) {}
} catch (ignore) {}
this.$('.modal-body').removeClass().addClass('modal-body');
this.$('.modal-body').html(views.Dialog.prototype.errorMessageTemplate({logsLink: logsLink}));
},
@ -349,7 +349,7 @@ function(require, utils, models, simpleMessageTemplate, createClusterWizardTempl
var description = '';
try {
description = release.get('modes_metadata')[mode].description;
} catch(e) {}
} catch (ignore) {}
this.$('.mode-description').text(description);
},
beforeClusterCreation: function(cluster) {
@ -370,7 +370,7 @@ function(require, utils, models, simpleMessageTemplate, createClusterWizardTempl
beforeSettingsSaving: function(settings) {
try {
settings.get('editable').common.libvirt_type.value = this.$('input[name=hypervisor]:checked').val();
} catch(e) {
} catch (e) {
return (new $.Deferred()).reject();
}
return (new $.Deferred()).resolve();
@ -429,7 +429,7 @@ function(require, utils, models, simpleMessageTemplate, createClusterWizardTempl
storageSettings.images_ceph.value = true;
}
}
} catch(e) {
} catch (e) {
return (new $.Deferred()).reject();
}
return (new $.Deferred()).resolve();
@ -458,7 +458,7 @@ function(require, utils, models, simpleMessageTemplate, createClusterWizardTempl
additionalServices.murano.value = this.$('input[name=murano]').is(':checked');
additionalServices.heat.value = this.$('input[name=murano]').is(':checked');
}
} catch(e) {
} catch (e) {
return (new $.Deferred()).reject();
}
return (new $.Deferred()).resolve();
@ -638,7 +638,7 @@ function(require, utils, models, simpleMessageTemplate, createClusterWizardTempl
} else if (name == 'max_speed' || name == 'current_speed') {
value = utils.showBandwidth(value);
}
} catch (e) {}
} catch (ignore) {}
return value;
},
showSummary: function(meta, group) {
@ -665,7 +665,7 @@ function(require, utils, models, simpleMessageTemplate, createClusterWizardTempl
var bandwidths = _.groupBy(_.pluck(meta.interfaces, 'current_speed'), utils.showBandwidth);
summary = _.map(_.keys(bandwidths).sort(), function(bandwidth) {return bandwidths[bandwidth].length + ' x ' + bandwidth;}).join(', ');
}
} catch (e) {}
} catch (ignore) {}
return summary;
},
sortEntryProperties: function(entry) {
@ -767,7 +767,7 @@ function(require, utils, models, simpleMessageTemplate, createClusterWizardTempl
return _.pick(node.attributes, 'id', 'cluster_id', 'pending_roles', 'pending_addition', 'pending_deletion');
});
};
var deferred = this.nodes.sync('update', this.nodes)
this.nodes.sync('update', this.nodes)
.done(_.bind(function() {
this.$el.modal('hide');
app.page.tab.model.fetch();

19
run_tests.sh
View File

@ -69,9 +69,8 @@ if [ -n "$ui_test_files" ]; then
fi
function clean {
echo "cleaning *.pyc, *.json, *.log, *.pid files"
echo "cleaning *.pyc, *.log, *.pid files"
find . -type f -name "*.pyc" -delete
rm -f *.json
rm -f *.log
rm -f *.pid
}
@ -107,20 +106,10 @@ if [ $just_flake8 -eq 1 ]; then
fi
function run_jslint {
which jslint > /dev/null
if [ $? -ne 0 ]; then
echo "JSLint is not installed; install by running:"
echo "sudo apt-get install npm"
echo "sudo npm install -g jslint"
return 1
fi
(
cd nailgun
jsfiles=$(find static/js -type f | grep -v ^static/js/libs/ | grep \\.js$)
jslint_predef=(requirejs require define app Backbone $ _ alert confirm)
jslint_options="$(echo ${jslint_predef[@]} | sed 's/^\| / --predef=/g') --browser=true --nomen=true --eqeq=true --vars=true --white=true --es5=false"
jslint $jslint_options $jsfiles
) || return 1
grunt jslint
)
}
if [ $just_jslint -eq 1 ]; then
@ -151,7 +140,7 @@ function run_ui_tests {
echo -n "Compressing UI... "
compressed_static_dir=/tmp/static_compressed
rm -rf $compressed_static_dir && mkdir -p $compressed_static_dir
r.js -o build.js dir=$compressed_static_dir > /dev/null
grunt build --static-dir=$compressed_static_dir > /dev/null
if [ $? -ne 0 ]; then
echo "Failed!"
exit 1