rename Refs to Reference

maxkorp · maxkorp · commit 04d2e01e9546 · 2014-11-20T19:21:03.000-07:00
diff --git a/example/add-and-commit.js b/example/add-and-commit.js
@@ -39,7 +39,7 @@ nodegit.Repository.open(path.resolve(__dirname, '../.git'))
 })
 .then(function(oidResult) {
   oid = oidResult;
-  return nodegit.Refs.nameToId(repo, 'HEAD');
+  return nodegit.Reference.nameToId(repo, 'HEAD');
 })
 .then(function(head) {
   return repo.getCommit(head);
diff --git a/example/general.js b/example/general.js
@@ -294,7 +294,7 @@ nodegit.Repository.open(path.resolve(__dirname, '../.git'))
   // references such as branches, tags and remote references (everything in
   // the .git/refs directory).
 
-  return repo.getReferenceNames(nodegit.Refs.Type.All);
+  return repo.getReferenceNames(nodegit.Reference.Type.All);
 }).then(function(referenceNames) {
   var promises = [];
 
diff --git a/example/remove-and-commit.js b/example/remove-and-commit.js
@@ -27,7 +27,7 @@ nodegit.Repository.open(path.resolve(__dirname, '../.git')).then(function(repo)
   return _index.writeTree();
 }).then(function(oid) {
   _oid = oid;
-  return nodegit.Refs.nameToId(_repository, "HEAD");
+  return nodegit.Reference.nameToId(_repository, "HEAD");
 }).then(function(head) {
   return _repository.getCommit(head);
 }).then(function(parent) {
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -71,7 +71,7 @@
       }
     },
     "ref": {
-      "owner": "Refs",
+      "owner": "Reference",
       "JsName": "TYPE"
     },
     "sort": {
@@ -1002,7 +1002,6 @@
     },
     "reference": {
       "cppClassName": "GitRefs",
-      "jsClassName": "Refs",
       "functions": {
         "git_reference__alloc": {
           "ignore": true
diff --git a/lib/nodegit.js b/lib/nodegit.js
@@ -55,12 +55,13 @@ require("./odb");
 require("./odb_object");
 require("./oid");
 require("./patch");
-require("./refs");
+require("./reference");
 require("./remote");
 require("./revwalk");
 require("./repository");
 require("./revwalk");
 require("./signature");
+require("./status");
 require("./tree");
 require("./tree_entry");
 
diff --git a/lib/reference.js b/lib/reference.js
@@ -1,6 +1,6 @@
 var NodeGit = require("../");
 
-var Reference = NodeGit.Refs;
+var Reference = NodeGit.Reference;
 var Branch = NodeGit.Branch;
 
 /**
diff --git a/lib/repository.js b/lib/repository.js
@@ -3,7 +3,7 @@ var normalizeOid = require("./util/normalize_oid");
 var Blob = require("./blob");
 var Tree = require("./tree");
 var Tag = require("./tag");
-var Reference = require("./refs");
+var Reference = require("./reference");
 var Revwalk = require("./revwalk");
 var Commit = require("./commit");
 var Remote = require("./remote");
diff --git a/test/tests/attr.js b/test/tests/attr.js
@@ -26,7 +26,7 @@ describe("Attr", function() {
     Attr.cacheFlush(this.repository);
   });
 
-  it.only("can lookup the value of a git attribute", function() {
+  it("can lookup the value of a git attribute", function() {
     var flags = Status.SHOW.INDEX_AND_WORKDIR;
     return Attr.get(this.repository, flags, ".gitattributes", "test");
   });
diff --git a/test/tests/commit.js b/test/tests/commit.js
@@ -82,7 +82,7 @@ describe("Commit", function() {
     })
     .then(function(oidResult) {
       treeOid = oidResult;
-      return NodeGit.Refs.nameToId(repo, "HEAD");
+      return NodeGit.Reference.nameToId(repo, "HEAD");
     })
     .then(function(head) {
       return repo.getCommit(head);
diff --git a/test/tests/refs.js b/test/tests/refs.js
@@ -7,11 +7,11 @@ var exec = promisify(function(command, opts, callback) {
   return require("child_process").exec(command, opts, callback);
 });
 
-describe("Refs", function() {
+describe("Reference", function() {
   var reposPath = path.resolve("test/repos/workdir/.git");
 
   var Repository = require("../../lib/repository");
-  var Refs = require("../../lib/refs");
+  var Reference = require("../../lib/reference");
 
   before(function() {
     var test = this;
@@ -25,27 +25,27 @@ describe("Refs", function() {
 
       return repository.getReference("refs/heads/master");
     })
-    .then(function(refs) {
-      test.refs = refs;
+    .then(function(reference) {
+      test.reference = reference;
     });
   });
 
   it("can look up a reference", function() {
-    assert.ok(this.refs instanceof Refs);
+    assert.ok(this.reference instanceof Reference);
   });
 
   it("can determine if the reference is symbolic", function() {
-    assert.equal(this.refs.isSymbolic(), false);
+    assert.equal(this.reference.isSymbolic(), false);
   });
 
   it("will return undefined looking up the symbolic target if not symbolic",
     function() {
-      var refs = this.refs;
-      assert(refs.symbolicTarget() === undefined);
+      var reference = this.reference;
+      assert(reference.symbolicTarget() === undefined);
     });
 
   it("can look up the HEAD sha", function() {
-    return Refs.nameToId(this.repository, "HEAD").then(function(oid) {
+    return Reference.nameToId(this.repository, "HEAD").then(function(oid) {
       var sha = oid.allocfmt();
       assert.equal(sha, "32789a79e71fbc9e04d3eff7425e1771eb595150");
     });
