CHANGELOG.md

@@ -1,3 +1,18 @@
+##### 3.2.0 - 14 February 2019
+
+- Update dependencies
+
+##### 3.1.0 - 03 December 2018
+
+- fix: fix: update badges on default readme (#175)
+- fix: update eslint and jsdoc templates (#174)
+- fix: remove contributors code (#173)
+
+##### 3.0.0 - 09 November 2018
+
+###### Breaking changes
+- Removed the `lint` command and dependency on `semistandard`
+
 ##### 2.3.6 - 07 November 2018
 
 ###### Backwards compatible changes

README.md

@@ -43,8 +43,6 @@ Usage: `repo-tools --help` or `tools --help`
 Commands:
   exec                  Run a given command in /Users/jdobry/projects/nodejs-repo-tools.
   generate <targets..>  Generate the given target(s) in /Users/jdobry/projects/nodejs-repo-tools.
-  lint                  Lint files by running: semistandard in /Users/jdobry/projects/nodejs-repo-tools.
-  list                  List samples.
   test                  Run a test sub-command.
   unify                 (Node.js only) Recursively add sub-directory dependencies to the top-level package.json file.
 

builders/base/Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update -y && \
     rm /var/lib/apt/lists/*_*
 
 # Install the latest LTS release of nodejs
-RUN mkdir /nodejs && curl https://nodejs.org/dist/v6.11.1/node-v6.11.1-linux-x64.tar.gz | tar xvzf - -C /nodejs --strip-components=1
+RUN mkdir /nodejs && curl https://nodejs.org/dist/v8.12.0/node-v8.12.0-linux-x64.tar.gz | tar xvzf - -C /nodejs --strip-components=1
 ENV PATH $PATH:/nodejs/bin
 
 # Install the Repo Tools binary

builders/nodejs/Dockerfile

@@ -19,6 +19,6 @@ RUN set -ex \
   && mv yarn.js /usr/local/bin/yarn \
   && chmod +x /usr/local/bin/yarn
 
-RUN yarn global add nyc codecov semistandard node-gyp
+RUN yarn global add nyc codecov node-gyp
 
 ENTRYPOINT ["node"]

builders/nodejs/README.md

@@ -2,7 +2,7 @@
 
 This Container Builder build step runs the `node` tool.
 
-It also installs Yarn, nyc, codecov, and semistandard.
+It also installs Yarn, nyc, and codecov.
 
 ## Building this builder
 

builders/ruby/README.md

@@ -2,7 +2,7 @@
 
 This Container Builder build step runs the `node` tool.
 
-It also install Yarn, nyc, codecov, and semistandard.
+It also install Yarn, nyc, and codecov.
 
 ## Building this builder
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@google-cloud/nodejs-repo-tools",
   "description": "Tools used to maintain and test Node.js repositories in the GoogleCloudPlaftorm organization.",
-  "version": "2.3.6",
+  "version": "3.2.0",
   "license": "Apache-2.0",
   "author": "Google Inc.",
   "engines": {
@@ -32,17 +32,6 @@
       "./cjs/cli/commands/**/*.js"
     ]
   },
-  "semistandard": {
-    "globals": [
-      "before",
-      "describe",
-      "it"
-    ],
-    "ignore": [
-      "test/samples/nodejs/snippet/lint_error.js",
-      "cjs/**/*.js"
-    ]
-  },
   "nyc": {
     "include": [
       "cjs/**/*.js"
@@ -54,58 +43,48 @@
         "env",
         {
           "targets": {
-            "node": "4.8.4"
+            "node": "10.15.1"
           }
         }
       ]
     ]
   },
-  "contributors": [
-    "Ace Nassri <anassri@google.com>",
-    "Alexander Fenster <github@fenster.name>",
-    "Jason Dobry <jason.dobry@gmail.com>",
-    "Jason Dobry <jmdobry@users.noreply.github.com>",
-    "Luke Sneeringer <luke@sneeringer.com>",
-    "Stephen <stephenplusplus@users.noreply.github.com>",
-    "greenkeeper[bot] <greenkeeper[bot]@users.noreply.github.com>"
-  ],
   "scripts": {
     "clean": "node ./scripts/clean",
     "build": "npm run clean && babel src --out-dir cjs",
-    "generate-scaffolding": "node ./bin/tools generate coc contributors license pkgjson",
-    "lint": "npm run build && node ./bin/tools lint --cmd eslint -- src/ test/",
-    "prettier": "npm run build && node ./bin/tools exec -- prettier --write 'src/{,**/,**/**/,**/**/**/}*.js' 'test/{,**/,**/**/,**/**/**/,**/**/**/**/,**/**/**/**/**/}*.js'",
+    "generate-scaffolding": "node ./bin/tools generate coc license pkgjson",
+    "lint": "npm run build && eslint src/ test/",
+    "fix": "npm run build && eslint --fix '**/*.js'",
     "prepublishOnly": "npm run lint",
     "release": "npm run prepublishOnly && node ./scripts/release",
     "pretest": "npm run prepublishOnly",
     "cover": "nyc --cache ava -v -T 1m -s && nyc report",
     "test": "node ./bin/tools test run --cmd npm -- run cover"
   },
   "dependencies": {
-    "@sindresorhus/slugify": "^0.6.0",
-    "ava": "0.25.0",
-    "colors": "1.1.2",
-    "fs-extra": "^6.0.0",
-    "got": "^9.3.0",
-    "handlebars": "4.0.11",
+    "@sindresorhus/slugify": "^0.8.0",
+    "ava": "^1.2.1",
+    "colors": "^1.3.3",
+    "fs-extra": "^7.0.1",
+    "got": "^9.6.0",
+    "handlebars": "^4.1.0",
     "lodash": "^4.17.11",
-    "nyc": "11.7.2",
-    "proxyquire": "^2.0.0",
-    "semistandard": "13.0.0",
-    "semver": "^5.5.0",
-    "sinon": "6.0.1",
-    "supertest": "^3.2.0",
-    "yargs": "^12.0.1",
-    "yargs-parser": "11.0.0"
+    "nyc": "^13.3.0",
+    "proxyquire": "^2.1.0",
+    "semver": "^5.6.0",
+    "sinon": "^7.2.3",
+    "supertest": "^3.4.2",
+    "yargs": "^13.1.0",
+    "yargs-parser": "^13.0.0"
   },
   "devDependencies": {
     "babel-cli": "6.26.0",
-    "babel-preset-env": "1.6.1",
-    "codecov": "^3.1.0",
-    "eslint": "^4.18.2",
-    "eslint-config-prettier": "^2.10.0",
-    "eslint-plugin-node": "6.0.1",
-    "eslint-plugin-prettier": "^3.0.0",
-    "prettier": "^1.11.0"
+    "babel-preset-env": "1.7.0",
+    "codecov": "^3.2.0",
+    "eslint": "^5.13.0",
+    "eslint-config-prettier": "^4.0.0",
+    "eslint-plugin-node": "8.0.1",
+    "eslint-plugin-prettier": "^3.0.1",
+    "prettier": "^1.16.4"
   }
 }

