merge metadata files

.env

@@ -0,0 +1,6 @@
+DIR="$( dirname "${BASH_SOURCE[0]}" )"
+ACTIVATE_DIR="$(if [ -f "$DIR/venv/bin/activate" ]; then echo 'bin'; else echo 'Scripts'; fi;)"
+if [ -z "$VIRTUAL_ENV" ] && [ -f "$DIR/venv/$ACTIVATE_DIR/activate" ]; then
+    echo "Activating mitmproxy virtualenv..."
+    source "$DIR/venv/$ACTIVATE_DIR/activate"
+fi

.gitattributes

@@ -0,0 +1,2 @@
+mitmproxy/libmproxy/web/static/**/* -diff
+mitmproxy/web/src/js/filt/filt.js -diff

.gitignore

@@ -0,0 +1,19 @@
+.DS_Store
+MANIFEST
+*/build
+*/dist
+*/tmp
+/venv
+*.py[cdo]
+*.swp
+*.swo
+*.egg-info/
+.coverage
+.idea
+.cache/
+
+# UI
+
+node_modules
+bower_components
+*.map

.landscape.yml

@@ -1,8 +1,8 @@
 ignore-paths:
-  - docs
+  - mitmproxy/docs
-  - examples
+  - mitmproxy/examples
-  - libmproxy/contrib
+  - mitmproxy/libmproxy/contrib
-  - web
+  - mitmproxy/web
 max-line-length: 140
 pylint:
   options:

.travis.yml

@@ -57,7 +57,9 @@ install:
         source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
       fi
   - "pip install -U pip setuptools"
-  - "pip install --src .. -r requirements.txt"
+  - "pip install -e ./netlib[dev]"
+  - "pip install -e ./pathod[dev]"
+  - "pip install -e ./mitmproxy[dev,contentviews,examples]"
 
 before_script:
   - "openssl version -a"

dev

@@ -1,10 +1,12 @@
 #!/bin/bash
 set -e
-VENV=../venv.mitmproxy
+VENV=./venv
 
 python -m virtualenv $VENV --always-copy
 . $VENV/bin/activate
-pip install --src .. -r requirements.txt
+pip install -e ./netlib[dev]
+pip install -e ./pathod[dev]
+pip install -e ./mitmproxy[dev,examples,contentviews]
 
 echo ""
 echo "* Created virtualenv environment in $VENV."

dev.bat

@@ -1,11 +1,15 @@
 @echo off
-set VENV=..\venv.mitmproxy
+set VENV=.\venv
 
 virtualenv %VENV% --always-copy
 if %errorlevel% neq 0 exit /b %errorlevel%
 call %VENV%\Scripts\activate.bat
 if %errorlevel% neq 0 exit /b %errorlevel%
-pip install --src .. -r requirements.txt
+pip install -e ./netlib[dev]
+if %errorlevel% neq 0 exit /b %errorlevel%
+pip install -e ./pathod[dev]
+if %errorlevel% neq 0 exit /b %errorlevel%
+pip install -e ./mitmproxy[dev,examples,contentviews]
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.

mitmproxy/.env

@@ -1,6 +0,0 @@
-DIR="$( dirname "${BASH_SOURCE[0]}" )"
-ACTIVATE_DIR="$(if [ -f "$DIR/../venv.mitmproxy/bin/activate" ]; then echo 'bin'; else echo 'Scripts'; fi;)"
-if [ -z "$VIRTUAL_ENV" ] && [ -f "$DIR/../venv.mitmproxy/$ACTIVATE_DIR/activate" ]; then
-    echo "Activating mitmproxy virtualenv..."
-    source "$DIR/../venv.mitmproxy/$ACTIVATE_DIR/activate"
-fi

mitmproxy/.gitattributes

@@ -1,2 +0,0 @@
-libmproxy/web/static/**/* -diff
-web/src/js/filt/filt.js -diff

mitmproxy/.gitignore

@@ -1,28 +0,0 @@
-.DS_Store
-MANIFEST
-/build
-/dist
-/tmp
-/doc
-/venv
-/libmproxy/gui
-/release/build
-*.py[cdo]
-*.swp
-*.swo
-mitmproxy.egg-info/
-mitmproxyc
-mitmdumpc
-.coverage
-.idea
-netlib
-pathod
-libpathod
-.cache/
-
-# UI
-
-node_modules
-bower_components
-*.compiled.js
-*.map

