irt 1.2.10 → 1.2.11

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2011 Domizio Demichelis
+Copyright (c) 2010-2012 Domizio Demichelis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -716,6 +716,9 @@ to be fully reloaded, so it is slower, but guaranteed.
 
 ### Rails Server Sessions
 
+Notice: this feature is optional. If you want to enable it you must `require 'irt/extensions/rails_server'` after
+the irt gem gets loaded.
+
 The server sessions are a quick way to interact with your application while your server is running,
 without the need to launch a the irt executable: you can do almost everything you can from a regular IRT session
 launched from the irt executable, besides you have access to the server internals.
@@ -796,4 +799,4 @@ Please, send me a line if this issue is bugging you, so I will try to fix it fas
 
 ## Copyright
 
-Copyright (c) 2010-2011 Domizio Demichelis. See LICENSE for details.
+Copyright (c) 2010-2012 Domizio Demichelis. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-1.2.10
+1.2.11

data/bin/irt

@@ -34,15 +34,15 @@ EOB
     options[:irb_options] = opt
   end
 
-  options[:rails_env] = 'development'
+  options[:rails_env] = ENV['RAILS_ENV'] || 'development'
   opts.on( '-e', '--rails-env [ENVIRONMENT]', 'Sets the Rails Environment' ) do |env|
      options[:rails_env] = env
    end
 
   options[:no_rails] = false
   opts.on( '-n', '--no-rails', 'Does not autoload the Rails Environment' ) do
-     options[:no_rails] = true
-   end
+    options[:no_rails] = true
+  end
 
   opts.on( '-v', '--version', 'Shows the version and exits' ) do
     puts IRT.version
@@ -85,7 +85,7 @@ if files.empty?
 end
 
 cmd_format = if File.exists?('./config/environment.rb') && !options[:no_rails]
-               ENV['RAILS_ENV'] = options[:rails_env]
+               ENV['RAILS_ENV'] = options[:rails_env] if options[:rails_env]
                if File.exists?('./script/rails')
                  gemfile = File.read('Gemfile')
                  unless gemfile.match(/\bgem\b.+\birt\b/)
@@ -96,10 +96,11 @@ 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.*'
+                 minor, patch = gemfile.match(/\bgem\b.+\brails\b.+3\.(\d+)\.(\d+)/).captures
+                 rails_version = (minor.to_i > 0 || patch.to_i > 9) ? :new : :old
                  'rails c %s %s %s'
                elsif File.exists?('./script/console')
-                 rails_version = '2.*'
+                 rails_version = :old
                  'ruby script/console --irb="irt_rails2 %2$s" %1$s %3$s'
                end
              else
