Merge pull request #40 from runk/maintenance

Maintenance

Author: Dmitry Shirokov

.github/workflows/build.yml

@@ -4,23 +4,24 @@ on:
  push:
  branches: [master]
  pull_request:
- branches: ["*"]
+ branches: ['*']
 
 jobs:
  build:
  runs-on: ubuntu-latest
 
  strategy:
  matrix:
- node-version: [10.x, 12.x, 14.x]
+ node-version: [12.x, 14.x, 16.x]
 
  steps:
- - uses: actions/checkout@v2
- - name: Use Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v2
- with:
- node-version: ${{ matrix.node-version }}
- - run: npm i
- env:
- MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }}
- - run: npm test
+ - uses: actions/checkout@v2
+ - name: Use Node.js ${{ matrix.node-version }}
+ uses: actions/setup-node@v2
+ with:
+ node-version: ${{ matrix.node-version }}
+ - run: npm i
+ env:
+ MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }}
+ - run: npm run format:check
+ - run: npm test

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.travis.yml

@@ -1,4 +1,4 @@
-Copyright 2020 Dmitry Shirokov
+Copyright 2022 Dmitry Shirokov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

LICENSE

@@ -1,5 +1,4 @@
-node-geolite2
-========
+# node-geolite2
 
 Maxmind's GeoLite2 Free Databases download helper.
 
@@ -44,7 +43,6 @@ If `selected-dbs` is unset, or is set but empty, all dbs will be downloaded.
 }
 ```
 
-
 ## Usage
 
 ```javascript

README.md

@@ -15,7 +15,9 @@
  "scripts": {
  "postinstall": "node scripts/postinstall.js",
  "test": "scripts/test",
- "semantic-release": "semantic-release"
+ "semantic-release": "semantic-release",
+ "format": "prettier --write .",
+ "format:check": "prettier --write ."
  },
  "repository": {
  "type": "git",
@@ -32,6 +34,7 @@
  },
  "devDependencies": {
  "mocha": "^5.2.0",
+ "prettier": "^2.6.0",
  "semantic-release": "^17.0.8"
  }
 }

package.json

@@ -2,20 +2,20 @@ const assert = require('assert');
 const fs = require('fs');
 const geolite2 = require('../');
 
-describe('geolite2', function() {
- it('should return a valid city db path', function() {
+describe('geolite2', function () {
+ it('should return a valid city db path', function () {
  var stat = fs.statSync(geolite2.paths.city);
  assert(stat.size > 1e6);
  assert(stat.ctime);
  });
 
- it('should return a valid country db path', function() {
+ it('should return a valid country db path', function () {
  var stat = fs.statSync(geolite2.paths.country);
  assert(stat.size > 1e6);
  assert(stat.ctime);
  });
 
- it('should return a valid ASN db path', function() {
+ it('should return a valid ASN db path', function () {
  var stat = fs.statSync(geolite2.paths.asn);
  assert(stat.size > 1e6);
  assert(stat.ctime);

test/index.js

@@ -39,9 +39,12 @@ const getSelectedDbs = () => {
 
  if (selected.length === 0) return valids;
 
- if (selected.length > 3) {
+ const validValuesText = valids.join(', ');
+ if (selected.length > valids.length) {
  console.error(
- `selected-dbs has too many values, there are only three valid values: ${valids.join(', ')}.`
+ 'Property selected-dbs has too many values, there are only %d valid values: %s',
+ valids.length,
+ validValuesText
  );
  process.exit(1);
  }
@@ -50,7 +53,9 @@ const getSelectedDbs = () => {
  const index = valids.indexOf(value);
  if (index === -1) {
  console.error(
- `Invalid value in selected-dbs: ${value}. The only valid values are: ${valids.join(', ')}.`
+ 'Invalid value in selected-dbs: %s The only valid values are: %s',
+ value,
+ validValuesText
  );
  process.exit(1);
  }