Merge pull request #216 from reverse-shell/macos-build

Add macOS build

.travis.yml

 language: python
-python:
-  - "2.7"
+
+matrix:
+  include:
+    - os: linux
+      python: 2.7
+
+    - os: osx
+      language: generic
+      env: PYTHON_VERSION=2.7.13
 
 install:
-  - "pip install -r requirements.txt"
-  - "pip install pexpect flake8"
+  - "./.travis/install.sh"
 
 script:
-  - "python -m unittest discover"
-  - "./run_linter.sh"
+  - "./.travis/run.sh"
\ No newline at end of file

.travis/install.sh

+#!/bin/bash
+
+set -e
+set -x
+
+if [[ "$(uname -s)" == 'Darwin' ]]; then
+    sw_vers
+
+    git clone --depth 1 https://github.com/yyuu/pyenv.git ~/.pyenv
+    PYENV_ROOT="$HOME/.pyenv"
+    PATH="$PYENV_ROOT/bin:$PATH"
+    eval "$(pyenv init -)"
+
+    pyenv install $PYTHON_VERSION
+    pyenv global $PYTHON_VERSION
+    pyenv rehash
+
+    pip install --user --upgrade pip
+    pip install --user virtualenv
+    python -m virtualenv ~/.venv
+    source ~/.venv/bin/activate
+fi
+
+pip install -r requirements-dev.txt

.travis/run.sh

+#!/bin/bash
+
+set -e
+set -x
+
+if [[ "$(uname -s)" == "Darwin" ]]; then
+    PYENV_ROOT="$HOME/.pyenv"
+    PATH="$PYENV_ROOT/bin:$PATH"
+    eval "$(pyenv init -)"
+    source ~/.venv/bin/activate
+fi
+
+source run_tests.sh
+source run_linter.sh

requirements-dev.txt

+future>=0.16.0
+requests>=2.9.1
+paramiko>=1.16.0
+beautifulsoup4>=4.4.1
+pysnmp>=4.3.2
+gnureadline
+pexpect
+mock
+flake8
\ No newline at end of file

routersploit/interpreter.py

@@ -378,8 +378,8 @@ class RoutersploitInterpreter(BaseInterpreter):
 
     @utils.module_required
     def _show_options(self, *args, **kwargs):
-        target_opts = {'port', 'target'}
-        module_opts = set(self.current_module.options) - target_opts
+        target_opts = ['target', 'port']
+        module_opts = [opt for opt in self.current_module.options if opt not in target_opts]
         headers = ("Name", "Current settings", "Description")
 
         utils.print_info('\nTarget options:')

routersploit/test/test_interpreter.py

@@ -436,8 +436,8 @@ class RoutersploitInterpreterTest(RoutersploitTestCase):
                 mock.call(),
                 mock.call('   Name     Current settings     Description     '),
                 mock.call('   ----     ----------------     -----------     '),
-                mock.call('   bar      2                    bar_desc        '),
                 mock.call('   foo      1                    foo_desc        '),
+                mock.call('   bar      2                    bar_desc        '),
                 mock.call('   baz      3                    baz_desc        '),
                 mock.call(),
                 mock.call(),