tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move find_candidates_in_parent_dirs() into a config module so that config doesn't import from cli. 

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-09-15 14:17:27 -04:00
parent 89be7f1fa7
commit fe5daf860d
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compose/cli/utils.py
View File

@ -36,25 +36,6 @@ def yesno(prompt, default=None):
return None return None
def find_candidates_in_parent_dirs(filenames, path):
"""
Given a directory path to start, looks for filenames in the
directory, and then each parent directory successively,
until found.
Returns tuple (candidates, path).
"""
candidates = [filename for filename in filenames
if os.path.exists(os.path.join(path, filename))]
if len(candidates) == 0:
parent_dir = os.path.join(path, '..')
if os.path.abspath(parent_dir) != os.path.abspath(path):
return find_candidates_in_parent_dirs(filenames, parent_dir)
return (candidates, path)
def split_buffer(reader, separator): def split_buffer(reader, separator):
""" """
Given a generator which yields strings and a separator string, Given a generator which yields strings and a separator string,

24
compose/config/config.py
View File

@ -17,7 +17,6 @@ from .validation import validate_extended_service_exists
from .validation import validate_extends_file_path from .validation import validate_extends_file_path
from .validation import validate_service_names from .validation import validate_service_names
from .validation import validate_top_level_object from .validation import validate_top_level_object
from compose.cli.utils import find_candidates_in_parent_dirs
DOCKER_CONFIG_KEYS = [ DOCKER_CONFIG_KEYS = [
@ -103,13 +102,13 @@ def find(base_dir, filenames):
if filenames: if filenames:
filenames = [os.path.join(base_dir, f) for f in filenames] filenames = [os.path.join(base_dir, f) for f in filenames]
else: else:
filenames = [get_config_path(base_dir)] filenames = get_default_config_path(base_dir)
return ConfigDetails( return ConfigDetails(
os.path.dirname(filenames[0]), os.path.dirname(filenames[0]),
[ConfigFile(f, load_yaml(f)) for f in filenames]) [ConfigFile(f, load_yaml(f)) for f in filenames])
def get_config_path(base_dir): def get_default_config_path(base_dir):
(candidates, path) = find_candidates_in_parent_dirs(SUPPORTED_FILENAMES, base_dir) (candidates, path) = find_candidates_in_parent_dirs(SUPPORTED_FILENAMES, base_dir)
if len(candidates) == 0: if len(candidates) == 0:
@ -133,6 +132,25 @@ def get_config_path(base_dir):
return os.path.join(path, winner) return os.path.join(path, winner)
def find_candidates_in_parent_dirs(filenames, path):
"""
Given a directory path to start, looks for filenames in the
directory, and then each parent directory successively,
until found.
Returns tuple (candidates, path).
"""
candidates = [filename for filename in filenames
if os.path.exists(os.path.join(path, filename))]
if len(candidates) == 0:
parent_dir = os.path.join(path, '..')
if os.path.abspath(parent_dir) != os.path.abspath(path):
return find_candidates_in_parent_dirs(filenames, parent_dir)
return (candidates, path)
@validate_top_level_object @validate_top_level_object
@validate_service_names @validate_service_names
def pre_process_config(config): def pre_process_config(config):