donald 0.1.4 → 0.1.6

data/bin/donald

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

data/lib/donald/editor.rb

@@ -0,0 +1,20 @@
+module Donald
+  class Editor
+    DEFAULT_EDITOR = 'vim'
+    
+    def initialize(editor_name = nil)
+      @editor_name = editor_name
+    end
+
+    def to_s
+      @editor_name || system_editor_variable || DEFAULT_EDITOR
+    end
+
+    private
+    
+    def system_editor_variable
+      editor = `echo $EDITOR`
+      editor.chomp.size.zero? ? nil : editor
+    end
+  end
+end

data/lib/donald/git.rb

@@ -0,0 +1,32 @@
+module Donald
+  class Git
+    CONFLICTED_TYPES = ['unmerged', 'both modified', 'both added']
+
+    def conflicted_files
+      files = []
+      
+      status.each_line do |line|
+        file = conflicted_file(line)
+        files << file unless file.nil?
+      end
+      
+      files
+    end
+    
+    private
+    
+    def status
+      `git status`
+    end
+
+    def conflicted_file(line)
+      CONFLICTED_TYPES.each do |conflicted_type|
+        if line.match /#{conflicted_type}: (.*)/
+          return $1.strip
+        end
+      end
+      
+      nil
+    end
+  end
+end

data/lib/donald/merge_tool.rb

@@ -1,19 +1,15 @@
 module Donald
-  class Donald::MergeTool
-    DELIMITER = '******************************'
-    DEFAULT_EDITOR = 'vim'
-    
-    def initialize output, args = []
+  class MergeTool
+    def initialize(output, args = [])
       @output = output
       @options = parse_options args
     end
     
     def start
-      files = unmerged_files git_status
+      files = Donald::Git.new.conflicted_files
       
       if files.any?
         print_files files
-        
         call_vim files
       else
         print_no_files_message
@@ -22,38 +18,15 @@ module Donald
     
     private
     
-    def git_status
-      `git status`
-    end
-    
-    def unmerged_files text
-      files = []
-      
-      text.each_line do |line|
-        file = conflicted_file(line)
-        files << file unless file.nil?
-      end
-      
-      files
-    end
-    
-    def conflicted_file line      
-      conflicted_types = ['unmerged', 'both modified']
-      
-      conflicted_types.each do |conflicted_type|
-        if line.match /#{conflicted_type}: (.*)/
-          return $1.strip
-        end
-      end
-      
-      nil
-    end
-    
-    def call_vim files
+    def call_vim(files)
       Kernel.system "#{editor}#{arguments(editor)} #{files.join(' ')}"
     end
+
+    def editor
+      @editor || @editor = Donald::Editor.new(@options[:editor])
+    end
     
-    def print_files files
+    def print_files(files)
       print_delimiter
       
       files.each {|f| @output.puts f}
@@ -70,10 +43,10 @@ module Donald
     end
     
     def print_delimiter
-      @output.puts DELIMITER
+      @output.puts '*' * 30
     end
     
-    def parse_options args
+    def parse_options(args)
       options = {}
       
       options.merge! :editor => 'vim' if args.include?('--vim')
@@ -84,18 +57,8 @@ module Donald
       options
     end
     
-    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')
+    def arguments(editor)
+      " #{tab_argument} #{search_argument}" if editor.to_s.include? 'vim'
     end
     
     def tab_argument

data/lib/donald.rb

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

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: donald
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Bruno Grasselli
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-24 00:00:00 -03:00
+date: 2010-07-18 00:00:00 -03:00
 default_executable: donald
 dependencies: []
 
@@ -25,6 +31,9 @@ files:
 - README.textile
 - LICENSE
 - bin/donald
+- lib/donald.rb
+- lib/donald/git.rb
+- lib/donald/editor.rb
 - lib/donald/merge_tool.rb
 has_rdoc: true
 homepage: http://brunograsselli.com.br
@@ -36,21 +45,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple vim based mergetool for git users.