Fix/url parsing (#8)

* build(Source control cleanup): Added "files" explicitly to package.json

* build(dist folder): Removed Dist folder from source control

* build(gitignore): Added dist and dist_tests to gitignore

* build(package.json): Updated Typescript version to 2.3.0

* refactor(SnConfig): Removed Behavior, FieldDecorator, FieldModel, FieldModelStore (these will be par

* build(tslint): variable-name checking syntax fix

* build(package.json): Updated sn-client-js dependency to development-1, modified version, published t

* build(tslint): fixed tslint scope from NPM script

* fix(SnConfig): Fixed CommandLineArgs valid commands list

* build(package.json): TS version update, added sn.config.js to included files

* fix(SnConfigReader): removed JwtTokenTemplate from CLI options

* fix(DownloadHandler): fixed url parsing

* build(tsconfig): removed explicit type declaration restrictions from tsconfigs

* fix(Download): Fixed URL parsing, now works with and without protocol declaration

* build(mocha-typescrip version set explicitly to 1.0.23 (known issue: https://github.com/pana-cc/moch

* chore(package.json): Updated dependencies, Test method syntax (mocha-typescript change)

Author: gallayl

.vscode/launch.json

@@ -15,6 +15,7 @@
             "outFiles": [
                 "${workspaceRoot}\\dist\\**\\*.js"
             ],
+            "cwd": "${workspaceRoot}\\..\\aurelia-mook\\",
             "console": "integratedTerminal",
             "preLaunchTask": "build"
         },

package.json

@@ -47,32 +47,33 @@
   },
   "homepage": "https://github.com/SenseNet/sn-client-cli#readme",
   "devDependencies": {
-    "@types/chai": "^3.4.35",
-    "@types/mocha": "^2.2.40",
-    "@types/node": "^7.0.12",
+    "@types/chai": "^3.5.2",
     "chai": "^3.5.0",
     "commitizen": "^2.9.6",
-    "mocha": "^3.2.0",
-    "mocha-typescript": "^1.0.23",
+    "mocha": "^3.4.1",
+    "mocha-typescript": "^1.1.2",
     "prompt": "^1.0.0",
-    "tslint": "^5.0.0",
-    "typedoc": "^0.5.9",
+    "tslint": "^5.2.0",
+    "typedoc": "^0.7.0",
     "typescript": "^2.3.2"
   },
   "dependencies": {
+    "@types/chai": "^3.5.2",
+    "@types/mocha": "^2.2.41",
+    "@types/node": "^7.0.18",
     "adm-zip": "^0.4.7",
-    "command-line-args": "^4.0.2",
+    "command-line-args": "^4.0.4",
     "command-line-commands": "^2.0.0",
     "command-line-usage": "^4.0.0",
-    "codecov": "^1.0.1",
+    "codecov": "^2.2.0",
     "del": "^2.2.2",
     "gulp": "^3.9.1",
-    "gulp-mocha": "^4.3.0",
+    "gulp-mocha": "^4.3.1",
     "gulp-promisify": "^1.2.2",
     "gulp-run": "^1.7.1",
     "gulp-typedoc": "^2.0.2",
     "path": "^0.12.7",
-    "sn-client-js": "1.1.1-development.3"
+    "sn-client-js": "2.0.0-RC.1"
   },
   "czConfig": {
     "path": "node_modules/cz-conventional-changelog"

src/utils/download.ts

@@ -1,4 +1,5 @@
 import * as Http from 'http';
+import * as URL from 'url';
 
 /**
  * This class represents a Download from a specified Sense/Net Repository
@@ -53,12 +54,11 @@ export class Download {
      */
     public async GetAsBufferAsync(): Promise<Buffer> {
         return new Promise<Buffer>((resolve) => {
-
-            const url = new URL(this.host);
-
+            const url = URL.parse(this.host);
             Http.get({
+                protocol: url.protocol,
                 headers: this.headers,
-                host: url.origin,
+                host: url.host || url.path,
                 path: this.path,
             }, (response: Http.IncomingMessage) => this.HandleResponse(response, resolve));
         });

test/AskTests.ts

@@ -8,14 +8,14 @@ const expect = Chai.expect;
 @suite('Ask Tests')
 export class AskTests {
 
-    @test('should return an awaitable Promise')
-    public TextAsync() {
+    @test
+    public 'Ask Text should return an awaitable Promise'() {
         const promise = Ask.TextAsync('Text');
         expect(promise).to.be.instanceOf(Promise, 'Should return a promise');
     }
 
-    @test('Ask text, resolve with override')
-    public TextOverride(done) {
+    @test
+    public 'Ask text, resolve with override'(done) {
         Prompt.override = {
             Text: 'alma'
         };
@@ -25,8 +25,8 @@ export class AskTests {
         });
     }
 
-    @test('Ask password, resolve with override')
-    public PasswordOverride(done) {
+    @test
+    public 'Ask password, resolve with override'(done) {
         Prompt.override = {
             Text: 'alma'
         };
@@ -36,20 +36,20 @@ export class AskTests {
         });
     }
 
-    @test('should return an awaitable Promise')
-    public PasswordAsync() {
+    @test
+    public 'Ask Password should return an awaitable Promise'() {
         const promise = Ask.PasswordAsync('Password');
         expect(promise).to.be.an.instanceOf(Promise);
     }
 
-    @test('should create Prompt question from config field name')
-    public createQuestionFromConfig() {
+    @test
+    public 'should create Prompt question from config field name'() {
         const q = Ask.createPromptQuestionFromConfigName('SnConfigModel.RepositoryUrl');
         expect(q.name).to.be.eq('RepositoryUrl');
     }
 
-    @test('should return an awaitable Promise')
-    public MissingConfigs() {
+    @test
+    public 'should return an awaitable Promise'() {
         const promise = Ask.MissingConfigs();
         expect(promise).to.be.an.instanceOf(Promise);
     }

test/DownloadTests.ts

@@ -14,26 +14,26 @@ export class DownloadTests {
 
     }
 
-    @test('Shouldn\'t have custom headers by default')
-    public EmptyHeaders() {
+    @test
+    public 'Shouldn\'t have custom headers by default'() {
         expect(Object.keys(this.download['headers']).length).to.be.eq(0);
 
     }
 
-    @test('Should have a proper base64 encoded Basic Authorization header after setting up Authenticate')
-    public BasicAuthHeaders() {
+    @test
+    public 'Should have a proper base64 encoded Basic Authorization header after setting up Authenticate'() {
         this.download.Authenticate('username', 'password');
         expect(this.download['headers']['Authorization']).to.be.eq('Basic dXNlcm5hbWU6cGFzc3dvcmQ=');
     }
 
-    @test('Should return the file as awaitable Promise on GetAsBufferAsync')
-    public GetAsBufferAsync() {
+    @test
+    public 'Should return the file as awaitable Promise on GetAsBufferAsync'() {
         const buffer = this.download.GetAsBufferAsync();
         expect(buffer).to.be.an.instanceOf(Promise);
     }
 
-    @test('HandleResponse')
-    public testHandleResponse(done) {
+    @test
+    public 'HandleResponse'(done) {
         const httpMsg: Http.IncomingMessage = new Events.EventEmitter() as Http.IncomingMessage;
         httpMsg.headers = {
             'content-length': 3

test/PathHelperTests.ts

@@ -13,24 +13,24 @@ export class PathHelperTests {
         this.PathHelper = new PathHelper('c:/temp/package/../package', 'c:/temp/package/../package/node_modules/sn-client-js', 'c:/temp/package/../package/node_modules/sn-client-cli');
     }
 
-    @test('Should normalize PackageRoot path')
-    public PackageRootPath() {
+    @test
+    public 'Should normalize PackageRoot path'() {
         expect(this.PathHelper.PackageRootPath).to.be.eq(`c:${Path.sep}temp${Path.sep}package`);
     }
 
-    @test('Should normalize SnClient path')
-    public SnClientPath() {
+    @test
+    public 'Should normalize SnClient path'() {
         expect(this.PathHelper.SnClientPath).to.be.eq(`c:${Path.sep}temp${Path.sep}package${Path.sep}node_modules${Path.sep}sn-client-js`);
 
     }
 
-    @test('Should provide realible relative path to PackageRootPath')
-    public RealiblePackageRoot() {
+    @test
+    public 'Should provide realible relative path to PackageRootPath'() {
         expect(this.PathHelper.GetRelativeToPackageRootPath('./alma')).to.be.eq(Path.join(this.PathHelper.PackageRootPath, './alma'));
     }
 
-    @test('Should provide realible relative path to SnClientPath')
-    public RealibleSnClientPath() {
+    @test
+    public 'Should provide realible relative path to SnClientPath'() {
         expect(this.PathHelper.GetRelativeToSnClientPath('./alma')).to.be.eq(Path.join(this.PathHelper.SnClientPath, './alma'));
 
     }

test/SnConfigReaderTests.ts

@@ -13,26 +13,26 @@ export class SnConfigReaderTests {
         this.reader = new SnConfigReader(SnCliConfigModel, process.cwd());
     }
 
-    @test('ReadConfigFile should return an awaitable promise')
-    public Read() {
+    @test
+    public 'ReadConfigFile should return an awaitable promise'() {
         const promise = this.reader.ReadConfigFile();
         expect(promise).to.be.an.instanceOf(Promise);
     }
 
-    @test('Should create a new config if not exists')
-    public async ReadNonExisting() {
+    @test
+    public async 'Should create a new config if not exists'() {
         await this.reader.ReadConfigFile('invalidConfig.js');
         expect(this.reader.Config).to.be.instanceof(SnCliConfigModel);
     }
 
-    @test('ValidateAsync should return an awaitable promise')
-    public ValidatePromise() {
+    @test
+    public 'ValidateAsync should return an awaitable promise'() {
         const promise = this.reader.ValidateAsync('RepositoryUrl', 'UserName', 'Password');
         expect(promise).to.be.an.instanceOf(Promise);
     }
 
-    @test('Shouldn resolve when all fields are provided')
-    public async ValidateResolve() {
+    @test
+    public async 'Shouldn resolve when all fields are provided'() {
         this.reader.Config = {
             RepositoryUrl: 'url',
             UserName: 'username',
@@ -42,8 +42,8 @@ export class SnConfigReaderTests {
         expect(cfg.RepositoryUrl).to.be.eq('url');
     }
 
-    @test('Should throw an error if a field is provided but disallowed form config by behavior')
-    public ValidateShouldThrowWhenNotAllowed(done) {
+    @test
+    public 'Should throw an error if a field is provided but disallowed form config by behavior'(done) {
         this.reader.Config = {
             RepositoryUrl: '',
             UserName: 'user',
@@ -56,8 +56,8 @@ export class SnConfigReaderTests {
             .catch(() => done());
     }
 
-    @test('OverrideConfig should override provided value')
-    public OverrideConfigTest() {
+    @test
+    public 'OverrideConfig should override provided value'() {
 
         this.reader.Config = {
             RepositoryUrl: 'url',

test/SnConfigTests.ts

@@ -0,0 +1,38 @@
+import * as Chai from 'chai';
+import { suite, test } from 'mocha-typescript';
+
+const expect = Chai.expect;
+
+@suite('SnConfig Tests')
+export class SnConfigTests {
+
+    @test
+    public 'SnConfigFieldModel Should be constructed with SnConfigBehavior.Default'() {
+        const fieldModel = new SnConfigFieldModel();
+        expect(fieldModel.Behavior).to.be.eq(SnConfigBehavior.Default);
+    }
+
+    @test
+    public 'SnConfigFieldModelStore Should throw error if entity isn\'t in the store '() {
+        const find = () => { SnConfigFieldModelStore.Get('exampleFieldName'); };
+        expect(find).to.throw(Error);
+    }
+
+    @test
+    public 'SnConfigFieldModelStore Should throw an error if you try to add a field that already exists'() {
+        const add = () => { SnConfigFieldModelStore.Add({ FieldName: 'Example', Question: 'ExampleQuestion', Behavior: SnConfigBehavior.Default }); };
+        add();  // add once
+        expect(add).to.throw(Error);
+    }
+
+    @test
+    public 'GetCommandOptions should return only commands that has AllowFromCommandLine flag'() {
+        const commands = SnConfigFieldModelStore.GetCommandOptions();
+        commands.forEach((command) => {
+            const isAllowed = (command.Behavior & SnConfigBehavior.AllowFromCommandLine) === SnConfigBehavior.AllowFromCommandLine;
+            expect(isAllowed).to.eq(true);
+        });
+
+    }
+
+}

test/StageTests.ts

@@ -17,36 +17,36 @@ export class StageTests {
         this.stage = new Stage(this.pathHelper);
     }
 
-    @test('Should have a proper temp folder path')
-    public TempFolderPath() {
+    @test
+    public 'Should have a proper temp folder path'() {
         expect(this.stage.TempFolderPath).to.be.eq(Path.join(this.pathHelper.SnClientPath, 'tmp'));
     }
 
-    @test('Prepare Should return an awaitable promise')
-    public PreparePromise() {
+    @test
+    public 'Prepare Should return an awaitable promise'() {
         const promise = this.stage.PrepareAsync();
         expect(promise).to.be.an.instanceOf(Promise);
     }
 
-    @test('InitializeConfigAsync Should return an awaitable promise')
-    public IniConfigPromise() {
+    @test
+    public 'InitializeConfigAsync Should return an awaitable promise'() {
         const promise = this.stage.InitializeConfigAsync();
         expect(promise).to.be.an.instanceOf(Promise);
     }
 
-    @test('UpdateModule Should return an awaitable promise')
-    public UpdatePromise() {
+    @test
+    public 'UpdateModule Should return an awaitable promise'() {
         const promise = this.stage.UpdateModuleAsync();
         expect(promise).to.be.an.instanceOf(Promise);
     }
 
-    @test('CallGulpAsync')
-    public async CallGulpAsync() {
+    @test
+    public async 'CallGulpAsync'() {
         await this.stage.CallGulpRunAsync('', __dirname);
     }
 
-    @test('CallGulpAsyncError')
-    public CallGulpAsyncError(done) {
+    @test
+    public 'CallGulpAsyncError'(done) {
         this.stage.CallGulpRunAsync('badCommand', __dirname).then(
             () => { done('Error expeced'); },
             (err) => { done(); }

test/tsconfig.json

@@ -6,11 +6,6 @@
         "experimentalDecorators": true,
         "target": "es2015",
         "sourceMap": true,
-        "inlineSources": true,
-        "types": [
-            "node",
-            "mocha",
-            "chai"
-        ]
+        "inlineSources": true
     }
 }