refactor: Rename to fediverse blocklist tool/fbt
This commit is contained in:
		@@ -4,14 +4,14 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
In order to have a common development environment, its nice to use docker. Its quite easy. To build a new image, simply run 
 | 
					In order to have a common development environment, its nice to use docker. Its quite easy. To build a new image, simply run 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
`docker build . -t fediverse_blocklist_deploy`
 | 
					`docker build . -t fediverse_blocklist_tool`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Now you can execute any commands using
 | 
					Now you can execute any commands using
 | 
				
			||||||
 | 
					
 | 
				
			||||||
`docker run --rm fediverse_blocklist_deploy --help`
 | 
					`docker run --rm fediverse_blocklist_tool --help`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
If you want to avoid building new containers for each change, simply mount your code into the container using
 | 
					If you want to avoid building new containers for each change, simply mount your code into the container using
 | 
				
			||||||
 | 
					
 | 
				
			||||||
`docker run --rm -v $(pwd):/app fediverse_blocklist_deploy`
 | 
					`docker run --rm -v $(pwd):/app fediverse_blocklist_tool`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Please be aware that changes to the package itself require a rebuild anyways.
 | 
					Please be aware that changes to the package itself require a rebuild anyways.
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,7 +4,7 @@ ENV PYTHONDONTWRITEBYTECODE=1
 | 
				
			|||||||
ENV PYTHONUNBUFFERED=1
 | 
					ENV PYTHONUNBUFFERED=1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COPY pyproject.toml poetry.lock README.md /app/
 | 
					COPY pyproject.toml poetry.lock README.md /app/
 | 
				
			||||||
COPY fediverse_blocklist_deploy /app/fediverse_blocklist_deploy
 | 
					COPY fediverse_blocklist_tool /app/fediverse_blocklist_tool
 | 
				
			||||||
WORKDIR /app
 | 
					WORKDIR /app
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENTRYPOINT ["fediverse_blocklist_deploy"]
 | 
					ENTRYPOINT ["fediverse_blocklist_deploy"]
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
# fediverse-blocklist-deploy
 | 
					# fediverse-blocklist-tool
 | 
				
			||||||
 | 
					
 | 
				
			||||||
A small tool to deploy blocklist updates to a fediverse server using its API.
 | 
					A small tool to deploy blocklist updates to a fediverse server using its API.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,8 +6,8 @@ import requests
 | 
				
			|||||||
import os
 | 
					import os
 | 
				
			||||||
import toml
 | 
					import toml
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from fediverse_blocklist_deploy.models import Instance
 | 
					from fediverse_blocklist_tool.models import Instance
 | 
				
			||||||
from fediverse_blocklist_deploy.helpers import blocklist_to_markdown, blocklist_to_toml, blocklist_to_csv, \
 | 
					from fediverse_blocklist_tool.helpers import blocklist_to_markdown, blocklist_to_toml, blocklist_to_csv, \
 | 
				
			||||||
    blocklist_to_json
 | 
					    blocklist_to_json
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -96,7 +96,7 @@ def merge(input_file, merge_target, format: str = "toml", private: bool = False,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def cli():
 | 
					def cli():
 | 
				
			||||||
    parser = argparse.ArgumentParser(description='Deploy blocklist updates to a fediverse server')
 | 
					    parser = argparse.ArgumentParser(description='Compare, merge, export and deploy blocklist of a fediverse server')
 | 
				
			||||||
    parser.add_argument('action', choices=['diff', 'deploy', 'export', 'merge'],
 | 
					    parser.add_argument('action', choices=['diff', 'deploy', 'export', 'merge'],
 | 
				
			||||||
                        help="Either use 'diff' to check the difference between local blockĺist and the blocklist on "
 | 
					                        help="Either use 'diff' to check the difference between local blockĺist and the blocklist on "
 | 
				
			||||||
                             "the server, 'deploy' to apply the current local blocklist or 'export' to export the remote "
 | 
					                             "the server, 'deploy' to apply the current local blocklist or 'export' to export the remote "
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
from fediverse_blocklist_deploy.models import Instance
 | 
					from fediverse_blocklist_tool.models import Instance
 | 
				
			||||||
import toml
 | 
					import toml
 | 
				
			||||||
import io
 | 
					import io
 | 
				
			||||||
import csv
 | 
					import csv
 | 
				
			||||||
@@ -1,10 +1,10 @@
 | 
				
			|||||||
[tool.poetry]
 | 
					[tool.poetry]
 | 
				
			||||||
name = "fediverse-blocklist-deploy"
 | 
					name = "fediverse-blocklist-tool"
 | 
				
			||||||
version = "0.1.0"
 | 
					version = "0.1.0"
 | 
				
			||||||
description = "A small tool to export, compareof merge and deploy blocklists of a fediverse server"
 | 
					description = "A small tool to export, compareof merge and deploy blocklists of a fediverse server"
 | 
				
			||||||
authors = ["Georg Krause <mail@georg-krause.net>", "Julian-Samuel Gebühr <julian-samuel@gebuehr.net>"]
 | 
					authors = ["Georg Krause <mail@georg-krause.net>", "Julian-Samuel Gebühr <julian-samuel@gebuehr.net>"]
 | 
				
			||||||
readme = "README.md"
 | 
					readme = "README.md"
 | 
				
			||||||
packages = [{include = "fediverse_blocklist_deploy"}]
 | 
					packages = [{include = "fediverse_blocklist_tool"}]
 | 
				
			||||||
license = "MIT"
 | 
					license = "MIT"
 | 
				
			||||||
keywords = ["fediverse", "blocklist", "mastodon", "gotosocial", "safety"]
 | 
					keywords = ["fediverse", "blocklist", "mastodon", "gotosocial", "safety"]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -16,7 +16,7 @@ rich = "^13.0.1"
 | 
				
			|||||||
toml = "^0.10.2"
 | 
					toml = "^0.10.2"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[tool.poetry.scripts]
 | 
					[tool.poetry.scripts]
 | 
				
			||||||
fediverse_blocklist_deploy = 'fediverse_blocklist_deploy.cli:cli'
 | 
					fbt = 'fediverse_blocklist_tool.cli:cli'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[tool.poetry.group.test.dependencies]
 | 
					[tool.poetry.group.test.dependencies]
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user