git-smart 0.1.7 → 0.1.8
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.
- data/lib/git-smart/git_repo.rb +2 -1
- metadata +16 -13
data/lib/git-smart/git_repo.rb
CHANGED
|
@@ -62,9 +62,10 @@ class GitRepo
|
|
|
62
62
|
case status
|
|
63
63
|
when /^[^ ]*M/; :modified
|
|
64
64
|
when /^[^ ]*A/; :added
|
|
65
|
+
when /^[^ ]*D/; :deleted
|
|
65
66
|
when /^[^ ]*\?\?/; :untracked
|
|
66
67
|
when /^[^ ]*UU/; :conflicted
|
|
67
|
-
else raise GitSmart::UnexpectedOutput.new("Expected the output of git status to only have lines starting with A,M, or ??. Got: \n#{raw_status}")
|
|
68
|
+
else raise GitSmart::UnexpectedOutput.new("Expected the output of git status to only have lines starting with A, M, D, UU, or ??. Got: \n#{raw_status}")
|
|
68
69
|
end
|
|
69
70
|
}
|
|
70
71
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: git-smart
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.8
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -13,7 +13,7 @@ date: 2011-01-06 00:00:00.000000000 Z
|
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: colorize
|
|
16
|
-
requirement: &
|
|
16
|
+
requirement: &70270124318420 !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: *
|
|
24
|
+
version_requirements: *70270124318420
|
|
25
25
|
- !ruby/object:Gem::Dependency
|
|
26
26
|
name: rspec
|
|
27
|
-
requirement: &
|
|
27
|
+
requirement: &70270124317920 !ruby/object:Gem::Requirement
|
|
28
28
|
none: false
|
|
29
29
|
requirements:
|
|
30
30
|
- - ! '>='
|
|
@@ -32,10 +32,10 @@ dependencies:
|
|
|
32
32
|
version: 2.7.0
|
|
33
33
|
type: :development
|
|
34
34
|
prerelease: false
|
|
35
|
-
version_requirements: *
|
|
35
|
+
version_requirements: *70270124317920
|
|
36
36
|
- !ruby/object:Gem::Dependency
|
|
37
37
|
name: rcov
|
|
38
|
-
requirement: &
|
|
38
|
+
requirement: &70270124317440 !ruby/object:Gem::Requirement
|
|
39
39
|
none: false
|
|
40
40
|
requirements:
|
|
41
41
|
- - ! '>='
|
|
@@ -43,10 +43,10 @@ dependencies:
|
|
|
43
43
|
version: '0'
|
|
44
44
|
type: :development
|
|
45
45
|
prerelease: false
|
|
46
|
-
version_requirements: *
|
|
46
|
+
version_requirements: *70270124317440
|
|
47
47
|
- !ruby/object:Gem::Dependency
|
|
48
48
|
name: rocco
|
|
49
|
-
requirement: &
|
|
49
|
+
requirement: &70270124316960 !ruby/object:Gem::Requirement
|
|
50
50
|
none: false
|
|
51
51
|
requirements:
|
|
52
52
|
- - ! '>='
|
|
@@ -54,7 +54,7 @@ dependencies:
|
|
|
54
54
|
version: '0'
|
|
55
55
|
type: :development
|
|
56
56
|
prerelease: false
|
|
57
|
-
version_requirements: *
|
|
57
|
+
version_requirements: *70270124316960
|
|
58
58
|
description: Installs some additional 'smart' git commands, like `git smart-pull`.
|
|
59
59
|
email: glenmaddern@gmail.com
|
|
60
60
|
executables:
|
|
@@ -95,9 +95,12 @@ files:
|
|
|
95
95
|
- spec/smart-merge_spec.rb
|
|
96
96
|
- spec/smart-pull_spec.rb
|
|
97
97
|
- spec/spec_helper.rb
|
|
98
|
-
-
|
|
99
|
-
|
|
100
|
-
-
|
|
98
|
+
- !binary |-
|
|
99
|
+
YmluL2dpdC1zbWFydC1sb2c=
|
|
100
|
+
- !binary |-
|
|
101
|
+
YmluL2dpdC1zbWFydC1tZXJnZQ==
|
|
102
|
+
- !binary |-
|
|
103
|
+
YmluL2dpdC1zbWFydC1wdWxs
|
|
101
104
|
homepage: http://github.com/geelen/git-smart
|
|
102
105
|
licenses:
|
|
103
106
|
- MIT
|
|
@@ -119,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
119
122
|
version: '0'
|
|
120
123
|
requirements: []
|
|
121
124
|
rubyforge_project:
|
|
122
|
-
rubygems_version: 1.8.
|
|
125
|
+
rubygems_version: 1.8.11
|
|
123
126
|
signing_key:
|
|
124
127
|
specification_version: 3
|
|
125
128
|
summary: Add some smarts to your git workflow
|