irt 1.1.2 → 1.1.3

data/README.markdown

@@ -500,17 +500,19 @@ which should work quite well without any change:
     # IRT.copy_to_clipboard_command = 'your command'
 
     # the format to build the command to launch nano
-    # IRT.nano_command_format = 'nano +%2$d %1$s'
+    # IRT.nano_command_format = %(nano +%2$d "%1$s")
 
     # the format to build the command to launch vi
-    # IRT.vi_command_format ="vi -c 'startinsert' %1$s +%2$d"
+    # IRT.vi_command_format = %(vi -c "startinsert" "%1$s" +%2$d)
 
     # the format to build the command to launch the ri tool
-    # IRT.ri_command_format = "qri -f #{Dye.color? ? 'ansi' : 'plain'} %s"
+    # if RUBY_VERSION > 1.9.2 uses qri (from fastri) else bri
+    # IRT.ri_command_format = %(qri -f #{Dye.color? ? 'ansi' : 'plain'} "%s")
+    # IRT.ri_command_format = %(bri "%s")
 
     # add your command format if you want to use another editor than nano or vi
     # default 'open -t %1$s' on MacOX; 'kde-open %1$s' or 'gnome-open %1$s' un unix/linux; '%1$s' on windoze
-    # IRT.edit_command_format ="your_preferred_GUI_editor %1$s +%2$d"
+    # IRT.edit_command_format = "your_preferred_GUI_editor %1$s +%2$d"
 
     # any log-ignored-echo command you want to add
     # IRT.log.ignored_echo_commands << %w[commandA commandB ...]

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/bin/irt

@@ -58,7 +58,10 @@ puts copy
 
 paths = if ARGV.empty?
           options[:interactive_eof] = true
-          [ Tempfile.new(%w[tmp- .irt]).path ]
+          tmp_file = Tempfile.new(%w[tmp- .irt])
+          tmp_file << "\n" # one empty line makes irb of 1.9.2 happy
+          tmp_file.flush
+          [ tmp_file.path ]
         else
           ARGV.map {|p| File.expand_path(p) }
         end
@@ -69,7 +72,7 @@ files = paths.map do |path|
             options[:interactive_eof] = true
             dirname = File.dirname(path)
             FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
-            FileUtils.touch(path)
+            File.open(path, 'w') {|f| f.puts "\n" } # one empty line makes irb of 1.9.2 happy
           end
           File.directory?(path) ? Dir.glob(File.join(path, '**/*.irt')) : path
         end.flatten

data/irt.gemspec

@@ -1,6 +1,7 @@
 name = File.basename( __FILE__, '.gemspec' )
 version = File.read(File.expand_path('../VERSION', __FILE__)).strip
 require 'date'
+require File.expand_path('../lib/irt/ruby_version.rb', __FILE__)
 
 Gem::Specification.new do |s|
 
@@ -13,7 +14,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('differ', [">= 0.1.1"])
   s.add_runtime_dependency('dye', [">= 0.1.1"])
   s.add_runtime_dependency('prompter', [">= 0.1.2"])
-  s.add_runtime_dependency('fastri', [">= 0.3.1.1"])
+  if IRT::RubyVersion >= '1.9.2'
+    s.add_runtime_dependency('bri', [">= 0.1.4"])
+  else
+    s.add_runtime_dependency('fastri', [">= 0.3.1.1"])
+  end
 
   s.executables = ['irt', 'irt_irb', 'irt_rails2']
   s.files = `git ls-files -z`.split("\0") - %w[irt-tutorial.pdf]

data/irtrc

@@ -24,17 +24,19 @@
 # IRT.copy_to_clipboard_command = 'your command'
 
 # the format to build the command to launch nano
-# IRT.nano_command_format = 'nano +%2$d %1$s'
+# IRT.nano_command_format = %(nano +%2$d "%1$s")
 
 # the format to build the command to launch vi
-# IRT.vi_command_format ="vi -c 'startinsert' %1$s +%2$d"
+# IRT.vi_command_format = %(vi -c "startinsert" "%1$s" +%2$d)
 
 # the format to build the command to launch the ri tool
-# IRT.ri_command_format = "qri -f #{Dye.color? ? 'ansi' : 'plain'} %s"
+# if RUBY_VERSION > 1.9.2 uses qri (from fastri) else bri
+# IRT.ri_command_format = %(qri -f #{Dye.color? ? 'ansi' : 'plain'} "%s")
+# IRT.ri_command_format = %(bri "%s")
 
 # add your command format if you want to use another editor than nano or vi
 # default 'open -t %1$s' on MacOX; 'kde-open %1$s' or 'gnome-open %1$s' un unix/linux; '%1$s' on windoze
