Merge branch 'dev'

Author: joonty

.travis.php.ini

@@ -0,0 +1 @@
+xdebug.remote_enable=1

.travis.yml

@@ -2,7 +2,16 @@ language: python
 python:
   - "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
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - "bundle install"
 # command to install dependencies
-install: "pip install -r requirements.txt --use-mirrors"
+install: pip install -r requirements.txt --use-mirrors
 # command to run tests
-script: python vdebugtests.py
+script: bundle exec rake travis

Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'rake', '~> 10.0.4'
+gem 'rspec', '~> 2.13.0'
+gem 'vimrunner', '~> 0.3.0'
+gem 'cucumber'

Gemfile.lock

@@ -0,0 +1,34 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.2)
+    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)
+    gherkin (2.12.0)
+      multi_json (~> 1.3)
+    multi_json (1.7.7)
+    multi_test (0.0.1)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    vimrunner (0.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber
+  rake (~> 10.0.4)
+  rspec (~> 2.13.0)
+  vimrunner (~> 0.3.0)

Rakefile

@@ -0,0 +1,39 @@
+require 'rspec/core/rake_task'
+require 'cucumber'
+require 'cucumber/rake/task'
+
+task :travis do
+  system("export DISPLAY=:99.0 && bundle exec rake test:all")
+  raise "Tests failed!" unless $?.exitstatus == 0
+end
+
+namespace :test do
+  desc "Run all tests (unit and integration/specs)"
+  task :all do
+    puts "Running unit tests"
+    Rake::Task["test:unit"].execute
+    puts "Running integration (spec) tests"
+    Rake::Task[:spec].execute
+    puts "Running cucumber features"
+    Rake::Task[:features].execute
+  end
+
+  desc "Run unit tests"
+  task :unit do
+    cmd = "python vdebugtests.py"
+    puts cmd
+    system cmd
+  end
+
+  desc "Run integration tests (alias for `spec`)"
+  task :integration do
+    Rake::Task[:spec]
+  end
+end
+
+RSpec::Core::RakeTask.new(:spec)
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "features --format pretty"
+end
+
+task :default => "test:all"

doc/Vdebug.txt

@@ -240,11 +240,16 @@ the "pydbgp" tool, created by ActiveState (who make the Komodo Edit/IDE
 software).
 
 To do this, go to http://code.activestate.com/komodo/remotedebugging/,
-download the Python client for your OS and extract it. Inside this package is 
-a binary file called pydbgp that we can include when running a script, which
-will allow for remote debugging.
+download the Python client for your OS and extract it.
 
-If we want to debug a script called "myscript.py", run the following: >
+Inside this package is a binary file called pydbgp that we can include when
+running a script, which will allow for remote debugging. If you're using
+version 8 or greater, then you will need to move the dbgp directory, which is
+inside pythonlib, to the same directory that contains the pydbgp executable.
+If you don't do this then you will get an error saying "No module named
+dbgp.client".
+
+To debug a script called "myscript.py", run the following: >
     python -S path/to/pydbgp -d localhost:9000 myscript.py
 <
 adding in the path to the pydbgp binary file. Running it without starting
@@ -254,10 +259,12 @@ this, you're ready to go.
 NOTE: You may have a problem when trying to do an "eval". If you get an error
 mentioning something about not providing a length then you need to patch the
 client.py file in the Python remote debugger source code. I've created a patch 
-that you can get at https://gist.github.com/3348076 - if using unix you can use 
-the patch command to apply it, e.g: >
+that you can get at https://gist.github.com/3348076. It will only apply cleanly
+if it's for the same version as the package you downloaded. 
+
+If using unix you can use the `patch` command to apply the changes, e.g: >
 
-    patch dbgp/client.py < client.patch
+    patch dbgp/client.py < client-7.1.0.patch
 <
 If you're still having trouble, drop me an email.
 

features/correct_window_setup.feature

@@ -0,0 +1,64 @@
+Feature: Correct window setup
+    In order to use Vdebug with all window panels
+    As a user
+    I want to see correct watch, stack and status information
+
+    Scenario: The status window
+        Given I have a file example.php containing
+            """
+            <?php
+            $var1 = 1;
+            ?>
+            """
+        When I start the debugger with the PHP script example.php
+        Then the status should be break
+        And the status window should contain localhost:9000
+
+    Scenario: The watch window
+        Given I have a file example.php containing
+            """
+            <?php
+            $var1 = 1;
+            $var2 = array("hello", "world");
+            ?>
+            """
+        And I start the debugger with the PHP script example.php
+        When I step over
+        Then the watch window should show $var1
+        And the watch window should show $var2
+        And the watch window variable $var1 should be (int) 1
+        And the watch window variable $var2 should be (uninitialized)
+
+    Scenario: The stack window
+        Given I have a file example.php containing
+            """
+            <?php
+            $var1 = 1;
+            $var2 = array("hello", "world");
+            ?>
+            """
+        And I start the debugger with the PHP script example.php
+        When I step over
+        Then the first item on the stack should show the file example.php
+        And the first item on the stack should show line 3
+
+    Scenario: Reading the stack window with multiple files
+        Given I have a file example.php containing
+            """
+            <?php
+            include "example2.php";
+            ?>
+            """
+        And I have a file example2.php containing
+            """
+            <?php
+            $var1 = 1;
+            $var2 = array("hello", "world");
+            ?>
+            """
+        And I start the debugger with the PHP script example.php
+        When I step in
+        Then item 1 on the stack should show the file example2.php
+        And item 1 on the stack should show line 2
+        And item 2 on the stack should show the file example.php
+        And item 2 on the stack should show line 2

features/eval.feature

@@ -0,0 +1,15 @@
+Feature: Evaluating expressions
+    In order to evaluate variables in Vdebug
+    As a user
+    I want to see the evaluated variable in the watch window
+
+    Scenario: Evaluating a PHP expression
+        Given I have a file example.php containing
+            """
+            <?php
+            $var1 = 1;
+            ?>
+            """
+        And I start the debugger with the PHP script example.php
+        When I evaluate $var1
+        Then the watch window should show Eval of: '$var1'

features/step_definitions/debugger_command_steps.rb

@@ -0,0 +1,9 @@
+When "I step over" do
+  vdebug.step_over
+  vdebug.running?.should be(true), 'Vdebug is not running'
+end
+
+When "I step in" do
+  vdebug.step_in
+  vdebug.running?.should be(true), 'Vdebug is not running'
+end

features/step_definitions/evaluate_steps.rb

@@ -0,0 +1,4 @@
+When "I evaluate $expression" do |expr|
+  vdebug.evaluate expr
+  vdebug.running?.should be(true), 'Vdebug is not running'
+end