git_wrapper 1.0.0 → 1.0.1

data/lib/git_wrapper/results/file_status.rb

@@ -6,7 +6,8 @@ module GitWrapper
           'M' => :modified,
           'D' => :deleted,
           'R' => :renamed,
-          'U' => :merge_conflict,
+          'UU' => :merge_conflict,
+          'AA' => :merge_conflict,
           'C' => :copied,
           'T' => :type_changed,
           'X' => :unknown

data/lib/git_wrapper/results/status_porcelain.rb

@@ -28,7 +28,7 @@ module GitWrapper
       end
 
       def self.parse_status(text)
-        FileStatus.value_of text[0..2].strip[0]
+        FileStatus.value_of text[0..2].strip
       end
 
       def self.parse_staged_for_commit(text)

data/lib/git_wrapper/version.rb

@@ -1,3 +1,3 @@
 module GitWrapper
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/status_porcelain_parser_spec.rb

@@ -56,7 +56,7 @@ describe GitWrapper, '-> Status porcelain parser' do
     file_status.staged_for_commit.should be_true
   end
 
-  it 'Merge conflict' do
+  it 'Merge conflict (UU)' do
     text = 'UU file.txt'
     file_status = StatusPorcelain.parse(text)
 
@@ -65,6 +65,15 @@ describe GitWrapper, '-> Status porcelain parser' do
     file_status.staged_for_commit.should be_false
   end
 
+  it 'Merge conflict (AA)' do
+    text = 'AA file.txt'
+    file_status = StatusPorcelain.parse(text)
+
+    file_status.file_name.should eq('file.txt')
+    file_status.status.should be(:merge_conflict)
+    file_status.staged_for_commit.should be_false
+  end
+
   it 'Renamed' do
     text = 'R  file.txt -> new_file.txt'
     file_status = StatusPorcelain.parse(text)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_wrapper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &26131704 !ruby/object:Gem::Requirement
+  requirement: &3974124 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26131704
+  version_requirements: *3974124
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26109240 !ruby/object:Gem::Requirement
+  requirement: &3973452 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26109240
+  version_requirements: *3973452
 description: OO git command line wrapper
 email:
 - gabynaiman@gmail.com