interactive_editor 0.0.6 → 0.0.7

data/README.md

@@ -14,7 +14,7 @@ Put the following in your .irbrc:
 
 Then, from within irb:
 
-    $ irb
+    $ irb                        # or ripl
     > vi                         # (use vi w/ temp file)
     > vi 'filename.rb'           # (open filename.rb in vi)
     > ed                         # (use EDITOR env variable)
@@ -27,6 +27,10 @@ To try it out without installing the gem:
     $ cd interactive_editor
     $ rake console
 
+interactive_editor also works with the IRB alternative [ripl][].
+
 ## Credits
 
 Giles Bowkett, Greg Brown, and several audience members from Giles' Ruby East presentation: [Use vi or any text editor from within IRB](http://gilesbowkett.blogspot.com/2007/10/use-vi-or-any-text-editor-from-within.html).
+
+[ripl]: https://github.com/cldwalker/ripl

data/interactive_editor.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'interactive_editor'
-  s.version           = '0.0.6'
-  s.date              = '2010-12-08'
+  s.version           = '0.0.7'
+  s.date              = '2011-03-11'
   s.rubyforge_project = 'interactive_editor'
 
   ## Make sure your summary is short. The description may be as long

data/lib/interactive_editor.rb

@@ -6,9 +6,10 @@ require 'irb'
 require 'fileutils'
 require 'tempfile'
 require 'shellwords'
+require 'yaml'
 
 class InteractiveEditor
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 
   attr_accessor :editor
 
@@ -16,30 +17,47 @@ class InteractiveEditor
     @editor = editor.to_s
   end
 
-  def edit(file=nil)
-    @file = if file
-       FileUtils.touch(file) unless File.exist?(file)
-       File.new(file)
+  def edit(object, file=nil)
+    object = object == TOPLEVEL_BINDING.eval('self') ? nil : object
+
+    current_file = if file
+      FileUtils.touch(file) unless File.exist?(file)
+      File.new(file)
+    else
+      if @file && File.exist?(@file.path) && !object
+        @file
       else
-       (@file && File.exist?(@file.path)) ? @file : Tempfile.new(["irb_tempfile", ".rb"])
+        Tempfile.new( object ? ["yobj_tempfile", ".yml"] : ["irb_tempfile", ".rb"] )
+      end
+    end
+
+    if object
+      File.open( current_file, 'w' ) { |f| f << object.to_yaml }
+    else
+      @file = current_file
+      mtime = File.stat(@file.path).mtime
     end
-    mtime = File.stat(@file.path).mtime
 
-    args = Shellwords.shellwords(@editor) #parse @editor as arguments could be complexe
-    args << @file.path
-    Exec.system(*args) 
+    args = Shellwords.shellwords(@editor) #parse @editor as arguments could be complex
+    args << current_file.path
+    current_file.close rescue nil
+    Exec.system(*args)
 
-    execute if mtime < File.stat(@file.path).mtime
+    if object
+      File.exists?(current_file.path) ? YAML.load_file(current_file.path) : object
+    elsif mtime < File.stat(@file.path).mtime
+      execute
+    end
   end
 
   def execute
     eval(IO.read(@file.path), TOPLEVEL_BINDING)
   end
 
-  def self.edit(editor, file=nil)
+  def self.edit(editor, self_, file=nil)
     #maybe serialise last file to disk, for recovery
     (IRB.conf[:interactive_editors] ||=
-      Hash.new { |h,k| h[k] = InteractiveEditor.new(k) })[editor].edit(file)
+      Hash.new { |h,k| h[k] = InteractiveEditor.new(k) })[editor].edit(self_, file)
   end
 
   module Exec
@@ -68,16 +86,20 @@ class InteractiveEditor
       :emacs => nil,
       :nano  => nil,
       :mate  => 'mate -w',
-      :mvim  => 'mvim -g -f -c "au VimLeave * !open -a Terminal"'
+      :mvim  => 'mvim -g -f' + case ENV['TERM_PROGRAM']
+        when 'iTerm.app';      ' -c "au VimLeave * !open -a iTerm"'
+        when 'Apple_Terminal'; ' -c "au VimLeave * !open -a Terminal"'
+        else '' #don't do tricky things if we don't know the Term
+      end
     }.each do |k,v|
       define_method(k) do |*args|
-       InteractiveEditor.edit(v || k, *args)
+        InteractiveEditor.edit(v || k, self, *args)
       end
     end
 
     def ed(*args)
       if ENV['EDITOR'].to_s.size > 0
-        InteractiveEditor.edit(ENV['EDITOR'], *args)
+        InteractiveEditor.edit(ENV['EDITOR'], self, *args)
       else
         raise "You need to set the EDITOR environment variable first"
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: interactive_editor
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jan Berkel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +01:00
+date: 2011-03-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: interactive_editor
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 2
 summary: Interactive editing in irb.