accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-18 11:05:12 +00:00
Code Issues Releases Activity

Merge pull request #1273 from Aradhya-Tripathi/uri-path

Browse Source 
fix: uri-path when initializing Apps
This commit is contained in:
gavin 2022-02-25 00:35:03 +05:30 committed by GitHub
commit 451712edcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bench/app.py
View File

@ -9,6 +9,7 @@ import subprocess
import sys import sys
import typing import typing
from datetime import date from datetime import date
from urllib.parse import urlparse
# imports - third party imports # imports - third party imports
import click import click
@ -62,6 +63,9 @@ class AppMeta:
self.from_apps = False self.from_apps = False
self.is_url = False self.is_url = False
self.branch = branch self.branch = branch
self.mount_path = os.path.abspath(
os.path.join(urlparse(self.name).netloc, urlparse(self.name).path)
)
self.setup_details() self.setup_details()
def setup_details(self): def setup_details(self):
@ -75,7 +79,7 @@ class AppMeta:
self._setup_details_from_installed_apps() self._setup_details_from_installed_apps()
# fetch meta for repo on mounted disk # fetch meta for repo on mounted disk
elif os.path.exists(self.name): elif os.path.exists(self.mount_path):
self.on_disk = True self.on_disk = True
self._setup_details_from_mounted_disk() self._setup_details_from_mounted_disk()
@ -91,7 +95,9 @@ class AppMeta:
self._setup_details_from_name_tag() self._setup_details_from_name_tag()
def _setup_details_from_mounted_disk(self): def _setup_details_from_mounted_disk(self):
self.org, self.repo, self.tag = os.path.split(self.name)[-2:] + (self.branch,) self.org, self.repo, self.tag = os.path.split(self.mount_path)[-2:] + (
self.branch,
)
def _setup_details_from_name_tag(self): def _setup_details_from_name_tag(self):
self.org, self.repo, self.tag = fetch_details_from_tag(self.name) self.org, self.repo, self.tag = fetch_details_from_tag(self.name)
@ -122,7 +128,7 @@ class AppMeta:
return os.path.abspath(os.path.join("apps", self.name)) return os.path.abspath(os.path.join("apps", self.name))
if self.on_disk: if self.on_disk:
return os.path.abspath(self.name) return self.mount_path
if self.is_url: if self.is_url:
return self.name return self.name

4
bench/tests/test_init.py
View File

@ -10,6 +10,7 @@ import git
# imports - module imports # imports - module imports
from bench.utils import exec_cmd from bench.utils import exec_cmd
from bench.release import get_bumped_version from bench.release import get_bumped_version
from bench.app import App
from bench.tests.test_base import FRAPPE_BRANCH, TestBenchBase from bench.tests.test_base import FRAPPE_BRANCH, TestBenchBase
@ -34,9 +35,10 @@ class TestBenchInit(TestBenchBase):
def test_utils(self): def test_utils(self):
self.assertEqual(subprocess.call("bench"), 0) self.assertEqual(subprocess.call("bench"), 0)
def test_init(self, bench_name="test-bench", **kwargs): def test_init(self, bench_name="test-bench", **kwargs):
self.init_bench(bench_name, **kwargs) self.init_bench(bench_name, **kwargs)
app = App("file:///tmp/frappe")
self.assertEqual(app.url, "/tmp/frappe")
self.assert_folders(bench_name) self.assert_folders(bench_name)
self.assert_virtual_env(bench_name) self.assert_virtual_env(bench_name)
self.assert_config(bench_name) self.assert_config(bench_name)