Ensure all options are normalized for proxy options

implausible · implausible · commit 7f040862c752 · 2017-01-25T16:06:23.000-07:00
diff --git a/lib/remote.js b/lib/remote.js
@@ -9,6 +9,7 @@ var _connect = Remote.prototype.connect;
 var _download = Remote.prototype.download;
 var _fetch = Remote.prototype.fetch;
 var _push = Remote.prototype.push;
+var _upload = Remote.prototype.upload;
 
 /**
  * Retrieves the remote by name
@@ -54,24 +55,61 @@ Remote.prototype.connect = function(
  * @return {Number} error code
  */
 Remote.prototype.download = function(refspecs, opts) {
+  return _download
+    .call(this, refspecs, normalizeFetchOptions(opts));
+};
+
+/**
+ * Connects to a remote
+ *
+ * @async
+ * @param {Array} refSpecs The ref specs that should be pushed
+ * @param {FetchOptions} opts The fetch options for download, contains callbacks
+ * @param {String} message The message to use for the update reflog messages
+ * @param {Function} callback
+ * @return {Number} error code
+ */
+Remote.prototype.fetch = function(refspecs, opts, reflog_message) {
+  return _fetch
+    .call(this, refspecs, normalizeFetchOptions(opts), reflog_message);
+};
+
+/**
+ * Pushes to a remote
+ *
+ * @async
+ * @param {Array} refSpecs The ref specs that should be pushed
+ * @param {PushOptions} options Options for the checkout
+ * @param {Function} callback
+ * @return {Number} error code
+ */
+Remote.prototype.push = function(refSpecs, opts) {
   var callbacks;
+  var proxyOpts;
 
   if (opts) {
     opts = shallowClone(opts);
     callbacks = opts.callbacks;
+    proxyOpts = opts.proxyOpts;
     delete opts.callbacks;
+    delete opts.proxyOpts;
   } else {
     opts = {};
   }
 
-  opts = normalizeOptions(opts, NodeGit.FetchOptions);
+  opts = normalizeOptions(opts, NodeGit.PushOptions);
 
   if (callbacks) {
     opts.callbacks =
       normalizeOptions(callbacks, NodeGit.RemoteCallbacks);
   }
 
-  return _download.call(this, refspecs, opts);
+  if (proxyOpts) {
+    opts.proxyOpts =
+      normalizeOptions(proxyOpts, NodeGit.ProxyOptions);
+  }
+
+  return _push.call(this, refSpecs, opts);
 };
 
 /**
@@ -85,7 +123,8 @@ Remote.prototype.download = function(refspecs, opts) {
  * @return {Number} error code
  */
 Remote.prototype.fetch = function(refspecs, opts, reflog_message) {
-  return _fetch.call(this, refspecs, normalizeFetchOptions(opts), reflog_message);
+  return _fetch
+    .call(this, refspecs, normalizeFetchOptions(opts), reflog_message);
 };
 
 /**
@@ -97,12 +136,16 @@ Remote.prototype.fetch = function(refspecs, opts, reflog_message) {
  * @param {Function} callback
  * @return {Number} error code
  */
-Remote.prototype.push = function(refSpecs, opts) {
+Remote.prototype.upload = function(refSpecs, opts) {
   var callbacks;
+  var proxyOpts;
+
   if (opts) {
     opts = shallowClone(opts);
     callbacks = opts.callbacks;
+    proxyOpts = opts.proxyOpts;
     delete opts.callbacks;
+    delete opts.proxyOpts;
   } else {
     opts = {};
   }
@@ -114,5 +157,10 @@ Remote.prototype.push = function(refSpecs, opts) {
       normalizeOptions(callbacks, NodeGit.RemoteCallbacks);
   }
 
-  return _push.call(this, refSpecs, opts);
+  if (proxyOpts) {
+    opts.proxyOpts =
+      normalizeOptions(proxyOpts, NodeGit.ProxyOptions);
+  }
+
+  return _upload.call(this, refSpecs, opts);
 };
diff --git a/lib/submodule.js b/lib/submodule.js
@@ -1,10 +1,40 @@
 var NodeGit = require("../");
+var normalizeFetchOptions = NodeGit.Utils.normalizeFetchOptions;
+var normalizeOptions = NodeGit.Utils.normalizeOptions;
+var shallowClone = NodeGit.Utils.shallowClone;
 
 var Submodule = NodeGit.Submodule;
 
 var _foreach = Submodule.foreach;
+var _update = Submodule.prototype.update;
 
 // Override Submodule.foreach to eliminate the need to pass null payload
 Submodule.foreach = function(repo, callback) {
   return _foreach(repo, callback, null);
 };
+
+/**
+ * Updates a submodule
+ *
+ * @async
+ * @param {Number} init Setting this to 1 will initialize submodule
+ *                      before updating
+ * @param {SubmoduleUpdateOptions} options Submodule update settings
+ * @return {Number} 0 on success, any non-zero return value from a callback
+ */
+Submodule.prototype.update = function(init, options) {
+  var fetchOpts = normalizeFetchOptions(options && options.fetchOpts);
+
+  if (options) {
+    options = shallowClone(options);
+    delete options.fetchOpts;
+  }
+
+  options = normalizeOptions(options, NodeGit.SubmoduleUpdateOptions);
+
+  if (options) {
+    options.fetchOpts = fetchOpts;
+  }
+
+  return _update.call(this, init, options);
+};
