2.0.11

.gitlab-ci.yml

@@ -0,0 +1,35 @@
+image: hosttoday/ht-docker-node:npmts
+
+stages:
+- test
+- release
+
+testLEGACY:
+  stage: test
+  script:
+    - npmci test legacy
+  tags:
+    - docker
+
+testLTS:
+  stage: test
+  script:
+    - npmci test lts
+  tags:
+    - docker
+    
+testSTABLE:
+  stage: test
+  script:
+    - npmci test stable
+  tags:
+    - docker
+
+release:
+  stage: release
+  script:
+    - npmci publish
+  only:
+    - tags
+  tags:
+    - docker

.travis.yml

@@ -1,12 +0,0 @@
-language: node_js
-node_js:
-- '4.3.0'
-- 'stable'
-deploy:
-  provider: npm
-  email: npm@lossless.digital
-  api_key:
-    secure: oKx1gdYYBnaoUcpxn3WM4SdZdInIYaa3ZgbXLSh88K+PjbcSw3NNbYEnAtWFV1eAQQchDjOHId4D1Ne68DtJb5umahvhYoejtZzawjPaa6Uyi46VPk31wXYzZJyadiyefuwOhLLMM4i3yzYwEC2BeTpbU8Tvaj6B42DoySKNGUnSF9+K2wsFNp13mRje6PLe+fjo+9H4CEKLwf74alwvAWd/PLzv47KKdCZ4/9zX7TxevrIBNie+n6VxjqXm/dTv9k7J3dCunojehBr9X9sn1sd8mR+FexjcgfCA2dz8ViP8qZCslzZixGVuasmjpQH9OabrlOfQ6e+Hs4puv+U7s53SVa9nWntiYHloT29UKCPG6ofuDFq5Nd+1PCNvPfrh99F87IKTOw9DQ9Lx7Q//To4LrbnsC85/uHgkWHhbr/ZGax7wuX9og1rem1MSjYr7gQ1sx9edtDSQe3Yjhi22xDREL5/uCbnThmrd1P44CtAU7UG4TQvnHADFqi4Oogf/VBQvsC+aUJPSfZuoxX31yCYuNToH65j1Vblj9tYuPdHSriPj2OdxbuWh68lpgsh7K64Imb++3oKjh3fKZEzeJsByI+QytyUwO/Qu1c6whlkyv8yMyoaD0WARufU+zcG4P7j4rFlAO/CoezSd6l5HBUiXJNe7XniIi6KZjA1zkZc=
-  on:
-    tags: true
-    repo: pushrocks/smartstring

README.md

@@ -1,5 +1,5 @@
 # smartstring
