ro 1.3.5 → 1.3.6

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. checksums.yaml +8 -8
  2. data/lib/ro.rb +1 -1
  3. data/lib/ro/git.rb +7 -2
  4. data/ro.gemspec +1 -1
  5. metadata +1 -1
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- YmNhMTUwNjIwODk1YjRiZTYwMjAzNjQ4MmJlZTA4ZjE5NzE2Y2ZhNA==
4
+ ZTFhYzhiYmVmMzRlMTA3OTc0MTMyN2UyMzUwYTlmM2ZkZDQ1OTQzZg==
5
5
  data.tar.gz: !binary |-
6
- NDA0M2FiZmQwN2JiZTc0YjU0NWExOTA1NDc2MWNkMzE4YmU4YzcyYw==
6
+ ZWU2MWYyY2JhOTEzODM2ZmM1NDYxYTYyNWFiZjI1YzY1NTRkMTAzZQ==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- NjI4M2VhNzIzMDIzMDZhNWEzMmNiYzQ0YzJjOGNhYjc2ZWQ5YTVlN2VmZGE0
10
- MjA5NzIyZGZiZWJiYTI5NWQ1OGJlNjE0MmE4NWVkNWI0NjAzZjZmYTVkNGVi
11
- YWU5MmU4NTA0N2U2MjJlNjQ5MTc4YzY0MGUxNGM5NTQwODZlYjM=
9
+ NjdkYTU5MTBiZDdhZjRkM2IyNWMwYWE1NGUwMjM4MjkyZTdhNmFkNTUyY2Qz
10
+ NzU3ZjQyZGE2MjAzMDg0MTZmMzI1MTQ2MjY2MzRiM2QyM2FlNjM1M2Q4ZmZi
11
+ Y2Q3MjRiNTE3Nzk0YjhhZGU2N2VkN2EzZDhmY2UzODliOWIyOWQ=
12
12
  data.tar.gz: !binary |-
13
- MDIwYjZlZTViZjQ3NDBlNzYzOTIyNWMzM2U5MjNkM2NiOTBmN2Q5NTE0NTc3
14
- NGIzNDRkNTc3MjgyNDk3OGYxZGIyNjEzMTRkMmVmOTI4Y2M0NjM2YmVkNTk1
15
- MTQxZDcwMTQ4NGFkNTk4NDZhZGYyMDFiMzk0NDhiZGUwMjkxMjM=
13
+ N2ZlZTYzMWEwZmNkOGQzYTI3NzZjZjA1Zjc0YjM0ZDE1MDc4MTllMTY4ZGVj
14
+ OTU5NGJjOTAwZjUwMzMzYTk4MjFmYzllM2ViYjNjMDI0ZmExMmU0ZjNkNzM5
15
+ NDIzNTc1MDI0NmI2ZmZkZTAwNTY3NDUxOWQzNmY2NDIyZmVhZDU=
data/lib/ro.rb CHANGED
@@ -10,7 +10,7 @@
10
10
 
11
11
  #
12
12
  module Ro
13
- Version = '1.3.5' unless defined?(Version)
13
+ Version = '1.3.6' unless defined?(Version)
14
14
 
15
15
  def version
16
16
  Ro::Version
data/lib/ro/git.rb CHANGED
@@ -95,11 +95,13 @@ module Ro
95
95
  #
96
96
  spawn("git rebase --abort")
97
97
  spawn("git am --abort")
98
- FileUtils.rm_rf("#{ dot_git }/rebase-apply")
98
+
99
+ spawn("git am --abort")
100
+ spawn("git rebase --abort")
99
101
 
100
102
  #
101
103
  status, stdout, stderr =
102
- spawn("git am --signoff --3way", :capture => true, :stdin => patch.data)
104
+ spawn("git am --signoff --3way --ignore-space-change --ignore-whitespace", :capture => true, :stdin => patch.data)
103
105
 
104
106
  #
105
107
  patch.applied = !!(status == 0)
@@ -123,6 +125,9 @@ module Ro
123
125
  spawn("git fetch --all", :raise => true)
124
126
  spawn("git reset --hard origin/master", :raise => true)
125
127
 
128
+ spawn("git am --abort")
129
+ spawn("git rebase --abort")
130
+
126
131
  # get changes
127
132
  #
128
133
  trying('to pull'){ spawn("git pull") }
data/ro.gemspec CHANGED
@@ -3,7 +3,7 @@
3
3
 
4
4
  Gem::Specification::new do |spec|
5
5
  spec.name = "ro"
6
- spec.version = "1.3.5"
6
+ spec.version = "1.3.6"
7
7
  spec.platform = Gem::Platform::RUBY
8
8
  spec.summary = "ro"
9
9
  spec.description = "description: ro kicks the ass"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ro
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.5
4
+ version: 1.3.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ara T. Howard