mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-08 15:28:26 +01:00
Ruslan Kuprieiev
53ec0fa41d
Adds support for `--config` to all three commands. For `ls` and `get`, it is
a purely runtime option that will merge the config you provide with target
repo's configs (similar to how .dvc/config.local works). E.g.
```
$ cat myconfig
[remote "myremote"]
access_key_id = 12345
secret_access_key = 98765
$ dvc get https://github.com/efiop/mydataregistry recent-grads.csv --config myconfig
```
In case of `dvc import`, the semantics are the same, but the value is also
recorded in the resulting dvcfile. E.g.
```
$ dvc import https://github.com/efiop/mydataregistry recent-grads.csv --config myconfig
...
$ cat recent-grads.csv.dvc
md5: 85c86eeb3afa6d1f7d11beedc644d28e
frozen: true
deps:
- path: recent-grads.csv
repo:
url: https://github.com/efiop/mydataregistry
config: myconfig
rev_lock: af22e06bbfe34d62a140437abf32f48b535944a7
outs:
- md5: f447e23a170a9f25a7799f069a1ba934
size: 26872
hash: md5
path: recent-grads.csv
```
This is the most general and powerful mechanism that we can give, that works
for everything from reconfiguring your default remote to completely changing
your remote layout and beyond (will be handy in the future).
Fixes #2466
123 lines
3.4 KiB
Python
123 lines
3.4 KiB
Python
import json
|
|
|
|
from dvc.cli import parse_args
|
|
from dvc.commands.ls import CmdList
|
|
|
|
|
|
def _test_cli(mocker, *args):
|
|
cli_args = parse_args(["list", *args])
|
|
assert cli_args.func == CmdList
|
|
|
|
cmd = cli_args.func(cli_args)
|
|
m = mocker.patch("dvc.repo.Repo.ls")
|
|
|
|
assert cmd.run() == 0
|
|
return m
|
|
|
|
|
|
def test_list(mocker):
|
|
url = "local_dir"
|
|
m = _test_cli(mocker, url)
|
|
m.assert_called_once_with(
|
|
url, None, recursive=False, rev=None, dvc_only=False, config=None
|
|
)
|
|
|
|
|
|
def test_list_recursive(mocker):
|
|
url = "local_dir"
|
|
m = _test_cli(mocker, url, "-R")
|
|
m.assert_called_once_with(
|
|
url, None, recursive=True, rev=None, dvc_only=False, config=None
|
|
)
|
|
|
|
|
|
def test_list_git_ssh_rev(mocker):
|
|
url = "[email protected]:repo"
|
|
m = _test_cli(mocker, url, "--rev", "123")
|
|
m.assert_called_once_with(
|
|
url, None, recursive=False, rev="123", dvc_only=False, config=None
|
|
)
|
|
|
|
|
|
def test_list_targets(mocker):
|
|
url = "local_dir"
|
|
target = "subdir"
|
|
m = _test_cli(mocker, url, target)
|
|
m.assert_called_once_with(
|
|
url, target, recursive=False, rev=None, dvc_only=False, config=None
|
|
)
|
|
|
|
|
|
def test_list_outputs_only(mocker):
|
|
url = "local_dir"
|
|
m = _test_cli(mocker, url, None, "--dvc-only")
|
|
m.assert_called_once_with(
|
|
url, None, recursive=False, rev=None, dvc_only=True, config=None
|
|
)
|
|
|
|
|
|
def test_list_config(mocker):
|
|
url = "local_dir"
|
|
m = _test_cli(mocker, url, None, "--config", "myconfig")
|
|
m.assert_called_once_with(
|
|
url, None, recursive=False, rev=None, dvc_only=False, config="myconfig"
|
|
)
|
|
|
|
|
|
def test_show_json(mocker, capsys):
|
|
cli_args = parse_args(["list", "local_dir", "--json"])
|
|
assert cli_args.func == CmdList
|
|
|
|
cmd = cli_args.func(cli_args)
|
|
|
|
result = [{"key": "val"}]
|
|
mocker.patch("dvc.repo.Repo.ls", return_value=result)
|
|
|
|
assert cmd.run() == 0
|
|
out, _ = capsys.readouterr()
|
|
assert json.dumps(result) in out
|
|
|
|
|
|
def test_show_colors(mocker, capsys, monkeypatch):
|
|
cli_args = parse_args(["list", "local_dir"])
|
|
assert cli_args.func == CmdList
|
|
cmd = cli_args.func(cli_args)
|
|
|
|
monkeypatch.setenv("LS_COLORS", "ex=01;32:rs=0:di=01;34:*.xml=01;31:*.dvc=01;33:")
|
|
result = [
|
|
{"isdir": False, "isexec": 0, "isout": False, "path": ".dvcignore"},
|
|
{"isdir": False, "isexec": 0, "isout": False, "path": ".gitignore"},
|
|
{"isdir": False, "isexec": 0, "isout": False, "path": "README.md"},
|
|
{"isdir": True, "isexec": 0, "isout": True, "path": "data"},
|
|
{"isdir": False, "isexec": 0, "isout": True, "path": "structure.xml"},
|
|
{
|
|
"isdir": False,
|
|
"isexec": 0,
|
|
"isout": False,
|
|
"path": "structure.xml.dvc",
|
|
},
|
|
{"isdir": True, "isexec": 0, "isout": False, "path": "src"},
|
|
{"isdir": False, "isexec": 1, "isout": False, "path": "run.sh"},
|
|
]
|
|
mocker.patch("dvc.repo.Repo.ls", return_value=result)
|
|
|
|
assert cmd.run() == 0
|
|
out, _ = capsys.readouterr()
|
|
entries = out.splitlines()
|
|
|
|
assert entries == [
|
|
".dvcignore",
|
|
".gitignore",
|
|
"README.md",
|
|
"\x1b[01;34mdata\x1b[0m",
|
|
"\x1b[01;31mstructure.xml\x1b[0m",
|
|
"\x1b[01;33mstructure.xml.dvc\x1b[0m",
|
|
"\x1b[01;34msrc\x1b[0m",
|
|
"\x1b[01;32mrun.sh\x1b[0m",
|
|
]
|
|
|
|
|
|
def test_list_alias():
|
|
cli_args = parse_args(["ls", "local_dir"])
|
|
assert cli_args.func == CmdList
|