mitmproxy/libmproxy/version.py

@@ -1,11 +1,3 @@
 from __future__ import (absolute_import, print_function, division)
 
-IVERSION = (0, 17)
+from netlib.version import *
-VERSION = ".".join(str(i) for i in IVERSION)
-MINORVERSION = ".".join(str(i) for i in IVERSION[:2])
-NAME = "mitmproxy"
-NAMEVERSION = NAME + " " + VERSION
-
-NEXT_MINORVERSION = list(IVERSION)
-NEXT_MINORVERSION[1] += 1
-NEXT_MINORVERSION = ".".join(str(i) for i in NEXT_MINORVERSION[:2])

mitmproxy/requirements.txt

@@ -1,3 +0,0 @@
--e git+https://github.com/mitmproxy/netlib.git#egg=netlib
--e git+https://github.com/mitmproxy/pathod.git#egg=pathod
--e .[dev,examples,contentviews]

netlib/.appveyor.yml

@@ -1,11 +0,0 @@
-version: '{build}'
-shallow_clone: true
-environment:
-  matrix:
-    - PYTHON: "C:\\Python27"
-install:
-  - "%PYTHON%\\Scripts\\pip install --src . -r requirements.txt"
-  - "%PYTHON%\\python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\""
-build: off  # Not a C# project
-test_script:
-  - "%PYTHON%\\Scripts\\py.test -n 4 --timeout 10"

netlib/.env

@@ -1,6 +0,0 @@
-DIR="$( dirname "${BASH_SOURCE[0]}" )"
-ACTIVATE_DIR="$(if [ -f "$DIR/../venv.mitmproxy/bin/activate" ]; then echo 'bin'; else echo 'Scripts'; fi;)"
-if [ -z "$VIRTUAL_ENV" ] && [ -f "$DIR/../venv.mitmproxy/$ACTIVATE_DIR/activate" ]; then
-    echo "Activating mitmproxy virtualenv..."
-    source "$DIR/../venv.mitmproxy/$ACTIVATE_DIR/activate"
-fi

netlib/.gitignore

@@ -1,16 +0,0 @@
-MANIFEST
-/build
-/dist
-/tmp
-/doc
-*.py[cdo]
-*.swp
-*.swo
-.coverage
-.idea/
-__pycache__
-_cffi__*
-.eggs/
-netlib.egg-info/
-pathod/
-.cache/

netlib/.landscape.yml

@@ -1,16 +0,0 @@
-max-line-length: 120
-pylint:
-  options:
-    dummy-variables-rgx: _$|.+_$|dummy_.+
-
-  disable:
-    - missing-docstring
-    - protected-access
-    - too-few-public-methods
-    - too-many-arguments
-    - too-many-instance-attributes
-    - too-many-locals
-    - too-many-public-methods
-    - too-many-return-statements
-    - too-many-statements
-    - unpacking-non-sequence

netlib/.travis.yml

