feat(license): show old license if changed, support no license, renam…

…e get util
greenkeeperio · Jul 4, 2019 · f536030 · f536030
1 parent 61be8fa
commit f536030
Show file tree

Hide file tree

Showing 8 changed files with 120 additions and 70 deletions.
diff --git a/content/update-pr.js b/content/update-pr.js
@@ -2,7 +2,7 @@ const _ = require('lodash')
 const md = require('./template')
 
 module.exports = ({
-  version, dependencyLink, dependency, monorepoGroupName, release, diffCommits, oldVersionResolved, type, packageUpdateList, license, licenseHasChanged, publisher
+  version, dependencyLink, dependency, monorepoGroupName, release, diffCommits, oldVersionResolved, type, packageUpdateList, license, licenseHasChanged, previousLicense, publisher
 }) => {
   const hasReleaseInfo = release && diffCommits
   return md`
@@ -17,16 +17,16 @@ ${monorepoGroupName && `\nThis monorepo update includes releases of one or more
 }
 ---
 
-publisher: ${publisher}
-${licenseHasChanged ? `License has changed from the prevoius release.` : ''}
-license: ${license}
+**Publisher:** ${publisher}
+**License:** ${licenseHasChanged ? `This package’s license has changed from **${previousLicense}** to **${license}** in this release` : `${license}`}
 
----
 ${hasReleaseInfo
     ? _.compact([release, diffCommits])
     : `[Find out more about this release](${dependencyLink}).`
 }
 
+---
+
 <details>
   <summary>FAQ and help</summary>
 

