Skip to content

Commit 14566b7

Browse files
author
benholloway
committed
sync branch
1 parent 9bb4300 commit 14566b7

File tree

162 files changed

+2216
-63989
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+2216
-63989
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[*.js]
2+
indent_style = space
3+
indent_size = 2

.travis.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
language: node_js
22
node_js:
33
- "0.11"
4+
- "0.10"
5+
- "0.8"
6+
matrix:
7+
allow_failures:
8+
- node_js: "0.11"
9+
- node_js: "0.8"
10+
fast_finish: true
411
before_install:
512
- npm install -g [email protected]
613
- npm i -g
714
- npm i -g jasmine-node
8-
script:
15+
- node -v
16+
- npm -v
917
- jasmine-node --version
18+
script:
1019
- pwd && ls
11-
- jasmine-node --verbose --test-dir /home/travis/build/angularity/node-angularity/test
20+
- jasmine-node --verbose --test-dir /home/travis/build/angularity/node-angularity/test

appveyor.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
environment:
2+
matrix:
3+
- nodejs_version: "0.11"
4+
- nodejs_version: "0.10"
5+
- nodejs_version: "0.8"
6+
7+
matrix:
8+
fast_finish: true
9+
allow_failures:
10+
- nodejs_version: "0.11"
11+
- nodejs_version: "0.8"
12+
13+
install:
14+
- ps: Install-Product node $env:nodejs_version
15+
- npm -g install npm@2
16+
- set PATH=%APPDATA%\npm;%PATH%
17+
- npm i -g
18+
- npm i -g jasmine-node
19+
- node -v
20+
- npm -v
21+
- jasmine-node --version
22+
23+
test_script:
24+
- npm test
25+
26+
build: off

bin/cli.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var path = require('path'),
1616
var yargs = require('./../lib/util/yargs');
1717

1818
// TODO @bholloway menus
19-
//var mainMenu = require('../lib/cli/mainMenu');
19+
// var mainMenu = require('../lib/cli/mainMenu');
2020
require('../index');
2121

2222
// we need to duplicate some event handlers from the gulp cli since we have bypassed it
@@ -68,6 +68,7 @@ else if (cliArgs.version) {
6868
console.log('angularity:', version);
6969
}
7070
// interactive menu
71-
else {
72-
mainMenu.prompt();
73-
}
71+
// TODO @bholloway reimplement after yargs refactor regression
72+
// else {
73+
// mainMenu.prompt();
74+
// }

lib/build/jshint-reporter.js

Lines changed: 0 additions & 49 deletions
This file was deleted.

lib/config/streams.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ function jsApp(opts) {
4545
}
4646

4747
function jsLib(opts) {
48-
return gulp.src(getGlob(['**/*.js', '!*.js']), opts);
48+
return gulp.src(getGlob(['**/*.js', '!*.js', '!**/*.spec.js']), opts);
4949
}
5050

5151
function jsSpec(opts) {
52-
return gulp.src(getGlob(['**/*.spec.js', '!*.spec.js'], APP), opts);
52+
return gulp.src(getGlob(['**/*.spec.js', '!*.spec.js']), opts);
5353
}
5454

5555
function scssApp(opts) {
@@ -81,4 +81,4 @@ module.exports = {
8181
jsSpec : jsSpec,
8282
testDependencies: testDependencies,
8383
getGlob : getGlob
84-
};
84+
};

lib/test/karma-background.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
var server = require('karma').server;
66
var decoded = require('querystring').unescape(process.argv[2]);
77
var data = JSON.parse(decoded);
8-
server.start(data);
8+
server.start(data);

0 commit comments

Comments
 (0)