@@ -1,98 +0,0 @@
-sudo: false
-language: python
-
-matrix:
-  fast_finish: true
-  include:
-    - python: 2.7
-    - python: 2.7
-      env: OPENSSL=1.0.2
-      addons:
-        apt:
-          sources:
-            # Debian sid currently holds OpenSSL 1.0.2
-            # change this with future releases!
-            - debian-sid
-          packages:
-            - libssl-dev
-    - python: 3.5
-    - python: 3.5
-      env: OPENSSL=1.0.2
-      addons:
-        apt:
-          sources:
-            # Debian sid currently holds OpenSSL 1.0.2
-            # change this with future releases!
-            - debian-sid
-          packages:
-            - libssl-dev
-    - python: pypy
-    - python: pypy
-      env: OPENSSL=1.0.2
-      addons:
-        apt:
-          sources:
-            # Debian sid currently holds OpenSSL 1.0.2
-            # change this with future releases!
-            - debian-sid
-          packages:
-            - libssl-dev
-
-install:
-  - |
-    if [[ $TRAVIS_OS_NAME == "osx" ]]
-    then
-      brew update || brew update # try again if it fails
-      brew outdated openssl || brew upgrade openssl
-      brew install python
-    fi
-  - |
-      if [ "$TRAVIS_PYTHON_VERSION" = "pypy" ]; then
-        export PYENV_ROOT="$HOME/.pyenv"
-        if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
-          pushd "$PYENV_ROOT" && git pull && popd
-        else
-          rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT"
-        fi
-        export PYPY_VERSION="4.0.1"
-        "$PYENV_ROOT/bin/pyenv" install --skip-existing "pypy-$PYPY_VERSION"
-        virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
-        source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
-      fi
-  - "pip install -U pip setuptools"
-  - "pip install --src . -r requirements.txt"
-
-before_script:
-  - "openssl version -a"
-
-script:
-  - "py.test -s --cov netlib --timeout 10"
-
-after_success:
-  - coveralls
-
-notifications:
-  irc:
-    channels:
-      - "irc.oftc.net#mitmproxy"
-    on_success: change
-    on_failure: always
-  slack:
-    rooms:
-        - mitmproxy:YaDGC9Gt9TEM7o8zkC2OLNsu#ci
-    on_success: always
-    on_failure: always
-
-# exclude cryptography from cache
-# it depends on libssl-dev version
-# which needs to be compiled specifically to each version
-before_cache:
-  - pip uninstall -y cryptography
-
-cache:
-  directories:
-    - $HOME/.cache/pip
-    - /home/travis/virtualenv/python2.7.9/lib/python2.7/site-packages
-    - /home/travis/virtualenv/python2.7.9/bin
-    - /home/travis/virtualenv/pypy-2.5.0/site-packages
-    - /home/travis/virtualenv/pypy-2.5.0/bin

netlib/CONTRIBUTORS

@@ -1,22 +0,0 @@
-   253	Aldo Cortesi
-   230	Maximilian Hils
-   123	Thomas Kriechbaumer
-     8	Chandler Abraham
-     8	Kyle Morton
-     5	Sam Cleveland
-     3	Benjamin Lee
-     3	Sandor Nemes
-     2	Brad Peabody
-     2	Israel Nir
-     2	Matthias Urlichs
-     2	Pedro Worcel
-     2	Sean Coates
-     1	Andrey Plotnikov
-     1	Bradley Baetz
-     1	Felix Yan
-     1	M. Utku Altinkaya
-     1	Paul
-     1	Pritam Baral
-     1	Rouli
-     1	Tim Becker
-     1	kronick

netlib/LICENSE

@@ -1,19 +0,0 @@
-Copyright (c) 2013, Aldo Cortesi. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

netlib/check_coding_style.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-autopep8 -i -r -a -a .
-if [[ -n "$(git status -s)" ]]; then
-  echo "autopep8 yielded the following changes:"
-  git status -s
-  git --no-pager diff
-  exit 0 # don't be so strict about coding style errors
-fi
-
-autoflake -i -r --remove-all-unused-imports --remove-unused-variables .
-if [[ -n "$(git status -s)" ]]; then
-  echo "autoflake yielded the following changes:"
-  git status -s
-  git --no-pager diff
-  exit 0 # don't be so strict about coding style errors
-fi
-
-echo "Coding style seems to be ok."
-exit 0

netlib/requirements.txt

@@ -1 +0,0 @@
--e .[dev]

pathod/.appveyor.yml

@@ -1,11 +0,0 @@
-version: '{build}'
-shallow_clone: true
-environment:
-  matrix:
-    - PYTHON: "C:\\Python27"
-install:
-  - "%PYTHON%\\Scripts\\pip install --src . -r requirements.txt"
-  - "%PYTHON%\\python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\""
-build: off  # Not a C# project
-test_script:
-  - "%PYTHON%\\Scripts\\py.test -n 4"

pathod/.env

@@ -1,6 +0,0 @@
-DIR="$( dirname "${BASH_SOURCE[0]}" )"
-ACTIVATE_DIR="$(if [ -f "$DIR/../venv.mitmproxy/bin/activate" ]; then echo 'bin'; else echo 'Scripts'; fi;)"
-if [ -z "$VIRTUAL_ENV" ] && [ -f "$DIR/../venv.mitmproxy/$ACTIVATE_DIR/activate" ]; then
-    echo "Activating mitmproxy virtualenv..."
-    source "$DIR/../venv.mitmproxy/$ACTIVATE_DIR/activate"
-fi

