diff --git a/README.md b/README.md index 4b87747..e24c817 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,12 @@ This limits options but reduces errors (TypeScript) and speeds up usage. Features: -* easily clone a git repo -* easily create a new git repo -* easily add all changes and make a new commit \ No newline at end of file +* clone a git repo +* init a new repo +* create a new git repo +* add changes and make a new commit +* commit changes +* push changes +* add/remove remotes + +Tip: use smartssh to setup your SSH environment \ No newline at end of file diff --git a/dist/smartgit.pull.js b/dist/smartgit.pull.js index 89f8c08..3bff87a 100644 --- a/dist/smartgit.pull.js +++ b/dist/smartgit.pull.js @@ -11,8 +11,9 @@ exports.pull = function (dirPathArg, sourceArg, branchArg) { return done.promse; } ; + // if everything is allright proceed plugins.shelljs.exec("(cd " + dirPathArg + " && git pull " + sourceArg + " " + branchArg + ")"); done.resolve(dirPathArg); return done.promise; }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRnaXQucHVsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0Z2l0LnB1bGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQVksT0FBTyxXQUFNLG9CQUFvQixDQUFDLENBQUE7QUFDOUMsSUFBWSxPQUFPLFdBQU0sb0JBQW9CLENBQUMsQ0FBQTtBQUVuQyxZQUFJLEdBQUcsVUFBQyxVQUFpQixFQUFDLFNBQXFCLEVBQUUsU0FBcUI7SUFBNUMseUJBQXFCLEdBQXJCLGNBQXFCO0lBQUUseUJBQXFCLEdBQXJCLGNBQXFCO0lBQzdFLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsRUFBRSxDQUFBLENBQUMsQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUEsQ0FBQztRQUNwQyxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyw2Q0FBNkMsQ0FBQyxDQUFDO1FBQ3ZFLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDO0lBQ3ZCLENBQUM7SUFBQSxDQUFDO0lBQ0YsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsU0FBTyxVQUFVLHFCQUFnQixTQUFTLFNBQUksU0FBUyxNQUFHLENBQUMsQ0FBQztJQUNqRixJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQ3pCLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRnaXQucHVsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0Z2l0LnB1bGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQVksT0FBTyxXQUFNLG9CQUFvQixDQUFDLENBQUE7QUFDOUMsSUFBWSxPQUFPLFdBQU0sb0JBQW9CLENBQUMsQ0FBQTtBQUVuQyxZQUFJLEdBQUcsVUFBQyxVQUFpQixFQUFDLFNBQXFCLEVBQUUsU0FBcUI7SUFBNUMseUJBQXFCLEdBQXJCLGNBQXFCO0lBQUUseUJBQXFCLEdBQXJCLGNBQXFCO0lBQzdFLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsRUFBRSxDQUFBLENBQUMsQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUEsQ0FBQztRQUNwQyxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyw2Q0FBNkMsQ0FBQyxDQUFDO1FBQ3ZFLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDO0lBQ3ZCLENBQUM7SUFBQSxDQUFDO0lBQ0Ysb0NBQW9DO0lBQ3BDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQU8sVUFBVSxxQkFBZ0IsU0FBUyxTQUFJLFNBQVMsTUFBRyxDQUFDLENBQUM7SUFDakYsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUN6QixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN4QixDQUFDLENBQUMifQ== \ No newline at end of file diff --git a/package.json b/package.json index 8dd6728..952e2b8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "smartgit", "version": "0.1.5", - "description": "an easy wrapper for nodegit", + "description": "an easy wrapper for git", "main": "dist/index.js", "typings": "dist/index.d.ts", "scripts": { @@ -11,7 +11,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/pushrocks/smartgit.git" + "url": "https://gitlab.com/pushrocks/smartgit.git" }, "keywords": [ "json", @@ -21,9 +21,9 @@ "author": "Smart Coordination GmbH (https://push.rocks)", "license": "MIT", "bugs": { - "url": "https://github.com/pushrocks/smartgit/issues" + "url": "https://gitlab.com/pushrocks/smartgit/issues" }, - "homepage": "https://github.com/pushrocks/smartgit", + "homepage": "https://gitlab.com/pushrocks/smartgit", "dependencies": { "@types/minimatch": "*", "beautylog": "^5.0.13", diff --git a/test/test.js b/test/test.js index 4a5db6a..dcbc1af 100644 --- a/test/test.js +++ b/test/test.js @@ -58,7 +58,7 @@ describe("smartgit", function () { }); }); describe("pull", function () { - this.timeout(10000); + this.timeout(20000); it("should error for noGit", function () { smartgit.pull(paths.noGit); }); diff --git a/test/test.ts b/test/test.ts index d492e16..ab3a664 100644 --- a/test/test.ts +++ b/test/test.ts @@ -60,7 +60,7 @@ describe("smartgit",function(){ }) }); describe("pull",function(){ - this.timeout(10000); + this.timeout(20000); it("should error for noGit",function(){ smartgit.pull(paths.noGit); }); diff --git a/ts/smartgit.pull.ts b/ts/smartgit.pull.ts index 6253ede..e7d759e 100644 --- a/ts/smartgit.pull.ts +++ b/ts/smartgit.pull.ts @@ -8,6 +8,7 @@ export let pull = (dirPathArg:string,sourceArg:string = "", branchArg:string = " done.reject(); return done.promse; }; + // if everything is allright proceed plugins.shelljs.exec(`(cd ${dirPathArg} && git pull ${sourceArg} ${branchArg})`); done.resolve(dirPathArg); return done.promise;