Skip to content

Commit c523093

Browse files
committed
Add file count to format script. Format.
1 parent 2fc6f07 commit c523093

File tree

13 files changed

+309
-272
lines changed

13 files changed

+309
-272
lines changed

faker/dates.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env node
2+
23
const faker = require("faker");
34

45
let futureDate = faker.date.future();
@@ -7,4 +8,4 @@ let weekday = faker.date.weekday();
78

89
console.log(futureDate);
910
console.log(recentDate);
10-
console.log(weekday);
11+
console.log(weekday);

faker/genusers.js

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
#!/usr/bin/env node
2+
23
const faker = require("faker");
34
const fs = require("fs");
45

56
function generateUsers() {
67

7-
let users = [];
8+
let users = [];
89

9-
for (let id=1; id <= 100; id++) {
10+
for (let id = 1; id <= 100; id++) {
1011

11-
let firstName = faker.name.firstName();
12-
let lastName = faker.name.lastName();
13-
let email = faker.internet.email();
12+
let firstName = faker.name.firstName();
13+
let lastName = faker.name.lastName();
14+
let email = faker.internet.email();
1415

15-
users.push({
16-
"id": id,
17-
"first_name": firstName,
18-
"last_name": lastName,
19-
"email": email
20-
});
21-
}
16+
users.push({
17+
"id": id,
18+
"first_name": firstName,
19+
"last_name": lastName,
20+
"email": email
21+
});
22+
}
2223

23-
return { "data": users };
24+
return {
25+
"data": users
26+
};
2427
}
2528

2629
let dataObj = generateUsers();
27-
fs.writeFileSync("data.json", JSON.stringify(dataObj, null, "\t"));
30+
fs.writeFileSync("data.json", JSON.stringify(dataObj, null, "\t"));

faker/getdata.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/usr/bin/env node
2+
23
const request = require("request");
34

45
request("http://localhost:3004/data?_start=4&_end=8", (err, resp, body) => {
5-
if (err) {
6-
console.error("request failed");
7-
console.error(err);
8-
} else {
9-
console.log(body);
10-
}
11-
});
12-
6+
if (err) {
7+
console.error("request failed");
8+
console.error(err);
9+
} else {
10+
console.log(body);
11+
}
12+
});

faker/localefaker.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env node
2+
23
const faker = require("faker/locale/ru");
34

45
let firstName = faker.name.firstName();
@@ -12,4 +13,4 @@ let rectentDate = faker.date.weekday();
1213

1314
console.log(month);
1415
console.log(recentDate);
15-
console.log(rectentDate);
16+
console.log(rectentDate);

faker/names.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#!/usr/bin/env node
2+
23
const faker = require("faker");
34

45
let firstName = faker.name.firstName();
56
let lastName = faker.name.lastName();
67

78
let jobTitle = faker.name.jobTitle();
8-
let prefix = faker.name.prefix();
9+
let prefix = faker.name.prefix();
910
let suffix = faker.name.suffix();
1011
let jobArea = faker.name.jobArea();
1112

@@ -14,4 +15,4 @@ let phone = faker.phone.phoneNumber();
1415
console.log(`Employee: ${prefix} ${firstName} ${lastName} ${suffix}`);
1516
console.log(`Job title: ${jobTitle}`);
1617
console.log(`Job area: ${jobArea}`);
17-
console.log(`Phone: ${phone}`);
18+
console.log(`Phone: ${phone}`);

faker/randomvalues.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env node
2+
23
const faker = require('faker');
34

45
let number = faker.datatype.number();
@@ -11,4 +12,4 @@ let word = faker.random.word();
1112
console.log(word);
1213

1314
let words = faker.random.words(6);
14-
console.log(words);
15+
console.log(words);

