Add IpIfy (#9)

README.md

@@ -22,6 +22,7 @@ Create a file in /etc/profile.d/ipteller.sh with the variables:
 ```bash
 export GMAIL_USER='[email protected]'
 export GMAIL_PASS='Password'
+export IP_PROVIDER='jsonip'
 ```
 
 and then in execute `crontab -e` and add this line at the end:

docker-compose.yml

@@ -9,6 +9,7 @@ services:
       PYTHONUSERBASE: /app/vendor
       PYTHONPATH: '/app/vendor/lib/python2.7/site-packages'
       PATH: '/app/vendor/bin:$PATH'
+      IP_PROVIDER: 'jsonip'
       TWINE_USERNAME: 'User'
       TWINE_PASSWORD: 'Password'
       GMAIL_USER: '[email protected]'

features/steps/step_mailer.py

@@ -14,10 +14,10 @@
 def step_impl(context, subject, body):
     context.subject = subject
     context.body = body
-    context.mailer = Mailer(subject, body)
+    context.message = Mailer.message({'user': 'test', 'pwd': 'pwd', 'subject': subject, 'body': body})
 
 
 @then('I expect to get it with a proper format')
 def step_impl(context):
-    assert context.subject in context.mailer.message()
-    assert context.body in context.mailer.message()
+    assert context.subject in context.message
+    assert context.body in context.message

ipteller/ipify.py

@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+from providerip import ProviderIp
+
+
+class IpIfy(ProviderIp):
+    def __init__(self):
+        ProviderIp.__init__(self)
+        self.url = 'https://api.ipify.org?format=json'
+
+    @staticmethod
+    def get_ip(uri):
+        return uri["ip"]

ipteller/ipteller.py

@@ -1,14 +1,31 @@
 #!/usr/bin/env python
 """This script runs the whole app"""
 
+from os import environ
 from address import Address
+from ipify import IpIfy
 from jsonip import JsonIp
 from mailer import Mailer
 
 address = Address('address.txt')
-provider = JsonIp()
+try:
+    user = environ["GMAIL_USER"]
+    pwd = environ["GMAIL_PASS"]
+except KeyError as err:
+    print('You need to add the environment variable: %s' % err)
+    quit(1)
+try:
+    provider = environ["IP_PROVIDER"]
+    if provider == 'ipify':
+        provider = IpIfy()
+    else:
+        raise KeyError
+except KeyError:
+    provider = JsonIp()
+
 ip = provider.get_ip(provider.get_response())
 
 if ip != address.load():
     address.save(ip)
-    deliver = Mailer('IP Teller', 'Your IP changed to: ' + ip).send()
+    data = {'user': user, 'pwd': pwd, 'subject': 'IP Teller', 'body': 'Your IP changed to: %s' % ip}
+    deliver = Mailer().send(data)

ipteller/jsonip.py

@@ -1,17 +1,12 @@
 #!/usr/bin/env python
 
-import logging
-import requests
+from providerip import ProviderIp
 
 
-class JsonIp(object):
-    @staticmethod
-    def get_response():
-        url = 'https://jsonip.com/'
-        try:
-            return requests.get(url).json()
-        except ValueError as err:
-            logging.exception(err)
+class JsonIp(ProviderIp):
+    def __init__(self):
+        ProviderIp.__init__(self)
+        self.url = 'https://jsonip.com/'
 
     @staticmethod
     def get_ip(uri):

ipteller/mailer.py

@@ -1,24 +1,18 @@
 #!/usr/bin/env python
 
 import logging
-import os
 import smtplib
 
 
 class Mailer(object):
-    def __init__(self, subject, body):
-        self.host = "smtp.gmail.com"
-        self.port = 465
-        self.user = os.environ["GMAIL_USER"]
-        self.pwd = os.environ["GMAIL_PASS"]
-        self.subject = subject
-        self.body = body
-
-    def send(self):
+    @staticmethod
+    def send(data):
+        host = "smtp.gmail.com"
+        port = 465
         try:
-            server = smtplib.SMTP_SSL(self.host, self.port)
-            server.login(self.user, self.pwd)
-            server.sendmail(self.user, self.user, self.message())
+            server = smtplib.SMTP_SSL(host, port)
+            server.login(data['user'], data['pwd'])
+            server.sendmail(data['user'], data['user'], Mailer.message(data))
             server.close()
             logging.info('Notification of the new IP sent')
         except smtplib.SMTPAuthenticationError as error:
@@ -28,11 +22,12 @@ def send(self):
             logging.exception(error.message)
             quit(0)
 
-    def message(self):
+    @staticmethod
+    def message(data):
         return """\
 From: %s
 To: %s
 Subject: %s
 
 %s
-""" % (self.user, self.user, self.subject, self.body)
+""" % (data['user'], data['user'], data['subject'], data['body'])

ipteller/providerip.py

@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+
+import logging
+import requests
+
+
+class ProviderIp(object):
+    def __init__(self):
+        self.url = ''
+
+    def get_response(self):
+        try:
+            return requests.get(self.url).json()
+        except ValueError as err:
+            logging.exception(err)

releaser.sh

@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
 
 GH=https://github.com/Saphyel/ipteller/compare/
-LAST_TAG=`git describe --tags --abbrev=0 HEAD^`
+LAST_TAG=`git describe --tags --abbrev=0 origin/master`
+TMP_FILE=CHANGELOG.md
 
-printf "**Changelog** (since "${GH}${LAST_TAG}"...NEW)\n" > CHANGELOG.md
-git log ${LAST_TAG}..HEAD --pretty=format:"* %s" >> CHANGELOG.md
-printf "\n" >> CHANGELOG.md
+git fetch origin
+printf "**Changelog** (since "${GH}${LAST_TAG}"...NEW)\n" > ${TMP_FILE}
+git log ${LAST_TAG}..HEAD --pretty=format:"* %s" >> ${TMP_FILE}
+printf "\n" >> ${TMP_FILE}
+cat ${TMP_FILE} && rm ${TMP_FILE}