Skip to content

Commit 55c4e32

Browse files
committed
Fixed proxy problems
1 parent fcc103b commit 55c4e32

File tree

4 files changed

+52
-13
lines changed

4 files changed

+52
-13
lines changed

Gruntfile.js

+45-8
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,13 @@ module.exports = function ( grunt ) {
2727
requirejs: false,
2828
forceExit: true
2929
},
30-
curl: {
31-
long: {
32-
src: 'http://bower.herokuapp.com/packages',
33-
dest: 'git_repositories/all_bower_packages.json'
34-
}
35-
},
3630
clean: {
37-
all: 'git_repositories'
31+
all: 'git_repositories/all_bower_packages.json'
3832
}
3933
});
4034

4135
grunt.registerTask('test', ['jshint', 'jasmine_node']);
42-
grunt.registerTask('sync', ['clean', 'curl', 'sync_db']);
36+
grunt.registerTask('sync', ['clean', 'get_bower_packages', 'sync_db']);
4337
grunt.registerTask('default', ['test', 'sync']);
4438

4539
grunt.registerTask('init_db', 'Sync database to Bower official registry', function(){
@@ -51,6 +45,49 @@ module.exports = function ( grunt ) {
5145
});
5246
});
5347

48+
grunt.registerTask('get_bower_packages', 'Get official bower packages', function(){
49+
var fs = require('fs');
50+
var request = require('request');
51+
var progress = require('request-progress');
52+
var util = require('util');
53+
var done = this.async();
54+
var url = 'http://bower.herokuapp.com/packages';
55+
56+
if(!fs.existsSync('git_repositories')){
57+
fs.mkdir('git_repositories');
58+
}
59+
60+
//request = request.defaults({'proxy':'http://<proxy-ip>:<proxy-port>'});
61+
62+
var total = '';
63+
progress(request(url), {
64+
throttle: 1000,
65+
delay: 500
66+
})
67+
.on('progress', function (state) {
68+
util.print('Receiving ' + state.received + ' of ' + state.total +
69+
' bytes. ' + state.percent + '% done.\r');
70+
total = state.total;
71+
})
72+
.on('error', function (err) {
73+
console.log('Could not read '+ url +' - ' + err);
74+
})
75+
.pipe(fs.createWriteStream('git_repositories/all_bower_packages.json'))
76+
.on('error', function (err) {
77+
console.log('Could not save git_repositories/all_bower_packages.json - ' + err);
78+
})
79+
.on('close', function (err) {
80+
if(total !== ''){
81+
util.print('Receiving ' + total + ' of ' + total +
82+
' bytes. 100 % done.\r');
83+
}
84+
else {
85+
util.print('100 % done.\r');
86+
}
87+
done();
88+
});
89+
});
90+
5491
grunt.registerTask('sync_db', 'Sync database to Bower official registry', function(){
5592
var done = this.async();
5693
var bowerDB = grunt.file.readJSON('git_repositories/all_bower_packages.json');

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ Install node dependencies
2424

2525
Install bower dependencies
2626

27+
git config --global http.sslVerify false
2728
bower install
2829

2930
### Setup database and server
3031

3132
If you have a proxy you need to add it to these to files on line 2:
3233

33-
nano +2 Gruntfile.js
34+
nano +62 Gruntfile.js
3435
nano +2 templates/.bowerrc
3536

3637
Run tests and sync with official Bower repository

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bowers-nest",
33
"main": "bowers-nest.js",
4-
"version": "1.0.0",
4+
"version": "1.0.1",
55
"homepage": "https://github.com/presidenten/bowers-nest",
66
"authors": [
77
"Johan Hernefeldt"

package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bowers-nest",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "A Bower registry written for node and express with SQLite3",
55
"main": "server.js",
66
"scripts": {
@@ -30,8 +30,9 @@
3030
"supertest": "~0.8.0",
3131
"jasmine-node": "~1.11.0",
3232
"grunt-jasmine-node": "~0.1.0",
33-
"grunt-curl": "~1.1.1",
3433
"grunt-contrib-clean": "~0.5.0",
35-
"grunt-text-replace": "~0.3.8"
34+
"grunt-text-replace": "~0.3.8",
35+
"request": "~2.27.0",
36+
"request-progress": "~0.3.1"
3637
}
3738
}

0 commit comments

Comments
 (0)