donald 0.1.0

data/LICENSE

@@ -0,0 +1,23 @@
+(The MIT License)
+
+Copyright © 2009
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+‘Software’), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/README

@@ -0,0 +1,31 @@
+Donald
+
+---------
+
+A simple vim based merge tool for git users
+
+---------
+
+(The MIT License)
+
+Copyright © 2009
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+‘Software’), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/bin/donald

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

data/lib/donald/merge_tool.rb

@@ -0,0 +1,59 @@
+module Donald
+  class Donald::MergeTool
+    DELIMITER = '******************************'
+    
+    def start
+      files = unmerged_files git_status
+      
+      if files.any?
+        print_files files
+        
+        call_vim files
+      else
+        print_no_files_message
+      end
+    end
+    
+    private
+    
+    def git_status
+      `git status`
+    end
+    
+    def unmerged_files text
+      files = []
+      
+      text.each_line do |line|
+        if line.match /unmerged: (.*)/
+          files << $1.strip
+        end
+      end
+      
+      files
+    end
+    
+    def call_vim files
+      system "vim -p #{files.join(' ')}"
+    end
+    
+    def print_files files
+      print_delimiter
+      
+      files.each {|f| puts f}
+      
+      print_delimiter
+    end
+    
+    def print_no_files_message
+      print_delimiter
+      
+      puts 'No unmerged files found'
+      
+      print_delimiter
+    end
+    
+    def print_delimiter
+      puts DELIMITER
+    end
+  end
+end

metadata

@@ -0,0 +1,58 @@
+--- !ruby/object:Gem::Specification 
+name: donald
+version: !ruby/object:Gem::Version 
+  version: 0.1.0
+platform: ruby
+authors: 
+- Bruno Grasselli
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-03-20 00:00:00 -03:00
+default_executable: donald
+dependencies: []
+
+description: Simple vim based mergetool for git users.
+email: bruno.grasselli@gmail.com
+executables: 
+- donald
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- README
+- LICENSE
+- bin/donald
+- lib/donald/merge_tool.rb
+has_rdoc: true
+homepage: http://brunograsselli.com.br
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: Simple vim based mergetool for git users.
+test_files: []
+