diff --git a/jobs/create-group-version-branch.js b/jobs/create-group-version-branch.js
@@ -19,7 +19,7 @@ const {
   hasTooManyPackageJSONs,
   getSatisfyingVersions,
   getOldVersionResolved,
-  getLicenseAndAuthorFromVersions
+  getLicenseAndPublisherFromVersions
 } = require('../utils/utils')
 const {
   isPartOfMonorepo,
@@ -362,7 +362,7 @@ module.exports = async function (
 
   const dependencyLink = getFormattedDependencyURL({ repositoryURL: transforms[0].repoURL })
 
-  const { license, licenseHasChanged, publisher } = getLicenseAndAuthorFromVersions({ versions, version, oldVersionResolved })
+  const { license, previousLicense, licenseHasChanged, publisher } = getLicenseAndPublisherFromVersions({ versions, version, oldVersionResolved })
 
   // maybe adapt PR body
   const body = prContent({
@@ -376,6 +376,7 @@ module.exports = async function (
     diffCommits,
     packageUpdateList,
     license,
+    previousLicense,
     licenseHasChanged,
     publisher
   })

diff --git a/jobs/create-version-branch.js b/jobs/create-version-branch.js
@@ -23,7 +23,7 @@ const { createTransformFunction,
   hasTooManyPackageJSONs,
   getSatisfyingVersions,
   getOldVersionResolved,
-  getLicenseAndAuthorFromVersions
+  getLicenseAndPublisherFromVersions
 } = require('../utils/utils')
 
 const prContent = require('../content/update-pr')
@@ -35,7 +35,7 @@ module.exports = async function (
     accountId,
     repositoryId,
     type,
-    // The following 4 don’t matter anymore, sincversionse we fetch them anew for every dependency anyway
+    // The following 4 don’t matter anymore, since we fetch them anew for every dependency anyway
     version,
     oldVersion,
     oldVersionResolved,
@@ -337,7 +337,7 @@ module.exports = async function (
     dependency: dependencyKey,
     prTitles: config.prTitles })
 
-  const { license, licenseHasChanged, publisher } = getLicenseAndAuthorFromVersions({ versions, version, oldVersionResolved })
+  const { license, previousLicense, licenseHasChanged, publisher } = getLicenseAndPublisherFromVersions({ versions, version, oldVersionResolved })
 
   const body = prContent({
     dependencyLink,
@@ -350,6 +350,7 @@ module.exports = async function (
     type,
     packageUpdateList,
     license,
+    previousLicense,
     licenseHasChanged,
     publisher
   })

diff --git a/test/jobs/__snapshots__/create-group-version-branch.js.snap b/test/jobs/__snapshots__/create-group-version-branch.js.snap
@@ -18,12 +18,12 @@ This monorepo update includes releases of one or more dependencies which all bel
 
 ---
 
-publisher: finn
+**Publisher:** finn
+**License:** MIT
 
-license: MIT
+[Find out more about this release](https://github.com/dep/dep).
 
 ---
-[Find out more about this release](https://github.com/dep/dep).
 
 <details>
   <summary>FAQ and help</summary>
@@ -58,12 +58,12 @@ This monorepo update includes releases of one or more dependencies which all bel
 
 ---
 
-publisher: finn
+**Publisher:** finn
+**License:** MIT
 
-license: MIT
+[Find out more about this release](https://github.com/dep/dep).
 
 ---
-[Find out more about this release](https://github.com/dep/dep).
 
 <details>
   <summary>FAQ and help</summary>
@@ -100,12 +100,12 @@ This monorepo update includes releases of one or more dependencies which all bel
 
 ---
 
-publisher: finn
+**Publisher:** finn
+**License:** MIT
 
-license: MIT
+[Find out more about this release](https://github.com/dep/dep).
 
 ---
-[Find out more about this release](https://github.com/dep/dep).
 
 <details>
   <summary>FAQ and help</summary>
@@ -140,12 +140,12 @@ This monorepo update includes releases of one or more dependencies which all bel
 
 ---
 
-publisher: finn
+**Publisher:** finn
+**License:** MIT
 
-license: MIT
+[Find out more about this release](https://github.com/dep/dep).
 
 ---
-[Find out more about this release](https://github.com/dep/dep).
 
 <details>
   <summary>FAQ and help</summary>
@@ -180,12 +180,12 @@ This monorepo update includes releases of one or more dependencies which all bel
 
 ---
 
-publisher: finn
+**Publisher:** finn
+**License:** MIT
 
-license: MIT
+[Find out more about this release](https://github.com/dep/dep).
 
 ---
-[Find out more about this release](https://github.com/dep/dep).
 
 <details>
   <summary>FAQ and help</summary>
@@ -235,12 +235,12 @@ If you don’t accept this pull request, your project will work just like it did
 
 ---
 
-publisher: finn
+**Publisher:** finn
+**License:** MIT
 
-license: MIT
+[Find out more about this release]().
 
 ---
-[Find out more about this release]().
 
 <details>
   <summary>FAQ and help</summary>

diff --git a/test/jobs/__snapshots__/create-version-branch.js.snap b/test/jobs/__snapshots__/create-version-branch.js.snap
@@ -27,12 +27,12 @@ This monorepo update includes releases of one or more dependencies which all bel
 
 ---
 
-publisher: finn
+**Publisher:** finn
+**License:** MIT
 
-license: MIT
+[Find out more about this release](https://github.com/orgname/colors).
 
 ---
-[Find out more about this release](https://github.com/orgname/colors).
 
 <details>
   <summary>FAQ and help</summary>
@@ -52,8 +52,8 @@ exports[`create version branch for dependencies from monorepos new pull request
 "
 ## There have been updates to the *numbers* monorepo: 
 
-- The \`devDependency\` [numbers](https://www.npmjs.com/package/numbers) was updated from \`2.1.0\` to \`2.2.0\`.
-- The \`dependency\` [numbers-four](https://www.npmjs.com/package/numbers-four) was updated from \`1.2.0\` to \`1.3.0\`.
+- The \`devDependency\` [numbers](https://github.com/dep/dep) was updated from \`2.1.0\` to \`2.2.0\`.
+- The \`dependency\` [numbers-four](https://github.com/dep/dep) was updated from \`1.2.0\` to \`1.3.0\`.
 
 These versions are **not covered** by your **current version range**.
 
@@ -63,7 +63,12 @@ This monorepo update includes releases of one or more dependencies which all bel
 
 ---
 
-[Find out more about this release]().
+**Publisher:** finn
+**License:** No license
+
+[Find out more about this release](https://github.com/dep/dep).
+
+---
 
 <details>
   <summary>FAQ and help</summary>
@@ -96,12 +101,12 @@ This monorepo update includes releases of one or more dependencies which all bel
 
 ---
 
-publisher: finn
+**Publisher:** finn
+**License:** MIT
 
-license: MIT
+[Find out more about this release](https://github.com/orgname/flowers).
 
 ---
-[Find out more about this release](https://github.com/orgname/flowers).
 
 <details>
   <summary>FAQ and help</summary>
@@ -131,12 +136,12 @@ This monorepo update includes releases of one or more dependencies which all bel
 
 ---
 
-publisher: finn
+**Publisher:** finn
+**License:** MIT
 
-license: MIT
+[Find out more about this release](https://github.com/orgname/colors).
 
 ---
-[Find out more about this release](https://github.com/orgname/colors).
 
 <details>
   <summary>FAQ and help</summary>
@@ -168,12 +173,12 @@ This monorepo update includes releases of one or more dependencies which all bel
 
 ---
 
-publisher: finn
+**Publisher:** finn
+**License:** MIT
 
-license: MIT
+[Find out more about this release](https://github.com/jest/jest).
 
 ---
-[Find out more about this release](https://github.com/jest/jest).
 
 <details>
   <summary>FAQ and help</summary>
@@ -200,12 +205,12 @@ If you don’t accept this pull request, your project will work just like it did
 
 ---
 
-publisher: finn
+**Publisher:** finn
+**License:** MIT
 
-license: MIT
+[Find out more about this release](https://github.com/best/best).
 
 ---
-[Find out more about this release](https://github.com/best/best).
 
 <details>
   <summary>FAQ and help</summary>
@@ -230,12 +235,12 @@ If you don’t accept this pull request, your project will work just like it did
 
 ---
 
-publisher: finn
+**Publisher:** finn
+**License:** This package’s license has changed from **BYOL** to **MIT** in this release
 
-license: MIT
+[Find out more about this release](https://github.com/finnpauls/dep).
 
 ---
-[Find out more about this release](https://github.com/finnpauls/dep).
 
 <details>
   <summary>FAQ and help</summary>
@@ -260,12 +265,12 @@ If you don’t accept this pull request, your project will work just like it did
 
 ---
 
-publisher: finn
+**Publisher:** finn
+**License:** MIT
 
-license: MIT
+[Find out more about this release](https://github.com/finnpauls/dep).
 
 ---
-[Find out more about this release](https://github.com/finnpauls/dep).
 
 <details>
   <summary>FAQ and help</summary>
@@ -290,12 +295,12 @@ If you don’t accept this pull request, your project will work just like it did
 
 ---
 
-publisher: finn
+**Publisher:** finn
+**License:** MIT
 
-license: MIT
+[Find out more about this release](https://github.com/finnpauls/dep).
 
 ---
-[Find out more about this release](https://github.com/finnpauls/dep).
 
 <details>
   <summary>FAQ and help</summary>

diff --git a/test/jobs/create-version-branch.js b/test/jobs/create-version-branch.js
@@ -22,7 +22,7 @@ const versionInfos = {
   }
 }
 
-describe.only('create version branch', () => {
+describe('create version branch', () => {
   beforeEach(() => {
     delete process.env.IS_ENTERPRISE
     cleanCache('../../lib/env')
@@ -281,7 +281,7 @@ describe.only('create version branch', () => {
       oldVersion: '^1.0.0',
       oldVersionResolved: '1.0.0',
       versions: {
-        '1.0.0': versionInfos,
+        '1.0.0': { ...versionInfos, license: 'BYOL' },
         '2.0.0': versionInfos
       }
     })
@@ -2169,7 +2169,6 @@ describe('create version branch for dependencies from monorepos', () => {
       versions: {
         '1.0.0': {
           gitHead: 'deadbeef100',
-          'license': 'MIT',
           '_npmUser': {
             name: 'finn',
             email: '[email protected]'
@@ -2180,7 +2179,16 @@ describe('create version branch for dependencies from monorepos', () => {
           repository: {
             url: 'https://github.com/numbers/monorepo'
           },
-          'license': 'MIT',
+          '_npmUser': {
+            name: 'finn',
+            email: '[email protected]'
+          }
+        },
+        '2.2.0': {
+          gitHead: 'deadbeef220',
+          repository: {
+            url: 'https://github.com/numbers/monorepo'
+          },
           '_npmUser': {
             name: 'finn',
             email: '[email protected]'