[gentoo-commits] gentoo-x86 commit in dev-ruby/packetfu/files: packetfu-1.1.10-ruby2x-encoding.patch

[Manuel Rueger (mrueg)]

mrueg       14/12/09 15:56:44

  Added:                packetfu-1.1.10-ruby2x-encoding.patch
  Log:
  Apply (retabbed) patch that makes ruby2.x tests succeed. Add ruby20, ruby21 
target.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key )

Revision  Changes    Path
1.1                  
dev-ruby/packetfu/files/packetfu-1.1.10-ruby2x-encoding.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/packetfu/files/packetfu-1.1.10-ruby2x-encoding.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/packetfu/files/packetfu-1.1.10-ruby2x-encoding.patch?rev=1.1&content-type=text/plain

Index: packetfu-1.1.10-ruby2x-encoding.patch
===================================================================
>From ba3ef1af81b494248db230b4f7fdcc155fe256d5 Mon Sep 17 00:00:00 2001
From: Jonathan Claudius <jclaud...@trustwave.com>
Date: Sat, 5 Apr 2014 22:15:00 -0400
Subject: [PATCH] Fix encoding issues in specs for Ruby 2.x

---
 spec/structfu_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/structfu_spec.rb b/spec/structfu_spec.rb
index c48c856..84b7e22 100644
--- a/spec/structfu_spec.rb
+++ b/spec/structfu_spec.rb
@@ -78,7 +78,7 @@ class StructClass
                @int.to_s.should == "\x02"
                @int.read(254)
                @int.to_i.should == 254
-               @int.to_s.should == "\xfe"
+               @int.to_s.should == "\xfe".force_encoding("binary")
        end
 
 end
@@ -98,7 +98,7 @@ class StructClass
        end
 
        it "should print a two character packed string" do
-               @int.to_s.should == "\x00\x0b"
+               @int.to_s.should == "\x00\x0b".force_encoding("binary")
        end
 
        it "should have a value of 11" do
@@ -113,7 +113,7 @@ class StructClass
                @int.to_s.should == "\x00\x02"
                @int.read(254)
                @int.to_i.should == 254
-               @int.to_s.should == "\x00\xfe"
+               @int.to_s.should == "\x00\xfe".force_encoding("binary")
        end
 
        it "should be able to set endianness" do
@@ -198,7 +198,7 @@ class StructClass
                @int.to_s.should == "\x00\x00\x00\x02"
                @int.read(254)
                @int.to_i.should == 254
-               @int.to_s.should == "\x00\x00\x00\xfe"
+               @int.to_s.should == "\x00\x00\x00\xfe".force_encoding("binary")
        end
 
        it "should be able to set endianness" do