ruby-debug-ide 0.4.17.beta8 → 0.4.17.beta9

data/Gemfile

@@ -0,0 +1,15 @@
+source "http://rubygems.org"
+
+gem "ruby-debug-base", :platforms => [:jruby, :ruby_18, :mingw_18]
+gem "ruby-debug-base19x", :platforms => [:ruby_19, :mingw_19]
+
+gemspec
+
+group :development do
+  gem "bundler", "~> 1.0.0"
+end
+
+group :test do
+  gem "test-unit"
+end
+

data/Rakefile

@@ -1,7 +1,4 @@
-require 'rubygems'
-
 require 'bundler/gem_tasks'
-require 'rake/rdoctask'
 require 'rake/testtask'
 
 desc 'Default: run unit tests.'

data/ext/mkrf_conf.rb

@@ -1,4 +1,10 @@
 jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
+
+def already_installed(dep)
+  Gem::DependencyInstaller.new(:domain => :local).find_gems_with_sources(dep) ||
+  Gem::DependencyInstaller.new(:domain => :local,:prerelease => true).find_gems_with_sources(dep)    
+end
+
 unless jruby
   require 'rubygems'
   require 'rubygems/command.rb'
@@ -16,8 +22,9 @@ unless jruby
     dep = Gem::Dependency.new("ruby-debug-base19x", '>=0.11.24')
   end
 
-  inst = Gem::DependencyInstaller.new
   begin
+    puts "Installing base gem"
+    inst = Gem::DependencyInstaller.new    
     inst.install dep
   rescue
     inst = Gem::DependencyInstaller.new(:prerelease => true)
@@ -28,7 +35,7 @@ unless jruby
       puts e.backtrace.join "\n  "
       exit(1)
     end
-  end
+  end unless already_installed(dep)
 end
 
 # create dummy rakefile to indicate success

data/lib/ruby-debug-ide.rb

@@ -3,17 +3,11 @@ require 'stringio'
 require "socket"
 require 'thread'
 require 'ruby-debug-base'
-if RUBY_VERSION < "1.9"
-  require 'ruby-debug/version'
-  require 'ruby-debug/xml_printer'
-  require 'ruby-debug/ide_processor'
-  require 'ruby-debug/event_processor'
-else
-  require_relative 'ruby-debug/version'
-  require_relative 'ruby-debug/xml_printer'
-  require_relative 'ruby-debug/ide_processor'
-  require_relative 'ruby-debug/event_processor'
-end
+
+require 'ruby-debug-ide/version'
+require 'ruby-debug-ide/xml_printer'
+require 'ruby-debug-ide/ide_processor'
+require 'ruby-debug-ide/event_processor'
 
 module Debugger
   

data/lib/{ruby-debug → ruby-debug-ide}/command.rb

@@ -1,9 +1,4 @@
-if RUBY_VERSION < "1.9"
-  require 'ruby-debug/helper'
-else
-  require_relative 'helper'
-end
-
+require 'ruby-debug-ide/helper'
 
 module Debugger
 

data/lib/{ruby-debug → ruby-debug-ide}/commands/breakpoints.rb

@@ -69,7 +69,7 @@ module Debugger
     self.control = true
 
     def regexp
-      /^\s*b(?:reak)?$/
+      /^\s*info\s*break$/
     end
 
     def execute

data/lib/{ruby-debug → ruby-debug-ide}/commands/variables.rb

@@ -38,7 +38,7 @@ module Debugger
       if RUBY_VERSION < "1.9"
         globals = global_variables - ['$=', '$IGNORECASE']
       else
-        globals = global_variables - [:$KCODE, :$-K, :$=, :$FILENAME]
+        globals = global_variables - [:$KCODE, :$-K, :$=, :$IGNORECASE, :$FILENAME]
       end
       print_variables(globals, 'global') do |var|
         debug_eval(var)

data/lib/{ruby-debug → ruby-debug-ide}/event_processor.rb