pathod/.gitignore

@@ -1,15 +0,0 @@
-# Python object files
-*.py[cd]
-MANIFEST
-/build
-/dist
-# Vim swap files
-*.swp
-/doc
-.coverage
-.noseids
-netlib
-venv
-.idea/
-pathod.egg-info/
-.cache/

pathod/.landscape.yml

@@ -1,16 +0,0 @@
-max-line-length: 120
-pylint:
-  options:
-    dummy-variables-rgx: _$|.+_$|dummy_.+
-
-  disable:
-    - missing-docstring
-    - protected-access
-    - too-few-public-methods
-    - too-many-arguments
-    - too-many-instance-attributes
-    - too-many-locals
-    - too-many-public-methods
-    - too-many-return-statements
-    - too-many-statements
-    - unpacking-non-sequence

pathod/.travis.yml

@@ -1,70 +0,0 @@
-sudo: false
-language: python
-
-matrix:
-  fast_finish: true
-  include:
-    - python: 2.7
-    - python: 2.7
-      env: OPENSSL=1.0.2
-      addons:
-        apt:
-          sources:
-            # Debian sid currently holds OpenSSL 1.0.2
-            # change this with future releases!
-            - debian-sid
-          packages:
-            - libssl-dev
-    - python: pypy
-    - python: pypy
-      env: OPENSSL=1.0.2
-      addons:
-        apt:
-          sources:
-            # Debian sid currently holds OpenSSL 1.0.2
-            # change this with future releases!
-            - debian-sid
-          packages:
-            - libssl-dev
-  allow_failures:
-    # We allow pypy to fail until Travis fixes their infrastructure to a pypy
-    # with a recent enought CFFI library to run cryptography 1.0+.
-    - python: pypy
-
-install:
-  - "pip install --src . -r requirements.txt"
-
-before_script:
-  - "openssl version -a"
-
-script:
-  - "py.test --cov libpathod -v"
-
-after_success:
-  - coveralls
-
-notifications:
-  irc:
-    channels:
-      - "irc.oftc.net#mitmproxy"
-    on_success: change
-    on_failure: always
-  slack:
-    rooms:
-      - mitmproxy:YaDGC9Gt9TEM7o8zkC2OLNsu#ci
-    on_success: always
-    on_failure: always
-
-# exclude cryptography from cache
-# it depends on libssl-dev version
-# which needs to be compiled specifically to each version
-before_cache:
-  - pip uninstall -y cryptography
-
-cache:
-  directories:
-    - $HOME/.cache/pip
-    - /home/travis/virtualenv/python2.7.9/lib/python2.7/site-packages
-    - /home/travis/virtualenv/python2.7.9/bin
-    - /home/travis/virtualenv/pypy-2.5.0/site-packages
-    - /home/travis/virtualenv/pypy-2.5.0/bin

pathod/CONTRIBUTORS

@@ -1,6 +0,0 @@
-   426	Aldo Cortesi
-    74	Maximilian Hils
-    50	Thomas Kriechbaumer
-     1	Felix Yan
-     1	requires.io
-     1	starenka

pathod/LICENSE

@@ -1,19 +0,0 @@
-Copyright (c) 2008, Aldo Cortesi. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

pathod/libpathod/version.py

@@ -1,11 +1,3 @@
 from __future__ import (absolute_import, print_function, division)
 
-IVERSION = (0, 17)
+from netlib.version import *
-VERSION = ".".join(str(i) for i in IVERSION)
-MINORVERSION = ".".join(str(i) for i in IVERSION[:2])
-NAME = "pathod"
-NAMEVERSION = NAME + " " + VERSION
-
-NEXT_MINORVERSION = list(IVERSION)
-NEXT_MINORVERSION[1] += 1
-NEXT_MINORVERSION = ".".join(str(i) for i in NEXT_MINORVERSION[:2])

pathod/requirements.txt

@@ -1,2 +0,0 @@
--e git+https://github.com/mitmproxy/netlib.git#egg=netlib
--e .[dev]