donald 0.1.8 → 2.0

data/README.textile

@@ -12,27 +12,17 @@ h2. Usage:
 
 <pre><code>donald</code></pre>
 
-h2. Options:
+h2. Using a different editor:
 
-h3. -g or --gvim
+You can use another editor sending its name as a parameter:
 
-Open files using gvim
+<pre><code>donald gvim</code></pre>
 
-Example:
-
-<pre><code>donald -g</code></pre>
-
-h3. -m or --mvim
-
-Open files using mvim
-
-h3. --vim
-
-Open files using vim
+Or
 
-h3. -t or --textmate
+<pre><code>donald mate</code></pre>
 
-Open files using Textmate
+If you inform more than one parameter donald will ignore it.
 
 h2. Setting up your default text editor
 
@@ -40,7 +30,7 @@ Set the $EDITOR variable in your ~/.bashrc file
 
 Example:
 
-<pre><code>export EDITOR="mate"</code></pre>
+<pre><code>export EDITOR="gedit"</code></pre>
 
 h2. Searching for conflicts
 

data/lib/donald.rb

@@ -1,2 +1 @@
 Dir.glob(File.dirname(__FILE__) + '/donald/*.rb').each { |file| require file }
-

data/lib/donald/editor.rb

@@ -2,12 +2,26 @@ module Donald
   class Editor
     DEFAULT_EDITOR = 'vim'
     
-    def initialize(editor_name = nil)
-      @editor_name = editor_name
+    def initialize(name = nil)
+      @name = name || Donald::Environment.editor_variable || DEFAULT_EDITOR
     end
 
-    def to_s
-      @editor_name || Donald::Environment.editor_variable || DEFAULT_EDITOR
+    def run(files)
+      Kernel.system "#{@name}#{arguments} #{files.join(' ')}"
+    end
+
+    private
+
+    def arguments
+      " #{tab_argument} #{search_argument}" if @name.include? 'vim'
+    end
+    
+    def tab_argument
+      '-p'
+    end
+    
+    def search_argument
+      '+/HEAD'
     end
   end
 end

data/lib/donald/merge_tool.rb

@@ -2,7 +2,7 @@ module Donald
   class MergeTool
     def initialize(output, args = [])
       @printer = Donald::Printer.new output
-      @options = parse_options args
+      @editor = Donald::Editor.new(editor_from(args))
     end
     
     def start
@@ -10,43 +10,16 @@ module Donald
       
       if files.any?
         @printer.print_files files
-        call_editor files
+        @editor.run files
       else
         @printer.print_no_files_message
       end
     end
     
     private
-    
-    def call_editor(files)
-      Kernel.system "#{editor}#{arguments(editor)} #{files.join(' ')}"
-    end
 
-    def editor
-      @editor || @editor = Donald::Editor.new(@options[:editor])
-    end
-    
-    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')
-      
-      options
-    end
-    
-    def arguments(editor)
-      " #{tab_argument} #{search_argument}" if editor.to_s.include? 'vim'
-    end
-    
-    def tab_argument
-      '-p'
-    end
-    
-    def search_argument
-      '+/HEAD'
+    def editor_from(args)
+      args.any? ? args.first : nil
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: donald
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 3
   prerelease: false
   segments: 
+  - 2
   - 0
-  - 1
-  - 8
-  version: 0.1.8
+  version: "2.0"
 platform: ruby
 authors: 
 - Bruno Grasselli
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-21 00:00:00 -03:00
+date: 2010-08-22 00:00:00 -03:00
 default_executable: donald
 dependencies: []