@@ -1,8 +1,5 @@
-if RUBY_VERSION < "1.9"
-  require 'ruby-debug/xml_printer'
-else
-  require_relative 'xml_printer'
-end
+require 'ruby-debug-ide/xml_printer'
+
  module Debugger
    
    class EventProcessor

data/lib/{ruby-debug → ruby-debug-ide}/ide_processor.rb

@@ -1,10 +1,5 @@
-if RUBY_VERSION < "1.9"
-  require 'ruby-debug/interface'
-  require 'ruby-debug/command'
-else
-  require_relative 'interface'
-  require_relative 'command'
-end
+require 'ruby-debug-ide/interface'
+require 'ruby-debug-ide/command'
 
 module Debugger
   class IdeCommandProcessor
@@ -34,11 +29,7 @@ module Debugger
       end
       event_cmds = Command.commands.map{|cmd| cmd.new(state, @printer) }
       while !state.proceed? do
-        input = @interface.command_queue.empty? ? nil : @interface.command_queue.shift
-        unless input
-          sleep 0.1
-          next
-        end
+        input = @interface.command_queue.pop
         catch(:debug_error) do
           splitter[input].each do |input|
             # escape % since print_debug might use printf

data/lib/{ruby-debug → ruby-debug-ide}/interface.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 class TCPSocket
   
   # Workaround for JRuby issue http://jira.codehaus.org/browse/JRUBY-2063
@@ -24,7 +26,7 @@ module Debugger
 
     def initialize(socket)
       @socket = socket
-      @command_queue = []
+      @command_queue = Queue.new
     end
     
     def read_command

data/lib/ruby-debug-ide/version.rb

@@ -0,0 +1,3 @@
+module Debugger
+  IDE_VERSION='0.4.17.beta9'
+end

data/lib/{ruby-debug → ruby-debug-ide}/xml_printer.rb

@@ -147,9 +147,6 @@ module Debugger
         unless value_str.is_a?(String)
           value_str = "ERROR: #{value.class}.to_s method returns #{value_str.class}. Should return String." 
         end
