git_wrapper 1.0.0 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/lib/git_wrapper/results/file_status.rb +2 -1
  2. data/lib/git_wrapper/results/status_porcelain.rb +1 -1
  3. data/lib/git_wrapper/version.rb +1 -1
  4. data/spec/status_porcelain_parser_spec.rb +10 -1
  5. metadata +6 -6
data/lib/git_wrapper/results/file_status.rb CHANGED
@@ -6,7 +6,8 @@ module GitWrapper
6
6
  'M' => :modified,
7
7
  'D' => :deleted,
8
8
  'R' => :renamed,
9
- 'U' => :merge_conflict,
9
+ 'UU' => :merge_conflict,
10
+ 'AA' => :merge_conflict,
10
11
  'C' => :copied,
11
12
  'T' => :type_changed,
12
13
  'X' => :unknown
data/lib/git_wrapper/results/status_porcelain.rb CHANGED
@@ -28,7 +28,7 @@ module GitWrapper
28
28
  end
29
29
 
30
30
  def self.parse_status(text)
31
- FileStatus.value_of text[0..2].strip[0]
31
+ FileStatus.value_of text[0..2].strip
32
32
  end
33
33
 
34
34
  def self.parse_staged_for_commit(text)
data/lib/git_wrapper/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module GitWrapper
2
- VERSION = '1.0.0'
2
+ VERSION = '1.0.1'
3
3
  end
data/spec/status_porcelain_parser_spec.rb CHANGED
@@ -56,7 +56,7 @@ describe GitWrapper, '-> Status porcelain parser' do
56
56
  file_status.staged_for_commit.should be_true
57
57
  end
58
58
 
59
- it 'Merge conflict' do
59
+ it 'Merge conflict (UU)' do
60
60
  text = 'UU file.txt'
61
61
  file_status = StatusPorcelain.parse(text)
62
62
 
@@ -65,6 +65,15 @@ describe GitWrapper, '-> Status porcelain parser' do
65
65
  file_status.staged_for_commit.should be_false
66
66
  end
67
67
 
68
+ it 'Merge conflict (AA)' do
69
+ text = 'AA file.txt'
70
+ file_status = StatusPorcelain.parse(text)
71
+
72
+ file_status.file_name.should eq('file.txt')
73
+ file_status.status.should be(:merge_conflict)
74
+ file_status.staged_for_commit.should be_false
75
+ end
76
+
68
77
  it 'Renamed' do
69
78
  text = 'R file.txt -> new_file.txt'
70
79
  file_status = StatusPorcelain.parse(text)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git_wrapper
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-10-02 00:00:00.000000000 Z
12
+ date: 2012-10-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: nokogiri
16
- requirement: &26131704 !ruby/object:Gem::Requirement
16
+ requirement: &3974124 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *26131704
24
+ version_requirements: *3974124
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rspec
27
- requirement: &26109240 !ruby/object:Gem::Requirement
27
+ requirement: &3973452 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *26109240
35
+ version_requirements: *3973452
36
36
  description: OO git command line wrapper
37
37
  email:
38
38
  - gabynaiman@gmail.com