Renamed the version to be 3.1.0-dev instead of having v<number>

for the 3.0.6 as this will be a major release when we are happy with everything

Try seeing if I can get travis to check how everything acts when installed as a python module
This commit is contained in:
L1ghtn1ng 2019-04-19 16:18:49 +01:00
parent 3a0e63238b
commit f63d6f71fb
5 changed files with 15 additions and 5 deletions

View file

@ -5,8 +5,9 @@ python:
- '3.7' - '3.7'
- '3.8-dev' - '3.8-dev'
install: install:
- pip install -r requirements.txt - python setup install
script: script:
- python theHarvester -h
- pytest - pytest
notifications: notifications:
email: false email: false

View file

@ -6,7 +6,7 @@
* | |_| | | | __/ / __ / (_| | | \ V / __/\__ \ || __/ | * * | |_| | | | __/ / __ / (_| | | \ V / __/\__ \ || __/ | *
* \__|_| |_|\___| \/ /_/ \__,_|_| \_/ \___||___/\__\___|_| * * \__|_| |_|\___| \/ /_/ \__,_|_| \_/ \___||___/\__\___|_| *
* * * *
* theHarvester 3.0.6 v380 * * theHarvester 3.1.0 dev *
* Coded by Christian Martorella * * Coded by Christian Martorella *
* Edge-Security Research * * Edge-Security Research *
* cmartorella@edge-security.com * * cmartorella@edge-security.com *

View file

@ -1,11 +1,12 @@
import setuptools import setuptools
from theHarvester.lib.core import Core
with open("README.md", "r") as fh: with open("README.md", "r") as fh:
long_description = fh.read() long_description = fh.read()
setuptools.setup( setuptools.setup(
name='theHarvester', name='theHarvester',
version='3.0.6', version=Core.version(),
author="Christian Martorella", author="Christian Martorella",
author_email="cmartorella@edge-security.com", author_email="cmartorella@edge-security.com",
description="theHarvester is a very simple, yet effective tool designed to be used in the early stages of a penetration test", description="theHarvester is a very simple, yet effective tool designed to be used in the early stages of a penetration test",
@ -21,6 +22,8 @@
classifiers=[ classifiers=[
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)", "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
"Operating System :: OS Independent", "Operating System :: OS Independent",
], ],

View file

@ -30,12 +30,14 @@
Core.banner() Core.banner()
def modified_source(excluded_engines): def modified_source(excluded_engines):
engines = Core.get_supportedengines() engines = Core.get_supportedengines()
engines.remove('all') engines.remove('all')
excluded_engines = set(map(str.strip, excluded_engines.split(','))) excluded_engines = set(map(str.strip, excluded_engines.split(',')))
return engines.difference(excluded_engines) return engines.difference(excluded_engines)
def start(): def start():
parser = argparse.ArgumentParser(description='theHarvester is used to gather open source intelligence (OSINT) on a\n' parser = argparse.ArgumentParser(description='theHarvester is used to gather open source intelligence (OSINT) on a\n'
'company or domain.') 'company or domain.')

View file

@ -5,6 +5,10 @@
class Core: class Core:
@staticmethod
def version():
return '3.1.0-dev'
@staticmethod @staticmethod
def bing_key(): def bing_key():
with open('api-keys.yaml', 'r') as api_keys: with open('api-keys.yaml', 'r') as api_keys:
@ -44,7 +48,7 @@ def banner():
print(r"* | |_| | | | __/ / __ / (_| | | \ V / __/\__ \ || __/ | *") print(r"* | |_| | | | __/ / __ / (_| | | \ V / __/\__ \ || __/ | *")
print(r"* \__|_| |_|\___| \/ /_/ \__,_|_| \_/ \___||___/\__\___|_| *") print(r"* \__|_| |_|\___| \/ /_/ \__,_|_| \_/ \___||___/\__\___|_| *")
print('* *') print('* *')
print('* theHarvester 3.0.6 v380 *') print(f'* theHarvester {Core.version()} *')
print('* Coded by Christian Martorella *') print('* Coded by Christian Martorella *')
print('* Edge-Security Research *') print('* Edge-Security Research *')
print('* cmartorella@edge-security.com *') print('* cmartorella@edge-security.com *')