Comparing version 0.6.0-beta.3 to 0.6.0-beta.4
@@ -16,4 +16,4 @@ 'use strict'; | ||
this.storeDir = path.join(storeDir.replace(/[\\\/]+$/, ''), this.getCacheKey()); | ||
this.api = new GithubAPI(this.urls, opts.getChild('git/api'), this.storeDir); | ||
this.raw = new GithubRaw(this.urls, opts.getChild('git/raw'), this.storeDir); | ||
this.api = new GithubAPI(this.urls, opts.getChild('git/api'), opts, this.storeDir); | ||
this.raw = new GithubRaw(this.urls, opts.getChild('git/raw'), opts, this.storeDir); | ||
} | ||
@@ -20,0 +20,0 @@ GithubRepo.prototype.getCacheKey = function () { |
@@ -16,4 +16,4 @@ 'use strict'; | ||
__extends(GithubAPI, _super); | ||
function GithubAPI(urls, options, storeDir) { | ||
_super.call(this, urls, options, storeDir, 'github-api', 'GithubAPI'); | ||
function GithubAPI(urls, options, shared, storeDir) { | ||
_super.call(this, urls, options, shared, storeDir, 'github-api', 'GithubAPI'); | ||
this.apiVersion = '3.0.0'; | ||
@@ -20,0 +20,0 @@ this.formatVersion = '1.0'; |
@@ -9,3 +9,3 @@ 'use strict'; | ||
var GithubLoader = (function () { | ||
function GithubLoader(urls, options, storeDir, prefix, label) { | ||
function GithubLoader(urls, options, shared, storeDir, prefix, label) { | ||
this.label = 'github-loader'; | ||
@@ -16,5 +16,7 @@ this.formatVersion = '0.0.0'; | ||
assertVar(options, JSONPointer, 'options'); | ||
assertVar(shared, JSONPointer, 'shared'); | ||
assertVar(storeDir, 'string', 'storeDir'); | ||
this.urls = urls; | ||
this.options = options; | ||
this.shared = shared; | ||
this.storeDir = storeDir; | ||
@@ -33,6 +35,7 @@ this.label = label; | ||
cache: cache, | ||
concurrent: this.options.getNumber('concurrent', 20), | ||
oath: this.options.getString('oath', null) | ||
concurrent: this.shared.getNumber('concurrent', 20), | ||
oath: this.shared.getString('oath', null), | ||
strictSSL: this.shared.getBoolean('strictSSL', true) | ||
}; | ||
opts.proxy = (this.options.getString('proxy') || process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy); | ||
opts.proxy = (this.shared.getString('proxy') || process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy); | ||
this.cache = new HTTPCache(opts); | ||
@@ -39,0 +42,0 @@ this.headers['user-agent'] = this.label + '-v' + this.formatVersion; |
@@ -14,4 +14,4 @@ 'use strict'; | ||
__extends(GithubRaw, _super); | ||
function GithubRaw(urls, options, storeDir) { | ||
_super.call(this, urls, options, storeDir, 'github-raw', 'GithubRaw'); | ||
function GithubRaw(urls, options, shared, storeDir) { | ||
_super.call(this, urls, options, shared, storeDir, 'github-raw', 'GithubRaw'); | ||
this.formatVersion = '1.0'; | ||
@@ -18,0 +18,0 @@ this._initGithubLoader(); |
@@ -133,2 +133,3 @@ 'use strict'; | ||
} | ||
req.strictSSL = _this.opts.strictSSL; | ||
Object.keys(_this.request.headers).forEach(function (key) { | ||
@@ -135,0 +136,0 @@ req.headers[key] = String(_this.request.headers[key]); |
@@ -96,3 +96,3 @@ 'use strict'; | ||
} | ||
if (options.saveToConfig && this.context.config.bundle) { | ||
if ((options.saveToConfig || options.saveBundle) && this.context.config.bundle) { | ||
bundles.push(path.resolve(basePath, this.context.config.bundle)); | ||
@@ -194,12 +194,14 @@ } | ||
return list.reduce(function (memo, file) { | ||
var url; | ||
var urls; | ||
if (file.info && file.info.projects) { | ||
url = file.info.projects; | ||
urls = file.info.projects; | ||
} | ||
else if (file.def.head.info && file.def.head.info.projects) { | ||
url = file.def.head.info.projects; | ||
urls = file.def.head.info.projects; | ||
} | ||
if (url) { | ||
memo.push(url); | ||
openInApp(url); | ||
if (urls) { | ||
urls.forEach(function (url) { | ||
memo.push(url); | ||
openInApp(url); | ||
}); | ||
} | ||
@@ -206,0 +208,0 @@ return memo; |
@@ -93,2 +93,3 @@ 'use strict'; | ||
job.options.saveToConfig = ctx.getOpt(Opt.save); | ||
job.options.saveBundle = ctx.getOpt(Opt.save); | ||
job.options.overwriteFiles = ctx.getOpt(Opt.overwrite); | ||
@@ -95,0 +96,0 @@ job.options.resolveDependencies = ctx.getOpt(Opt.resolve); |
@@ -12,2 +12,3 @@ 'use strict'; | ||
this.saveToConfig = false; | ||
this.saveBundle = false; | ||
this.addToBundles = []; | ||
@@ -14,0 +15,0 @@ } |
{ | ||
"name": "tsd", | ||
"version": "0.6.0-beta.3", | ||
"version": "0.6.0-beta.4", | ||
"description": "TypeScript Definition manager for DefinitelyTyped", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
@@ -14,8 +14,9 @@ # TSD | ||
## Install | ||
Install global using [node](http://nodejs.org/) using [npm](https://npmjs.org/): | ||
Install global using [node](http://nodejs.org/) using [npm](https://npmjs.org/). This `v0.6.x` prerelease is available on npm tagged as `next`: | ||
````bash | ||
$ npm install tsd -g | ||
npm install tsd@next -g | ||
```` | ||
@@ -458,2 +459,14 @@ | ||
- "**strictSSL**" - Toggle strictSSL verification: | ||
Enabled by default, setting this option to `false` disables strict SSL. Passed to [request](https://github.com/mikeal/request) package. | ||
Useful behind (corporate) proxies that act like man-in-the middle on https connections. | ||
````json | ||
{ | ||
"strictSSL": false | ||
} | ||
```` | ||
- "**token**" - Github OAuth token: | ||
@@ -545,2 +558,6 @@ | ||
### What if my proxy terminates SSL? | ||
As of `v0.6.0` strict SSL verification can be disabled in `.tsdrc` via `strictSSL` variable (see tsdrc-section). | ||
### Can TSD auto-install definitions for a specific package version? | ||
@@ -547,0 +564,0 @@ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
329321
8491
707