donald 0.1.0 → 0.1.1

data/{README → README.textile}

@@ -1,10 +1,30 @@
-Donald
+h2. About Donald
 
----------
+A simple vim based merge tool for git users.
+Use this gem when a git conflict happens and it will open all conflicted files using vim (one file by tab).
 
-A simple vim based merge tool for git users
+h2. Installation:
 
----------
+sudo gem sources -a http://gemcutter.org
+sudo gem install donald
+
+h2. Usage:
+
+donald
+
+h2. Options:
+
+-m or --mvim
+Open files using mvim
+
+-g or --gvim
+Open files using gvim
+
+Example:
+
+donald -g
+
+h2. License
 
 (The MIT License)
 

data/bin/donald

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require File.expand_path(File.dirname(__FILE__) + '/../lib/donald/merge_tool')
 
-merge_tool = Donald::MergeTool.new
+merge_tool = Donald::MergeTool.new(ARGV)
 
 merge_tool.start

data/lib/donald/merge_tool.rb

@@ -1,6 +1,11 @@
 module Donald
   class Donald::MergeTool
     DELIMITER = '******************************'
+    DEFAULT_EDITOR = 'vim'
+    
+    def initialize args = []
+      @options = parse_options args
+    end
     
     def start
       files = unmerged_files git_status
@@ -33,7 +38,9 @@ module Donald
     end
     
     def call_vim files
-      system "vim -p #{files.join(' ')}"
+      editor = @options[:editor] || DEFAULT_EDITOR
+      
+      system "#{editor} -p #{files.join(' ')}"
     end
     
     def print_files files
@@ -55,5 +62,14 @@ module Donald
     def print_delimiter
       puts DELIMITER
     end
+    
+    def parse_options args
+      options = {}
+      
+      options.merge! :editor => 'mvim' if args.include?('-m') || args.include?('--mvim')
+      options.merge! :editor => 'gvim' if args.include?('-g') || args.include?('--gvim')
+      
+      options
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: donald
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Bruno Grasselli
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-20 00:00:00 -03:00
+date: 2010-03-21 00:00:00 -03:00
 default_executable: donald
 dependencies: []
 
-description: Simple vim based mergetool for git users.
+description: Use this gem when a git conflict happens and it will open all conflicted files using vim (one file by tab).
 email: bruno.grasselli@gmail.com
 executables: 
 - donald
@@ -22,7 +22,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README
+- README.textile
 - LICENSE
 - bin/donald
 - lib/donald/merge_tool.rb