#71 #77 Upgrade supporting the new prefix option

Changed files.selectorPrefix -> files.getSelectorPrefix to follow the conventions used in the rest of the code

Author: gonzofish

commands/component/index.js

@@ -15,7 +15,7 @@ let prefix;
 
 module.exports = function createComponent(rootDir, selector) {
     logger = logging.create('Component');
-    prefix = files.selectorPrefix('component-selector') ? `${files.selectorPrefix('component-selector')}-` : '';
+    prefix = files.getSelectorPrefix('component-selector') ? `${files.getSelectorPrefix('component-selector')}-` : '';
 
     const options = opts.parseOptions(Array.from(arguments).slice(hasSelector(selector) ? 2 : 1), [
         'default', 'defaults', 'd',

commands/directive/index.js

@@ -16,7 +16,7 @@ let prefix;
 
 module.exports = function createDirective(rootDir, name) {
     logger = logging.create('Directive');
-    prefix = files.selectorPrefix('directive-selector');
+    prefix = files.getSelectorPrefix('directive-selector');
 
     const providedOptions = Array.from(arguments).slice(name && name[0] !== '-' ? 2 : 1);
     const options = opts.parseOptions(providedOptions, [

commands/initial/templates/package.json

@@ -28,33 +28,33 @@
     "@angular/platform-browser-dynamic": "^4.0.0",
     "core-js": "^2.4.1",
     "rxjs": "^5.0.1",
-    "zone.js": "0.8.12"
+    "zone.js": "^0.7.2"
   },
   "devDependencies": {
     "@angular/compiler-cli": "^4.0.0",
-    "@types/jasmine": "2.5.38",
-    "@types/node": "^6.0.42",
+    "@types/jasmine": "^2.0.0",
+    "@types/node": "^8.0.0",
     "angular-librarian": "{{ librarianVersion }}",
     "angular2-template-loader": "0.6.0",
     "awesome-typescript-loader": "^3.0.0",
-    "codelyzer": "~3.0.0",
-    "css-loader": "^0.26.1",
-    "css-to-string-loader": "^0.1.3",
+    "codelyzer": "^4.0.0",
+    "css-loader": "^0.28.0",
+    "css-to-string-loader": "^0.1.0",
     "extract-text-webpack-plugin": "^2.1.0",
-    "file-loader": "^0.8.5",
+    "file-loader": "^1.0.0",
     "fs-extra": "^2.1.2",
-    "html-webpack-plugin": "^2.19.0",
-    "istanbul-instrumenter-loader": "^1.2.0",
-    "jasmine-core": "2.5.2",
-    "jasmine-spec-reporter": "2.5.0",
-    "karma": "1.2.0",
+    "html-webpack-plugin": "^2.0.0",
+    "istanbul-instrumenter-loader": "^3.0.0",
+    "jasmine-core": "^2.0.0",
+    "jasmine-spec-reporter": "^4.0.0",
+    "karma": "^1.0.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-coverage-istanbul-reporter": "^1.3.0",
     "karma-jasmine": "^1.0.2",
     "karma-phantomjs-launcher": "^1.0.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^2.0.0",
-    "node-sass": "^4.1.1",
+    "node-sass": "^4.0.0",
     "np": "^2.12.0",
     "phantomjs-prebuilt": "^2.1.7",
     "raw-loader": "^0.5.1",
@@ -64,17 +64,17 @@
     "rollup-plugin-node-resolve": "3.0.0",
     "rollup-plugin-sourcemaps": "0.4.2",
     "rollup-plugin-uglify": "2.0.1",
-    "sass-loader": "^4.0.1",
+    "sass-loader": "^6.0.0",
     "script-loader": "^0.7.0",
-    "semver": "5.3.0",
-    "source-map-loader": "^0.1.5",
-    "style-loader": "^0.13.1",
+    "semver": "^5.0.0",
+    "source-map-loader": "^0.2.0",
+    "style-loader": "^0.19.0",
     "tslint": "^5.0.0",
     "tslint-loader": "^3.0.0",
-    "typescript": "~2.2.1",
-    "url-loader": "^0.5.7",
-    "webpack": "^2.2.0",
-    "webpack-dev-server": "^2.2.0",
+    "typescript": "^2.4.0",
+    "url-loader": "^0.6.0",
+    "webpack": "^2.0.0",
+    "webpack-dev-server": "^2.0.0",
     "webpack-merge": "^0.14.0",
     "webpack-node-externals": "^1.5.4"
   },

commands/upgrade/index.js

@@ -109,7 +109,10 @@ const upgradeFiles = (npmCommand) => erector.inquire([
 
 const updateFiles = () => {
     logger.info(colorize.colorize('Updating managed files to latest versions', 'blue'));
-    const answers = getErectorAnswers().concat({ answer: librarianVersions.get(), name: 'librarianVersion' });
+    const answers = getErectorAnswers().concat([
+        { answer: librarianVersions.get(), name: 'librarianVersion' },
+        { answer: files.getSelectorPrefix(), name: 'prefix' }
+    ]);
     const srcDir = files.resolver.create('src');
     const fileList = [
         { destination: files.resolver.root('.gitignore'), name: '__gitignore', update: updateFlatFile },

package.json

@@ -41,6 +41,7 @@
     "eslint": "^4.7.2",
     "eslint-plugin-node": "^5.2.0",
     "nodemon": "^1.11.0",
+    "semver": "^5.0.0",
     "sinon": "^2.4.1",
     "tap": "^10.7.1"
   },

test/component.spec.js

@@ -36,7 +36,7 @@ tap.test('command: component', (suite) => {
         color = sandbox.stub(colorize, 'colorize');
         construct = sandbox.stub(erector, 'construct');
         createYesNo = sandbox.stub(inputs, 'createYesNoValue');
-        filesSelectorPrefix = sandbox.stub(files, 'selectorPrefix');
+        filesSelectorPrefix = sandbox.stub(files, 'getSelectorPrefix');
         inquire = sandbox.stub(erector, 'inquire');
         log = sandbox.spy();
         mockLogger = sandbox.stub(logging, 'create');

test/tools/utilities/files.spec.js

@@ -474,7 +474,7 @@ tap.test('.librarianVersions', (suite) => {
 });
 
 tap.test('.selectorPrefix', (suite) => {
-    const selectorPrefix = files.selectorPrefix;
+    const selectorPrefix = files.getSelectorPrefix;
 
     suite.test('should read the prefix directive-selector setting from tslint.json', (test) => {
         const include = sinon.stub(files, 'include');

test/upgrade.spec.js

@@ -25,7 +25,6 @@ const npm = /^win/.test(process.platform) ? 'npm.cmd' : 'npm';
 
 
 tap.test('command: upgrade', (suite) => {
-    let getVersion;
     let gt;
     let make;
     let mocks;
@@ -208,8 +207,12 @@ tap.test('command: upgrade', (suite) => {
                 answer: 'my-package'
             },
             {
-            name: 'librarianVersion',
-            answer: 'ice-cream'
+                name: 'librarianVersion',
+                answer: 'ice-cream'
+            },
+            {
+                name: 'prefix',
+                answer: 'nglpf'
             }
         );
         const inquireAnswers = [
@@ -219,9 +222,11 @@ tap.test('command: upgrade', (suite) => {
             }
         ];
         const dirname = [process.cwd(), 'commands', 'upgrade'].join(path.sep);
+        const getPrefix = mockOnce('files', 'getSelectorPrefix');
         const include = mockOnce('files', 'include');
         const open = mockOnce('files', 'open');
 
+        getPrefix.returns('nglpf');
         include.returns({
             name: 'my-package'
         });

tools/utilities/files.js

@@ -105,7 +105,6 @@ exports.librarianVersions = {
 
 const getSelectorPrefixFromTslintRules = (selector) => {
     const tslint = exports.include(exports.resolver.root('tslint.json'));
-
     let prefix = '';
 
     if (tslint && tslint.rules && tslint.rules[selector]) {
@@ -118,4 +117,5 @@ const getSelectorPrefixFromTslintRules = (selector) => {
 const getValueFromTslintRules = (tslint, attribute) =>
   tslint.rules[attribute];
 
-exports.selectorPrefix = (selector) => getSelectorPrefixFromTslintRules(selector);
+exports.getSelectorPrefix = (selector) =>
+    getSelectorPrefixFromTslintRules(selector);