donald 0.1.7 → 0.1.8

data/lib/donald/editor.rb

@@ -7,14 +7,7 @@ module Donald
     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
+      @editor_name || Donald::Environment.editor_variable || DEFAULT_EDITOR
     end
   end
 end

data/lib/donald/environment.rb

@@ -0,0 +1,14 @@
+module Donald
+  class Environment
+    def self.editor_variable
+      editor = system_variable('EDITOR').chomp
+      editor.size.zero? ? nil : editor
+    end
+
+    private
+
+    def self.system_variable(name)
+      `echo $#{name}`
+    end
+  end
+end

data/lib/donald/merge_tool.rb

@@ -1,7 +1,7 @@
 module Donald
   class MergeTool
     def initialize(output, args = [])
-      @output = output
+      @printer = Donald::Printer.new output
       @options = parse_options args
     end
     
@@ -9,16 +9,16 @@ module Donald
       files = Donald::Git.new.unmerged_files
       
       if files.any?
-        print_files files
-        call_vim files
+        @printer.print_files files
+        call_editor files
       else
-        print_no_files_message
+        @printer.print_no_files_message
       end
     end
     
     private
     
-    def call_vim(files)
+    def call_editor(files)
       Kernel.system "#{editor}#{arguments(editor)} #{files.join(' ')}"
     end
 
@@ -26,26 +26,6 @@ module Donald
       @editor || @editor = Donald::Editor.new(@options[:editor])
     end
     
-    def print_files(files)
-      print_delimiter
-      
-      files.each {|f| @output.puts f}
-      
-      print_delimiter
-    end
-    
-    def print_no_files_message
-      print_delimiter
-      
-      @output.puts 'No unmerged files found'
-      
-      print_delimiter
-    end
-    
-    def print_delimiter
-      @output.puts '*' * 30
-    end
-    
     def parse_options(args)
       options = {}
       

data/lib/donald/printer.rb

@@ -0,0 +1,33 @@
+module Donald
+  class Printer
+    def initialize(output)
+      @output = output
+    end
+
+    def print_files(files)
+      print_delimiter do
+        files.each {|f| @output.puts f}
+      end
+    end
+    
+    def print_no_files_message
+      print_delimiter do
+        @output.puts 'No unmerged files found'
+      end
+    end
+    
+    private
+
+    def print_delimiter
+      print_single_delimiter
+      if block_given?
+        yield
+        print_single_delimiter
+      end
+    end
+
+    def print_single_delimiter
+      @output.puts '*' * 30
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: donald
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Bruno Grasselli
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-18 00:00:00 -03:00
+date: 2010-08-21 00:00:00 -03:00
 default_executable: donald
 dependencies: []
 
@@ -33,6 +33,8 @@ files:
 - lib/donald.rb
 - lib/donald/git.rb
 - lib/donald/editor.rb
+- lib/donald/printer.rb
+- lib/donald/environment.rb
 - lib/donald/merge_tool.rb
 has_rdoc: true
 homepage: http://brunograsselli.com.br