Merge branch 'master' into persistent-eval

Author: benjifisher

.travis.yml

@@ -1,17 +1,17 @@
+notifications:
+  irc: irc.freenode.org#vdebug
+  slack:
+    secure: BksygPSsoRfvre27w6XQN9ooKB9C1n83Bw96YurvyDHJ6BYM2Gv9fW1Sj6NHpB8MQkMaJ+9gRiBSflkP+l80t3EXAdStuI/8EM/wZu1ov6bmYT/hYQ8HnULmmPNj8uVzsX13VGEUC/YY4osWuJFM1wh61dStoF+SKrpslqWCV4w=
 language: python
 python:
-  - "2.6"
-  - "2.7"
+- '2.6'
+- '2.7'
 rvm: 1.9.3
-notifications:
-  irc: "irc.freenode.org#vdebug"
 before_install:
-  - sudo apt-get update && sudo apt-get install vim-gtk php5-cli php5-xdebug
+- sudo apt-get update && sudo apt-get install vim-gtk php5-cli php5-xdebug
 before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - "bundle install"
-# command to install dependencies
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
+- bundle install
 install: pip install -r requirements.txt --use-mirrors
-# command to run tests
 script: bundle exec rake travis

HISTORY CHANGELOGHISTORY renamed to CHANGELOG

