donald 0.1.1 → 0.1.2

data/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright © 2009
+Copyright © 2010
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.textile

@@ -14,21 +14,27 @@ donald
 
 h2. Options:
 
--m or --mvim
-Open files using mvim
+h3. -g or --gvim
 
--g or --gvim
 Open files using gvim
 
 Example:
 
 donald -g
 
+h3. -m or --mvim
+
+Open files using mvim
+
+h3. -t or --textmate
+
+Open files using Textmate
+
 h2. License
 
 (The MIT License)
 
-Copyright © 2009
+Copyright © 2010
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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(ARGV)
+merge_tool = Donald::MergeTool.new(STDOUT, ARGV)
 
 merge_tool.start

data/lib/donald/merge_tool.rb

@@ -3,7 +3,8 @@ module Donald
     DELIMITER = '******************************'
     DEFAULT_EDITOR = 'vim'
     
-    def initialize args = []
+    def initialize output, args = []
+      @output = output
       @options = parse_options args
     end
     
@@ -40,13 +41,13 @@ module Donald
     def call_vim files
       editor = @options[:editor] || DEFAULT_EDITOR
       
-      system "#{editor} -p #{files.join(' ')}"
+      Kernel.system "#{editor}#{tab_argument editor} #{files.join(' ')}"
     end
     
     def print_files files
       print_delimiter
       
-      files.each {|f| puts f}
+      files.each {|f| @output.puts f}
       
       print_delimiter
     end
@@ -54,13 +55,13 @@ module Donald
     def print_no_files_message
       print_delimiter
       
-      puts 'No unmerged files found'
+      @output.puts 'No unmerged files found'
       
       print_delimiter
     end
     
     def print_delimiter
-      puts DELIMITER
+      @output.puts DELIMITER
     end
     
     def parse_options args
@@ -68,8 +69,13 @@ module Donald
       
       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 tab_argument editor
+      editor.include?('vim') ? ' -p' : ''
+    end
   end
 end

metadata

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