src/build_packs/build_pack.js

@@ -16,13 +16,9 @@
 'use strict';
 
 const _ = require('lodash');
-const {execSync} = require('child_process');
 const path = require('path');
-
 const utils = require('../utils');
 
-const TTY = process.platform === 'win32' ? 'CON' : '/dev/tty';
-
 const globalOpts = {
   global: {
     dryRun: false,
@@ -31,10 +27,6 @@ const globalOpts = {
     config: '.cloud-repo-tools.json',
     configKey: null,
   },
-  lint: {
-    cmd: 'lint',
-    args: [],
-  },
   test: {
     app: {},
     build: {
@@ -63,26 +55,6 @@ const globalOpts = {
       description: 'Generate a .github/CONTRIBUTING.md file.',
       filename: '.github/CONTRIBUTING.md',
     },
-    contributors: {
-      description: 'Generate a CONTRIBUTORS file.',
-      filename: 'CONTRIBUTORS',
-      addData(data, opts) {
-        try {
-          const output = execSync(`git shortlog -e -s < ${TTY}`, {
-            shell: true,
-            cwd: opts.localPath,
-            encoding: 'utf8',
-          });
-          data.contributors = output
-            .split('\n')
-            .filter(x => x)
-            .map(line => line.substring(line.indexOf('\t') + 1));
-        } catch (err) {
-          utils.logger.error('generate', 'Failed to load contibutors!');
-          throw err;
-        }
-      },
-    },
     issue_template: {
       description: 'Generate a .github/ISSUE_TEMPLATE.md file.',
       filename: '.github/ISSUE_TEMPLATE.md',

src/build_packs/nodejs.js

@@ -51,10 +51,6 @@ const TESTS = `
 
 const nodejsConfig = {
   display: 'Node.js',
-  lint: {
-    cmd: 'semistandard',
-    args: [],
-  },
   test: {
     app: {
       cmd: 'node',
@@ -118,7 +114,7 @@ const nodejsConfig = {
     pkgjson: {
       description: 'Generate and/or update a package.json file.',
       filename: 'package.json',
-      addData(data, opts) {
+      addData(data) {
         const json = {};
         const origKeys = Object.keys(data.pkgjson);
         json.name = data.libPkgName || data.pkgjson.name || 'TODO';
@@ -141,7 +137,6 @@ const nodejsConfig = {
         json.main = data.pkgjson.main || 'src/index.js';
         _.pull(origKeys, 'main');
 
-        _.pull(origKeys, 'contributors');
         _.pull(origKeys, 'scripts');
         const depRe = /dependencies/i;
         const depKeys = origKeys.filter(x => depRe.test(x));
@@ -152,9 +147,6 @@ const nodejsConfig = {
           json[key] = data.pkgjson[key];
         }
 
-        // Put contributors, scripts, and (dev)dependencies at the bottom
-        data.generate.contributors.addData(data, opts);
-        json.contributors = data.contributors;
         json.scripts = data.pkgjson.scripts || {};
         depKeys.sort();
         for (const key of depKeys) {

src/build_packs/python.js

@@ -40,10 +40,6 @@ const TESTS = `
 
 const pythonConfig = {
   display: 'Python',
-  lint: {
-    cmd: 'nox',
-    args: ['lint'],
-  },
   test: {
     app: {
       cmd: 'python',

src/build_packs/ruby.js

@@ -38,10 +38,6 @@ module.exports = {
   display: 'Ruby',
   detect: cwd => fs.statSync(path.join(cwd, 'Gemfile')).isFile(),
   load: filename => require(filename),
-  lint: {
-    cmd: 'semistandard',
-    args: [],
-  },
   test: {
     app: {
       cmd: 'bundle',