ro 1.3.5 → 1.3.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmNhMTUwNjIwODk1YjRiZTYwMjAzNjQ4MmJlZTA4ZjE5NzE2Y2ZhNA==
+    ZTFhYzhiYmVmMzRlMTA3OTc0MTMyN2UyMzUwYTlmM2ZkZDQ1OTQzZg==
   data.tar.gz: !binary |-
-    NDA0M2FiZmQwN2JiZTc0YjU0NWExOTA1NDc2MWNkMzE4YmU4YzcyYw==
+    ZWU2MWYyY2JhOTEzODM2ZmM1NDYxYTYyNWFiZjI1YzY1NTRkMTAzZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjI4M2VhNzIzMDIzMDZhNWEzMmNiYzQ0YzJjOGNhYjc2ZWQ5YTVlN2VmZGE0
-    MjA5NzIyZGZiZWJiYTI5NWQ1OGJlNjE0MmE4NWVkNWI0NjAzZjZmYTVkNGVi
-    YWU5MmU4NTA0N2U2MjJlNjQ5MTc4YzY0MGUxNGM5NTQwODZlYjM=
+    NjdkYTU5MTBiZDdhZjRkM2IyNWMwYWE1NGUwMjM4MjkyZTdhNmFkNTUyY2Qz
+    NzU3ZjQyZGE2MjAzMDg0MTZmMzI1MTQ2MjY2MzRiM2QyM2FlNjM1M2Q4ZmZi
+    Y2Q3MjRiNTE3Nzk0YjhhZGU2N2VkN2EzZDhmY2UzODliOWIyOWQ=
   data.tar.gz: !binary |-
-    MDIwYjZlZTViZjQ3NDBlNzYzOTIyNWMzM2U5MjNkM2NiOTBmN2Q5NTE0NTc3
-    NGIzNDRkNTc3MjgyNDk3OGYxZGIyNjEzMTRkMmVmOTI4Y2M0NjM2YmVkNTk1
-    MTQxZDcwMTQ4NGFkNTk4NDZhZGYyMDFiMzk0NDhiZGUwMjkxMjM=
+    N2ZlZTYzMWEwZmNkOGQzYTI3NzZjZjA1Zjc0YjM0ZDE1MDc4MTllMTY4ZGVj
+    OTU5NGJjOTAwZjUwMzMzYTk4MjFmYzllM2ViYjNjMDI0ZmExMmU0ZjNkNzM5
+    NDIzNTc1MDI0NmI2ZmZkZTAwNTY3NDUxOWQzNmY2NDIyZmVhZDU=

data/lib/ro.rb

@@ -10,7 +10,7 @@
 
 #
   module Ro
-    Version = '1.3.5' unless defined?(Version)
+    Version = '1.3.6' unless defined?(Version)
 
     def version
       Ro::Version

data/lib/ro/git.rb

@@ -95,11 +95,13 @@ module Ro
                   #
                     spawn("git rebase --abort")
                     spawn("git am --abort")
-                    FileUtils.rm_rf("#{ dot_git }/rebase-apply")
+
+                    spawn("git am --abort")
+                    spawn("git rebase --abort")
 
                   #
                     status, stdout, stderr =
-                      spawn("git am --signoff --3way", :capture => true, :stdin => patch.data)
+                      spawn("git am --signoff --3way --ignore-space-change --ignore-whitespace", :capture => true, :stdin => patch.data)
 
                   #
                     patch.applied = !!(status == 0)
@@ -123,6 +125,9 @@ module Ro
                 spawn("git fetch --all", :raise => true)
                 spawn("git reset --hard origin/master", :raise => true)
 
+                spawn("git am --abort")
+                spawn("git rebase --abort")
+
               # get changes
               #
                 trying('to pull'){ spawn("git pull") }

data/ro.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "ro"
-  spec.version = "1.3.5"
+  spec.version = "1.3.6"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "ro"
   spec.description = "description: ro kicks the ass"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ro
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Ara T. Howard