Merge branch 'develop'

Conflicts:
	pyrasite/tools/gui.py
	setup.py

README.rst

@@ -6,17 +6,10 @@ pyrasite
 Pyrasite lets you to inject arbitrary code into an unaltered running Python
 process.
 
-It also contains a graphical interface that makes it easy to monitor and
-introspect running processes.
-
 Requirements
 ~~~~~~~~~~~~
 
   - gdb (https://www.gnu.org/s/gdb) (version 7.3+)
-  - python-gobject-dev (on debian or ubuntu: apt-get install python-gobject-dev)
-  - Cython (http://cython.org)
-  - meliae (https://launchpad.net/meliae) 
-    - easy_install/pip may not work for this install. If not, use the tarball from the distribution website
 
 Download
 ~~~~~~~~
@@ -25,19 +18,23 @@ Download the latest stable release from PyPi: http://pypi.python.org/pypi/pyrasi
 
 ::
 
-    easy_install pyrasite
+    pip install pyrasite
 
-Grab the latest source by running:
+You can also run the latest pyrasite from source:
 
 ::
 
     git clone git://git.fedorahosted.org/git/pyrasite
+    cd pyrasite
+    python -m pyrasite.main
 
 You can also fork pyrasite on GitHub: http://github.com/lmacken/pyrasite
 
 pyrasite-gui
 ~~~~~~~~~~~~
 
+The gui has been moved into it's own repository: https://github.com/lmacken/pyrasite-gui
+
 .. image:: http://lewk.org/img/pyrasite/pyrasite-info.png
 
 API
@@ -48,7 +45,7 @@ API
     from pyrasite.inject import CodeInjector
 
     ci = CodeInjector(p.pid)
-    ci.inject('payloads/helloworld.py')
+    ci.inject('pyrasite/payloads/helloworld.py')
 
 
 Payloads
@@ -67,7 +64,7 @@ This lets you easily introspect or alter any objects in your running process.
 
 ::
 
-    $ pyrasite <PID> payloads/reverse_python_shell.py
+    $ pyrasite <PID> pyrasite/payloads/reverse_python_shell.py
     $ nc -l localhost 9001
     Python 2.7.1 (r271:86832, Apr 12 2011, 16:15:16)
     [GCC 4.6.0 20110331 (Red Hat 4.6.0-2)]
@@ -82,13 +79,19 @@ Viewing the largest objects in your process
 
 This payload uses `meliae <https://launchpad.net/meliae>`_ to dump all of the objects in your process to an `objects.json` file (currently dumped in the working directory of your process).
 
-::
+We recommend using python-meliae from your OS distribution, if available. If it
+is not, you will need to first install Cython, and then meliae seperately. If
+pip/easy_install does not work, you may need to use the tarball from the
+upstream website.
 
-    $ pyrasite <PID> payloads/dump_memory.py
+::
 
+    $ pyrasite <PID> pyrasite/payloads/dump_memory.py
 
-Pyrasite also provides a tool to view the values of largest objects in your process.
 
+Pyrasite also provides a tool to view the values of largest objects in your
+process. This requires `urwid <http://pypi.python.org/pypi/urwid>`_ to be
+installed.
 
 ::
 
@@ -103,7 +106,7 @@ Reverse Shell
 
 ::
 
-    $ pyrasite <PID> payloads/reverse_shell.py
+    $ pyrasite <PID> pyrasite/payloads/reverse_shell.py
     $ nc -l localhost 9001
     Linux tomservo 2.6.40.3-0.fc15.x86_64 #1 SMP Tue Aug 16 04:10:59 UTC 2011 x86_64 x86_64 x86_64 GNU/Linux
     Type 'quit' to exit.
@@ -118,8 +121,8 @@ graph using `pycallgraph <http://pycallgraph.slowchop.com>`_.
 
 ::
 
-    $ pyrasite <PID> payloads/start_callgraph.py
-    $ pyrasite <PID> payloads/stop_callgraph.py
+    $ pyrasite <PID> pyrasite/payloads/start_callgraph.py
+    $ pyrasite <PID> pyrasite/payloads/stop_callgraph.py
 
 The callgraph is then generated using `graphviz <http://www.graphviz.org>`_ and
 saved to `callgraph.png`. You can see an example callgraph `here <http://pycallgraph.slowchop.com/pycallgraph/wiki/RegExpExample>`_.
@@ -130,9 +133,9 @@ Dumping modules, thread stacks, and forcing garbage collection
 
 ::
 
-    payloads/dump_modules.py
-    payloads/dump_stacks.py
-    payloads/force_garbage_collection.py
+    pyrasite/payloads/dump_modules.py
+    pyrasite/payloads/dump_stacks.py
+    pyrasite/payloads/force_garbage_collection.py
 
 Additional installation notes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -145,7 +148,7 @@ If you don't want to override Apple's default gdb, install the latest version of
 ::
 
     $ ./configure --program-prefix=gnu
-    $ pyrasite <PID> payloads/reverse_python_shell.py --prefix="gnu"
+    $ pyrasite <PID> pyrasite/payloads/reverse_python_shell.py --prefix="gnu"
 
 Ubuntu
 ------

docs/GUI.rst

 pyrasite-gui - A graphical interface for Pyrasite
 =================================================
 
+The GUI has been moved into it's own repository:
+
+https://github.com/lmacken/pyrasite-gui
+
 .. image:: http://lewk.org/img/pyrasite/pyrasite-info.png
 
 .. image:: http://lewk.org/img/pyrasite/pyrasite-stacks.png

setup.py

@@ -6,12 +6,6 @@ f = open('README.rst')
 long_description = f.read().split('split here')[1]
 f.close()
 
-try:
-    from meliae import version_info
-except ImportError:
-    print "We require meliae to be installed."
-    exit(1)
-
 setup(name='pyrasite',
       version=version,
       description="Inject code into a running Python process",
@@ -24,13 +18,7 @@ setup(name='pyrasite',
       packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
       include_package_data=True,
       zip_safe=False,
-      install_requires=[
-        "Cython", # Needed for meliae
-        "meliae",
-        "pycallgraph",
-        "psutil",
-        "Sphinx",
-      ],
+      install_requires=[],
       tests_require=['nose'],
       test_suite='nose.collector',
       entry_points="""