redcar-dev 0.12.7dev-java → 0.12.8dev-java

data/CHANGES

@@ -11,6 +11,8 @@ Version 0.12 (TBA)
  * Fixed irritating bugs in the indenter (Dan Lucraft)
  * Pressing enter when between {} will expand the block (Dan Lucraft)
  * Tweak to line numbers so highlighting isn't lost as doc passes 100 lines (Dan Lucraft)
+ * Added next line, previous line bindings to Ctrl+N and Ctrl+P (Dan Lucraft)
+ * Added open line, transpose characters commands (Dan Lucraft)
 
 Version 0.11 (23 March 2011)
 ============================

data/README.md

@@ -104,7 +104,7 @@ On Linux/Windows:
 
 To just run all specs:
 
-   $ jruby -S rake specs  
+   $ rake specs  
 
 ### Features
 
@@ -118,7 +118,7 @@ On Linux/Windows:
 
 To just run all features:
 
-    $ jruby -S rake cucumber
+    $ rake cucumber
 
 ## LICENSE
 

data/Rakefile

@@ -134,6 +134,7 @@ end
 desc "Run all specs and features"
 task :default => ["specs", "cucumber"]
 
+desc "Run all specs"
 task :specs do
   files = Dir['plugins/*/spec/*/*_spec.rb'] + Dir['plugins/*/spec/*/*/*_spec.rb'] + Dir['plugins/*/spec/*/*/*/*_spec.rb']
   case Config::CONFIG["host_os"]

data/lib/redcar.rb

@@ -56,7 +56,7 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.12.7dev' # also change in the gemspec!
+  VERSION         = '0.12.8dev' # also change in the gemspec!
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 12
   VERSION_RELEASE = 0

data/lib/redcar_quick_start.rb

@@ -51,8 +51,13 @@ module Redcar
           if arg =~ /--untitled-file=(.*)/
             path = $1 if File.file?($1)
             untitled = true
-          elsif File.file?(arg) or File.directory?(arg)
+          elsif arg !~ /^--/ # not --something
             path = File.expand_path(arg)
+            if !File.exist?(path)
+              require 'fileutils'
+              FileUtils.mkdir_p File.dirname(path)
+              FileUtils.touch path
+            end
           end
           next unless path
           drb_answer = drb.open_item_drb(path, untitled, ARGV.include?("-w"))

data/plugins/application/lib/application.rb

@@ -138,7 +138,7 @@ module Redcar
     end
 
     # Create a new Application::Window, and the controller for it.
-    def new_window
+    def new_window(show=true)
       s = Time.now
       new_window = Window.new
       windows << new_window
@@ -146,18 +146,29 @@ module Redcar
       attach_window_listeners(new_window)
       new_window.refresh_menu
       new_window.refresh_toolbar
-      new_window.show
-      set_focussed_window(new_window)
-      #puts "App#new_window took #{Time.now - s}s"
+      show_window(new_window) if show
       new_window
     end
 
+    def show_window(window)
+      window.show
+      set_focussed_window(window)
+    end
+
     def make_sure_at_least_one_window_open
       if windows.length == 0
         new_window
       end
     end
 
+    def make_sure_at_least_one_window_there
+      if windows.length == 0
+        win = new_window(false)
+        set_focussed_window(win)
+        win
+      end
+    end
+
     # Removes a window from this Application. Should not be called by plugins,
     # use Window#close instead.
     def window_closed(window)

data/plugins/project/features/find_file.feature

@@ -36,23 +36,23 @@ Feature: Find file
     Then the filter dialog should have 1 entry
     And I should see "foo_spec.rb (myproject/spec)" at 0 the filter dialog
 
-  Scenario: One matching file when specifying a directory
+  Scenario: One matching file when specifying a symlinked directory
     When I open the find file dialog
     And I set the filter to "lib_sym/foo"
     And I wait "0.4" seconds
     Then the filter dialog should have 1 entry
     And I should see "foo_lib.rb (myproject/lib_symlink)" at 0 the filter dialog
 
