Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/johnnycrab/abschluss_app
Browse files Browse the repository at this point in the history 
Conflicts:
	src/core/utils/logger/IrcLogger.js.map
	src/core/utils/logger/LoggerFactory.js.map
	src/main.js
	src/main.js.map
	src/main.ts
  • Loading branch information
@joernroeder
joernroeder committed Jul 9, 2014
2 parents 8327615 + 8712fae commit c98db64
Show file tree
Hide file tree
Showing 1,305 changed files with 51,904 additions and 2,984 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ node_modules
/utils/topologyTestRunner/zmap-results.json
/utils/topologyTestRunner/node-webkit/**/*.app
*.pyc

/src/public/primus.io.js
/src/bin/core/search/elasticsearch/logs/
24 changes: 16 additions & 8 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = function (grunt) {
plato: {
source: {
options: {
exclude: /node_modules|reports|interfaces|namespace\.js|\.json/
exclude: /node_modules|reports|interfaces|public|namespace\.js|\.json/
},
files : {
'build/js-source-analysis-report': ['src/**/*.js']
Expand Down Expand Up @@ -73,6 +73,13 @@ module.exports = function (grunt) {
src : ['./application.nw/**/*'] // Your node-webkit app
},

benchmark: {
all: {
src: ['utils/benchmarks/**/*.js'],
dest: 'utils/benchmarks/results.csv'
}
},

// execute 'grunt curl' manually to refresh the external definition files
curl : {
'ts-definitions/fs-extra/fs-extra.d.ts' : 'https://github.com/borisyankov/DefinitelyTyped/raw/master/fs-extra/fs-extra.d.ts',
Expand All @@ -96,15 +103,16 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-curl');
grunt.loadNpmTasks('grunt-node-webkit-builder');
grunt.loadNpmTasks('grunt-plato');
grunt.loadNpmTasks('grunt-benchmark');

// Task aliases
grunt.registerTask('createReports', ['env:test', 'mochaTest:coverage', 'plato:source']);
grunt.registerTask('_runTests', ['env:test', 'mochaTest']);
grunt.registerTask('_coverage', ['env:test', 'mochaTest:coverage']);
grunt.registerTask('test', ['_runTests']);
grunt.registerTask('dev', ['env:dev', 'nodemon']);
grunt.registerTask('prod', ['env:prod', 'nodemon']);
grunt.registerTask('createReports', ['coverage', 'plato:source']);
grunt.registerTask('runTests', ['env:test', 'mochaTest']);
grunt.registerTask('coverage', ['env:test', 'mochaTest:coverage']);
//grunt.registerTask('test', ['_runTests']);
//grunt.registerTask('dev', ['env:dev', 'nodemon']);
//grunt.registerTask('prod', ['env:prod', 'nodemon']);

// Default task
grunt.registerTask('default', ['test']);
grunt.registerTask('default', ['runTests']);
};
52 changes: 26 additions & 26 deletions build/js-source-analysis-report/display.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h1>JavaScript Source Analysis</h1>
<div class="reportBlock lineCount">
<div class="reportContent">
<small class="chart-label">Total / Average Lines</small>
<h1>11044 / 153</h1>
<h1>19017 / 148</h1>
</div>
<div id="chart_historical_sloc" class="chart js-chart"></div>
</div>
Expand All @@ -41,7 +41,7 @@ <h1>11044 / 153</h1>
<div class="reportBlock maintainability">
<div class="reportContent">
<small class="chart-label">Average Maintainability</small>
<h1>74.22</h1>
<h1>73.90</h1>
</div>
<div id="chart_historical_maint" class="chart js-chart"></div>
</div>
Expand All @@ -55,28 +55,28 @@ <h2 class="reportTitle">Worst Maintainability Scores</h2>
<ul class="list-unstyled">

<li>
<strong>90 score</strong>
<small>core/search/SearchItemFactory.js</small>
<strong>97 score</strong>
<small>main.js</small>
</li>

<li>
<strong>90 score</strong>
<small>core/utils/JSONStateHandlerFactory.js</small>
<small>core/protocol/hydra/messages/Aes128GcmLayeredEncDecHandlerFactory.js</small>
</li>

<li>
<strong>90 score</strong>
<small>core/fs/FolderWatcherFactory.js</small>
<small>core/protocol/hydra/messages/ReadableAdditiveSharingMessageFactory.js</small>
</li>

<li>
<strong>90 score</strong>
<small>core/net/tcp/TCPSocketFactory.js</small>
<small>core/protocol/hydra/messages/ReadableCellCreatedRejectedMessageFactory.js</small>
</li>

<li>
<strong>90 score</strong>
<small>core/net/tcp/TCPSocketHandlerFactory.js</small>
<small>core/protocol/hydra/messages/ReadableCreateCellAdditiveMessageFactory.js</small>
</li>

</ul>
Expand All @@ -88,28 +88,28 @@ <h2 class="reportTitle">Largest Files</h2>
<ul class="list-unstyled">

<li>
<strong>948 lines</strong>
<strong>981 lines</strong>
<small>core/protocol/net/ProtocolConnectionManager.js</small>
</li>

<li>
<strong>546 lines</strong>
<small>core/protocol/proxy/ProxyManager.js</small>
<strong>601 lines</strong>
<small>core/search/SearchClient.js</small>
</li>

<li>
<strong>471 lines</strong>
<small>core/plugin/PluginManager.js</small>
<strong>553 lines</strong>
<small>core/protocol/proxy/ProxyManager.js</small>
</li>

<li>
<strong>430 lines</strong>
<small>core/search/SearchClient.js</small>
<strong>532 lines</strong>
<small>core/fs/FolderWatcherManager.js</small>
</li>

<li>
<strong>429 lines</strong>
<small>core/topology/RoutingTable.js</small>
<strong>510 lines</strong>
<small>core/search/IndexManager.js</small>
</li>

</ul>
Expand All @@ -121,28 +121,28 @@ <h2 class="reportTitle">Lint Warnings</h2>
<ul class="list-unstyled">

<li>
<strong>6 lint errors</strong>
<strong>9 lint errors</strong>
<small>core/search/SearchClient.js</small>
</li>

<li>
<strong>5 lint errors</strong>
<small>core/search/SearchManager.js</small>
<strong>6 lint errors</strong>
<small>core/protocol/fileTransfer/messages/FeedingNodesMessageBlock.js</small>
</li>

<li>
<strong>4 lint errors</strong>
<small>core/plugin/PluginLoader.js</small>
<strong>5 lint errors</strong>
<small>core/search/SearchManager.js</small>
</li>

<li>
<strong>3 lint errors</strong>
<small>core/plugin/PluginManager.js</small>
<strong>5 lint errors</strong>
<small>core/search/SearchRequestManager.js</small>
</li>

<li>
<strong>3 lint errors</strong>
<small>core/search/SearchItem.js</small>
<strong>4 lint errors</strong>
<small>core/plugin/PluginLoader.js</small>
</li>

</ul>
Expand Down
Loading

0 comments on commit c98db64

Please sign in to comment.