-# IRT.edit_command_format ="your_preferred_GUI_editor %1$s +%2$d"
+# IRT.edit_command_format = "your_preferred_GUI_editor %1$s +%2$d"
 
 # any log-ignored-echo command you want to add
 # IRT.log.ignored_echo_commands << %w[commandA commandB ...]

data/lib/irt/commands/system.rb

@@ -79,7 +79,7 @@ module IRT
                      else
                        args
                      end
-        system sprintf(cmd_format, file, line)
+        system sprintf(cmd_format, file, line||0)
       end
 
       def copy_to_clipboard(cmd)

data/lib/irt/extensions/irb/context.rb

@@ -87,8 +87,9 @@ module IRB
 private
 
     def process_exception(e)
-      return if IRT.debug
-      bktr = e.backtrace.reject {|m| File.expand_path(m).match(/^#{IRT.lib_path}/) || workspace.filter_backtrace(m).nil? }
+      bktr = e.backtrace.reject do |m|
+               workspace.filter_backtrace(m).nil? || !IRT.debug && File.expand_path(m).match(/^#{IRT.lib_path}/)
+             end
       e.set_backtrace( e.class.name.match(/^IRT::/) ? bktr : map_backtrace(bktr) )
     end
 
@@ -135,8 +136,8 @@ private
       end
     end
 
-     def output_ignored_echo_value(value)
-       if inspect?
+    def output_ignored_echo_value(value)
+      if inspect?
         printf return_format(:ignored_color,false), value.inspect
       else
         printf return_format(:ignored_color,false), value

data/lib/irt/ruby_version.rb

@@ -0,0 +1,22 @@
+module IRT
+  module RubyVersion
+
+    extend self
+
+    class Version < Array
+      include Comparable
+
+       def initialize(version=RUBY_VERSION)
+         replace version.split('.').map(&:to_i)
+       end
+    end
+
+    [:>, :>=, :<, :<=, :==, :between?].each do |m|
+      define_method(m) do |*args|
+        vers = args.map{|a| Version.new(a)}
+        Version.new.send m, *vers
+      end
+    end
+
+  end
+end

data/lib/irt.rb

@@ -19,6 +19,7 @@ require 'irt/hunks'
 require 'irt/differ'
 require 'irt/directives'
 require 'irt/session'
+require 'irt/ruby_version'
 
 module IRT
 
@@ -92,9 +93,9 @@ module IRT
                                'gnome-open %1$s'
                              end
     end
-    @vi_command_format = "vi -c 'startinsert' %1$s +%2$d"
-    @nano_command_format = 'nano +%2$d %1$s'
-    @ri_command_format =  "qri -f #{Dye.color? ? 'ansi' : 'plain'} %s"
+    @vi_command_format = %(vi -c "startinsert" "%1$s" +%2$d)
+    @nano_command_format = %(nano +%2$d "%1$s")
+    @ri_command_format =  IRT::RubyVersion >= '1.9.2' ? %(bri "%s") : %(qri -f #{Dye.color? ? 'ansi' : 'plain'} "%s")
     @debug = false
   end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: irt
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 2
-  version: 1.1.2
+  prerelease: 
+  version: 1.1.3
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -04:00
+date: 2011-02-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
         version: 0.1.1
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
         version: 0.1.1
   type: :runtime
   version_requirements: *id002
@@ -58,29 +43,18 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
         version: 0.1.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: fastri
+  name: bri
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 81
-        segments: 
-        - 0
-        - 3
-        - 1
-        - 1
-        version: 0.3.1.1
+        version: 0.1.4
   type: :runtime
   version_requirements: *id004
 description: If you use IRT in place of irb or rails console, you will have more tools that will make your life a lot easier.
@@ -126,6 +100,7 @@ files:
 - lib/irt/hunks.rb
 - lib/irt/init.rb
 - lib/irt/log.rb
+- lib/irt/ruby_version.rb
 - lib/irt/session.rb
 has_rdoc: true
 homepage: http://github.com/ddnexus/irt
@@ -141,25 +116,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Interactive Ruby Tools - Improved irb and rails console with a lot of easy and powerful tools.