Merge branch 'master' into analysis-view

# Conflicts:
#	dnstwister/__init__.py
#	dnstwister/static/build.py

.gitignore

@@ -3,3 +3,4 @@ resolvers/dnsresolve*
 .cache/
 brand/*.psd
 _build*
+.coverage

.travis.yml

@@ -1,5 +1,10 @@
 language: python
 python:
   - "2.7"
-install: "pip install -r requirements.txt"
-script: py.test
+install:
+    - pip install -r requirements.txt
+    - pip install pytest-cov
+script: py.test --cov=dnstwister
+after_success:
+    - pip install python-coveralls
+    - coveralls -i

dnstwister/__init__.py

@@ -3,7 +3,6 @@
 import flask.ext.cache
 
 import mail.sendgridservice
-import payment.stripeservice
 import storage.pg_database
 
 
@@ -12,7 +11,6 @@
 cache = flask.ext.cache.Cache(app, config={'CACHE_TYPE': 'simple'})
 db = storage.pg_database.PGDatabase()
 emailer = mail.sendgridservice.SGSender()
-gateway = payment.stripeservice.StripeService()
 
 # Blueprints
 import api
@@ -28,4 +26,3 @@
 import views.www.index
 import views.www.search
 import views.www.status
-import views.www.whois

dnstwister/dnstwist/dnstwist.py

@@ -8,7 +8,7 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
@@ -19,20 +19,24 @@
 
 #
 # dnstwist 1.02 modified by Robert Wallhead (robert@thisismyrobot.com) for use
-# in https://dnstwist.herokuapp.com - all functionality except fuzzing removed
-# and various changes made to allow usage in Google App Engine.
+# in https://dnstwister.report - all functionality except fuzzing removed and
+# various changes made to allow usage in Heroku.
 #
 
 __author__ = 'Marcin Ulikowski'
 __version__ = '1.02'
 __email__ = 'marcin@ulikowski.pl'
 
 import re
-import sys
 import os.path
 
 
-FILE_TLD = os.path.join('dnstwist', 'database', 'effective_tld_names.dat')
+FILE_TLD = os.path.join(
+    'dnstwister',
+    'dnstwist',
+    'database',
+    'effective_tld_names.dat'
+)
 DB_TLD = os.path.exists(FILE_TLD)
 
 

dnstwister/static/build.py

@@ -15,11 +15,6 @@
         'common.css',
         'index.css',
     ),
-    'whois.min.css': (
-        'normalize.css',
-        'skeleton.css',
-        'common.css',
-    ),
     'analyse.min.css': (
         'normalize.css',
         'skeleton.css',

dnstwister/storage/interfaces.py

@@ -6,19 +6,15 @@ class IKeyValueDB(zope.interface.Interface):
     """Interface for a key-value storage."""
     def set(self, key, value):
         """Set the value for key"""
-        pass
 
     def get(self, key):
         """Get a value for key or None."""
-        pass
 
     def ikeys(self, prefix=''):
         """Return an iterator of all keys, optionally filtered on prefix."""
-        pass
 
     def delete(self, key):
         """Delete a key."""
-        pass
 
 
 def instance_valid(instance):

dnstwister/tools/__init__.py

@@ -12,7 +12,6 @@
 
 from dnstwister import cache
 import dnstwister.dnstwist as dnstwist
-import dnstwister.whois as whois
 
 
 RESOLVER = dns.resolver.Resolver()
@@ -129,14 +128,6 @@ def resolve(domain):
         return False, True
 
 
-def whois_query(domain):
-    """Returns the whois info for a domain or None."""
-    try:
-        return whois.lookup(domain)
-    except:
-        return 'Error: whois lookup failed'
-
-
 def random_id(n_bytes=32):
     """Generate a random id for an email subscription (for instance)."""
     return binascii.hexlify(os.urandom(n_bytes))

dnstwister/views/www/email.py

@@ -1,7 +1,7 @@
 """Email pages."""
 import flask
 
-from dnstwister import app, emailer, gateway, repository
+from dnstwister import app, emailer, repository
 import dnstwister.tools as tools
 import dnstwister.tools.email as email_tools