ro 1.3.4 → 1.3.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTI4MGE3ZmJiMTNiMmQ1ODY3ZmQ1MGVjZDNkOGNkNzE5MTg1ZmE5NA==
+    YmNhMTUwNjIwODk1YjRiZTYwMjAzNjQ4MmJlZTA4ZjE5NzE2Y2ZhNA==
   data.tar.gz: !binary |-
-    ZjZkMDlhOTIwOWEyMDcwYzQwZjUwYjc5MDI0ZTZiMzk4ZDg1NjVkMg==
+    NDA0M2FiZmQwN2JiZTc0YjU0NWExOTA1NDc2MWNkMzE4YmU4YzcyYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTdmYTk2ZGU5ZTc5NTU5NWJmMjM2ZThiYjdjZjQ4Y2MzZDRmNDUzZDgyYmUw
-    YTFhMTlkNWZlZTIwZmFjMzcxMmUxNmYxOWY5ZWIwNDg2MTdjMzk0MmM4ZDlk
-    ODk2YTllYWU3NWZlNTgxOWFmMDhhMzc4MjBhZTYyMDA1MmMwOTI=
+    NjI4M2VhNzIzMDIzMDZhNWEzMmNiYzQ0YzJjOGNhYjc2ZWQ5YTVlN2VmZGE0
+    MjA5NzIyZGZiZWJiYTI5NWQ1OGJlNjE0MmE4NWVkNWI0NjAzZjZmYTVkNGVi
+    YWU5MmU4NTA0N2U2MjJlNjQ5MTc4YzY0MGUxNGM5NTQwODZlYjM=
   data.tar.gz: !binary |-
-    ZGFjMDliMjAxOWM0OGRlMzQ0ZjI4M2RlMWYyNGM0ZTIyNTdmYzMwYTgzZjRk
-    ODM0MTNmMWUxOTY2NTA4NDFiNDI4MDZhNjgyYjliNzYyMDRlMjM4ZGQzOWUx
-    YzUyMDg0NTJiMmU2MGUxOGJkZTcyOGE0ZDczY2NkNjkwMWVhOTI=
+    MDIwYjZlZTViZjQ3NDBlNzYzOTIyNWMzM2U5MjNkM2NiOTBmN2Q5NTE0NTc3
+    NGIzNDRkNTc3MjgyNDk3OGYxZGIyNjEzMTRkMmVmOTI4Y2M0NjM2YmVkNTk1
+    MTQxZDcwMTQ4NGFkNTk4NDZhZGYyMDFiMzk0NDhiZGUwMjkxMjM=

data/lib/ro.rb

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

data/lib/ro/git.rb

@@ -92,9 +92,16 @@ module Ro
                   #
                     spawn("git checkout master", :raise => true)
 
+                  #
+                    spawn("git rebase --abort")
+                    spawn("git am --abort")
+                    FileUtils.rm_rf("#{ dot_git }/rebase-apply")
+
+                  #
                     status, stdout, stderr =
                       spawn("git am --signoff --3way", :capture => true, :stdin => patch.data)
 
+                  #
                     patch.applied = !!(status == 0)
 
                   # commit the patch back to the repo

data/ro.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ro
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map