-  Scenario: Two matching files
+  Scenario: Two matching files, plus one in symlink
     When I open the find file dialog
     And I set the filter to "foo"
-    And I wait "0.4" seconds
+    And I wait "1.4" seconds
     Then the filter dialog should have 3 entries
     And I should see "foo_lib.rb (myproject/lib)" at 0 the filter dialog
     And I should see "foo_lib.rb (myproject/lib_symlink)" at 1 the filter dialog
     And I should see "foo_spec.rb (myproject/spec)" at 2 the filter dialog
 
-  Scenario: Two matching files - spaces ignored
+  Scenario: Two matching files, plus one in symlink - spaces ignored
     When I open the find file dialog
     And I set the filter to "foo rb"
     And I wait "0.4" seconds

data/plugins/project/lib/project.rb

@@ -236,8 +236,17 @@ module Redcar
     end
 
     def config_dir
-      dir = File.join(path, ".redcar")
-      FileUtils.mkdir_p(dir)
+      if Redcar.platform == :windows && Redcar.environment != :test 
+        dir = File.join(path, "._redcar")
+      else
+        dir = File.join(path, ".redcar")
+      end
+      unless File.directory? dir
+        FileUtils.mkdir_p(dir)
+        if Redcar.platform == :windows
+          system("attrib.exe +H \"#{dir}") # make hidden for cmd directory listings
+        end
+      end
       dir
     end
 

data/plugins/project/lib/project/manager.rb

@@ -264,8 +264,10 @@ module Redcar
         end
         if should_open == :yes
           win = Redcar.app.focussed_window
-          win = Redcar.app.new_window if !win or Manager.in_window(win)
+          win = Redcar.app.new_window(false) if !win or Manager.in_window(win)
           project.open(win) if project.ready?
+          Redcar.app.show_window(win)
+          project
         end
       end
 
@@ -418,7 +420,7 @@ module Redcar
       end
 
       def self.close_tab_guard(tab)
