Tweak origin properties

src/commits.js

@@ -103,21 +103,21 @@ function getMerge (message, origin) {
 
 function getCommitLink (hash, origin) {
   if (origin.hostname === 'bitbucket.org') {
-    return `${origin.repoURL}/commits/${hash}`
+    return `${origin.url}/commits/${hash}`
   }
-  return `${origin.repoURL}/commit/${hash}`
+  return `${origin.url}/commit/${hash}`
 }
 
 function getIssueLink (id, origin) {
-  return `${origin.repoURL}/issues/${id}`
+  return `${origin.url}/issues/${id}`
 }
 
 function getPullLink (id, origin) {
   if (origin.hostname === 'bitbucket.org') {
-    return `${origin.repoURL}/pull-requests/${id}`
+    return `${origin.url}/pull-requests/${id}`
   }
   if (origin.hostname === 'gitlab.com') {
-    return `${origin.repoURL}/merge_requests/${id}`
+    return `${origin.url}/merge_requests/${id}`
   }
-  return `${origin.repoURL}/pull/${id}`
+  return `${origin.url}/pull/${id}`
 }

src/origin.js

@@ -9,9 +9,9 @@ export async function fetchOrigin (remote) {
   }
   const origin = parseRepoURL(originURL)
   const protocol = origin.protocol === 'http:' ? 'http:' : 'https:'
-  const host = origin.hostname || origin.host
+  const hostname = origin.hostname || origin.host
   return {
-    ...origin,
-    repoURL: `${protocol}//${host}/${origin.repo}`
+    hostname,
+    url: `${protocol}//${hostname}/${origin.repo}`
   }
 }

src/releases.js

@@ -59,9 +59,9 @@ function filterCommit (commit, merges) {
 
 function getCompareLink (from, to, origin) {
   if (origin.hostname === 'bitbucket.org') {
-    return `${origin.repoURL}/compare/${to}%0D${from}`
+    return `${origin.url}/compare/${to}%0D${from}`
   }
-  return `${origin.repoURL}/compare/${from}...${to}`
+  return `${origin.url}/compare/${from}...${to}`
 }
 
 function sortCommits (a, b) {

test/commits.js

@@ -20,18 +20,15 @@ const getMerge = __get__('getMerge')
 const origin = {
   github: {
     hostname: 'github.com',
-    repoURL: 'https://github.com/user/repo',
-    repo: 'user/repo'
+    url: 'https://github.com/user/repo'
   },
   gitlab: {
     hostname: 'gitlab.com',
-    repoURL: 'https://gitlab.com/user/repo',
-    repo: 'user/repo'
+    url: 'https://gitlab.com/user/repo'
   },
   bitbucket: {
     hostname: 'bitbucket.org',
-    repoURL: 'https://bitbucket.org/user/repo',
-    repo: 'user/repo'
+    url: 'https://bitbucket.org/user/repo'
   }
 }
 

test/releases.js

@@ -7,8 +7,7 @@ import { parseReleases } from '../src/releases'
 
 const origin = {
   hostname: 'github.com',
-  repoURL: 'https://github.com/user/repo',
-  repo: 'user/repo'
+  url: 'https://github.com/user/repo'
 }
 
 describe('parseReleases', () => {