donald 0.1.6 → 0.1.7

data/lib/donald/git.rb

@@ -1,32 +1,13 @@
 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
+    def unmerged_files
+      ls_files.split("\n")
     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
+    def ls_files
+      `git ls-files --unmerged | cut -f2 | sort -u`
     end
   end
 end

data/lib/donald/merge_tool.rb

@@ -6,7 +6,7 @@ module Donald
     end
     
     def start
-      files = Donald::Git.new.conflicted_files
+      files = Donald::Git.new.unmerged_files
       
       if files.any?
         print_files files

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: donald
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Bruno Grasselli
@@ -29,7 +29,6 @@ extra_rdoc_files: []
 
 files: 
 - README.textile
-- LICENSE
 - bin/donald
 - lib/donald.rb
 - lib/donald/git.rb

data/LICENSE

@@ -1,23 +0,0 @@
-(The MIT License)
-
-Copyright © 2010
-
-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.
-