Move around some url config logic

Author: BGR360

app/app.py

@@ -8,7 +8,7 @@
 
 from pbr.version import SemanticVersion
 
-from app.config import GITHUB_REPO
+from app.config import github_pypi_package_url
 from app.version import __version__, get_latest_version_string_from_github_repo
 
 class SelfUpdatingApp():
@@ -17,7 +17,7 @@ class SelfUpdatingApp():
     def __init__(self):
         # Fetch most recent version from GitHub repository
         self.remote_version = SemanticVersion.from_pip_string(
-            get_latest_version_string_from_github_repo(GITHUB_REPO))
+            get_latest_version_string_from_github_repo())
         # Fetch locally installed version from PBR
         self.local_version = SemanticVersion.from_pip_string(__version__)
 
@@ -27,7 +27,7 @@ def is_out_of_date(self):
 
     def update(self):
         '''Use pip to upgrade the current installation to the newest version.'''
-        package = 'git+https://github.com/{}.git'.format(GITHUB_REPO)
+        package = github_pypi_package_url()
         command = [sys.executable, '-m', 'pip', 'install', '--upgrade', package]
         subprocess.call(command, stdout=sys.stdout, stderr=sys.stderr)
 

app/config.py

@@ -1,3 +1,15 @@
 """Static application configuration is placed here."""
 
 GITHUB_REPO = 'BGR360/self-updating-program'
+
+def github_repo_url():
+    return 'https://github.com/{}'.format(GITHUB_REPO)
+
+def github_pypi_package_url(version=None):
+    url = 'git+{}.git'.format(github_repo_url())
+    if version is not None:
+        url += '@{}'.format(version)
+    return url
+
+def github_api_url():
+    return 'https://api.github.com/repos/{}'.format(GITHUB_REPO)

app/version.py

@@ -9,13 +9,14 @@
 import requests
 from pbr.version import VersionInfo
 
+from app.config import github_api_url
+
 INFO = VersionInfo('app').semantic_version()
 __version__ = INFO.release_string()
 __version_info__ = INFO.version_tuple()
 
-def get_latest_version_string_from_github_repo(repository):
-    latest_release_url = 'https://api.github.com/repos/{}/releases/latest'.format(repository)
-    req = requests.get(latest_release_url)
+def get_latest_version_string_from_github_repo():
+    req = requests.get(github_api_url() + '/releases/latest')
     api_response = req.json()
     version_string = api_response['tag_name']
     return version_string