@@ -110,10 +111,10 @@ ENV['IRT_INTERACTIVE_EOF'] = options[:interactive_eof].inspect if options[:inter
 
 files.each do |file|
   ENV['IRT_COMMAND'] = case rails_version
-                       when '2.*', '=3.0.*'
-                         sprintf cmd_format, options[:irb_options], file, options[:rails_env]
-                       when '>=3.1.*'
+                       when :new
                          sprintf cmd_format, options[:rails_env], options[:irb_options], file
+                       when :old
+                         sprintf cmd_format, options[:irb_options], file, options[:rails_env]
                        else
                          sprintf cmd_format, options[:irb_options], file
                        end

data/irt.gemspec

@@ -1,23 +1,22 @@
-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|
-
-  s.authors = ["Domizio Demichelis"]
-  s.email = 'dd.nexus@gmail.com'
-  s.homepage = 'http://github.com/ddnexus/irt'
-  s.summary = 'Interactive Ruby Tools - Very improved irb and Rails Console with a lot of cool features.'
-  s.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.'
-
-  s.add_runtime_dependency('differ', [">= 0.1.1"])
-  s.add_runtime_dependency('dye', [">= 0.1.3"])
-  s.add_runtime_dependency('prompter', [">= 0.1.4"])
-
-  s.executables = ['irt', 'irt_irb', 'irt_rails2']
-  s.files = `git ls-files -z`.split("\0") - %w[irt-tutorial.pdf]
-  s.post_install_message = <<EOM
+  s.name                      = 'irt'
+  s.authors                   = ["Domizio Demichelis"]
+  s.email                     = 'dd.nexus@gmail.com'
+  s.homepage                  = 'http://github.com/ddnexus/irt'
+  s.summary                   = 'Interactive Ruby Tools - Very improved irb and Rails Console with a lot of cool features.'
+  s.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.'
+  s.executables               = ['irt', 'irt_irb', 'irt_rails2']
+  s.extra_rdoc_files          = ["README.markdown"]
+  s.require_paths             = ["lib"]
+  s.files                     = `git ls-files -z`.split("\0") - %w[irt-tutorial.pdf]
+  s.version                   = File.read(File.expand_path('../VERSION', __FILE__)).strip
+  s.date                      = Date.today.to_s
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rdoc_options              = ["--charset=UTF-8"]
+  s.post_install_message      = <<EOM
 ________________________________________________________________________________
 
                                 IMPORTANT NOTES
@@ -41,13 +40,7 @@ ________________________________________________________________________________
 ________________________________________________________________________________
 
 EOM
-  s.name = name
-  s.version = version
-  s.date = Date.today.to_s
-
-  s.required_rubygems_version = ">= 1.3.6"
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.extra_rdoc_files = ["README.markdown"]
-  s.require_paths = ["lib"]
-
+  s.add_runtime_dependency('differ', [">= 0.1.1"])
+  s.add_runtime_dependency('dye', [">= 0.1.3"])
+  s.add_runtime_dependency('prompter', [">= 0.1.4"])
 end

data/lib/irt/extensions/rails.rb

@@ -3,12 +3,13 @@ class ActiveSupport::BufferedLogger
   alias_method :original_add, :add
 
   def add(*args)
-    message = original_add(*args)
+    original_add(*args)
+    message = args[1]
     # no inline log when in rails server and not interactive mode
     return message if IRB.CurrentContext.nil? || IRT.rails_server && IRB.CurrentContext.irt_mode != :interactive
     if IRT.rails_log
       if IRT.dye_rails_log
-        plain_message = Dye.strip_ansi(message).chomp
+        plain_message = message.match(/\e\[[\d;]+m/) ? Dye.strip_ansi(message).chomp : message
         irt_message = IRT.dye(plain_message, :log_color) + "\n"
       end
       puts irt_message || message
@@ -18,71 +19,9 @@ class ActiveSupport::BufferedLogger
 
 end
 
-module Kernel
-
-  alias_method :original_irt, :irt
-  def irt(bind)
-    raise IRT::ArgumentTypeError, "You must pass binding instead of #{bind.class.name} object" unless bind.is_a?(Binding)
-    IRT.send(:rails_server_notice_wrap) do
-      IRT.start
-      IRT::Session.enter :binding, bind
-    end
-  end
-
-end
-
-require 'rack/server'
-module Rack
-  class Server
-    alias_method :original_server, :server
-    def server
-      # override the SIGINT trap in the Rack::Server.start method allowing multiple choices
-      # since #server is also called after the Rack::Server.start trap
-      IRT.start
-      IRT.rails_server_sigint_trap = trap('SIGINT') { IRT.rails_signal_handle }
-      IRT.rails_server = original_server
-    end
-  end
-end
 
 module IRT
 
-  def rails_signal_handle
-    puts
-    rails_server_notice_wrap do
-      trap('SIGINT'){}
-      input = IRT::Prompter.choose " [s]hutdown, [i]rt or [c]ancel?", /^(s|i|c)$/i,
-                              :hint => '[<enter>=s|i|c]', :default => 's'
-      trap('SIGINT') { rails_signal_handle  }
-      case input
-      when 's'
-        IRT.rails_server_sigint_trap.call
-      when 'i'
-        Session.enter :interactive
-      end
-    end
-  end
-
-private
-
-  def rails_server_notice_wrap
-    return yield unless rails_server
-    IRT::Prompter.say_notice "Server suspended"
-    yield
-    IRT::Prompter.say_notice "Server resumed"
-  end
-
-  module Utils
-    alias_method :original_ask_run_new_file, :ask_run_new_file
-    # skips asking to run the save file if it is a tmp file in a server session
-    # because the server is exiting so no rerun is possible
-    def ask_run_new_file(new_file_path, source_path, tmp)
-      return if tmp && IRT.rails_server
-      original_ask_run_new_file(new_file_path, source_path, tmp)
-    end
-  end
-
-
   module Commands
     module Core
 

data/lib/irt/extensions/rails_server.rb

@@ -0,0 +1,68 @@
+# this file patches the rack server and irt in order to enter irt from the server execution
+# you should require this file after loading irt.rb
+
+module Kernel
+
+  alias_method :original_irt, :irt
+  def irt(bind)
+    raise IRT::ArgumentTypeError, "You must pass binding instead of #{bind.class.name} object" unless bind.is_a?(Binding)
+    IRT.send(:rails_server_notice_wrap) do
+      IRT.start
+      IRT::Session.enter :binding, bind
+    end
+  end
+
+end
+
+require 'rack/server'
+module Rack
+  class Server
+    alias_method :original_server, :server
+    def server
+      # override the SIGINT trap in the Rack::Server.start method allowing multiple choices
+      # since #server is also called after the Rack::Server.start trap
+      IRT.start
+      IRT.rails_server_sigint_trap = trap('SIGINT') { IRT.rails_signal_handle }
+      IRT.rails_server = original_server
+    end
+  end
+end
+
+module IRT
+
+  def rails_signal_handle
+    puts
+    rails_server_notice_wrap do
+      trap('SIGINT'){}
+      input = IRT::Prompter.choose " [s]hutdown, [i]rt or [c]ancel?", /^(s|i|c)$/i,
+                                   :hint => '[<enter>=s|i|c]', :default => 's'
+      trap('SIGINT') { rails_signal_handle  }
+      case input
+      when 's'
+        IRT.rails_server_sigint_trap.call
+      when 'i'
+        Session.enter :interactive
+      end
+    end
+  end
+
+  private
+
+  def rails_server_notice_wrap
+    return yield unless rails_server
+    IRT::Prompter.say_notice "Server suspended"
+    yield
+    IRT::Prompter.say_notice "Server resumed"
+  end
+
+  module Utils
+    alias_method :original_ask_run_new_file, :ask_run_new_file
+    # skips asking to run the save file if it is a tmp file in a server session
+    # because the server is exiting so no rerun is possible
+    def ask_run_new_file(new_file_path, source_path, tmp)
+      return if tmp && IRT.rails_server
+      original_ask_run_new_file(new_file_path, source_path, tmp)
+    end
+  end
+
+end

metadata

@@ -1,66 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: irt
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.2.11
   prerelease: 
-  version: 1.2.10
 platform: ruby
-authors: 
+authors:
 - Domizio Demichelis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-19 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: differ
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: dye
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: dye
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: prompter
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: prompter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
-  version_requirements: *id003
-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.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+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.
 email: dd.nexus@gmail.com
-executables: 
+executables:
 - irt
 - irt_irb
 - irt_rails2
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - .gitignore
 - LICENSE
 - README.markdown
-- Rakefile
 - VERSION
 - bin/irt
 - bin/irt_irb
@@ -87,6 +99,7 @@ files:
 - lib/irt/extensions/method.rb
 - lib/irt/extensions/object.rb
 - lib/irt/extensions/rails.rb
+- lib/irt/extensions/rails_server.rb
 - lib/irt/helpers/rails.rb
 - lib/irt/history.rb
 - lib/irt/hunks.rb
@@ -96,55 +109,38 @@ files:
 - lib/irt/ruby_version.rb
 - lib/irt/session.rb
 - lib/irt/utils.rb
-has_rdoc: true
 homepage: http://github.com/ddnexus/irt
 licenses: []
-
-post_install_message: |+
-  ________________________________________________________________________________
-  
-                                  IMPORTANT NOTES
-  ________________________________________________________________________________
-  
-    1. If you notice a messed prompt while navigating the history, you must
-       enable the 'fix_readline_prompt' option in the ~/.irtrc file:
-  
-          IRT.fix_readline_prompt = true
-  
-       (see the README file for details)
-  
-  ________________________________________________________________________________
-  
-    2. In order to use the IRT contextual ri command, one of the following gems
-       must be installed:
-  
-         "bri"    if you run ruby >= 1.9.2
-         "fastri" if you run ruby  < 1.9.2
-  
-  ________________________________________________________________________________
-  
-rdoc_options: 
+post_install_message: ! "________________________________________________________________________________\n\n
+  \                               IMPORTANT NOTES\n________________________________________________________________________________\n\n
+  \ 1. If you notice a messed prompt while navigating the history, you must\n     enable
+  the 'fix_readline_prompt' option in the ~/.irtrc file:\n\n        IRT.fix_readline_prompt
+  = true\n\n     (see the README file for details)\n\n________________________________________________________________________________\n\n
+  \ 2. In order to use the IRT contextual ri command, one of the following gems\n
+  \    must be installed:\n\n       \"bri\"    if you run ruby >= 1.9.2\n       \"fastri\"
+  if you run ruby  < 1.9.2\n\n________________________________________________________________________________\n\n"
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Interactive Ruby Tools - Very improved irb and Rails Console with a lot of cool features.
+summary: Interactive Ruby Tools - Very improved irb and Rails Console with a lot of
+  cool features.
 test_files: []
-
+has_rdoc: 

data/Rakefile

@@ -1,60 +0,0 @@
-name = 'irt'
-
-def ensure_clean(action, force=false)
-  if !force && ! `git status -s`.empty?
-    puts <<-EOS.gsub(/^ {6}/, '')
-      Rake task aborted: the working tree is dirty!
-      If you know what you are doing you can use \`rake #{action}[force]\`"
-    EOS
-    exit(1)
-  end
-end
-
-desc "Install the gem"
-task :install, :force do |t, args|
-  ensure_clean(:install, args.force)
-  orig_version = version = File.read('VERSION').strip
-  begin
-    commit_id = `git log -1 --format="%h" HEAD`.strip
-    version = "#{orig_version}.#{commit_id}"
-    File.open('VERSION', 'w') {|f| f.puts version }
-    gem_name = "#{name}-#{version}.gem"
-    sh %(gem build #{name}.gemspec)
-    sh %(gem install #{gem_name} --local --no-rdoc --no-ri)
-    puts <<-EOS.gsub(/^ {6}/, '')
-
-      *******************************************************************************
-      *                                   NOTICE                                    *
-      *******************************************************************************
-      * The version id of locally installed gems is comparable to a --pre version:  *
-      * i.e. it is alphabetically ordered (not numerically ordered), besides it     *
-      * includes the sah1 commit id which is not aphabetically ordered, so be sure  *
-      * your application picks the version you really intend to use                 *
-      *******************************************************************************
-
-    EOS
-  ensure
-    remove_entry_secure gem_name, true
-    File.open('VERSION', 'w') {|f| f.puts orig_version }
-  end
-end
-
-desc %(Remove all the "#{name}" installed gems and executables and install this version)
-task :clean_install, :force do |t, args|
-  ensure_clean(:install, args.force)
-  sh %(gem uninstall #{name} --all --ignore-dependencies --executables)
-  Rake::Task['install'].invoke(args.force)
-end
-
-desc "Push the gem to rubygems.org"
-task :push, :force do |t, args|
-  begin
-    ensure_clean(:push, args.force)
-    version = File.read('VERSION').strip
-    gem_name = "#{name}-#{version}.gem"
-    sh %(gem build #{name}.gemspec)
-    sh %(gem push #{gem_name})
-  ensure
-    remove_entry_secure gem_name, true
-  end
-end