diff --git a/dvc/command/init.py b/dvc/command/init.py index 0af442928..b5e3b5e40 100644 --- a/dvc/command/init.py +++ b/dvc/command/init.py @@ -85,8 +85,8 @@ ProjectName = return 1 config_dir_path = self.get_not_existing_path(Config.CONFIG_DIR) - cache_dir_path = self.get_not_existing_path(Config.CONFIG_DIR, Config.CACHE_DIR) - state_dir_path = self.get_not_existing_path(Config.CONFIG_DIR, Config.STATE_DIR) + cache_dir_path = self.get_not_existing_path(Config.CONFIG_DIR, Config.CACHE_DIR_NAME) + state_dir_path = self.get_not_existing_path(Config.CONFIG_DIR, Config.STATE_DIR_NAME) conf_file_name = self.get_not_existing_conf_file_name() diff --git a/dvc/config.py b/dvc/config.py index cff3b41e0..3f301a79b 100644 --- a/dvc/config.py +++ b/dvc/config.py @@ -19,8 +19,8 @@ class ConfigI(object): CONFIG_DIR = '.dvc' TARGET_FILE_DEFAULT = 'target' CONFIG = 'config' - STATE_DIR = 'state' - CACHE_DIR = 'cache' + STATE_DIR_NAME = 'state' + CACHE_DIR_NAME = 'cache' def __init__(self, cloud=None, conf_parser=None): self._conf_parser = None @@ -35,12 +35,12 @@ class ConfigI(object): @property def cache_dir(self): """ Directory with cached data files """ - return os.path.join(self.CONFIG_DIR, self.CACHE_DIR) + return os.path.join(self.CONFIG_DIR, self.CACHE_DIR_NAME) @property def state_dir(self): """ Directory with state files """ - return os.path.join(self.CONFIG_DIR, self.STATE_DIR) + return os.path.join(self.CONFIG_DIR, self.STATE_DIR_NAME) @property def cloud(self): diff --git a/tests/basic_env.py b/tests/basic_env.py index ebfdab9fd..1d01f1c0d 100644 --- a/tests/basic_env.py +++ b/tests/basic_env.py @@ -34,8 +34,8 @@ class BasicEnvironment(TestCase): os.makedirs(self._test_git_dir) data_dir = os.path.join(self._test_git_dir, 'data') - cache_dir = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR) - state_dir = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.STATE_DIR, 'data') + cache_dir = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR_NAME) + state_dir = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.STATE_DIR_NAME, 'data') os.makedirs(data_dir) os.makedirs(cache_dir) @@ -103,13 +103,13 @@ class DirHierarchyEnvironment(BasicEnvironment): def crate_data_item(self, data_file, cache_file=True, content='random text'): file_result = os.path.join('data', data_file) - state_result = os.path.join(ConfigI.CONFIG_DIR, ConfigI.STATE_DIR, file_result + DataItem.STATE_FILE_SUFFIX) + state_result = os.path.join(ConfigI.CONFIG_DIR, ConfigI.STATE_DIR_NAME, file_result + DataItem.STATE_FILE_SUFFIX) dummy_md5 = os.path.basename(data_file) + DataItem.CACHE_FILE_SEP + self._commit self.create_content_file(state_result, '{"Md5" : "' + dummy_md5 + '", "Command" : "run", "Cwd" : "dir"}') if cache_file: - cache_result = os.path.join(ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR, dummy_md5) + cache_result = os.path.join(ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR_NAME, dummy_md5) self.create_content_file(cache_result, content) System.hardlink(cache_result, file_result) @@ -121,4 +121,4 @@ class DirHierarchyEnvironment(BasicEnvironment): def create_dirs(self, dir): os.makedirs(os.path.join('data', dir)) - os.makedirs(os.path.join(ConfigI.CONFIG_DIR, ConfigI.STATE_DIR, 'data', dir)) + os.makedirs(os.path.join(ConfigI.CONFIG_DIR, ConfigI.STATE_DIR_NAME, 'data', dir)) diff --git a/tests/test_cmd_run.py b/tests/test_cmd_run.py index 8c2772390..cda6a5a9f 100644 --- a/tests/test_cmd_run.py +++ b/tests/test_cmd_run.py @@ -23,8 +23,8 @@ class RunBasicTest(TestCase): os.chdir(self.test_dir) os.mkdir('data') os.mkdir(ConfigI.CONFIG_DIR) - os.mkdir(os.path.join(ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR)) - os.mkdir(os.path.join(ConfigI.CONFIG_DIR, ConfigI.STATE_DIR)) + os.mkdir(os.path.join(ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR_NAME)) + os.mkdir(os.path.join(ConfigI.CONFIG_DIR, ConfigI.STATE_DIR_NAME)) self.init_git_repo() self.git = GitWrapper() @@ -37,7 +37,7 @@ class RunBasicTest(TestCase): def init_git_repo(self): Executor.exec_cmd_only_success(['git', 'init']) - msg = os.path.join(ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR) + msg = os.path.join(ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR_NAME) msg += '\n' msg += os.path.join(ConfigI.CONFIG_DIR, '.' + ConfigI.CONFIG + '.lock') self.create_file('.gitignore', msg) @@ -72,8 +72,8 @@ class RunTwoFilesBase(RunBasicTest): stdout=self.file_name1, stderr=self.file_name2) - self.state_file_name1 = os.path.join(ConfigI.CONFIG_DIR, ConfigI.STATE_DIR, self.file_name1 + DataItem.STATE_FILE_SUFFIX) - self.state_file_name2 = os.path.join(ConfigI.CONFIG_DIR, ConfigI.STATE_DIR, self.file_name2 + DataItem.STATE_FILE_SUFFIX) + self.state_file_name1 = os.path.join(ConfigI.CONFIG_DIR, ConfigI.STATE_DIR_NAME, self.file_name1 + DataItem.STATE_FILE_SUFFIX) + self.state_file_name2 = os.path.join(ConfigI.CONFIG_DIR, ConfigI.STATE_DIR_NAME, self.file_name2 + DataItem.STATE_FILE_SUFFIX) self.state_file1 = None self.state_file2 = None diff --git a/tests/test_data_file_obj.py b/tests/test_data_file_obj.py index cc7ea821a..1b8c748b6 100644 --- a/tests/test_data_file_obj.py +++ b/tests/test_data_file_obj.py @@ -16,7 +16,7 @@ class TestDataFileObjBasic(BasicEnvironment): config = ConfigI() file = os.path.join('data', 'file.txt') - self.cache_file_full_path = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR, 'file.txt_ad45ba8') + self.cache_file_full_path = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR_NAME, 'file.txt_ad45ba8') self._data_path = DataItem(file, git, config, cache_file=self.cache_file_full_path) pass @@ -28,7 +28,7 @@ class TestDataFileObjBasic(BasicEnvironment): self.assertEqual(self._data_path.cache.abs, self.cache_file_full_path) def test_state_file(self): - state_file_full_path = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.STATE_DIR, 'data', 'file.txt.state') + state_file_full_path = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.STATE_DIR_NAME, 'data', 'file.txt.state') self.assertEqual(self._data_path.state.abs, state_file_full_path) @@ -40,7 +40,7 @@ class TestDataItemWithGivenCache(BasicEnvironment): self._config = ConfigI('data') self._file = os.path.join('data', 'file.txt') - self._cache = os.path.join(ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR, 'file.txt_abcd') + self._cache = os.path.join(ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR_NAME, 'file.txt_abcd') self._data_item = DataItem(self._file, self._git, self._config, self._cache) pass @@ -58,7 +58,7 @@ class TestDeepDataItemWithGivenCache(BasicEnvironment): self._config = ConfigI('data') self._file = os.path.join('data', 'dir1', 'file.txt') - self._cache = os.path.join(ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR, 'dir1', 'file.txt_abcd') + self._cache = os.path.join(ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR_NAME, 'dir1', 'file.txt_abcd') self._data_item = DataItem(self._file, self._git, self._config, self._cache) pass @@ -78,8 +78,8 @@ class TestPathFactory(BasicEnvironment): self.data_file = os.path.join('data', 'file.txt') dummy_md5 = 'fsymlinc.txt' - self.cache_file = os.path.join(ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR, dummy_md5) - self.state_file = os.path.join(ConfigI.CONFIG_DIR, ConfigI.STATE_DIR, 'data', 'file.txt' + DataItem.STATE_FILE_SUFFIX) + self.cache_file = os.path.join(ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR_NAME, dummy_md5) + self.state_file = os.path.join(ConfigI.CONFIG_DIR, ConfigI.STATE_DIR_NAME, 'data', 'file.txt' + DataItem.STATE_FILE_SUFFIX) with open(self.cache_file, 'w+') as fd: fd.write('some text') @@ -134,7 +134,7 @@ class TestDataPathInDataDir(BasicEnvironment): self.path_factory = PathFactory(git, config) deep_path = os.path.join(self.data_dir, 'dir1', 'd2', 'file.txt') - self.cache_file = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR, 'dir1', 'd2', 'file.txt_eeeff8f') + self.cache_file = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR_NAME, 'dir1', 'd2', 'file.txt_eeeff8f') self.data_path = self.path_factory.data_item(deep_path, cache_file=self.cache_file) pass @@ -146,7 +146,7 @@ class TestDataPathInDataDir(BasicEnvironment): self.assertEqual(self.data_path.cache.abs, self.cache_file) def test_state_file(self): - target = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.STATE_DIR, 'da', 'dir1', 'd2', 'file.txt.state') + target = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.STATE_DIR_NAME, 'da', 'dir1', 'd2', 'file.txt.state') self.assertEqual(self.data_path.state.abs, target) @@ -162,7 +162,7 @@ class TestDataFileObjLongPath(BasicEnvironment): self._config = ConfigI('data') self.path_factory = PathFactory(self._git, self._config) - self.cache_file = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR, 'file1.txt_123ed8') + self.cache_file = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.CACHE_DIR_NAME, 'file1.txt_123ed8') self.data_path = self.path_factory.data_item(os.path.join('..', '..', 'data', 'file1.txt'), cache_file=self.cache_file) pass @@ -174,7 +174,7 @@ class TestDataFileObjLongPath(BasicEnvironment): self.assertEqual(self.data_path.cache.abs, self.cache_file) def test_state_file(self): - target = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.STATE_DIR, 'data', 'file1.txt.state') + target = os.path.join(self._test_git_dir, ConfigI.CONFIG_DIR, ConfigI.STATE_DIR_NAME, 'data', 'file1.txt.state') self.assertEqual(self.data_path.state.abs, target)