Update Tests and fix merge conflicts

Author: ingalls

README.md

@@ -63,6 +63,12 @@ Show repository information
 repo.show(function(err, repo) {});
 ```
 
+Delete a repository
+
+```js
+repo.deleteRepo(function(err, res) {});
+```
+
 Get contents at a particular path in a particular branch. Set sync to true to get contents via sync method.
 
 ```js
@@ -78,7 +84,7 @@ repo.fork(function(err) {});
 Create new branch for repo. You can omit oldBranchName to default to "master".
 
 ```js
-repo.branch(oldBranchName, newBranchName, function(err) {}); 
+repo.branch(oldBranchName, newBranchName, function(err) {});
 ```
 
 Create Pull Request.
@@ -208,6 +214,15 @@ List public repositories for a particular user.
 user.userRepos(username, function(err, repos) {});
 ```
 
+Create a new repo for the authenticated user
+
+```js
+user.createRepo({"name": "test"}, function(err, res) {});
+```
+Repo description, homepage, private/public can also be set.
+For a full list of options see the docs [here](https://developer.github.com/v3/repos/#create)
+
+
 List repositories for a particular organization. Includes private repositories if you are authorized.
 
 ```js
@@ -234,7 +249,7 @@ gist.read(function(err, gist) {
 });
 ```
 
-Updating the contents of a Gist. Please consult the documentation on [GitHub](http://developer.github.com/v3/gists/). 
+Updating the contents of a Gist. Please consult the documentation on [GitHub](http://developer.github.com/v3/gists/).
 
 ```js
 var delta = {
@@ -255,7 +270,7 @@ var delta = {
 };
 
 gist.update(delta, function(err, gist) {
-  
+
 });
 ```
 ## Issues API
@@ -264,7 +279,7 @@ gist.update(delta, function(err, gist) {
 var issues = github.getIssues(username, reponame);
 ```
 
-To read all the issues of a given repository 
+To read all the issues of a given repository
 
 ```js
 issues.list(options, function(err, issues) {});
@@ -313,7 +328,7 @@ Adds support for organizations and fixes an encoding issue.
 
 ### 0.5.X
 
-Smart caching of latest commit sha. 
+Smart caching of latest commit sha.
 
 ### 0.4.X
 

github.js

@@ -95,29 +95,11 @@
             path = next;
             iterate();
           }
-<<<<<<< HEAD
         });
       })();
-=======
-        }
-      };
-      xhr.setRequestHeader('Accept','application/json');
-      xhr.setRequestHeader('Content-Type','application/json');
-      if (
-         (options.auth == 'oauth' && options.token) ||
-         (options.auth == 'basic' && options.username && options.password)
-         ) {
-           xhr.setRequestHeader('Authorization',options.auth == 'oauth'
-             ? 'token '+ options.token
-             : 'Basic ' + Base64.encode(options.username + ':' + options.password)
-           );
-         }
-      data ? xhr.send(JSON.stringify(data)) : xhr.send();
->>>>>>> c75337c4b3621f8509ebcddd27bdc4a85b51170a
     }
 
 
-
     // User API
     // =======
 
@@ -220,13 +202,8 @@
         _request("POST", "/user/repos", options, cb);
       };
 
-
-
-
-
     };
 
-
     // Repository API
     // =======
 
@@ -369,21 +346,10 @@
       // -------
 
       this.getSha = function(branch, path, cb) {
-<<<<<<< HEAD
-        // Just use head if path is empty
-        if (path === "") return that.getRef("heads/"+branch, cb);
-        that.getTree(branch+"?recursive=true", function(err, tree) {
-          if (err) return cb(err);
-          var file = _.select(tree, function(file) {
-            return file.path === path;
-          })[0];
-          cb(null, file ? file.sha : null);
-=======
         if (!path || path === "") return that.getRef("heads/"+branch, cb);
         _request("GET", repoPath + "/contents/"+path, {ref: branch}, function(err, pathContent) {
           if (err) return cb(err);
           cb(null, pathContent.sha);
->>>>>>> c75337c4b3621f8509ebcddd27bdc4a85b51170a
         });
       };
 
@@ -497,13 +463,8 @@
       // Get contents
       // --------
 
-<<<<<<< HEAD
-      this.contents = function(branch, path, cb, sync) {
-        return _request("GET", repoPath + "/contents?ref=" + branch + (path ? "&path=" + path : ""), null, cb, 'raw', sync);
-=======
       this.contents = function(ref, path, cb) {
         _request("GET", repoPath + "/contents/"+path, { ref: ref }, cb);
->>>>>>> c75337c4b3621f8509ebcddd27bdc4a85b51170a
       };
 
       // Fork repository
@@ -581,8 +542,8 @@
           if (err && err.error === 404) return cb("not found", null, null);
 
           if (err) return cb(err);
-          var sha = obj.sha
-            , content = Base64.decode(obj.content);
+          var sha = obj.sha,
+              content = atob(obj.content);
 
           cb(null, content, sha);
         });
@@ -651,14 +612,13 @@
           if (err && err.error!=404) return cb(err);
           _request("PUT", repoPath + "/contents/" + path, {
             message: message,
-            content: Base64.encode(content),
+            content: btoa(content),
             branch: branch,
             sha: sha
           }, cb);
         });
       };
 
-<<<<<<< HEAD
       // List commits on a repository. Takes an object of optional paramaters:
       // sha: SHA or branch to start listing commits from
       // path: Only commits containing this file path will be returned
@@ -695,8 +655,6 @@
           }
           _request("GET", url, null, cb);
       };
-=======
->>>>>>> c75337c4b3621f8509ebcddd27bdc4a85b51170a
     };
 
     // Gists API

test/test.repo.js

@@ -47,7 +47,44 @@ test("Repo API", function(t) {
 
 });
 
-test('Repo Returns commit errors correctly', function(t){
+var repoTest = Date.now();
+
+test('Create Repo', function(t) {
+    var timeout = setTimeout(function () { t.fail(); }, 10000);
+    var github = new Github({
+        username: test_user.USERNAME,
+        password: test_user.PASSWORD,
+        auth: "basic"
+    });
+    var user = github.getUser();
+
+    user.createRepo({ "name": repoTest }, function (err, res) {
+        t.error(err);
+        t.equals(res.name, repoTest.toString(), 'Repo created');
+        clearTimeout(timeout);
+        t.end();
+    });
+
+});
+
+test('delete Repo', function(t) {
+    var timeout = setTimeout(function () { t.fail(); }, 10000);
+    var github = new Github({
+        username: test_user.USERNAME,
+        password: test_user.PASSWORD,
+        auth: "basic"
+    });
+    var repo = github.getRepo(test_user.USERNAME, repoTest);
+    repo.deleteRepo(function(err, res) {
+        t.error(err);
+        t.equals(res, true, 'Repo Deleted');
+        clearTimeout(timeout);
+        t.end();
+    });
+    
+});
+
+test('Repo Returns commit errors correctly', function(t) {
     var timeout = setTimeout(function () { t.fail(); }, 10000);
     var github = new Github({
       username: test_user.USERNAME,