irt 1.2.0 → 1.2.1

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/bin/irt

@@ -63,11 +63,7 @@ puts copy
 
 paths = if ARGV.empty?
           options[:interactive_eof] = true
-          tmp_path = IRT::Utils.create_tmp_file do |as_file, tmp_path|
-                       ENV['IRT_COMMAND'] = ENV['IRT_COMMAND'].sub(/#{Regexp.quote(tmp_path)}/, as_file)
-                       exec ENV['IRT_COMMAND']
-                     end
-          [ tmp_path ]
+          [ IRT::Utils.create_tmp_file ]
         else
           ARGV.map {|p| File.expand_path(p) }
         end

data/irt.gemspec

@@ -8,8 +8,8 @@ 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 - Improved irb and rails console with a lot of easy and powerful tools.'
-  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.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"])
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rdoc_options = ["--charset=UTF-8"]
+  s.extra_rdoc_files = ["README.markdown"]
   s.require_paths = ["lib"]
 
 end

data/lib/irt/commands/test.rb

@@ -44,10 +44,8 @@ module IRT
       end
       alias_method :tt, :add_test
 
-      def save_as(path)
-        IRT::Utils.save_as(path) do |as_file|
-          IRT::Session.run_file as_file
-        end
+      def save_as(file_path)
+        IRT::Utils.save_as(file_path)
       end
       alias_method :sa, :save_as
 

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

@@ -101,7 +101,7 @@ private
 
     def process_exception(e)
       bktr = e.backtrace.reject do |m|
-               workspace.filter_backtrace(m).nil? || !IRT.debug && File.expand_path(m).match(/^#{IRT.lib_path}/)
+               workspace.filter_backtrace(m).nil? || !IRT.debug && File.expand_path(m).match(/^#{Regexp.quote(IRT.lib_path)}/)
              end
       e.set_backtrace map_backtrace(bktr)
     end

data/lib/irt/extensions/irb.rb

@@ -41,7 +41,7 @@ module IRB #:nodoc:
 
   module HistorySavingAbility
     def HistorySavingAbility.extended(obj)
-    # save_history has to be called just one time at exit
+    # save_history has to be called just once at exit
     # IRB.conf[:AT_EXIT].push proc{obj.save_history}
       obj.load_history
       obj

data/lib/irt/extensions/kernel.rb

@@ -12,7 +12,7 @@ module Kernel
 
   def irt(bind)
     raise IRT::ArgumentTypeError, "You must pass binding instead of #{bind.class.name} object" unless bind.is_a?(Binding)
-    IRT::Utils.load_irt
+    IRT.start
     IRT::Session.enter :binding, bind
   end
 

data/lib/irt/extensions/rails.rb

@@ -24,7 +24,7 @@ module Kernel
   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::Utils.load_irt
+      IRT.start
       IRT::Session.enter :binding, bind
     end
   end
@@ -38,7 +38,7 @@ module Rack
     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::Utils.load_irt(false)
+      IRT.start
       IRT.rails_server_sigint_trap = trap('SIGINT') { IRT.rails_signal_handle }
       IRT.rails_server = original_server
     end
@@ -88,6 +88,17 @@ private
   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/session.rb

@@ -84,13 +84,12 @@ module IRT
     def set_binding_file_pointers(context)
       caller.each do |c|
         file, line = c.sub(/:in .*$/,'').split(':', 2)
-        next if File.expand_path(file).match(/^#{IRT.lib_path}/) # exclude irt internal callers
+        next if File.expand_path(file).match(/^#{Regexp.quote(IRT.lib_path)}/) # exclude irt internal callers
         context.binding_file = file
         context.binding_line_no = line
         break
       end
     end
 
-
   end
 end

data/lib/irt/utils.rb

@@ -2,49 +2,37 @@ require 'irt/prompter'
 
 module IRT
 
+  extend self
+
+  def cli?
+    !!ENV['IRT_COMMAND']
+  end
+
+
   module Utils
 
     extend self
 
-    # this will create a tmp file and start IRB
-    # but it will be left in file mode at EOF (sort of irt-standby)
-    def load_irt(run=true)
-      return if IRT.initialized
-      puts IRT::Utils.copyright
-      ARGV.clear
-      tmp_path = if run
-                   create_tmp_file {|as_file| IRT::Session.run_file as_file}
-                 else
-                   create_tmp_file
-                 end
-      ARGV.push tmp_path
-      IRB.start
-    end
-
-    def create_tmp_file(&block)
+    def create_tmp_file()
       require 'tempfile'
       tmp_file = Tempfile.new(['', '.irt'])
       tmp_file << "\n" # one empty line makes irb of 1.9.2 happy
       tmp_file.flush
       # ENV used because with IRT.cli? 2 different processes need to access the same path
-      ENV['IRT_TMP_PATH'] = tmp_path = tmp_file.path
-      at_exit { check_save_tmp_file(tmp_file, &block) }
-      tmp_path
+      ENV['IRT_TMP_PATH'] = tmp_file.path
+      at_exit { check_save_tmp_file(tmp_file) }
+      ENV['IRT_TMP_PATH']
     end
 
-    def save_as(as_file_local, source_path=IRT.irt_file, &block)
-      as_file = File.expand_path(as_file_local)
-      if File.exists?(as_file)
-        return false if IRT::Prompter.no? %(Do you want to overwrite "#{as_file}"?), :hint => '[y|<enter=n]', :default => 'n'
+    def save_as(file_path, source_path=IRT.irt_file, tmp=false)
+      new_file_path = File.expand_path(file_path)
+      if File.exists?(new_file_path)
+        return false if IRT::Prompter.no? %(Do you want to overwrite "#{new_file_path}"?), :hint => '[y|<enter=n]', :default => 'n'
       end
-      dirname = File.dirname(as_file)
+      dirname = File.dirname(new_file_path)
       FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
-      FileUtils.cp source_path, as_file
-      if block && IRT::Prompter.yes?( %(Do you want to run the file "#{as_file_local}" now?) )
-        # reset the tmpfile content so the at_exit proc will not be triggered
-        File.open(source_path, 'w'){|f| f.puts "\n"} if IRT.irt_file == Pathname.new(ENV['IRT_TMP_PATH']).realpath
-        block.call as_file, source_path
-      end
+      FileUtils.cp source_path, new_file_path
+      ask_run_new_file new_file_path, source_path, tmp
     end
 
     def version
@@ -57,11 +45,28 @@ module IRT
 
   private
 
-    def check_save_tmp_file(tmp_file, &block)
+    def ask_run_new_file(new_file_path, source_path, tmp)
+      if IRT::Prompter.yes?( %(Do you want to run the file "#{File.basename(new_file_path)}" now?) )
+        # if we are saving a tmp_file from a save_as command (not from an at_exit block)
+        if ENV['IRT_TMP_PATH'] && IRT.respond_to?(:irt_file) && IRT.irt_file == Pathname.new(ENV['IRT_TMP_PATH']).realpath
+          ENV.delete('IRT_TMP_PATH')
+          # reset tmp file content so check_save_tmp_file will be skipped
+          File.open(source_path, 'w'){|f| f.puts "\n"}
+        end
+        if tmp && IRT.cli?
+          ENV['IRT_COMMAND'] = ENV['IRT_COMMAND'].sub(/#{Regexp.quote(source_path)}/, new_file_path)
+          exec ENV['IRT_COMMAND']
+        else
+          IRT::Session.run_file new_file_path
+        end
+      end
+    end
+
+    def check_save_tmp_file(tmp_file)
       if tmp_file.size > 1
         IRT::Prompter.yes? %(The template file has been modified, do you want to save it?) do
-          IRT::Prompter.choose %(Enter the file path to save:), /[\w0-9_]/ do |as_file|
-            save_as(as_file, tmp_file.path, &block)
+          IRT::Prompter.choose %(Enter the file path to save:), /[\w0-9_]/ do |file_path|
+            save_as(file_path, tmp_file.path, tmp=true)
           end
         end
       end

data/lib/irt.rb

@@ -1,3 +1,6 @@
+# allows standard rails 3 console to run without loading irt
+unless defined?(Rails::Console) && !ENV['IRT_COMMAND']
+
 at_exit{ Dye.print_reset_colors }
 
 require 'rubygems'
@@ -50,10 +53,6 @@ module IRT
                 :copy_to_clipboard_command, :nano_command_format, :vi_command_format, :edit_command_format, :ri_command_format
   attr_reader :log, :irt_file, :initialized
 
-  def cli?
-    !!ENV['IRT_COMMAND']
-  end
-
   def force_color=(bool)
     Dye.color = bool
   end
@@ -140,8 +139,20 @@ module IRT
     yml.gsub(/ +\n/, "\n")
   end
 
+  # this will create a tmp file and start IRB
+  # but it will be left in file mode at EOF (sort of irt-standby)
+  def start
+    return if initialized
+    puts IRT::Utils.copyright
+    ARGV.clear
+    ARGV.push IRT::Utils.create_tmp_file
+    IRB.start
+  end
+
 end
 
 IRT.init_config
 require 'irt/prompter'
 require 'irt/extensions/rails' if defined?(ActiveSupport::BufferedLogger)
+
+end

metadata

@@ -2,7 +2,7 @@
 name: irt
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Domizio Demichelis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -04:00
+date: 2011-03-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,7 @@ dependencies:
         version: 0.1.5
   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.
+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: 
 - irt
@@ -65,8 +65,8 @@ executables:
 - irt_rails2
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.markdown
 files: 
 - .gitignore
 - LICENSE
@@ -133,6 +133,6 @@ rubyforge_project:
 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.
+summary: Interactive Ruby Tools - Very improved irb and Rails Console with a lot of cool features.
 test_files: []