Compare commits

..

No commits in common. "ff8a3c1b5682a38c6f8cb1563faa31a7f6d84444" and "8a9e17ad0d6268f1c1f1b97ea45b5d715281d551" have entirely different histories.

6 changed files with 58 additions and 55 deletions

22
.gitignore vendored
View File

@ -1,7 +1,15 @@
dist/ #########
*.egg-info/ # Python
.env #########
env *.pyc
*/__pycache__/*
.venv build
venv
#########
# Debian
#########
*.deb
backup-*.tgz
description-pak
doc-pak

6
Makefile Normal file
View File

@ -0,0 +1,6 @@
install:
python setup.py build
sudo checkinstall -Dy --fstrans=no python setup.py install
clean:
sudo rm -r build *-pak dicekey_*.deb

View File

@ -1,19 +1,32 @@
# Dicekey # Dicekey
Dicekey is a [Diceware](http://diceware.com) simple Python passphrase generator. Dicekey is a [Diceware](http://diceware.com) passphrase generator that aims
to be user friendly and encourage the adoption of strong random passphrases.
## Quick Start ## Quick Start
1. Clone the repository: `git clone https://git.krislamo.org/kris/dicekey` Instructions on how to install from the git repository for developers.
2. Install dependencies: `sudo apt-get install python-tk`
3. Create a virtual environment: `python3 -m venv .venv` * Clone the repository: `git clone https://github.com/Kris619/Dicekey.git`
4. Activate the virtual environment `source .venv/bin/activate` * Install dependencies: `sudo apt-get install python-tk checkinstall`
5. Install package: `pip install -e .` * Install Dicekey with GNU make: `make install`
6. Run `dicekey` and optionally specify a length, i.e., `dicekey 7` * Clean up files: `make clean`
To uninstall Dicekey: `sudo dpkg -r dicekey`
## Development
Dicekey is developed on Trisquel GNU/Linux 7 x86_64 with Python 2.7.6
and checkinstall 1.6.2. There *are* plans to support other platforms.
Development follows the the [Semantic
Versioning](http://semver.org/spec/v2.0.0.html) 2.0.0 specification and the
[PEP 8](https://www.python.org/dev/peps/pep-0008/) styling guide. Mistakes may
occur but we shall try to follow these guidelines to the best of our ability.
## Copyrights and Licenses ## Copyrights and Licenses
Copyright (C) 2016, 2023 Kris Lamoureux Copyright (C) 2016 Kris Lamoureux
All Dicekey All Dicekey
code is [Free Software](https://www.gnu.org/philosophy/free-sw.en.html) code is [Free Software](https://www.gnu.org/philosophy/free-sw.en.html)

12
dicekey/main.py → dicekey/dicekey Executable file → Normal file
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python
# Dicekey. A Diceware passphrase generator. # Dicekey. A Diceware passphrase generator.
# Copyright (C) 2016, 2023 Kris Lamoureux # Copyright (C) 2016 Kris Lamoureux
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -17,7 +17,7 @@
# Built-in # Built-in
import sys import sys
import tkinter as tk import Tkinter as tk
# Local # Local
from dicekey import diceware from dicekey import diceware
@ -47,12 +47,12 @@ def main():
if len(sys.argv) > 1: if len(sys.argv) > 1:
if wordlist: if wordlist:
if sys.argv[1].isdigit(): if sys.argv[1].isdigit():
print(' '.join(pwgen.wordgen(int(sys.argv[1])))) print ' '.join(pwgen.wordgen(int(sys.argv[1])))
else: else:
error = "Error: Argument '%s' is not an integer." error = "Error: Argument '%s' is not an integer."
print(error % (sys.argv[1])) print error % (sys.argv[1])
else: else:
print("Error: Incomplete or missing word list.") print "Error: Incomplete or missing word list."
else: else:
root = tk.Tk() root = tk.Tk()

View File

@ -1,21 +0,0 @@
[build-system]
requires = ["setuptools>=61.0"]
build-backend = "setuptools.build_meta"
[project]
name = "dicekey"
version = "0.0.1"
authors = [
{ name="Kris Lamoureux", email="kris@lamoureux.io" },
]
description = "A simple Python passphrase generator"
readme = "README.md"
requires-python = ">=3.7"
classifiers = [
"Programming Language :: Python :: 3",
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
"Operating System :: OS Independent",
]
[project.urls]
"Homepage" = "https://git.krislamo.org/kris/dicekey"

View File

@ -1,5 +1,5 @@
# Dicekey. A Diceware passphrase generator. # Dicekey. A Diceware passphrase generator.
# Copyright (C) 2016, 2023 Kris Lamoureux # Copyright (C) 2016 Kris Lamoureux
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -13,13 +13,14 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from setuptools import setup # Built-in
from distutils.core import setup
NAME = "dicekey" NAME = "Dicekey"
VERSION = "0.0.1" VERSION = "3.1.0-prealpha"
AUTHOR = "Kris Lamoureux" AUTHOR = "Kris Lamoureux"
AUTHOR_EMAIL = "kris@lamoureux.io" AUTHOR_EMAIL = "KrisPublicEmail@gmail.com"
URL = "https://git.krislamo.org/kris/dicekey" URL = "https://github.com/Kris619/Dicekey/"
DESCRIPTION = "A Diceware passphrase generator" DESCRIPTION = "A Diceware passphrase generator"
setup( setup(
@ -30,11 +31,7 @@ setup(
author_email=AUTHOR_EMAIL, author_email=AUTHOR_EMAIL,
license="GNU GPLv3", license="GNU GPLv3",
url=URL, url=URL,
scripts = ["dicekey/dicekey"],
py_modules = ["dicekey.diceware"], py_modules = ["dicekey.diceware"],
data_files = [("dicekey/wordlist.asc", '')], data_files = [("dicekey/wordlist.asc", '')]
entry_points={ )
'console_scripts': [
'dicekey = dicekey.main:main',
],
},
)