-        if value_str =~ /^\"(.*)"$/
-          value_str = $1
-        end
       end
       value_str = "[Binary Data]" if (value_str.respond_to?('is_binary_data?') && value_str.is_binary_data?)
       print("<variable name=\"%s\" kind=\"%s\" value=\"%s\" type=\"%s\" hasChildren=\"%s\" objectId=\"%#+x\"/>",

data/ruby-debug-ide.gemspec

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/lib/ruby-debug-ide/version'
+require "date"
+
+# ------- Default Package ----------
+RUBY_DEBUG_IDE_VERSION = Debugger::IDE_VERSION unless defined? RUBY_DEBUG_IDE_VERSION
+
+unless defined? FILES
+  FILES = ['CHANGES',
+  'ChangeLog',
+  'ChangeLog.archive',
+  'MIT-LICENSE',
+  'Rakefile',
+  'ext/mkrf_conf.rb',
+  'Gemfile',
+  'ruby-debug-ide.gemspec'
+  ]
+  FILES.push(*Dir['bin/*'])
+  FILES.push(*Dir['lib/**/*'])
+  #  'test/**/*',
+end
+
+Gem::Specification.new do |spec|
+  spec.name = "ruby-debug-ide"
+
+  spec.homepage = "https://github.com/JetBrains/ruby-debug-ide"
+  spec.summary = "IDE interface for ruby-debug."
+  spec.description = <<-EOF
+An interface which glues ruby-debug to IDEs like Eclipse (RDT), NetBeans and RubyMine.
+EOF
+
+  spec.version = RUBY_DEBUG_IDE_VERSION
+
+  spec.author = "Markus Barchfeld, Martin Krauskopf, Mark Moseley, JetBrains RubyMine Team"
+  spec.email = "rubymine-feedback@jetbrains.com"
+  spec.platform = Gem::Platform::RUBY
+  spec.require_path = "lib"
+  spec.bindir = "bin"
+  spec.executables = ["rdebug-ide"]
+  spec.files = FILES
+
+  spec.extensions << "ext/mkrf_conf.rb" unless ENV['NO_EXT']
+  spec.add_dependency("rake", ">= 0.8.1")
+
+  spec.required_ruby_version = '>= 1.8.2'
+  spec.date = DateTime.now
+  spec.rubyforge_project = 'debug-commons'
+
+  # rdoc
+  spec.has_rdoc = false
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-debug-ide
 version: !ruby/object:Gem::Version
-  version: 0.4.17.beta8
+  version: 0.4.17.beta9
   prerelease: 7
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000Z
+date: 2012-03-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70349904728880 !ruby/object:Gem::Requirement
+  requirement: &70355403341520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70349904728880
+  version_requirements: *70355403341520
 description: ! 'An interface which glues ruby-debug to IDEs like Eclipse (RDT), NetBeans
   and RubyMine.
 
@@ -39,30 +39,31 @@ files:
 - MIT-LICENSE
 - Rakefile
 - ext/mkrf_conf.rb
+- Gemfile
+- ruby-debug-ide.gemspec
 - bin/rdebug-ide
-- lib/ruby-debug/command.rb
-- lib/ruby-debug/commands/breakpoints.rb
-- lib/ruby-debug/commands/catchpoint.rb
-- lib/ruby-debug/commands/condition.rb
-- lib/ruby-debug/commands/control.rb
-- lib/ruby-debug/commands/enable.rb
-- lib/ruby-debug/commands/eval.rb
-- lib/ruby-debug/commands/frame.rb
-- lib/ruby-debug/commands/inspect.rb
-- lib/ruby-debug/commands/jump.rb
-- lib/ruby-debug/commands/load.rb
-- lib/ruby-debug/commands/pause.rb
-- lib/ruby-debug/commands/set_type.rb
-- lib/ruby-debug/commands/stepping.rb
-- lib/ruby-debug/commands/threads.rb
-- lib/ruby-debug/commands/variables.rb
-- lib/ruby-debug/event_processor.rb
-- lib/ruby-debug/helper.rb
-- lib/ruby-debug/ide_processor.rb
-- lib/ruby-debug/interface.rb
-- lib/ruby-debug/printers.rb
-- lib/ruby-debug/version.rb
-- lib/ruby-debug/xml_printer.rb
+- lib/ruby-debug-ide/command.rb
+- lib/ruby-debug-ide/commands/breakpoints.rb
+- lib/ruby-debug-ide/commands/catchpoint.rb
+- lib/ruby-debug-ide/commands/condition.rb
+- lib/ruby-debug-ide/commands/control.rb
+- lib/ruby-debug-ide/commands/enable.rb
+- lib/ruby-debug-ide/commands/eval.rb
+- lib/ruby-debug-ide/commands/frame.rb
+- lib/ruby-debug-ide/commands/inspect.rb
+- lib/ruby-debug-ide/commands/jump.rb
+- lib/ruby-debug-ide/commands/load.rb
+- lib/ruby-debug-ide/commands/pause.rb
+- lib/ruby-debug-ide/commands/set_type.rb
+- lib/ruby-debug-ide/commands/stepping.rb
+- lib/ruby-debug-ide/commands/threads.rb
+- lib/ruby-debug-ide/commands/variables.rb
+- lib/ruby-debug-ide/event_processor.rb
+- lib/ruby-debug-ide/helper.rb
+- lib/ruby-debug-ide/ide_processor.rb
+- lib/ruby-debug-ide/interface.rb
+- lib/ruby-debug-ide/version.rb
+- lib/ruby-debug-ide/xml_printer.rb
 - lib/ruby-debug-ide.rb
 homepage: https://github.com/JetBrains/ruby-debug-ide
 licenses: []

data/lib/ruby-debug/printers.rb

@@ -1,2 +0,0 @@
-require 'ruby-debug/printers/plain_printer'
-require 'ruby-debug/printers/xml_printer'

data/lib/ruby-debug/version.rb

@@ -1,3 +0,0 @@
-module Debugger
-  IDE_VERSION='0.4.17.beta8'
-end