ro 1.3.4 → 1.3.5
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.
- checksums.yaml +8 -8
- data/lib/ro.rb +1 -1
- data/lib/ro/git.rb +7 -0
- data/ro.gemspec +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
---
|
|
2
2
|
!binary "U0hBMQ==":
|
|
3
3
|
metadata.gz: !binary |-
|
|
4
|
-
|
|
4
|
+
YmNhMTUwNjIwODk1YjRiZTYwMjAzNjQ4MmJlZTA4ZjE5NzE2Y2ZhNA==
|
|
5
5
|
data.tar.gz: !binary |-
|
|
6
|
-
|
|
6
|
+
NDA0M2FiZmQwN2JiZTc0YjU0NWExOTA1NDc2MWNkMzE4YmU4YzcyYw==
|
|
7
7
|
!binary "U0hBNTEy":
|
|
8
8
|
metadata.gz: !binary |-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
NjI4M2VhNzIzMDIzMDZhNWEzMmNiYzQ0YzJjOGNhYjc2ZWQ5YTVlN2VmZGE0
|
|
10
|
+
MjA5NzIyZGZiZWJiYTI5NWQ1OGJlNjE0MmE4NWVkNWI0NjAzZjZmYTVkNGVi
|
|
11
|
+
YWU5MmU4NTA0N2U2MjJlNjQ5MTc4YzY0MGUxNGM5NTQwODZlYjM=
|
|
12
12
|
data.tar.gz: !binary |-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
MDIwYjZlZTViZjQ3NDBlNzYzOTIyNWMzM2U5MjNkM2NiOTBmN2Q5NTE0NTc3
|
|
14
|
+
NGIzNDRkNTc3MjgyNDk3OGYxZGIyNjEzMTRkMmVmOTI4Y2M0NjM2YmVkNTk1
|
|
15
|
+
MTQxZDcwMTQ4NGFkNTk4NDZhZGYyMDFiMzk0NDhiZGUwMjkxMjM=
|
data/lib/ro.rb
CHANGED
data/lib/ro/git.rb
CHANGED
|
@@ -92,9 +92,16 @@ module Ro
|
|
|
92
92
|
#
|
|
93
93
|
spawn("git checkout master", :raise => true)
|
|
94
94
|
|
|
95
|
+
#
|
|
96
|
+
spawn("git rebase --abort")
|
|
97
|
+
spawn("git am --abort")
|
|
98
|
+
FileUtils.rm_rf("#{ dot_git }/rebase-apply")
|
|
99
|
+
|
|
100
|
+
#
|
|
95
101
|
status, stdout, stderr =
|
|
96
102
|
spawn("git am --signoff --3way", :capture => true, :stdin => patch.data)
|
|
97
103
|
|
|
104
|
+
#
|
|
98
105
|
patch.applied = !!(status == 0)
|
|
99
106
|
|
|
100
107
|
# commit the patch back to the repo
|
data/ro.gemspec
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ro
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.3.
|
|
4
|
+
version: 1.3.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ara T. Howard
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-02-
|
|
11
|
+
date: 2014-02-07 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: map
|