Revert "Merge branch 'master' of git://github.com/andreacode/node-jira into merging"

This reverts commit fc2806b, reversing
changes made to 7011868.

Author: Chris Moultrie

lib/jira.js

@@ -112,8 +112,6 @@
 // *  _0.0.3 Added APIs and Docco documentation_
 // *  _0.0.2 Initial version_
 var url = require('url'),
-    FormData = require('form-data'),
-    fs = require('fs'),
     logger = console;
 
 
@@ -869,23 +867,14 @@ var JiraApi = exports.JiraApi = function(protocol, host, port, username, passwor
         });
     };
 
-<<<<<<< HEAD
     // ## List Components ##
     // ### Takes ###
     //
     // *  project: key for the project
-=======
-    // ## Assign issue in Jira ##
-    // ### Takes ###
-    //
-    // *  issueId: the Id of the issue to delete
-    // *  issueUpdate: username of the assignee
->>>>>>> bbae5ff8ea8893449ee2d00000eb91dde4860dfc
     // *  callback: for when it's done
     //
     // ### Returns ###
     // *  error string
-<<<<<<< HEAD
     // *  array of components
     //
     // [Jira Doc](http://docs.atlassian.com/jira/REST/latest/#id290489)
@@ -921,28 +910,12 @@ var JiraApi = exports.JiraApi = function(protocol, host, port, username, passwor
         };
 
         this.request(options, function(error, response, body) {
-=======
-    // *  success string
-    //
-    // [Jira Doc](http://docs.atlassian.com/jira/REST/latest/#idp1342720)
-    this.assign = function(issueNum, assignee, callback) {
-        var options = {
-            rejectUnauthorized: this.strictSSL,
-            uri: this.makeUri('/issue/' + issueNum + '/assignee'),
-            json: {name: assignee},
-            method: 'PUT',
-            followAllRedirects: true
-        };
-
-        this.request(options, function(error, response) {
->>>>>>> bbae5ff8ea8893449ee2d00000eb91dde4860dfc
 
             if (error) {
                 callback(error, null);
                 return;
             }
 
-<<<<<<< HEAD
             if (response.statusCode === 200) {
                 callback(null, body);
                 return;
@@ -1054,14 +1027,6 @@ var JiraApi = exports.JiraApi = function(protocol, host, port, username, passwor
             }
 
             callback(response.statusCode + ': Error while updating');
-=======
-            if (response.statusCode === 204) {
-                callback(null, "Success");
-                return;
-            }
-
-            callback(response.statusCode + ': Error while assigning');
->>>>>>> bbae5ff8ea8893449ee2d00000eb91dde4860dfc
 
         });
     };
@@ -1181,61 +1146,6 @@ var JiraApi = exports.JiraApi = function(protocol, host, port, username, passwor
         });
     };
 
-<<<<<<< HEAD
-=======
-    // ## Add attachment to issue ##
-    // ### Takes ###
-    //
-    // *  issueId: the Id of the issue to delete
-    // *  path: local path to the attachment
-    // *  callback: for when it's done
-    //
-    // ### Returns ###
-    // *  error string
-    // *  success string
-    //
-    // [Jira Doc](http://docs.atlassian.com/jira/REST/latest/#idp2051136)
-    this.attachToIssue = function(issueNum, path, callback) {
-        var self = this;
-        var options = {
-            rejectUnauthorized: this.strictSSL,
-            uri: this.makeUri('/issue/' + issueNum + '/attachments'),
-            method: 'POST',
-            followAllRedirects: true,
-            json: true,
-            headers: {
-              'x-atlassian-token': 'nocheck'
-            }
-        };
-
-        var form = new FormData();
-        form.append('file', fs.createReadStream(path));
-
-        form.getLength(function(err, length) {
-
-            var form_request = self.request(options, function(error, response) {
-                if (error) {
-                    callback(error, null);
-                    return;
-                }
-
-                if (response.statusCode === 200) {
-                    callback(null, "Success");
-                    return;
-                }
-
-                callback(response.statusCode + ': Error while uploading');
-
-            });
-
-            form_request.setHeader('Content-Length', length);
-            form = form_request.form();
-            form.append('file', fs.createReadStream(path));
-        });
-
-    };
-
->>>>>>> bbae5ff8ea8893449ee2d00000eb91dde4860dfc
     // ## List all Viewable Projects ##
     // ### Takes ###
     //

package.json

@@ -22,8 +22,7 @@
     }
   ],
   "dependencies": {
-    "request": "<2.16.0",
-    "form-data": "0.0.10"
+    "request": "<2.16.0"
   },
   "scripts": {
     "test": "grunt test"

spec/jira.spec.coffee

@@ -364,24 +364,6 @@ describe "Node Jira Tests", ->
         @jira.request.mostRecentCall.args[1] null, statusCode:200
         expect(@cb).toHaveBeenCalledWith null, 'Success'
 
-    it "Assigns an Issue", ->
-        options =
-            rejectUnauthorized: true
-            uri: makeUrl "issue/1/assignee"
-            json: {name: 'newAssignee'}
-            method: 'PUT'
-            followAllRedirects: true
-
-        @jira.assign 1, 'newAssignee', @cb
-        expect(@jira.request).toHaveBeenCalledWith options, jasmine.any(Function)
-
-        @jira.request.mostRecentCall.args[1] null, statusCode:400
-        expect(@cb).toHaveBeenCalledWith '400: Error while assigning'
-
-        # Successful Request
-        @jira.request.mostRecentCall.args[1] null, statusCode:204
-        expect(@cb).toHaveBeenCalledWith null, 'Success'
-
     it "Lists Transitions", ->
         options =
             rejectUnauthorized: true