irt 1.2.7 → 1.2.8

data/VERSION

@@ -1 +1 @@
-1.2.7
+1.2.8

data/bin/irt

@@ -96,8 +96,10 @@ cmd_format = if File.exists?('./config/environment.rb') && !options[:no_rails]
                      end
                    end
                  end
+                 rails_version = gemfile.match(/\bgem\b.+\brails\b.+3\.0\.\d/) ? '=3.0.*' : '>=3.1.*'
                  'rails c %s %s %s'
                elsif File.exists?('./script/console')
+                 rails_version = '2.*'
                  'ruby script/console --irb="irt_rails2 %2$s" %1$s %3$s'
                end
              else
@@ -107,6 +109,11 @@ cmd_format = if File.exists?('./config/environment.rb') && !options[:no_rails]
 ENV['IRT_INTERACTIVE_EOF'] = options[:interactive_eof].inspect if options[:interactive_eof]
 
 files.each do |file|
-  ENV['IRT_COMMAND'] = sprintf cmd_format, options[:irb_options], file, options[:rails_env]
+  ENV['IRT_COMMAND'] = case rails_version
+                       when '2.*', '=3.0.*'
+                         sprintf cmd_format, options[:irb_options], file, options[:rails_env]
+                       when '>=3.1.*'
+                         sprintf cmd_format, options[:rails_env], options[:irb_options], file
+                       end
   exit(1) unless system ENV['IRT_COMMAND']
 end

data/lib/irt/commands/core.rb

@@ -1,10 +1,8 @@
 module IRT
   module Commands
     module Core
-      extend self
 
       def irt(obj=nil)
-        context ||= IRB.CurrentContext
         irt_mode = context.irt_mode
         to_mode = case obj
                   when nil
@@ -46,6 +44,8 @@ module IRT
 
       def rerun
         ensure_session
+        Directives::Test.test_summary
+        Directives::Test.reset_variables
         IRT::Session.run_file
       end
       alias_method :rr, :rerun

data/lib/irt/directives/test.rb

@@ -3,11 +3,14 @@ module IRT
     module Test
       extend self
 
-      @@tests = 0
-      @@oks = 0
-      @@diffs = 0
-      @@errors = 0
-      @@last_desc = nil
+      def reset_variables
+        @@tests = 0
+        @@oks = 0
+        @@diffs = 0
+        @@errors = 0
+        @@last_desc = nil
+      end
+      reset_variables
 
       def desc(description)
         @@last_desc = description

data/lib/irt.rb

@@ -153,12 +153,6 @@ module IRT
 
 end
 
-# before we patch irb
-if defined?(Debugger)
-  require 'ruby-debug/command'
-  require 'ruby-debug/commands/irb'
-end
-
 require 'irt/extensions/irb'
 require 'irb/completion'
 IRT.init_config
@@ -167,6 +161,5 @@ require 'irt/extensions/object'
 require 'irt/extensions/method'
 require 'irt/prompter'
 require 'irt/extensions/rails' if defined?(ActiveSupport::BufferedLogger)
-require 'irt/extensions/debugger' if defined?(Debugger)
 
 end

metadata

@@ -2,7 +2,7 @@
 name: irt
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 -04:00
+date: 2011-08-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,6 @@ files:
 - lib/irt/differ.rb
 - lib/irt/directives.rb
 - lib/irt/directives/test.rb
-- lib/irt/extensions/debugger.rb
 - lib/irt/extensions/irb.rb
 - lib/irt/extensions/irb/commands.rb
 - lib/irt/extensions/irb/context.rb

data/lib/irt/extensions/debugger.rb

@@ -1,39 +0,0 @@
-module IRB
-
-  def self.start_session(bind)
-    IRT.start
-    IRT::Session.enter :binding, bind
-  end
-
-  class Context
-    alias_method :evaluate_without_debugger, :evaluate
-    def evaluate(line, line_no)
-      $rdebug_irb_statements = line
-      evaluate_without_debugger line, line_no
-    end
-  end
-
-end
-
-module Kernel
-  alias_method :original_irt, :irt
-  def irt(bind=nil)
-    IRT.start
-    IRT::Commands::Core.irt(bind)
-  end
-end
-
-module IRT
-  module Session
-
-    private
-
-    def set_binding_file_pointers(context)
-      context.binding_file = Debugger.current_context.frame_file
-      context.binding_line_no = Debugger.current_context.frame_line
-    end
-
-  end
-end
-
-