-        if tab.respond_to?(:edit_view) && tab.edit_view.document.modified?
+        if tab.respond_to?(:edit_view) && tab.edit_view.document.modified? && !tab.is_a?(REPL::Tab)
           tab.focus
           result = Application::Dialog.message_box(
           "This tab has unsaved changes. \n\nSave before closing?",

data/plugins/redcar/redcar.rb

@@ -246,6 +246,18 @@ Redcar.environment: #{Redcar.environment}
       end
     end
     
+    class MoveUpCommand < EditTabCommand
+      def execute
+        tab.edit_view.invoke_action(:LINE_UP)
+      end
+    end
+    
+    class MoveDownCommand < EditTabCommand
+      def execute
+        tab.edit_view.invoke_action(:LINE_DOWN)
+      end
+    end
+    
     class ForwardCharCommand < DocumentCommand
       def execute
         doc.cursor_offset = [doc.cursor_offset + 1, doc.length].min
@@ -258,6 +270,14 @@ Redcar.environment: #{Redcar.environment}
       end
     end
     
+    class OpenLineCommand < DocumentCommand
+      def execute
+        prev = doc.cursor_offset
+        doc.insert_at_cursor("\n")
+        doc.cursor_offset = prev
+      end
+    end
+
     class DeleteCharCommand < DocumentCommand
       def execute
         if doc.cursor_offset < doc.length
@@ -465,6 +485,25 @@ Redcar.environment: #{Redcar.environment}
         doc.scroll_to_line(last_line_ix + 1)
       end
     end
+    
+    class TransposeCharactersCommand < Redcar::DocumentCommand
+      def execute
+        line        = doc.get_line(doc.cursor_line)
+        line_offset = doc.cursor_line_offset
+        
+        if line_offset > 0 and line.length >= 2
+          if line_offset < line.length - 1
+            first_char  = line.chars[line_offset - 1].to_s
+            second_char = line.chars[line_offset].to_s
+            doc.replace(doc.cursor_offset - 1, 2, second_char + first_char)
+          elsif line_offset == line.length - 1
+            first_char  = line.chars[line_offset - 2].to_s
+            second_char = line.chars[line_offset - 1].to_s
+            doc.replace(doc.cursor_offset - 2, 2, second_char + first_char)
+          end
+        end
+      end
+    end
 
     class SortLinesCommand < Redcar::DocumentCommand
 
@@ -617,6 +656,7 @@ Redcar.environment: #{Redcar.environment}
         link "Cmd+C",        CopyCommand
         link "Cmd+V",        PasteCommand
         link "Cmd+D",        DuplicateCommand
+        link "Ctrl+T",       TransposeCharactersCommand
 
         link "Home",    MoveTopCommand
         link "Ctrl+A",  MoveHomeCommand
@@ -624,6 +664,10 @@ Redcar.environment: #{Redcar.environment}
         link "End",     MoveBottomCommand
         link "Ctrl+F",  ForwardCharCommand
         link "Ctrl+B",  BackwardCharCommand
+        link "Ctrl+P",  MoveUpCommand
+        link "Ctrl+N",  MoveDownCommand
+        link "Ctrl+B",  BackwardCharCommand
+        link "Ctrl+O",  OpenLineCommand
         link "Ctrl+D",  DeleteCharCommand
         link "Ctrl+H",  BackspaceCommand
 
@@ -858,8 +902,15 @@ Redcar.environment: #{Redcar.environment}
               
               item "Forward Character",  ForwardCharCommand
               item "Backward Character", BackwardCharCommand
+              item "Previous Line",      MoveUpCommand
+              item "Next Line",          MoveDownCommand
+              item "Open Line",          OpenLineCommand
+              
+              separator
+              
               item "Delete Character",   DeleteCharCommand
               item "Backspace",          BackspaceCommand
+              item "Transpose",          TransposeCharactersCommand
             end
           end
 
@@ -1000,11 +1051,11 @@ Redcar.environment: #{Redcar.environment}
         end
         Redcar.update_gui do
           SplashScreen.splash_screen.close if SplashScreen.splash_screen
-          win = Redcar.app.make_sure_at_least_one_window_open
-          win.close if win and args.include?("--no-window")
+          win = Redcar.app.make_sure_at_least_one_window_there
           Redcar.log.info("startup milestone: window open #{Time.now - Redcar.process_start_time}")
           Redcar::Project::Manager.start(args)
           Redcar.log.info("startup milestone: project open #{Time.now - Redcar.process_start_time}")
+          win.show if win and !args.include?("--no-window")
         end
         Redcar.load_useful_libraries
         Redcar.log.info("startup milestone: complete: #{Time.now - Redcar.process_start_time}")

data/plugins/spray/README

@@ -0,0 +1,32 @@
+Basic, simple (beta) debugger plugin for redcar editor.
+
+It lacks:
+- Variables, eval, and call stack information.
+- Conditional breakpoints.
+
+It has:
+- Ruby debugger integrated in a REPL tab (variables, eval, conditional breakpoints... and much more).
+- ToolBar debug buttons: debug, next, step, continue and list.
+- Tags current line in editor tab.
+
+Working in:
+- Breakpoint toolbar button.
+- Breakpoint persistence between restarts.
+
+If you use rdebug, probably this is more than you ever needed.
+If you use Netbeans or Rubymine, this could seem like a wombat against a sabretooth. 
+If you use Redcar, take a look at http://blog.bithug.org/2011/04/redcar-debug, it's far more advanced than this project.
+
+Why would you like to test this plugin?
+- It gives access to the rdebug command line power: conditional breakpoints, frames...
+- It makes rdebug easier to use.
+- It's small and hackable. You can add your own commands or support to new languages. 
+
+If you still want to install this:
+- Install ruby-debug gem.
+- Download and copy the spray folder to your redcar plugins folder.
+- Restart redcar, and you can see the new buttons in the redcar ToolBar.
+
+You can see it in action:
+http://s3.amazonaws.com/files.posterous.com/temp-2011-07-22/eEfnBmyqCjgkzrkxesmCdIgpvvwIghxFJdFtvAyFupucGdjFtxgwFbpCAjFA/SprayTest.swf?AWSAccessKeyId=AKIAJFZAE65UYRT34AOQ&Expires=1311401313&Signature=WLEFFjhmHW4u59KNqKVf8oqwhq4%3D
+

data/plugins/spray/foo.rb

@@ -0,0 +1,5 @@
+
+
+
+10.times { puts "hi" }
+

data/plugins/spray/lib/annotations.rb

@@ -0,0 +1,50 @@
+require 'spray_tabs'
+
+module Annotations
+
+  BREAKPOINT   = ["breakpoint.annotation.type","control-pause-small",[100, 100, 200]]
+  CURRENT_LINE = ["current_line.annotation.type","control",[100, 100, 200]]
+
+  def self.set(path, line, type=CURRENT_LINE)
+    tab= (SprayTabs.find_first_matching_tab(path) || SprayTabs.open_tab(path))
+    unless Annotations.get_types(path).andand.include?(type)
+      tab.edit_view.add_annotation_type(*type)
+    end
+    unless Annotations.get_lines(path, type).include?(line)
+      tab.edit_view.add_annotation(type[0], line-1, type[0].split('.')[0], 0,0)
+    end
+    SprayTabs.set_current_tab(path, line)
+  end
+
+  def self.remove(path, line, type=CURRENT_LINE)
+    tab= (SprayTabs.find_first_matching_tab(path) || SprayTabs.open_tab(path))
+    tab.edit_view.remove_annotation(Annotations.get(path, line-1, type))
+  end
+
+  def self.get(path, line, type=CURRENT_LINE)
+    tab= SprayTabs.find_first_matching_tab(path)
+    begin
+      annotation= tab.edit_view.annotations.select{|a| 
+        (a.getLine==line) and (a.getType==type[0])
+      }.first
+    rescue 
+      nil
+    end
+  end
+  
+  def self.get_types(path)
+    tab= SprayTabs.find_first_matching_tab(path)
+    tab.edit_view.annotations.map{|a| a.getType}.uniq! rescue []
+  end
+  
+  def self.get_lines(path, type=CURRENT_LINE)
+    tab= SprayTabs.find_first_matching_tab(path)
+    begin
+      annotations= tab.edit_view.annotations.select{|a| a.getType==type[0]}
+      annotations.map{|a| a.getLine+1}.sort! 
+    rescue 
+      []
+    end
+  end
+  
+end

data/plugins/spray/lib/controllers/rdebug_controller.rb

@@ -0,0 +1,38 @@
+require 'net/telnet'
+
+class RDebugController
+  RDEBUG_NO_PRINT= File.join(Redcar.root, "plugins", "spray", "lib", "controllers", "rdebug_no_print.rb")
+  RDEBUG_PROMPT= /PROMPT \(rdb:\d*\) |CONFIRM Really quit\? \(y\/n\)/
+  @@current_port= 31415
+  @@s= nil
+  
+  attr_reader :command
+  
+  def initialize(path, host='localhost', port=nil)
+    @path, @host, @port = path, host, (port || @@current_port+=1)
+    @command= "rdebug --debug -nx -p #{@port} -s -w -r '#{RDEBUG_NO_PRINT}' '#{@path}'"
+  end
+  
+  def connect
+    retries= 1 #1 seconds of timeout
+    begin
+      @@s= Net::Telnet::new("Host"=> @host, "Port"=> @port, "Prompt"=> RDEBUG_PROMPT,
+      "Telnetmode"=> false, "Timeout"=> 2, "Waittime"=> 0)
+    rescue
+      sleep 0.2
+      retry if 0 <= (retries-=0.2)
+      raise("Timeout connecting to rdebug on #{@host}:#{@port}")
+    end
+    @@s.waitfor(/PROMPT \(rdb:\d*\)/)
+  end
+  
+  def send_command(command)
+    @@s.cmd(command) || ''
+  end
+  
+  def current_position
+    line, file = @@s.cmd("info line").scan(/Line\s(\d+).*"(.*)"/).flatten
+    [line.to_i, File.expand_path(file, File.dirname(@path))]
+  end
+  
+end

data/plugins/spray/lib/controllers/rdebug_no_print.rb

@@ -0,0 +1,9 @@
+
+##
+# Avoids printing file & line after commands
+module Debugger
+  class CommandProcessor  
+    def self.print_location_and_text(file, line)
+    end
+  end
+end

data/plugins/spray/lib/spray.rb

@@ -0,0 +1,58 @@
+require 'spray_repl_mirror'
+require 'spray_tabs'
+
+module Redcar
+  class Spray
+    #menu and toolbar
+    def self.menus
+      Menu::Builder.build do
+        sub_menu "Plugins" do
+          sub_menu "Spray", :priority => 139 do
+            item "Debug file", OpenSprayREPL
+            ["List", "Step", "Next", "Continue"].each{|command|
+              item(command) {Redcar.safely{SprayTabs.send_to_repl(command.downcase)}}
+            }
+          end
+        end
+      end
+    end
+    
+    def self.toolbars
+      ToolBar::Builder.build do
+        item "Debug file", {:icon=>File.join(Redcar::ICONS_DIRECTORY, "arrow-step-over.png"), :command=>OpenSprayREPL}
+        item "Next", {:icon=>File.join(Redcar::ICONS_DIRECTORY, "arrow-270.png"), :command=>SpraySendNext}
+        item "Step", {:icon=>File.join(Redcar::ICONS_DIRECTORY, "arrow-315.png"), :command=>SpraySendStep}
+        item "Continue", {:icon=>File.join(Redcar::ICONS_DIRECTORY, "arrow-step.png"), :command=>SpraySendContinue}
+        item "List", {:icon=>File.join(Redcar::ICONS_DIRECTORY, "arrow-continue.png"), :command=>SpraySendList}
+      end
+    end
+    
+    class OpenSprayREPL < Redcar::REPL::OpenREPL
+      def execute
+        Redcar.safely{
+          SprayTabs.find_first_matching_tab("SprayOutput").andand.close
+          SprayTabs.find_first_matching_tab("Spray: ").andand.close
+          open_repl(SprayReplMirror.new)
+        }
+      end
+    end
+    
+    class SpraySendList < Redcar::Command
+      def execute; Redcar.safely{SprayTabs.send_to_repl("list")}; end
+    end
+    
+    class SpraySendStep < Redcar::Command
+      def execute; Redcar.safely{SprayTabs.send_to_repl("step")}; end
+    end
+    
+    class SpraySendNext < Redcar::Command
+      def execute; Redcar.safely{SprayTabs.send_to_repl("next")}; end
+    end
+    
+    class SpraySendContinue < Redcar::Command
+      def execute; Redcar.safely{SprayTabs.send_to_repl("continue")}; end
+    end
+    
+  end
+end
+

data/plugins/spray/lib/spray_repl_mirror.rb

@@ -0,0 +1,58 @@
+require 'controllers/rdebug_controller'
+require 'annotations'
+
+module Redcar
+  class Spray
+    class SprayReplMirror < Redcar::REPL::ReplMirror
+      
+      attr_reader :title, :prompt, :grammar_name, :evaluator
+      
+      def initialize
+        @spray_path  = Redcar.app.focussed_window.focussed_notebook_tab_document.path
+        raise "No file, please select another tab" if @spray_path.nil?
+        @evaluator   = SprayEvaluator.new(@spray_path)
+        @title = "Spray: #{File.basename(@spray_path)}"
+        @prompt= "(#{File.extname(@spray_path)})>"
+        @grammar_name= "Spray REPL"
+        super
+      end
+      
+      def format_error(e)
+        backtrace= e.backtrace.reject{|l| l=~ /repl_mirror/}
+        backtrace.unshift("(repl):1")
+        "#{e.class}: #{e.message}" #\n        '#{backtrace.join("'\n        '")}'"
+      end
+      
+      class SprayEvaluator
+        
+        def initialize(path)
+          @binding   = binding
+          @controller= case File.extname(path)
+          when '.rb'   then RDebugController.new(path)
+          when '.java' then raise("Java support still not implemented")
+          else raise("Spray can't handle this file type")
+          end
+          @previous_file, @previous_line = path, 1
+          Redcar::Runnables.run_process(File.dirname(path), @controller.command, "SprayOutput")
+        end
+        
+        def inspect; "SprayEvaluator"; end
+        
+        def execute(command)
+          begin
+            retries=1
+            output= @controller.send_command(command)
+            @current_line, @current_file= @controller.current_position
+            Annotations.remove(@previous_file, @previous_line)
+            Annotations.set(@current_file, @current_line)
+            @previous_file, @previous_line = @current_file, @current_line
+            return output
+          rescue
+            (@controller.connect; retry) if 0 <= (retries-=1)
+          end
+        end
+      end
+      
+    end
+  end
+end

data/plugins/spray/lib/spray_tabs.rb

@@ -0,0 +1,56 @@
+##
+# Module for files being debugged
+module SprayTabs
+  
+  ##
+  # Sends and evaluates command with RDebug REPL
+  def self.send_to_repl(command)
+    tab= SprayTabs.find_first_matching_tab('Spray: ')
+    if tab.nil?
+      raise "Open a file and goto Plugins -> Spray -> Debug"
+    else
+      tab.edit_view.document.insert_at_cursor(command)
+      tab.edit_view.document.mirror.evaluate(command)
+    end
+  end
+  
+  def self.set_current_tab(path, line)
+    tab= (SprayTabs.find_first_matching_tab(path) || SprayTabs.open_tab(path))
+    tab.focus
+    tab.document.scroll_to_line(line)
+  end
+  
+  ##
+  # Returns nil when no matches
+  def self.find_first_matching_tab(path)
+    Redcar.app.focussed_window.all_tabs.select{|tab|
+      ((tab.document.path rescue nil) =~ /#{path}/) or
+      ((tab.document.title rescue nil) =~ /#{path}/)
+    }.first
+  end
+  
+  ##
+  # Returns opened tab, or nil if file not exists
+  def self.open_tab(path)
+    if File.exist?(path)
+      tab  = Redcar.app.focussed_window.new_tab(Redcar::EditTab)
+      mirror = Redcar::Project::FileMirror.new(path)
+      tab.edit_view.document.mirror = mirror
+      tab.edit_view.reset_undo
+      tab
+    end
+  end
+  
+  def self.scroll_to(path, line)
+    tab= (SprayTabs.find_first_matching_tab(path) || SprayTabs.open_tab(path))
+    tab.edit_view.document.scroll_to_line(line)
+  end
+  
+  def self.focussed_doc
+    Redcar.app.focussed_window.focussed_notebook_tab_document
+  end
+  
+  def self.focussed_path; focussed_doc.path rescue nil; end
+  
+  def self.focussed_line; (focussed_doc.cursor_line+1) rescue nil; end
+end

data/plugins/spray/plugin.rb

@@ -0,0 +1,8 @@
+
+Plugin.define do
+  name    "spray"
+  version "0.1"
+  file    "lib", "spray"
+  object  "Redcar::Spray"
+  dependencies "redcar", ">0"
+end

data/plugins/spray/test/hanoi.rb

@@ -0,0 +1,13 @@
+
+def hanoi(n,a,b,c)
+   if n-1 > 0
+      hanoi(n-1, a, c, b)
+   end
+   puts "Move disk %s to %s" % [a, b]
+   if n-1 > 0
+      hanoi(n-1, c, b, a)
+    end
+end
+
+hanoi(3, :a, :b, :c)
+puts "Done!"

data/plugins/web_bookmarks/lib/web_bookmarks/commands.rb

@@ -34,7 +34,7 @@ module Redcar
         if @path
           json = File.read(@path)
         else
-          @path = project.path + "/.redcar/#{BOOKMARKS_FILE}"
+          @path = project.config_dir + "/#{BOOKMARKS_FILE}"
           json = JSON.generate({"bookmarks"=>[]})
         end
         bookmarks = JSON(json)["bookmarks"]

metadata

@@ -2,7 +2,7 @@
 name: redcar-dev
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.12.7dev
+  version: 0.12.8dev
 platform: java
 authors: 
   - Daniel Lucraft
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 +01:00
+date: 2011-07-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -157,7 +157,7 @@ dependencies:
     type: :runtime
     version_requirements: *id013
   - !ruby/object:Gem::Dependency 
-    name: spoon
+    name: ruby-blockcache
     prerelease: false
     requirement: &id014 !ruby/object:Gem::Requirement 
       none: false
@@ -168,7 +168,7 @@ dependencies:
     type: :runtime
     version_requirements: *id014
   - !ruby/object:Gem::Dependency 
-    name: ffi
+    name: spoon
     prerelease: false
     requirement: &id015 !ruby/object:Gem::Requirement 
       none: false
@@ -179,7 +179,7 @@ dependencies:
     type: :runtime
     version_requirements: *id015
   - !ruby/object:Gem::Dependency 
-    name: cucumber
+    name: ffi
     prerelease: false
     requirement: &id016 !ruby/object:Gem::Requirement 
       none: false
@@ -187,10 +187,10 @@ dependencies:
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    type: :development
+    type: :runtime
     version_requirements: *id016
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: cucumber
     prerelease: false
     requirement: &id017 !ruby/object:Gem::Requirement 
       none: false
@@ -201,7 +201,7 @@ dependencies:
     type: :development
     version_requirements: *id017
   - !ruby/object:Gem::Dependency 
-    name: watchr
+    name: rspec
     prerelease: false
     requirement: &id018 !ruby/object:Gem::Requirement 
       none: false
@@ -211,6 +211,17 @@ dependencies:
             version: "0"
     type: :development
     version_requirements: *id018
+  - !ruby/object:Gem::Dependency 
+    name: watchr
+    prerelease: false
+    requirement: &id019 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id019
 description: ""
 email: 
   - dan@fluentradical.com
@@ -3869,6 +3880,16 @@ files:
   - plugins/snippets/lib/snippets/tab_handler.rb
   - plugins/splash_screen/plugin.rb
   - plugins/splash_screen/splash_screen.rb
+  - plugins/spray/foo.rb
+  - plugins/spray/plugin.rb
+  - plugins/spray/README
+  - plugins/spray/lib/annotations.rb
+  - plugins/spray/lib/spray.rb
+  - plugins/spray/lib/spray_repl_mirror.rb
+  - plugins/spray/lib/spray_tabs.rb
+  - plugins/spray/lib/controllers/rdebug_controller.rb
+  - plugins/spray/lib/controllers/rdebug_no_print.rb
+  - plugins/spray/test/hanoi.rb
   - plugins/strip_trailing_spaces/plugin.rb
   - plugins/strip_trailing_spaces/features/strip_trailing_spaces.feature
   - plugins/strip_trailing_spaces/features/fixtures/test.txt