Add more cucumber features, e.g for eval

Author: joonty

features/correct_window_setup.feature

@@ -24,8 +24,8 @@ Feature: Correct window setup
             """
         And I start the debugger with the PHP script example.php
         When I step over
-        Then the watch window should show the variable $var1
-        And the watch window should show the variable $var2
+        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)
 

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/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

features/step_definitions/watch_window_steps.rb

@@ -1,5 +1,5 @@
-Then "the watch window should show the variable $var" do |var|
-  vdebug.watch_window_content.should include var
+Then "the watch window should show $text" do |text|
+  vdebug.watch_window_content.should include text
 end
 
 Then "the watch window variable $var should be $value" do |var, value|

features/unicode_in_source_buffer.feature

@@ -12,4 +12,4 @@ Feature: Unicode in source buffer
             """
         And I start the debugger with the PHP script test.php
         When I step over
-        Then the watch window should show the variable $arr
+        Then the watch window should show $arr

features/valid_file_names.feature

@@ -12,7 +12,7 @@ Feature: Valid file names
             """
         And I start the debugger with the PHP script My File.php
         When I step over
-        Then the watch window should show the variable $var
+        Then the watch window should show $var
 
     Scenario: Debug a PHP file with a space in the directory
         Given I have a file A Path/myfile.php containing
@@ -23,4 +23,4 @@ Feature: Valid file names
             """
         And I start the debugger with the PHP script A Path/myfile.php
         When I step over
-        Then the watch window should show the variable $var
+        Then the watch window should show $var

rubylib/vdebug.rb

@@ -30,6 +30,11 @@ def step_in
     vim.command 'python debugger.step_into()'
   end
 
+  def evaluate(expression)
+    safe_expression = expression.gsub(/['"\\\x0]/,'\\\\\0')
+    vim.command %Q{python debugger.handle_eval("#{safe_expression}")}
+  end
+
   # Retrieve a hash with the buffer names (values) and numbers (keys)
   def buffers
     @buffers ||= fetch_buffers