@@ -1,3 +1,22 @@
+=== Vdebug 1.5.0 / 2015-08-28
+Bug fixes:
+ * Fix for remote and local file paths with a windows/unix setup (thanks @brothert, #130)
+ * Sort path maps by remote path length (thanks @ragol and @adambiggs, #153, #201)
+ * Default "stop" behaviour (default <F6>) actually stops rather than detaches (issue #166)
+ * Various documentation fixes (issue #172, issue #223, thanks @loonies for #210)
+ * Add documentation to show that komodo-debug doesn't work with nodejs > 0.10 (#202, #223)
+ * Don't override previously defined breakpoint highlights (#208)
+
+Features:
+ * Add support for Python 2.4 (thanks @mbarbon, #189)
+ * Add Vagrantfile and bootstrap for easier local development
+ * Add new VdebugTrace command for tracking individual variables and expressions (thanks @escher9, #178)
+ * Show ellipses for truncated arrays in watch window (#177)
+ * Bind to all available interfaces by default, instead of just localhost (#209, thanks @zolem)
+
+Misc:
+ * Changed HISTORY to CHANGELOG
+
 === Vdebug 1.4.2 / 2014-05-15
 
 Bug fixes:

Gemfile

@@ -4,3 +4,4 @@ gem 'rake', '~> 10.0.4'
 gem 'rspec', '~> 2.13.0'
 gem 'vimrunner', '~> 0.3.0'
 gem 'cucumber'
+gem 'travis'

Gemfile.lock

@@ -1,18 +1,50 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.3.8)
+    backports (3.6.6)
     builder (3.2.2)
+    coderay (1.1.0)
     cucumber (1.3.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12.0)
       multi_json (~> 1.7.5)
       multi_test (~> 0.0.1)
     diff-lcs (1.2.4)
+    ethon (0.7.4)
+      ffi (>= 1.3.0)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.10.0)
+      faraday (>= 0.7.4, < 0.10)
+    ffi (1.9.10)
+    gh (0.14.0)
+      addressable
+      backports
+      faraday (~> 0.8)
+      multi_json (~> 1.0)
+      net-http-persistent (>= 2.7)
+      net-http-pipeline
     gherkin (2.12.0)
       multi_json (~> 1.3)
+    highline (1.7.3)
+    json (1.8.3)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    method_source (0.8.2)
     multi_json (1.7.7)
     multi_test (0.0.1)
+    multipart-post (2.0.0)
+    net-http-persistent (2.9.4)
+    net-http-pipeline (1.0.1)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pusher-client (0.6.2)
+      json
+      websocket (~> 1.0)
     rake (10.0.4)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
@@ -22,7 +54,22 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
+    slop (3.6.0)
+    travis (1.8.0)
+      addressable (~> 2.3)
+      backports
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.9, >= 0.9.1)
+      gh (~> 0.13)
+      highline (~> 1.6)
+      launchy (~> 2.1)
+      pry (~> 0.9, < 0.10)
+      pusher-client (~> 0.4)
+      typhoeus (~> 0.6, >= 0.6.8)
+    typhoeus (0.7.3)
+      ethon (>= 0.7.4)
     vimrunner (0.3.0)
+    websocket (1.2.2)
 
 PLATFORMS
   ruby
@@ -31,4 +78,5 @@ DEPENDENCIES
   cucumber
   rake (~> 10.0.4)
   rspec (~> 2.13.0)
+  travis
   vimrunner (~> 0.3.0)

README.md

@@ -2,6 +2,8 @@
 
 [![Build Status](https://travis-ci.org/joonty/vdebug.png?branch=master)](https://travis-ci.org/joonty/vdebug)
 
+## Introduction
+
 Vdebug is a new, fast, powerful debugger client for Vim. It's multi-language,
 and has been tested with PHP, Python, Ruby, Perl, Tcl and NodeJS. It interfaces with 
 **any** debugger that faithfully uses the DBGP protocol, such as Xdebug for PHP.  
@@ -16,40 +18,43 @@ It's written in Python, and has an object-oriented interface that is easy to ext
 and can even be used from the command-line. It even has unit tests covering
 some of the more critical parts of the code.
 
-# Getting help
+## Getting help
 
 If you're having trouble with Vdebug in any way, here are the steps you can take to get help (in the right order):
 
   1. [Check the issues][3] to see whether it's already come up.
   2. Visit the **#vdebug** irc channel on freenode, someone is normally there.
   3. [Open a new issue.][4]
 
-# News
+## News
 
 Follow me on Twitter, [@joonty](http://twitter.com/joonty), for Vdebug updates and release news.
 
-* **15/05/2014:** Version 1.4.2 was released. This fixes major problems with the latest version of Vim, which has stricter rules around function naming. See [this pull request for more details][5]
+* **26/08/2015:** Version 1.5.0 released. This has a whole series of fixes and even a couple of new features. See below for more information.
+* **15/05/2014:** Version 1.4.2 released. This fixes major problems with the latest version of Vim, which has stricter rules around function naming. See [this pull request for more details][5]
 * **12/04/2014:** My son was born! Hence no contact or work on Vdebug for the following month.
 
-
-# Recent version (version 1.4.2)
+## Recent version (version 1.5.0)
 
 ### Bug fixes:
- * Allow overriding of options dictionary after sourcing vdebug (issues #112, #113)
- * Show local file path in stack window if using path mapping (issue #118)
- * Change function names for stricter rules introduced in Vim v.7.4.260 (thanks @BlackEagle, #158 and #155)
-
-### Documentation:
- * Various fixes
- * Mention vim-nox package for Debian (thanks @henningda, #138)
- * Add Python installation for Windows information (issue #135)
+ * Fix for remote and local file paths with a windows/unix setup (thanks @brothert, #130)
+ * Sort path maps by remote path length (thanks @ragol and @adambiggs, #153, #201)
+ * Default "stop" behaviour (default <F6>) actually stops rather than detaches (issue #166)
+ * Various documentation fixes (issue #172, issue #223, thanks @loonies for #210)
+ * Add documentation to show that komodo-debug doesn't work with nodejs > 0.10 (#202, #223)
+ * Don't override previously defined breakpoint highlights (#208)
 
 ### Features:
- * Add completion to :Breakpoint command (thanks @tommcdo, #124)
- * Add VdebugStart command (thanks @blueyed, #132)
- * Sleep for 100ms in wait loop, don't consume as much CPU (thanks @blueyed, #133)
+ * Add support for Python 2.4 (thanks @mbarbon, #189)
+ * Add Vagrantfile and bootstrap for easier local development
+ * Add new VdebugTrace command for tracking individual variables and expressions (thanks @escher9, #178)
+ * Show ellipses for truncated arrays in watch window (#177)
+ * Bind to all available interfaces by default, instead of just localhost (#209, thanks @zolem)
+
+### Misc:
+ * Changed HISTORY to CHANGELOG
 
-# How to use
+## How to use
 
 First of all, scoot down to the quick guide below.
 
@@ -66,7 +71,7 @@ To get this help, type:
 
 after installing the plugin. If this doesn't work, you will need to generate the help tags.
 
-## Generating help tags
+### Generating help tags
 
 Some package managers, such as Vundle, will automatically generate help tags. Others, such as Pathogen, won't by default, so you have to do it yourself. Also, if you have installed Vdebug manually then you will also have to do this step.
 
@@ -84,27 +89,27 @@ To manually generate the tags, run this in vim:
 
 where the path supplied is vdebug's doc directory. This should enable vdebug's help to be accessed.
 
-# Installation
+## Installation
 
 **Requirements**:
 
-  * Vim compiled with Python 2.6+ support, tabs and signs (for Debian/Ubuntu this is provided in the vim-nox package)
+  * Vim compiled with Python 2.4+ support, tabs and signs (for Debian/Ubuntu this is provided in the vim-nox package)
   * A programming language that has a DBGP debugger, e.g. PHP, Python, Ruby,
     Perl, NodeJS, Tcl...
 
-## Classic
+### Classic
 
 Clone or download a tarball of the plugin and move its content in your
 `~/.vim/` directory.
 
 Your `~/.vim/plugin/` directory should now contain vdebug.vim and a directory
 called "python".
 
-## Using git and Pathogen
+### Using git and Pathogen
 
 Clone this repository in your `~/.vim/bundle` directory
 
-## Using vundle
+### Using vundle
 
 Add this to your `~/.vimrc` file:
 
@@ -118,7 +123,7 @@ Then, from the command line, run:
 vim +BundleInstall +qall
 ```
 
-# Quick guide
+## Quick guide
 
 Set up any DBGP protocol debugger, e.g. Xdebug. (See :help VdebugSetUp). Start Vdebug with `<F5>`, which will make it wait for an incoming connection. Run the script you want to debug, with the debugging engine enabled. A new tab will open with the debugging interface.
 
@@ -128,7 +133,7 @@ Once in debugging mode, the following default mappings are available:
  * `<F2>`: step over
  * `<F3>`: step into
  * `<F4>`: step out
- * `<F6>`: stop debugging
+ * `<F6>`: stop debugging (kills script)
  * `<F7>`: detach script from debugger
  * `<F9>`: run to cursor
  * `<F10>`: toggle line breakpoint
@@ -143,7 +148,7 @@ To stop debugging, press `<F6>`. Press it again to close the debugger interface.
 
 If you can't get a connection, then chances are you need to spend a bit of time setting up your environment. Type `:help Vdebug` for more information.
 
-# Debugging
+## Debugging
 
 If you have a problem, and would like to see what's going on under the hood or raise an issue, it's best to create a log file. You can do this by setting these options before you start debugging:
 
@@ -156,14 +161,14 @@ Then start debugging, and you can follow what's added to the log file as you go.
 
 If you're creating an issue then it's probably best to upload a log as a Gist, as it can be pretty large.
 
-# Contributing
+## Contributing
 
 I gladly accept contributions to the code. Just fork the repository, make your changes and open a pull request with detail about your changes. There are a couple of conditions:
 
  * The tests must pass (see below)
  * Your commit messages should follow the [rules outlined here][2]
 
-# Tests
+## Tests
 
  * The tests use `unittest2` and `mock`, so make sure they're installed
 
@@ -174,7 +179,7 @@ pip install mock
 
 * To run the tests, run `python vdebugtests.py` in the top directory of the plugin
 
-# Licence
+## Licence
 
 This plugin is released under the [MIT License][1].
 

VERSION

@@ -1 +1 @@
-1.4.2
+1.5.0

Vagrantfile

@@ -0,0 +1,21 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  # Use Debian 7 64-bit as our operating system, same as production
+  config.vm.box = "debian/wheezy7.6"
+  config.vm.box_url = "https://github.com/jose-lpa/packer-debian_7.6.0/releases/download/1.0/packer_virtualbox-iso_virtualbox.box"
+
+  # Configure the virtual machine to use 1GB of RAM
+  config.vm.provider :virtualbox do |vb|
+    vb.customize ["modifyvm", :id, "--memory", "1024"]
+  end
+
+  # Forward the vdebug server port to the host
+  config.vm.network :forwarded_port, guest: 9000, host: 9000
+
+  # Use a shell script to provision
+  config.vm.provision :shell, path: "bootstrap.sh"
+end