sorting options + some cleanup

Author: ahmadnassri

src/targets/shell/helpers.js src/helpers/shell.jssrc/targets/shell/helpers.js renamed to src/helpers/shell.js

@@ -16,9 +16,9 @@ var CodeBuilder = require('../../helpers/code-builder')
 
 module.exports = function (source, options) {
   var opts = util._extend({
-    timeout: '10',
     indent: '    ',
-    pretty: true
+    pretty: true,
+    timeout: '10'
   }, options)
 
   var code = new CodeBuilder(opts.indent)

src/targets/objc/nsurlsession.js

@@ -15,18 +15,19 @@ var CodeBuilder = require('../../helpers/code-builder')
 
 module.exports = function (source, options) {
   var opts = util._extend({
+    closingTag: false,
     indent: '  ',
-    noTags: false,
     maxRedirects: 10,
-    timeout: 30,
     namedErrors: false,
-    closingTag: false
+    noTags: false,
+    shortTags: false,
+    timeout: 30
   }, options)
 
   var code = new CodeBuilder(opts.indent)
 
   if (!opts.noTags) {
-    code.push('<?php')
+    code.push(opts.shortTags ? '<?' : '<?php')
         .blank()
   }
 
@@ -121,7 +122,7 @@ module.exports = function (source, options) {
       .push(1, 'echo $response;')
       .push('}')
 
-  if (opts.closingTag) {
+  if (!opts.noTags && opts.closingTag) {
     code.blank()
         .push('?>')
   }
@@ -133,5 +134,5 @@ module.exports.info = {
   key: 'curl',
   title: 'cURL',
   link: 'http://php.net/manual/en/book.curl.php',
-  description: 'PHP with libcurl'
+  description: 'PHP with ext-curl'
 }

src/targets/php/curl.js

@@ -16,15 +16,16 @@ var CodeBuilder = require('../../helpers/code-builder')
 
 module.exports = function (source, options) {
   var opts = util._extend({
+    closingTag: false,
     indent: '  ',
     noTags: false,
-    closingTag: false
+    shortTags: false
   }, options)
 
   var code = new CodeBuilder(opts.indent)
 
   if (!opts.noTags) {
-    code.push('<?php')
+    code.push(opts.shortTags ? '<?' : '<?php')
         .blank()
   }
 
@@ -80,7 +81,7 @@ module.exports = function (source, options) {
       .push(1, 'echo $ex;')
       .push('}')
 
-  if (opts.closingTag) {
+  if (!opts.noTags && opts.closingTag) {
     code.blank()
         .push('?>')
   }

src/targets/php/http1.js

@@ -16,16 +16,17 @@ var CodeBuilder = require('../../helpers/code-builder')
 
 module.exports = function (source, options) {
   var opts = util._extend({
+    closingTag: false,
     indent: '  ',
     noTags: false,
-    closingTag: false
+    shortTags: false
   }, options)
 
   var code = new CodeBuilder(opts.indent)
   var hasBody = false
 
   if (!opts.noTags) {
-    code.push('<?php')
+    code.push(opts.shortTags ? '<?' : '<?php')
         .blank()
   }
 
@@ -112,7 +113,7 @@ module.exports = function (source, options) {
       .blank()
       .push('echo $response->getBody();')
 
-  if (opts.closingTag) {
+  if (!opts.noTags && opts.closingTag) {
     code.blank()
         .push('?>')
   }

src/targets/php/http2.js

@@ -11,13 +11,13 @@
 'use strict'
 
 var util = require('util')
-var helpers = require('./helpers')
+var helpers = require('../../helpers/shell')
 var CodeBuilder = require('../../helpers/code-builder')
 
 module.exports = function (source, options) {
   var opts = util._extend({
-    short: false,
-    indent: '  '
+    indent: '  ',
+    short: false
   }, options)
 
   var code = new CodeBuilder(opts.indent, opts.indent !== false ? ' \\\n' + opts.indent : ' ')
@@ -59,5 +59,5 @@ module.exports.info = {
   key: 'curl',
   title: 'cURL',
   link: 'http://curl.haxx.se/',
-  description: 'curl is a command line tool and library for transferring data with URL syntax'
+  description: 'cURL is a command line tool and library for transferring data with URL syntax'
 }

src/targets/shell/curl.js

@@ -11,18 +11,18 @@
 'use strict'
 
 var util = require('util')
-var helpers = require('./helpers')
+var helpers = require('../../helpers/shell')
 var CodeBuilder = require('../../helpers/code-builder')
 
 module.exports = function (source, options) {
   var opts = util._extend({
-    queryParams: false,
     body: false,
     cert: false,
     headers: false,
     indent: '  ',
     pretty: false,
     print: false,
+    queryParams: false,
     short: false,
     style: false,
     timeout: false,

src/targets/shell/httpie.js

@@ -11,7 +11,7 @@
 'use strict'
 
 var util = require('util')
-var helpers = require('./helpers')
+var helpers = require('../../helpers/shell')
 var CodeBuilder = require('../../helpers/code-builder')
 
 module.exports = function (source, options) {

src/targets/shell/wget.js

@@ -16,9 +16,9 @@ var CodeBuilder = require('../../helpers/code-builder')
 
 module.exports = function (source, options) {
   var opts = util._extend({
-    timeout: '10',
     indent: '  ',
-    pretty: true
+    pretty: true,
+    timeout: '10'
   }, options)
 
   var code = new CodeBuilder(opts.indent)

src/targets/swift/nsurlsession.js

@@ -9,7 +9,7 @@
         "key": "curl",
         "title": "cURL",
         "link": "http://curl.haxx.se/",
-        "description": "curl is a command line tool and library for transferring data with URL syntax"
+        "description": "cURL is a command line tool and library for transferring data with URL syntax"
       },
       {
         "key": "httpie",
@@ -95,7 +95,7 @@
         "key": "curl",
         "title": "cURL",
         "link": "http://php.net/manual/en/book.curl.php",
-        "description": "PHP with libcurl"
+        "description": "PHP with ext-curl"
       },
       {
         "key": "http1",