interactive_editor 0.0.1 → 0.0.2

data/README.md

@@ -3,7 +3,28 @@
 
 cf. my blog post: [Integrating vim and irb](http://zegoggl.es/2009/04/integrating-vim-and-irb.html).
 
+## Usage
 
-# Credits
+    $ gem install interactive_editor
 
-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).
+Put the following in your .irbrc:
+
+    require 'rubygems'
+    require 'interactive_editor'
+
+Then, from within irb:
+
+    $ irb
+    > vi
+    > vi 'filename.rb'
+    > [emacs|vim|nano|mate] ...
+
+To try it out without installing the gem:
+
+    $ git clone git://github.com/jberkel/interactive_editor.git
+    $ cd interactive_editor
+    $ rake console
+
+## 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).

data/Rakefile

@@ -70,6 +70,7 @@ task :release => :build do
   sh "gem push pkg/#{name}-#{version}.gem"
 end
 
+desc "Builds the gem"
 task :build => :gemspec do
   sh "mkdir -p pkg"
   sh "gem build #{gemspec_file}"

data/interactive_editor.gemspec

@@ -7,7 +7,7 @@ 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.1'
+  s.version           = '0.0.2'
   s.date              = '2010-05-16'
   s.rubyforge_project = 'interactive_editor'
 

data/lib/interactive_editor.rb

@@ -7,7 +7,7 @@ require 'fileutils'
 require 'tempfile'
 
 class InteractiveEditor
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
   attr_accessor :editor
 
@@ -23,7 +23,12 @@ class InteractiveEditor
        (@file && File.exist?(@file.path)) ? @file : Tempfile.new(["irb_tempfile", ".rb"])
     end
     mtime = File.stat(@file.path).mtime
-    Exec.system(@editor, @file.path)
+
+    if (args = @editor.split(/\s+/)).size > 1
+      Exec.system(args[0], *(args[1..-1] << @file.path))
+    else
+      Exec.system(@editor, @file.path)
+    end
 
     execute if mtime < File.stat(@file.path).mtime
   end
@@ -33,30 +38,28 @@ class InteractiveEditor
   end
 
   def self.edit(editor, file=nil)
-    #idea serialise last file to disk, for recovery
-    unless IRB.conf[:interactive_editors] && IRB.conf[:interactive_editors][editor]
-      IRB.conf[:interactive_editors] ||= {}
-      IRB.conf[:interactive_editors][editor] = InteractiveEditor.new(editor)
-    end
-    IRB.conf[:interactive_editors][editor].edit(file)
+    #maybe serialise last file to disk, for recovery
+    (IRB.conf[:interactive_editors] ||=
+      Hash.new { |h,k| h[k] = InteractiveEditor.new(k) })[editor].edit(file)
   end
 
   module Exec
-    extend self
-
-    if RUBY_PLATFORM =~ /java/
-      #http://github.com/headius/spoon
-      require 'rubygems'
-      require 'spoon'
-
-      def system(*args)
-        Process.waitpid(Spoon.spawnp(*args))
+    module Java
+      def system(file, *args)
+        require 'spoon'
+        Process.waitpid(Spoon.spawnp(file, *args))
+      rescue Errno::ECHILD => e
+        raise "error exec'ing #{file}: #{e}"
       end
-    else
+    end
+
+    module MRI
       def system(file, *args)
-        Kernel::system(file, *args)
+        Kernel::system(file, *args) or raise "error exec'ing #{file}: #{$?}"
       end
     end
+
+    extend RUBY_PLATFORM =~ /java/ ? Java : MRI
   end
 
   module Editors
@@ -74,5 +77,4 @@ class InteractiveEditor
   end
 end
 
-Object.send(:include, InteractiveEditor::Editors)
-
+include InteractiveEditor::Editors

metadata

@@ -1,27 +1,36 @@
 --- !ruby/object:Gem::Specification 
 name: interactive_editor
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
-  - Jan Berkel
+- Jan Berkel
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-16 00:00:00 +09:00
+date: 2010-05-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: spoon
-    type: :runtime
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.0.1
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: spoon
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 1
+        version: 0.0.1
+  type: :runtime
+  version_requirements: *id001
 description: Use vim (or any other text editor) from inside irb to quickly test & write new code.
 email: jan.berkel@gmail.com
 executables: []
@@ -29,39 +38,41 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-  - README.md
-  - LICENSE
+- README.md
+- LICENSE
 files: 
-  - LICENSE
-  - README.md
-  - Rakefile
-  - interactive_editor.gemspec
-  - lib/interactive_editor.rb
+- LICENSE
+- README.md
+- Rakefile
+- interactive_editor.gemspec
+- lib/interactive_editor.rb
 has_rdoc: true
 homepage: http://github.com/jberkel/interactive_editor
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --charset=UTF-8
+- --charset=UTF-8
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  version: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  version: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: interactive_editor
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Interactive editing in irb.