-handle strings in smart ways.
+handle strings in smart ways. TypeScript ready.
 
 ## Status
 [![Build Status](https://travis-ci.org/pushrocks/smartstring.svg?branch=master)](https://travis-ci.org/pushrocks/smartstring)
@@ -8,4 +8,31 @@ handle strings in smart ways.
 [![bitHound Code](https://www.bithound.io/github/pushrocks/smartstring/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartstring)
 
 ## Usage
-### Git
+Use TypeScript for intellisense.
+
+```typescript
+import * as smartstring from "smartstring";
+
+// smartstring.GitRepo class
+let myGitRepo = new smartstring.GitRepo("git@github.com:someorg/somerepo.git"); // takes https and git and npm repo URL versions
+myGitRepo.host // "github.com"
+myGitRepo.user // "someorg"
+myGitRepo.repo // "somerepo"
+myGitRepo.accessToken // accessToken if specified with https
+myGitRepo.sshUrl // "git@github.com:someorg/somerepo.git" (computed also from https)
+myGitRepo.httpsUrl // "https://github.com/someorg/somerepo.git" (computed also from ssh)
+
+// smartstring.Domain class
+let myDomain = new smartstring.Domain("https://sub.main.tld");
+myDomain.level1 // "tld"
+myDomain.level2 // "main"
+// level3 , level 4 and so on...
+myDomain.zoneName // "main.tld"
+myDOmain.protocol // "https"
+
+```
+
+## About the authors:
+[![Project Phase](https://mediaserve.lossless.digital/lossless.com/img/createdby_github.svg)](https://lossless.com/)
+
+[![PayPal](https://img.shields.io/badge/Support%20us-PayPal-blue.svg)](https://paypal.me/lossless)

dist/index.d.ts

@@ -1,7 +1,8 @@
-import "typings-global";
-import SmartstringDocker = require("./smartstring.docker");
-import SmartstringTypescript = require("./smartstring.typescript");
+import * as SmartstringDocker from "./smartstring.docker";
+import * as SmartstringTypescript from "./smartstring.typescript";
+import * as SmartstringIndent from "./smartstring.indent";
 export { Domain } from "./smartstring.domain";
 export { GitRepo } from "./smartstring.git";
 export declare let docker: typeof SmartstringDocker;
 export declare let typescript: typeof SmartstringTypescript;
+export declare let indent: typeof SmartstringIndent;

dist/index.js

@@ -1,12 +1,12 @@
 "use strict";
-require("typings-global");
 var SmartstringDocker = require("./smartstring.docker");
 var SmartstringTypescript = require("./smartstring.typescript");
+var SmartstringIndent = require("./smartstring.indent");
 var smartstring_domain_1 = require("./smartstring.domain");
 exports.Domain = smartstring_domain_1.Domain;
 var smartstring_git_1 = require("./smartstring.git");
 exports.GitRepo = smartstring_git_1.GitRepo;
 exports.docker = SmartstringDocker;
 exports.typescript = SmartstringTypescript;
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUNQLENBQUMsQ0FEc0I7QUFDdkIsSUFBTyxpQkFBaUIsV0FBVyxzQkFBc0IsQ0FBQyxDQUFDO0FBQzNELElBQU8scUJBQXFCLFdBQVcsMEJBQTBCLENBQUMsQ0FBQztBQUVuRSxtQ0FBcUIsc0JBQXNCLENBQUM7QUFBcEMsNkNBQW9DO0FBQzVDLGdDQUFzQixtQkFBbUIsQ0FBQztBQUFsQyw0Q0FBa0M7QUFDL0IsY0FBTSxHQUFHLGlCQUFpQixDQUFDO0FBQzNCLGtCQUFVLEdBQUcscUJBQXFCLENBQUMiLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiXHJcbmltcG9ydCBTbWFydHN0cmluZ0RvY2tlciA9IHJlcXVpcmUoXCIuL3NtYXJ0c3RyaW5nLmRvY2tlclwiKTtcclxuaW1wb3J0IFNtYXJ0c3RyaW5nVHlwZXNjcmlwdCA9IHJlcXVpcmUoXCIuL3NtYXJ0c3RyaW5nLnR5cGVzY3JpcHRcIik7XHJcblxyXG5leHBvcnQge0RvbWFpbn0gZnJvbSBcIi4vc21hcnRzdHJpbmcuZG9tYWluXCI7XHJcbmV4cG9ydCB7R2l0UmVwb30gZnJvbSBcIi4vc21hcnRzdHJpbmcuZ2l0XCI7XHJcbmV4cG9ydCBsZXQgZG9ja2VyID0gU21hcnRzdHJpbmdEb2NrZXI7XHJcbmV4cG9ydCBsZXQgdHlwZXNjcmlwdCA9IFNtYXJ0c3RyaW5nVHlwZXNjcmlwdDsiXX0=
+exports.indent = SmartstringIndent;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQ0EsSUFBWSxpQkFBaUIsV0FBTSxzQkFBc0IsQ0FBQyxDQUFBO0FBQzFELElBQVkscUJBQXFCLFdBQU0sMEJBQTBCLENBQUMsQ0FBQTtBQUNsRSxJQUFZLGlCQUFpQixXQUFNLHNCQUFzQixDQUFDLENBQUE7QUFFMUQsbUNBQXFCLHNCQUFzQixDQUFDO0FBQXBDLDZDQUFvQztBQUM1QyxnQ0FBc0IsbUJBQW1CLENBQUM7QUFBbEMsNENBQWtDO0FBQy9CLGNBQU0sR0FBRyxpQkFBaUIsQ0FBQztBQUMzQixrQkFBVSxHQUFHLHFCQUFxQixDQUFDO0FBQ25DLGNBQU0sR0FBRyxpQkFBaUIsQ0FBQyJ9

dist/smartstring.docker.d.ts

@@ -1,4 +1,3 @@
-import "typings-global";
 /**
  * converts an erray of env strings from docker remote api to an usable object.
  * @param envArrayArg

dist/smartstring.docker.js

@@ -1,5 +1,4 @@
 "use strict";
-require("typings-global");
 /**
  * converts an erray of env strings from docker remote api to an usable object.
  * @param envArrayArg
@@ -15,5 +14,4 @@ exports.makeEnvObject = function (envArrayArg) {
     ;
     return returnObject;
 };
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3RyaW5nLmRvY2tlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFDUCxDQUFDLENBRHNCO0FBR3ZCOzs7O0dBSUc7QUFDUSxxQkFBYSxHQUFHLFVBQVMsV0FBb0I7SUFDcEQsSUFBSSxZQUFZLEdBQUcsRUFBRSxDQUFDO0lBQ3RCLElBQUksV0FBVyxHQUFHLFdBQVcsQ0FBQztJQUM5QixHQUFHLENBQUEsQ0FBQyxJQUFJLE1BQU0sSUFBSSxXQUFXLENBQUMsQ0FBQSxDQUFDO1FBQzNCLElBQUksWUFBWSxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDekQsWUFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBQUEsQ0FBQztJQUNGLE1BQU0sQ0FBQyxZQUFZLENBQUM7QUFDeEIsQ0FBQyxDQUFDIiwiZmlsZSI6InNtYXJ0c3RyaW5nLmRvY2tlci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCJcclxuaW1wb3J0IHBsdWdpbnMgPSByZXF1aXJlKFwiLi9zbWFydHN0cmluZy5wbHVnaW5zXCIpO1xyXG5cclxuLyoqXHJcbiAqIGNvbnZlcnRzIGFuIGVycmF5IG9mIGVudiBzdHJpbmdzIGZyb20gZG9ja2VyIHJlbW90ZSBhcGkgdG8gYW4gdXNhYmxlIG9iamVjdC5cclxuICogQHBhcmFtIGVudkFycmF5QXJnXHJcbiAqIEByZXR1cm5zIHt9XHJcbiAqL1xyXG5leHBvcnQgbGV0IG1ha2VFbnZPYmplY3QgPSBmdW5jdGlvbihlbnZBcnJheUFyZzpzdHJpbmdbXSl7XHJcbiAgICBsZXQgcmV0dXJuT2JqZWN0ID0ge307XHJcbiAgICBsZXQgcmVnZXhTdHJpbmcgPSAvKC4qKT0oLiopLztcclxuICAgIGZvcihsZXQgZW52S2V5IGluIGVudkFycmF5QXJnKXtcclxuICAgICAgICBsZXQgcmVnZXhNYXRjaGVzID0gcmVnZXhTdHJpbmcuZXhlYyhlbnZBcnJheUFyZ1tlbnZLZXldKTtcclxuICAgICAgICByZXR1cm5PYmplY3RbcmVnZXhNYXRjaGVzWzFdXSA9IHJlZ2V4TWF0Y2hlc1syXTtcclxuICAgIH07XHJcbiAgICByZXR1cm4gcmV0dXJuT2JqZWN0O1xyXG59OyJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzdHJpbmcuZG9ja2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzdHJpbmcuZG9ja2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFFQTs7OztHQUlHO0FBQ1EscUJBQWEsR0FBRyxVQUFTLFdBQW9CO0lBQ3BELElBQUksWUFBWSxHQUFHLEVBQUUsQ0FBQztJQUN0QixJQUFJLFdBQVcsR0FBRyxXQUFXLENBQUM7SUFDOUIsR0FBRyxDQUFBLENBQUMsSUFBSSxNQUFNLElBQUksV0FBVyxDQUFDLENBQUEsQ0FBQztRQUMzQixJQUFJLFlBQVksR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ3pELFlBQVksQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDcEQsQ0FBQztJQUFBLENBQUM7SUFDRixNQUFNLENBQUMsWUFBWSxDQUFDO0FBQ3hCLENBQUMsQ0FBQyJ9

dist/smartstring.domain.d.ts

@@ -1,4 +1,3 @@
-import "typings-global";
 export declare class Domain {
     fullName: string;
     level1: string;
@@ -7,6 +6,7 @@ export declare class Domain {
     level4: string;
     level5: string;
     protocol: string;
+    zoneName: string;
     topLevel: string;
     domainName: any;
     subDomain: any;

dist/smartstring.domain.js

@@ -1,14 +1,27 @@
 "use strict";
-require("typings-global");
 var Domain = (function () {
     function Domain(domainStringArg) {
-        this.fullName = domainStringArg;
         var regexMatches = domainRegex(domainStringArg);
-        this.level1 = regexMatches[0];
-        this.level2 = regexMatches[1];
-        this.level3 = regexMatches[2];
-        this.level4 = regexMatches[3];
-        this.level5 = regexMatches[4];
+        this.fullName = "";
+        for (var i = 1; i <= 5; i++) {
+            if (regexMatches[i - 1]) {
+                var localMatch = regexMatches[i - 1];
+                this["level" + i.toString()] = localMatch;
+                if (this.fullName == "") {
+                    this.fullName = localMatch;
+                }
+                else {
+                    this.fullName = localMatch + "." + this.fullName;
+                }
+            }
+            else {
+                this["level" + i.toString()] = undefined;
+            }
+            ;
+        }
+        ;
+        this.protocol = protocolRegex(domainStringArg);
+        this.zoneName = this.level2 + "." + this.level1;
         // aliases
         this.topLevel = this.level1;
         this.domainName = this.level2;
@@ -18,13 +31,23 @@ var Domain = (function () {
 }());
 exports.Domain = Domain;
 var domainRegex = function (stringArg) {
-    var regexString = /([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}$/;
+    var regexString = /([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}$/;
     var regexMatches = regexString.exec(stringArg);
-    regexMatches.reverse();
+    regexMatches.reverse(); //make sure we build the domain from toplevel to subdomain (reversed order)
+    regexMatches.pop(); // pop the last element, which is, since we reversed the Array, the full String of matched elements
     var regexMatchesFiltered = regexMatches.filter(function (stringArg) {
         return (stringArg != "");
     });
     return regexMatchesFiltered;
 };
+var protocolRegex = function (stringArg) {
+    var regexString = /^([a-zA-Z0-9]*):\/\//;
+    var regexMatches = regexString.exec(stringArg);
+    if (regexMatches) {
+        return regexMatches[1];
+    }
+    else {
+        return undefined;
+    }
+};
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3RyaW5nLmRvbWFpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFDUCxDQUFDLENBRHNCO0FBR3ZCO0lBWUksZ0JBQVksZUFBc0I7UUFDOUIsSUFBSSxDQUFDLFFBQVEsR0FBRyxlQUFlLENBQUM7UUFDaEMsSUFBSSxZQUFZLEdBQUcsV0FBVyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ2hELElBQUksQ0FBQyxNQUFNLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxNQUFNLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxNQUFNLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxNQUFNLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlCLElBQUksQ0FBQyxNQUFNLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlCLFVBQVU7UUFDVixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDNUIsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQzlCLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztJQUNqQyxDQUFDO0lBQ0wsYUFBQztBQUFELENBekJBLEFBeUJDLElBQUE7QUF6QlksY0FBTSxTQXlCbEIsQ0FBQTtBQUdELElBQUksV0FBVyxHQUFHLFVBQVMsU0FBZ0I7SUFDdkMsSUFBSSxXQUFXLEdBQUcsNEdBQTRHLENBQUM7SUFDL0gsSUFBSSxZQUFZLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUMvQyxZQUFZLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDdkIsSUFBSSxvQkFBb0IsR0FBRyxZQUFZLENBQUMsTUFBTSxDQUFDLFVBQVMsU0FBZ0I7UUFDcEUsTUFBTSxDQUFBLENBQUMsU0FBUyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQzVCLENBQUMsQ0FBQyxDQUFDO0lBQ0gsTUFBTSxDQUFDLG9CQUFvQixDQUFDO0FBQ2hDLENBQUMsQ0FBQyIsImZpbGUiOiJzbWFydHN0cmluZy5kb21haW4uanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiXHJcbmltcG9ydCBwbHVnaW5zID0gcmVxdWlyZShcIi4vc21hcnRzdHJpbmcucGx1Z2luc1wiKTtcclxuXHJcbmV4cG9ydCBjbGFzcyBEb21haW4ge1xyXG4gICAgZnVsbE5hbWU6c3RyaW5nO1xyXG4gICAgbGV2ZWwxOnN0cmluZztcclxuICAgIGxldmVsMjpzdHJpbmc7XHJcbiAgICBsZXZlbDM6c3RyaW5nO1xyXG4gICAgbGV2ZWw0OnN0cmluZztcclxuICAgIGxldmVsNTpzdHJpbmc7XHJcbiAgICBwcm90b2NvbDpzdHJpbmc7XHJcbiAgICAvL2FsaWFzZXNcclxuICAgIHRvcExldmVsOnN0cmluZztcclxuICAgIGRvbWFpbk5hbWU7XHJcbiAgICBzdWJEb21haW47XHJcbiAgICBjb25zdHJ1Y3Rvcihkb21haW5TdHJpbmdBcmc6c3RyaW5nKXtcclxuICAgICAgICB0aGlzLmZ1bGxOYW1lID0gZG9tYWluU3RyaW5nQXJnO1xyXG4gICAgICAgIGxldCByZWdleE1hdGNoZXMgPSBkb21haW5SZWdleChkb21haW5TdHJpbmdBcmcpO1xyXG4gICAgICAgIHRoaXMubGV2ZWwxID0gcmVnZXhNYXRjaGVzWzBdO1xyXG4gICAgICAgIHRoaXMubGV2ZWwyID0gcmVnZXhNYXRjaGVzWzFdO1xyXG4gICAgICAgIHRoaXMubGV2ZWwzID0gcmVnZXhNYXRjaGVzWzJdO1xyXG4gICAgICAgIHRoaXMubGV2ZWw0ID0gcmVnZXhNYXRjaGVzWzNdO1xyXG4gICAgICAgIHRoaXMubGV2ZWw1ID0gcmVnZXhNYXRjaGVzWzRdO1xyXG4gICAgICAgIC8vIGFsaWFzZXNcclxuICAgICAgICB0aGlzLnRvcExldmVsID0gdGhpcy5sZXZlbDE7XHJcbiAgICAgICAgdGhpcy5kb21haW5OYW1lID0gdGhpcy5sZXZlbDI7XHJcbiAgICAgICAgdGhpcy5zdWJEb21haW4gPSB0aGlzLmxldmVsMztcclxuICAgIH1cclxufVxyXG5cclxuXHJcbmxldCBkb21haW5SZWdleCA9IGZ1bmN0aW9uKHN0cmluZ0FyZzpzdHJpbmcpe1xyXG4gICAgbGV0IHJlZ2V4U3RyaW5nID0gLyhbYS16QS1aMC05XSopXFwuezAsMX0oW2EtekEtWjAtOV0qKVxcLnswLDF9KFthLXpBLVowLTldKilcXC57MCwxfShbYS16QS1aMC05XSopXFwuezAsMX0oW2EtekEtWjAtOV0qKVxcLnswLDF9JC87XHJcbiAgICBsZXQgcmVnZXhNYXRjaGVzID0gcmVnZXhTdHJpbmcuZXhlYyhzdHJpbmdBcmcpO1xyXG4gICAgcmVnZXhNYXRjaGVzLnJldmVyc2UoKTtcclxuICAgIGxldCByZWdleE1hdGNoZXNGaWx0ZXJlZCA9IHJlZ2V4TWF0Y2hlcy5maWx0ZXIoZnVuY3Rpb24oc3RyaW5nQXJnOnN0cmluZyl7XHJcbiAgICAgICAgcmV0dXJuKHN0cmluZ0FyZyAhPSBcIlwiKTtcclxuICAgIH0pO1xyXG4gICAgcmV0dXJuIHJlZ2V4TWF0Y2hlc0ZpbHRlcmVkO1xyXG59OyJdfQ==

dist/smartstring.git.d.ts

@@ -1,4 +1,3 @@
-import "typings-global";
 export declare class GitRepo {
     host: string;
     user: string;

dist/smartstring.indent.d.ts

@@ -0,0 +1,3 @@
+export declare let indent: (stringArg: string, spaceAmount: number) => string;
+export declare let indentWithPrefix: (stringArg: string, prefixArg: string) => string;
+export declare let deIndent: (stringArg: string) => string;

dist/smartstring.indent.js

@@ -0,0 +1,24 @@
+"use strict";
+var splitString = function (stringArg) {
+    var stringArray = [];
+    return stringArray;
+};
+var joinString = function (stringArrayArg) {
+    var localString = "";
+    for (var _i = 0, stringArrayArg_1 = stringArrayArg; _i < stringArrayArg_1.length; _i++) {
+        var line = stringArrayArg_1[_i];
+        localString = localString + line + "\n";
+    }
+    ;
+    return localString;
+};
+exports.indent = function (stringArg, spaceAmount) {
+    return;
+};
+exports.indentWithPrefix = function (stringArg, prefixArg) {
+    return;
+};
+exports.deIndent = function (stringArg) {
+    return;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzdHJpbmcuaW5kZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzdHJpbmcuaW5kZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFFQSxJQUFJLFdBQVcsR0FBRyxVQUFDLFNBQWdCO0lBQy9CLElBQUksV0FBVyxHQUFZLEVBQUUsQ0FBQztJQUU5QixNQUFNLENBQUMsV0FBVyxDQUFDO0FBRXZCLENBQUMsQ0FBQztBQUVGLElBQUksVUFBVSxHQUFHLFVBQUMsY0FBdUI7SUFDckMsSUFBSSxXQUFXLEdBQVUsRUFBRSxDQUFDO0lBQzVCLEdBQUcsQ0FBQSxDQUFhLFVBQWMsRUFBZCxpQ0FBYyxFQUFkLDRCQUFjLEVBQWQsSUFBYyxDQUFDO1FBQTNCLElBQUksSUFBSSx1QkFBQTtRQUNSLFdBQVcsR0FBRyxXQUFXLEdBQUcsSUFBSSxHQUFHLElBQUksQ0FBQztLQUMzQztJQUFBLENBQUM7SUFDRixNQUFNLENBQUMsV0FBVyxDQUFDO0FBQ3ZCLENBQUMsQ0FBQTtBQUVVLGNBQU0sR0FBRyxVQUFDLFNBQWdCLEVBQUMsV0FBa0I7SUFFcEQsTUFBTSxDQUFDO0FBQ1gsQ0FBQyxDQUFDO0FBRVMsd0JBQWdCLEdBQUcsVUFBQyxTQUFnQixFQUFDLFNBQWdCO0lBQzVELE1BQU0sQ0FBQztBQUNYLENBQUMsQ0FBQztBQUVTLGdCQUFRLEdBQUcsVUFBQyxTQUFnQjtJQUNuQyxNQUFNLENBQUE7QUFDVixDQUFDLENBQUEifQ==

dist/smartstring.plugins.js

@@ -1,5 +1,4 @@
 "use strict";
 require("typings-global");
 exports.beautylog = require("beautylog");
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3RyaW5nLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBRVAsQ0FBQyxDQUZzQjtBQUVULGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUMiLCJmaWxlIjoic21hcnRzdHJpbmcucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCJcclxuXHJcbmV4cG9ydCBpbXBvcnQgYmVhdXR5bG9nID0gcmVxdWlyZShcImJlYXV0eWxvZ1wiKTsiXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzdHJpbmcucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c3RyaW5nLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQ1AsQ0FBQyxDQURzQjtBQUNULGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUMifQ==

dist/smartstring.typescript.d.ts

@@ -1,2 +1 @@
-import "typings-global";
 export declare let regexReferencePath: RegExp;

dist/smartstring.typescript.js

@@ -1,5 +1,3 @@
 "use strict";
-require("typings-global");
 exports.regexReferencePath = /\/\/\/\s*<reference\s+path\s*=\s*["|'].*["|']\s*\/>\s*[\\n]?/;
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3RyaW5nLnR5cGVzY3JpcHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQ1AsQ0FBQyxDQURzQjtBQUdaLDBCQUFrQixHQUFHLDhEQUE4RCxDQUFBIiwiZmlsZSI6InNtYXJ0c3RyaW5nLnR5cGVzY3JpcHQuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiXHJcbmltcG9ydCBwbHVnaW5zID0gcmVxdWlyZShcIi4vc21hcnRzdHJpbmcucGx1Z2luc1wiKTtcclxuXHJcbmV4cG9ydCBsZXQgcmVnZXhSZWZlcmVuY2VQYXRoID0gL1xcL1xcL1xcL1xccyo8cmVmZXJlbmNlXFxzK3BhdGhcXHMqPVxccypbXCJ8J10uKltcInwnXVxccypcXC8+XFxzKltcXFxcbl0/LyJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzdHJpbmcudHlwZXNjcmlwdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c3RyaW5nLnR5cGVzY3JpcHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUVXLDBCQUFrQixHQUFHLDhEQUE4RCxDQUFBIn0=

package.json

@@ -1,7 +1,7 @@
 {
   "name": "smartstring",
-  "version": "2.0.0",
-  "description": "bundles a bunch of (regex) matching and altering methods.",
+  "version": "2.0.11",
+  "description": "handle strings in smart ways. TypeScript ready.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/pushrocks/smartstring.git"
+    "url": "git+https://gitlab.com/pushrocks/smartstring.git"
   },
   "keywords": [
     "regex",
@@ -18,16 +18,16 @@
   "author": "Lossless GmbH",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/pushrocks/smartstring/issues"
+    "url": "https://gitlab.com/pushrocks/smartstring/issues"
   },
-  "homepage": "https://github.com/pushrocks/smartstring#readme",
+  "homepage": "https://gitlab.com/pushrocks/smartstring#readme",
   "devDependencies": {
-    "npmts": "^5.1.13",
-    "should": "^8.4.0",
+    "npmts-g": "^5.2.6",
+    "should": "^9.0.2",
     "typings-test": "^1.0.1"
   },
   "dependencies": {
-    "beautylog": "^5.0.6",
-    "typings-global": "^1.0.3"
+    "beautylog": "^5.0.13",
+    "typings-global": "^1.0.6"
   }
 }

test/test.ts

@@ -5,9 +5,11 @@ let should = require("should");
 describe("smartstring",function(){
     describe(".Domain class",function(){
         let testDomain:smartstring.Domain;
+        let testDomain2:smartstring.Domain;
         it("should create a new Domain object",function(){
-            testDomain = new smartstring.Domain("level3D.level2D.level1D");
+            testDomain = new smartstring.Domain("https://level3D.level2D.level1D");
             testDomain.should.be.instanceof(smartstring.Domain);
+            console.log(testDomain);
         });
         it("should have a .topLevel",function(){
             testDomain.topLevel.should.equal("level1D");
@@ -18,6 +20,16 @@ describe("smartstring",function(){
         it("should have a .level3",function(){
             testDomain.level3.should.equal("level3D");
         });
+        it("should have the correct dns zone name",function(){
+            testDomain.zoneName.should.equal("level2D.level1D");
+        })
+        it ("should have the correct protocol",function(){
+            testDomain.protocol.should.equal("https");
+        })
+        it("testDomain2 should be a basic domain",function(){
+            testDomain2 = new smartstring.Domain("bleu.de");
+            console.log(testDomain2);
+        });
     })
     describe(".Git class",function(){
         let testGit:smartstring.GitRepo;
@@ -50,7 +62,7 @@ describe("smartstring",function(){
         describe(".makeEnvObject",function(){
             it("should create a Env Object",function(){
                 let envStringArray = ["VIRTUAL_HOST=sub.domain.tld","DEFAULT_HOST=some.domain.com"];
-                let envObject = smartstring.docker.makeEnvObject(envStringArray);
+                let envObject:any = smartstring.docker.makeEnvObject(envStringArray);
                 envObject.VIRTUAL_HOST.should.equal("sub.domain.tld");
                 envObject.DEFAULT_HOST.should.equal("some.domain.com");
             })

ts/index.ts

@@ -1,8 +1,10 @@
-import "typings-global"
-import SmartstringDocker = require("./smartstring.docker");
-import SmartstringTypescript = require("./smartstring.typescript");
+import * as plugins from "./smartstring.plugins";
+import * as SmartstringDocker from "./smartstring.docker";
+import * as SmartstringTypescript from "./smartstring.typescript";
+import * as SmartstringIndent from "./smartstring.indent";
 
 export {Domain} from "./smartstring.domain";
 export {GitRepo} from "./smartstring.git";
 export let docker = SmartstringDocker;
-export let typescript = SmartstringTypescript;
+export let typescript = SmartstringTypescript;
+export let indent = SmartstringIndent;

ts/smartstring.docker.ts

@@ -1,5 +1,4 @@
-import "typings-global"
-import plugins = require("./smartstring.plugins");
+import * as plugins from "./smartstring.plugins";
 
 /**
  * converts an erray of env strings from docker remote api to an usable object.

ts/smartstring.domain.ts

@@ -1,5 +1,4 @@
-import "typings-global"
-import plugins = require("./smartstring.plugins");
+import * as plugins from "./smartstring.plugins";
 
 export class Domain {
     fullName:string;
@@ -9,18 +8,30 @@ export class Domain {
     level4:string;
     level5:string;
     protocol:string;
+    zoneName:string;
     //aliases
     topLevel:string;
     domainName;
     subDomain;
     constructor(domainStringArg:string){
-        this.fullName = domainStringArg;
         let regexMatches = domainRegex(domainStringArg);
-        this.level1 = regexMatches[0];
-        this.level2 = regexMatches[1];
-        this.level3 = regexMatches[2];
-        this.level4 = regexMatches[3];
-        this.level5 = regexMatches[4];
+        this.fullName = "";
+        for(let i = 1; i <= 5; i++){
+            if(regexMatches[i - 1]) {
+                let localMatch = regexMatches[i - 1]
+                this["level" + i.toString()] = localMatch;
+                if (this.fullName == ""){
+                    this.fullName = localMatch;
+                } else {
+                    this.fullName = localMatch + "." + this.fullName;
+                }
+            } else {
+                this["level" + i.toString()] = undefined;
+            };
+        };
+        this.protocol = protocolRegex(domainStringArg);
+        this.zoneName = this.level2 + "." + this.level1; 
+        
         // aliases
         this.topLevel = this.level1;
         this.domainName = this.level2;
@@ -30,11 +41,22 @@ export class Domain {
 
 
 let domainRegex = function(stringArg:string){
-    let regexString = /([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}([a-zA-Z0-9]*)\.{0,1}$/;
+    let regexString = /([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}([a-zA-Z0-9\-\_]*)\.{0,1}$/;
     let regexMatches = regexString.exec(stringArg);
-    regexMatches.reverse();
+    regexMatches.reverse(); //make sure we build the domain from toplevel to subdomain (reversed order)
+    regexMatches.pop(); // pop the last element, which is, since we reversed the Array, the full String of matched elements
     let regexMatchesFiltered = regexMatches.filter(function(stringArg:string){
         return(stringArg != "");
     });
     return regexMatchesFiltered;
-};
+};
+
+let protocolRegex = function(stringArg:string){
+    let regexString = /^([a-zA-Z0-9]*):\/\//;
+    let regexMatches = regexString.exec(stringArg);
+    if(regexMatches){
+        return regexMatches[1];
+    } else {
+        return undefined;
+    }
+}

ts/smartstring.git.ts

@@ -1,5 +1,4 @@
-import "typings-global"
-import plugins = require("./smartstring.plugins");
+import * as plugins from "./smartstring.plugins";
 
 /* ---------------------------------------------- *
  * ------------------ classes ------------------- *
@@ -26,7 +25,7 @@ export class GitRepo {
  * ------------------ helpers ------------------- *
  * ---------------------------------------------- */
 let gitRegex = function(stringArg:string){
-    let regexString = /(?:git\+|git\@|https\:\/\/|)(?:https\:\/\/|)([^\/|\:]*)(?:\/|:)([^\/]+)*(?:\/|:)([^\.]+)/;
+    let regexString = /([a-zA-Z0-9\-\.]*)(?:\/|\:)([a-zA-Z0-9\-]*)(?:\/)([a-zA-Z0-9\-]*)(?:\.git)/;
     let regexMatches = regexString.exec(stringArg);
     return regexMatches;
 };

ts/smartstring.indent.ts

@@ -0,0 +1,29 @@
+import * as plugins from "./smartstring.plugins";
+
+let splitString = (stringArg:string):string[] => {
+    let stringArray:string[] = [];
+
+    return stringArray;
+
+};
+
+let joinString = (stringArrayArg:string[]):string => {
+    let localString:string = "";
+    for(let line of stringArrayArg){
+        localString = localString + line + "\n";
+    };
+    return localString;
+}
+
+export let indent = (stringArg:string,spaceAmount:number):string => {
+
+    return;
+};
+
+export let indentWithPrefix = (stringArg:string,prefixArg:string):string => {
+    return;
+};
+
+export let deIndent = (stringArg:string):string => {
+    return
+}

ts/smartstring.plugins.ts

@@ -1,3 +1,2 @@
 import "typings-global"
-
-export import beautylog = require("beautylog");
+export import beautylog = require("beautylog");

ts/smartstring.typescript.ts

@@ -1,4 +1,3 @@
-import "typings-global"
-import plugins = require("./smartstring.plugins");
+import * as plugins from "./smartstring.plugins";
 
 export let regexReferencePath = /\/\/\/\s*<reference\s+path\s*=\s*["|'].*["|']\s*\/>\s*[\\n]?/

ts/typings.json

@@ -1,7 +0,0 @@
-{
-  "ambientDependencies": {
-    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts",
-    "mocha": "github:Bartvds/tsd-deftools/typings/DefinitelyTyped/mocha/mocha.d.ts",
-    "colors": "github:DefinitelyTyped/DefinitelyTyped/colors/colors.d.ts"
-  }
-}