Merge pull request #27 from psypanda/pypi

Prepare hashID for release on PyPi (#24)

.gitignore

@@ -1,9 +1,13 @@
 $RECYCLE.BIN/
 *.bak
+*.egg
+*.egg-info
 .DS_Store
 .~lock*
+build
 Desktop.ini
+dist
 ehthumbs.db
 js/node_modules
-test/
+test
 Thumbs.db

MANIFEST.in

@@ -0,0 +1 @@
+include doc/LICENSE doc/CHANGELOG

README.rst

@@ -7,7 +7,7 @@ This tool replaces `hash-identifier <http://code.google.com/p/hash-identifier/>`
 is outdated!
 
 hashID is a tool written in Python 3.x which supports the
-identification of over 210 unique hash types using regular expressions.
+identification of over 215 unique hash types using regular expressions.
 A detailed list of supported hashes can be found
 `here <doc/hashinfo.xlsx>`__.
 
@@ -25,7 +25,15 @@ quotes to prevent interpolation*
 Installation
 ------------
 
-You can either install by cloning the repository:
+You can install, upgrade, uninstall hashID with these commands:
+
+.. code:: console
+
+    $ pip install hashid
+    $ pip install --upgrade hashid
+    $ pip uninstall hashid
+
+Or you can install by cloning the repository:
 
 .. code:: console
 
@@ -35,7 +43,7 @@ You can either install by cloning the repository:
     $ sudo install -g 0 -o 0 -m 0644 doc/man/hashid.7 /usr/share/man/man7/
     $ sudo gzip /usr/share/man/man7/hashid.7
 
-Or you can grab the latest release
+Alternatively you can grab the latest release
 `here <https://github.com/psypanda/hashID/releases>`__.
 
 Usage

doc/CHANGELOG

@@ -1,5 +1,13 @@
 ### Changelog
 
+v3.1.3
+- First release on PyPi
+- Added Dahua hash format
+- Added GOST CryptoPro S-Box hash format
+- Added PBKDF2-HMAC-SHA256(PHP) hash format
+- Added PDF 1.4 - 1.6 (Acrobat 5 - 8) hash format
+- Fix JohnTheRipper format for Joomla ≥ v2.5.18
+
 v3.1.2
 - Add Microsoft Outlook PST hash format
 - Add Siemens-S7 hash format

hashid.py

@@ -23,7 +23,7 @@
 from collections import namedtuple
 
 __author__  = "c0re"
-__version__ = "3.1.2"
+__version__ = "3.1.3"
 __github__  = "https://github.com/psypanda/hashID"
 __license__ = "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>"
 

setup.cfg

@@ -0,0 +1,2 @@
+[wheel]
+universal = 1

setup.py

@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import io
+import os
+import re
+from setuptools import setup, find_packages
+
+
+def read(*parts):
+    here = os.path.abspath(os.path.dirname(__file__))
+    with io.open(os.path.join(here, *parts), "r", encoding="utf-8") as f:
+        return f.read()
+
+
+def get_version(*file_paths):
+    version_file = read(*file_paths)
+    version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", version_file, re.M)
+    if version_match:
+        return version_match.group(1)
+    raise RuntimeError("Unable to find version string.")
+
+
+setup(
+    name='hashID',
+    packages=find_packages(exclude=['hashinfo.xlsx']),
+    version=get_version('hashid.py'),
+    description='Software to identify the different types of hashes',
+    long_description=read('README.rst'),
+    author='c0re',
+    author_email='c0re@psypanda.org',
+    license='GNU GPL',
+    url='https://github.com/psypanda/hashID',
+    download_url='https://github.com/psypanda/hashID/tarball/v' + get_version('hashid.py'),
+    keywords='hashid hash identifier hash-identifier',
+    py_modules=['hashid'],
+    entry_points={
+        'console_scripts': [
+            'hashid = hashid:main',
+        ],
+    },
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'Natural Language :: English',
+        'Intended Audience :: Other Audience',
+        'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+    ],
+)