format

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,31 @@
11
#!/usr/bin/env bash
22
folders=0
3+
files=0
34
errors=0
5+
6+
filecount() {
7+
return $(ls "$1" | grep -e "[.]js$" | wc -l)
8+
}
9+
410
if [ "$#" -eq 0 ] ; then
511
for dir in $(find . -maxdepth 1 -type d ! -path "*node_modules*" ! -path "*.git*" ! -path "*config*" ! -path . );
612
do
713
echo $dir
14+
filecount "$dir"
15+
files=`expr $files + $?`
816
(cd "$dir";
917
js-beautify *.js;
1018
cd ..;)
1119
errors=`expr $(echo $?) + $errors`
1220
folders=`expr $folders + 1`
1321
done
1422
else
23+
filecount "$1"
24+
files=`expr $files + $?`
1525
(cd "$1";
1626
js-beautify *.js;cd ..;)
1727
errors=`expr $(echo $?) + $errors`
1828
folders=`expr $folders + 1`
1929
fi
20-
echo $folders 'folders processed with ' $errors ' errors.'
30+
echo $folders 'folder(s) and' $files 'file(s) processed with '$errors 'error(s).'
2131
exit $errors

mongodb/kitty.js

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,62 +4,62 @@ const mongoose = require("mongoose");
44

55
async function main() {
66

7-
await mongoose.connect("mongodb://localhost/test", {
8-
useNewUrlParser: true,
9-
useUnifiedTopology: true
10-
});
7+
await mongoose.connect("mongodb://localhost/test", {
8+
useNewUrlParser: true,
9+
useUnifiedTopology: true
10+
});
1111

12-
let db = mongoose.connection;
13-
db.on("error", console.error.bind(console, "connection error:"));
14-
db.once("open", function() {
15-
console.log("open");
16-
});
12+
let db = mongoose.connection;
13+
db.on("error", console.error.bind(console, "connection error:"));
14+
db.once("open", function() {
15+
console.log("open");
16+
});
1717

18-
const kittySchema = new mongoose.Schema({
19-
name: String
20-
});
18+
const kittySchema = new mongoose.Schema({
19+
name: String
20+
});
2121

22-
kittySchema.methods.speak = function() {
23-
const greeting = this.name ?
24-
"Meow name is " + this.name :
25-
"I do not have a name";
26-
console.log(greeting);
27-
};
22+
kittySchema.methods.speak = function() {
23+
const greeting = this.name ?
24+
"Meow name is " + this.name :
25+
"I do not have a name";
26+
console.log(greeting);
27+
};
2828

29-
const Kitten = mongoose.model("Kitten", kittySchema);
30-
const silence = new Kitten({
31-
name: "Silence"
32-
});
33-
console.log(silence.name);
29+
const Kitten = mongoose.model("Kitten", kittySchema);
30+
const silence = new Kitten({
31+
name: "Silence"
32+
});
33+
console.log(silence.name);
3434

35-
const fluffy = new Kitten({
36-
name: "fluffy"
37-
});
38-
fluffy.speak();
35+
const fluffy = new Kitten({
36+
name: "fluffy"
37+
});
38+
fluffy.speak();
3939

40-
await silence.save(function(err, silence) {
41-
if (err) return console.error(err);
42-
silence.speak();
43-
});
40+
await silence.save(function(err, silence) {
41+
if (err) return console.error(err);
42+
silence.speak();
43+
});
4444

45-
await fluffy.save(function(err, fluffy) {
46-
if (err) return console.error(err);
47-
fluffy.speak();
48-
});
45+
await fluffy.save(function(err, fluffy) {
46+
if (err) return console.error(err);
47+
fluffy.speak();
48+
});
4949

50-
await Kitten.find(function(err, kittens) {
51-
if (err) return console.error(err);
52-
console.log(kittens);
53-
});
50+
await Kitten.find(function(err, kittens) {
51+
if (err) return console.error(err);
52+
console.log(kittens);
53+
});
5454
}
5555

5656

5757
(async () => {
58-
try {
59-
await main();
60-
} catch (e) {
61-
console.log(e.message);
62-
} finally {
63-
mongoose.disconnect();
64-
}
65-
})();
58+
try {
59+
await main();
60+
} catch (e) {
61+
console.log(e.message);
62+
} finally {
63+
mongoose.disconnect();
64+
}
65+
})();

mongodb/movieSchema.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
const mongoose = require("mongoose");
22

33
const movie = mongoose.Schema({
4-
title: {
5-
type: String
6-
},
7-
year: {type: Number}
4+
title: {
5+
type: String
6+
},
7+
year: {
8+
type: Number
9+
}
810
});
911

1012
module.exports =
11-
mongoose.model("Movie", movie);
13+
mongoose.model("Movie", movie);

0 commit comments

Comments
 (0)