donald 0.1.3 → 0.1.4

data/README.textile

@@ -5,12 +5,12 @@ Use this gem when a git conflict happens and it will open all conflicted files u
 
 h2. Installation:
 
-sudo gem sources -a http://gemcutter.org
-sudo gem install donald
+<pre><code>sudo gem sources -a http://gemcutter.org
+sudo gem install donald</code></pre>
 
 h2. Usage:
 
-donald
+<pre><code>donald</code></pre>
 
 h2. Options:
 
@@ -20,16 +20,32 @@ Open files using gvim
 
 Example:
 
-donald -g
+<pre><code>donald -g</code></pre>
 
 h3. -m or --mvim
 
 Open files using mvim
 
+h3. --vim
+
+Open files using vim
+
 h3. -t or --textmate
 
 Open files using Textmate
 
+h2. Setting up your default text editor
+
+Set the $EDITOR variable in your ~/.bashrc file
+
+Example:
+
+<pre><code>export EDITOR="mate"</code></pre>
+
+h2. Searching for conflicts
+
+If you are using vim just type "n" to go to the next conflict.
+
 h2. License
 
 (The MIT License)

data/lib/donald/merge_tool.rb

@@ -50,9 +50,7 @@ module Donald
     end
     
     def call_vim files
-      editor = @options[:editor] || DEFAULT_EDITOR
-      
-      Kernel.system "#{editor}#{tab_argument editor} #{files.join(' ')}"
+      Kernel.system "#{editor}#{arguments(editor)} #{files.join(' ')}"
     end
     
     def print_files files
@@ -78,6 +76,7 @@ module Donald
     def parse_options args
       options = {}
       
+      options.merge! :editor => 'vim' if args.include?('--vim')
       options.merge! :editor => 'mvim' if args.include?('-m') || args.include?('--mvim')
       options.merge! :editor => 'gvim' if args.include?('-g') || args.include?('--gvim')
       options.merge! :editor => 'mate' if args.include?('-t') || args.include?('--textmate')
@@ -85,8 +84,26 @@ module Donald
       options
     end
     
-    def tab_argument editor
-      editor.include?('vim') ? ' -p' : ''
+    def editor
+      editor = @options[:editor] || system_editor_variable || DEFAULT_EDITOR
+    end
+    
+    def system_editor_variable
+      editor = `echo $EDITOR`.chomp
+      
+      editor.size.zero? ? nil : editor
+    end
+    
+    def arguments editor
+      " #{tab_argument} #{search_argument}" if editor.include?('vim')
+    end
+    
+    def tab_argument
+      '-p'
+    end
+    
+    def search_argument
+      '+/HEAD'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: donald
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Bruno Grasselli
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 -03:00
+date: 2010-04-24 00:00:00 -03:00
 default_executable: donald
 dependencies: []