Skip to content

Commit 143107b

Browse files
authored
refactor: rename manager (#30)
1 parent 15ca45c commit 143107b

File tree

6 files changed

+26
-24
lines changed

6 files changed

+26
-24
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
test:
1010
name: Test
1111
uses: ./.github/workflows/test.yaml
12+
secrets: inherit
1213
tag:
1314
name: Tag
1415
timeout-minutes: 2

.github/workflows/pr.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ jobs:
99
test:
1010
name: Test
1111
uses: ./.github/workflows/test.yaml
12+
secrets: inherit

poetry.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/git_draft/__main__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
ensure_state_home,
1414
open_editor,
1515
)
16-
from .manager import Manager
16+
from .drafter import Drafter
1717
from .prompt import TemplatedPrompt
1818
from .store import Store
1919

@@ -113,7 +113,7 @@ def main() -> None:
113113
return
114114
logging.basicConfig(level=config.log_level, filename=str(log_path))
115115

116-
manager = Manager.create(
116+
drafter = Drafter.create(
117117
store=Store.persistent(),
118118
path=opts.root,
119119
operation_hook=print_operation,
@@ -140,13 +140,13 @@ def main() -> None:
140140
else:
141141
prompt = sys.stdin.read()
142142

143-
manager.generate_draft(
143+
drafter.generate_draft(
144144
prompt, bot, checkout=opts.checkout, reset=opts.reset
145145
)
146146
elif command == "finalize":
147-
manager.finalize_draft(delete=opts.delete)
147+
drafter.finalize_draft(delete=opts.delete)
148148
elif command == "discard":
149-
manager.discard_draft(delete=opts.delete)
149+
drafter.discard_draft(delete=opts.delete)
150150
else:
151151
raise UnreachableError()
152152

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ def _write(self, path: PurePosixPath, contents: str) -> None:
8484
)
8585

8686

87-
class Manager:
88-
"""Draft state manager"""
87+
class Drafter:
88+
"""Draft state orchestrator"""
8989

9090
def __init__(
9191
self, store: Store, repo: git.Repo, hook: OperationHook | None = None
@@ -102,7 +102,7 @@ def create(
102102
store: Store,
103103
path: str | None = None,
104104
operation_hook: OperationHook | None = None,
105-
) -> Manager:
105+
) -> Drafter:
106106
return cls(
107107
store,
108108
git.Repo(path, search_parent_directories=True),
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import pytest
55

66
from git_draft.bots import Action, Bot, Toolbox
7-
import git_draft.manager as sut
7+
import git_draft.drafter as sut
88
from git_draft.store import Store
99

1010

@@ -15,27 +15,27 @@ def act(self, prompt: str, toolbox: Toolbox) -> Action:
1515

1616

1717
@pytest.fixture
18-
def manager(repo: git.Repo) -> sut.Manager:
19-
return sut.Manager(Store.in_memory(), repo)
18+
def drafter(repo: git.Repo) -> sut.Drafter:
19+
return sut.Drafter(Store.in_memory(), repo)
2020

2121

22-
class TestManager:
22+
class TestDrafter:
2323
def test_generate_draft(
24-
self, manager: sut.Manager, repo: git.Repo
24+
self, drafter: sut.Drafter, repo: git.Repo
2525
) -> None:
26-
manager.generate_draft("hello", _FakeBot())
26+
drafter.generate_draft("hello", _FakeBot())
2727
commits = list(repo.iter_commits())
2828
assert len(commits) == 2
2929

3030
def test_generate_then_discard_draft(
31-
self, manager: sut.Manager, repo: git.Repo
31+
self, drafter: sut.Drafter, repo: git.Repo
3232
) -> None:
33-
manager.generate_draft("hello", _FakeBot())
34-
manager.discard_draft()
33+
drafter.generate_draft("hello", _FakeBot())
34+
drafter.discard_draft()
3535
assert len(list(repo.iter_commits())) == 1
3636

3737
def test_discard_restores_worktree(
38-
self, manager: sut.Manager, repo: git.Repo
38+
self, drafter: sut.Drafter, repo: git.Repo
3939
) -> None:
4040
p1 = osp.join(repo.working_dir, "p1.txt")
4141
with open(p1, "w") as writer:
@@ -44,29 +44,29 @@ def test_discard_restores_worktree(
4444
with open(p2, "w") as writer:
4545
writer.write("b1")
4646

47-
manager.generate_draft("hello", _FakeBot(), sync=True)
47+
drafter.generate_draft("hello", _FakeBot(), sync=True)
4848
with open(p1, "w") as writer:
4949
writer.write("a2")
5050

51-
manager.discard_draft()
51+
drafter.discard_draft()
5252

5353
with open(p1) as reader:
5454
assert reader.read() == "a1"
5555
with open(p2) as reader:
5656
assert reader.read() == "b1"
5757

5858
def test_finalize_keeps_changes(
59-
self, manager: sut.Manager, repo: git.Repo
59+
self, drafter: sut.Drafter, repo: git.Repo
6060
) -> None:
6161
p1 = osp.join(repo.working_dir, "p1.txt")
6262
with open(p1, "w") as writer:
6363
writer.write("a1")
6464

65-
manager.generate_draft("hello", _FakeBot(), checkout=True)
65+
drafter.generate_draft("hello", _FakeBot(), checkout=True)
6666
with open(p1, "w") as writer:
6767
writer.write("a2")
6868

69-
manager.finalize_draft()
69+
drafter.finalize_draft()
7070

7171
with open(p1) as reader:
7272
assert reader.read() == "a2"

0 commit comments

Comments
 (0)