pio 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27d53b285f5a1953f25ee64f1e4d2049433826f1
-  data.tar.gz: 63407621a578d12c4142b556c881921dc28d553c
+  metadata.gz: 0a56473e633e294a1756d819645ccee51e6440cd
+  data.tar.gz: 8d6d9fc9c7625281475858f76e090a9e4f1038d6
 SHA512:
-  metadata.gz: 800d67d4ad15c762008ec915ff559a6d3c93d6908bd41d7f9a26cfbc7d11b4c90ca7eb0a15db68e772d6d05fc69e77185b895a28bcd249ebdf588fe06e42e0b0
-  data.tar.gz: 9cad26ff854970d9b0bbb55bfbb254335300eedb621a43436c4ae64b6b38e8ebba7a07d1d0c7fbf862dc8d02b8f39ece68605045bd3310bc699ed11906ea3476
+  metadata.gz: 1fadec47b009cab08eb3565b864952f050aa2a82477b2e9298a760691958fc998cdcf34ddc5fdbade680b5849e9e79c6ee61b8ab452b43e803ec64c3bfda93df
+  data.tar.gz: 5dcb89e55d28bc69dd59325829ac1bb740bfbde2516980aa41af5f15aafb01fac17e3f6d4224503e5c18a07f05a9c38473735076192863c6bf2ddbec1b6663e3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.11.2 (1/29/2015)
+
+### Bugs fixed
+* [#121](https://github.com/trema/pio/pull/121): Fix behavior of `Pio::Match#==` and `Pio::SendOutPort#==`.
+
+
 ## 0.11.1 (1/15/2015)
 
 ### New features

data/lib/pio/match.rb

@@ -145,6 +145,7 @@ module Pio
     def_delegators :@format, :dl_vlan_pcp
     def_delegators :@format, :nw_tos
     def_delegators :@format, :to_binary_s
+    def_delegator :@format, :to_binary_s, :to_binary
 
     # rubocop:disable MethodLength
     # This method smells of :reek:FeatureEnvy
@@ -163,5 +164,10 @@ module Pio
       @format = MatchFormat.new({ wildcards: flags }.merge user_options)
     end
     # rubocop:enable MethodLength
+
+    def ==(other)
+      return false unless other
+      to_binary == other.to_binary
+    end
   end
 end

data/lib/pio/open_flow/message.rb

@@ -75,11 +75,11 @@ module Pio
       def self.body_type
         klass_name = name.split('::').last + 'Body'
         const_get(klass_name)
-        klass_name.sub(/.*::/, '')
-          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-          .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-          .tr('-', '_')
-          .downcase
+        klass_name.sub(/.*::/, '').
+          gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+          gsub(/([a-z\d])([A-Z])/, '\1_\2').
+          tr('-', '_').
+          downcase
       rescue NameError
         'string'
       end

data/lib/pio/send_out_port.rb

@@ -71,5 +71,10 @@ module Pio
       @format = Format.new(options)
     end
     # rubocop:enable MethodLength
+
+    def ==(other)
+      return false unless other
+      to_binary == other.to_binary
+    end
   end
 end

data/lib/pio/version.rb

@@ -1,5 +1,5 @@
 # Base module.
 module Pio
   # gem version.
-  VERSION = '0.11.1'.freeze
+  VERSION = '0.11.2'.freeze
 end

data/pio.gemspec

@@ -56,12 +56,12 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'yard', '~> 0.8.7.6'
 
   # Test
-  gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.4.5'
-  gem.add_development_dependency 'coveralls', '~> 0.7.2'
+  gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.4.6'
+  gem.add_development_dependency 'coveralls', '~> 0.7.3'
   gem.add_development_dependency 'cucumber', '~> 1.3.18'
   gem.add_development_dependency 'flay', '~> 2.6.0'
   gem.add_development_dependency 'flog', '~> 4.3.1'
-  gem.add_development_dependency 'reek', '~> 1.6.2'
+  gem.add_development_dependency 'reek', '~> 1.6.4'
   gem.add_development_dependency 'rspec', '~> 3.1.0'
   gem.add_development_dependency 'rspec-given', '~> 3.6.0'
   gem.add_development_dependency 'rubocop', '~> 0.28.0'

data/spec/pio/match_spec.rb

@@ -91,9 +91,10 @@ describe Pio::Match do
   end
 
   describe '.new' do
-    context 'with in_port: 1' do
-      When(:match) { Pio::Match.new(in_port: 1) }
+    When(:match) { Pio::Match.new(options) }
 
+    context 'with in_port: 1' do
+      Given(:options) { { in_port: 1 } }
       Then do
         match.wildcards.keys == [
           :dl_vlan,
@@ -121,11 +122,19 @@ describe Pio::Match do
       Then { match.nw_dst == '0.0.0.0' }
       Then { match.tp_src == 0 }
       Then { match.tp_dst == 0 }
+
+      describe '#==' do
+        When(:result) { match == other }
+
+        context 'with Match.new(in_port: 1)' do
+          Given(:other) { Pio::Match.new(in_port: 1) }
+          Then { result == true }
+        end
+      end
     end
 
     context "with nw_src: '192.168.1.0/24'" do
-      When(:match) { Pio::Match.new(nw_src: '192.168.1.0/24') }
-
+      Given(:options) { { nw_src: '192.168.1.0/24' } }
       Then do
         match.wildcards.keys == [
           :in_port,
@@ -158,8 +167,7 @@ describe Pio::Match do
     end
 
     context "with nw_dst: '192.168.1.0/24'" do
-      When(:match) { Pio::Match.new(nw_dst: '192.168.1.0/24') }
-
+      Given(:options) { { nw_dst: '192.168.1.0/24' } }
       Then do
         match.wildcards.keys == [
           :in_port,

data/spec/pio/send_out_port_spec.rb

@@ -2,20 +2,30 @@ require 'pio/send_out_port'
 
 describe Pio::SendOutPort do
   describe '.new' do
-    When(:send_out_port) do
-      Pio::SendOutPort.new(options)
-    end
-
-    context 'with an integer' do
-      When(:options) { 1 }
+    When(:send_out_port) { Pio::SendOutPort.new(options) }
 
+    context 'with 1' do
+      Given(:options) { 1 }
       Then { send_out_port.port_number == 1 }
       Then { send_out_port.max_len == 2**16 - 1 }
+
+      describe '#==' do
+        When(:result) { send_out_port == other }
+
+        context 'with SendOutPort.new(1)' do
+          Given(:other) { Pio::SendOutPort.new(1) }
+          Then { result == true }
+        end
+
+        context 'with SendOutPort.new(2)' do
+          Given(:other) { Pio::SendOutPort.new(2) }
+          Then { result == false }
+        end
+      end
     end
 
     context 'with 0' do
-      When(:options) { 0 }
-
+      Given(:options) { 0 }
       Then do
         send_out_port ==
           Failure(ArgumentError, 'The port_number should be > 0')
@@ -23,8 +33,7 @@ describe Pio::SendOutPort do
     end
 
     context 'with 0xff01 (OFPP_MAX + 1)' do
-      When(:options) { 0xff01 }
-
+      Given(:options) { 0xff01 }
       Then do
         send_out_port ==
           Failure(ArgumentError, 'The port_number should be < 0xff00')
@@ -32,75 +41,63 @@ describe Pio::SendOutPort do
     end
 
     context 'with :in_port' do
-      When(:options) { :in_port }
-
+      Given(:options) { :in_port }
       Then { send_out_port.port_number == :in_port }
     end
 
     context 'with :table' do
-      When(:options) { :table }
-
+      Given(:options) { :table }
       Then { send_out_port.port_number == :table }
     end
 
     context 'with :normal' do
-      When(:options) { :normal }
-
+      Given(:options) { :normal }
       Then { send_out_port.port_number == :normal }
     end
 
     context 'with :flood' do
-      When(:options) { :flood }
-
+      Given(:options) { :flood }
       Then { send_out_port.port_number == :flood }
     end
 
     context 'with :all' do
-      When(:options) { :all }
-
+      Given(:options) { :all }
       Then { send_out_port.port_number == :all }
     end
 
     context 'with :controller' do
-      When(:options) { :controller }
-
+      Given(:options) { :controller }
       Then { send_out_port.port_number == :controller }
     end
 
     context 'with :controller' do
-      When(:options) { :local }
-
+      Given(:options) { :local }
       Then { send_out_port.port_number == :local }
     end
 
     context 'with :controller' do
-      When(:options) { :none }
-
+      Given(:options) { :none }
       Then { send_out_port.port_number == :none }
     end
 
     context 'with port_number: NUMBER option' do
-      When(:options) { { port_number: 1 } }
-
+      Given(:options) { { port_number: 1 } }
       Then { send_out_port.port_number == 1 }
     end
 
     context 'with port_number: SYMBOL option' do
-      When(:options) { { port_number: :flood } }
-
+      Given(:options) { { port_number: :flood } }
       Then { send_out_port.port_number == :flood }
     end
 
     context 'with port_number: and max_len: option' do
-      When(:options) { { port_number: 1, max_len: 256 } }
-
+      Given(:options) { { port_number: 1, max_len: 256 } }
       Then { send_out_port.port_number == 1 }
       Then { send_out_port.max_len == 256 }
     end
 
     context 'with invalid max_len: (-1) option' do
-      When(:options) { { port_number: 1, max_len: -1 } }
-
+      Given(:options) { { port_number: 1, max_len: -1 } }
       Then do
         send_out_port ==
           Failure(ArgumentError,
@@ -109,8 +106,7 @@ describe Pio::SendOutPort do
     end
 
     context 'with invalid max_len: (2**16) option' do
-      When(:options) { { port_number: 1, max_len: 2**16 } }
-
+      Given(:options) { { port_number: 1, max_len: 2**16 } }
       Then do
         send_out_port ==
           Failure(ArgumentError,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pio
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -226,28 +226,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -296,14 +296,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -583,105 +583,105 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Packet parser and generator.
 test_files:
-- spec/pio/arp/reply/options_spec.rb
-- spec/pio/arp/reply_spec.rb
-- spec/pio/arp/request/options_spec.rb
-- spec/pio/arp/request_spec.rb
-- spec/pio/arp_spec.rb
+- spec/pio/set_eth_src_addr_spec.rb
+- spec/pio/features/request_spec.rb
+- spec/pio/features/reply_spec.rb
+- spec/pio/set_vlan_vid_spec.rb
+- spec/pio/set_transport_dst_port_spec.rb
+- spec/pio/strip_vlan_header_spec.rb
+- spec/pio/ipv4_address_spec.rb
+- spec/pio/open_flow/type_spec.rb
+- spec/pio/open_flow/phy_port_spec.rb
+- spec/pio/enqueue_spec.rb
+- spec/pio/hello_spec.rb
+- spec/pio/set_ip_src_addr_spec.rb
+- spec/pio/dhcp/request_spec.rb
+- spec/pio/dhcp/offer_spec.rb
 - spec/pio/dhcp/ack_spec.rb
 - spec/pio/dhcp/discover_spec.rb
-- spec/pio/dhcp/offer_spec.rb
-- spec/pio/dhcp/request_spec.rb
-- spec/pio/dhcp_spec.rb
-- spec/pio/echo/reply_spec.rb
-- spec/pio/echo/request_spec.rb
-- spec/pio/enqueue_spec.rb
-- spec/pio/features/reply_spec.rb
-- spec/pio/features/request_spec.rb
+- spec/pio/set_transport_src_port_spec.rb
+- spec/pio/arp/request_spec.rb
+- spec/pio/arp/reply/options_spec.rb
+- spec/pio/arp/request/options_spec.rb
+- spec/pio/arp/reply_spec.rb
 - spec/pio/flow_mod_spec.rb
-- spec/pio/hello_spec.rb
-- spec/pio/icmp/reply_spec.rb
+- spec/pio/lldp/options_spec.rb
+- spec/pio/set_vlan_priority_spec.rb
+- spec/pio/set_ip_dst_addr_spec.rb
+- spec/pio/mac_spec.rb
 - spec/pio/icmp/request_spec.rb
+- spec/pio/icmp/reply_spec.rb
 - spec/pio/icmp_spec.rb
-- spec/pio/ipv4_address_spec.rb
-- spec/pio/lldp/options_spec.rb
+- spec/pio/wildcards_spec.rb
+- spec/pio/dhcp_spec.rb
+- spec/pio/set_ip_tos_spec.rb
+- spec/pio/send_out_port_spec.rb
+- spec/pio/packet_in_spec.rb
 - spec/pio/lldp_spec.rb
-- spec/pio/mac_spec.rb
+- spec/pio/arp_spec.rb
+- spec/pio/echo/request_spec.rb
+- spec/pio/echo/reply_spec.rb
+- spec/pio/set_eth_dst_addr_spec.rb
 - spec/pio/match_spec.rb
-- spec/pio/open_flow/phy_port_spec.rb
-- spec/pio/open_flow/type_spec.rb
-- spec/pio/packet_in_spec.rb
 - spec/pio/packet_out_spec.rb
-- spec/pio/send_out_port_spec.rb
-- spec/pio/set_eth_dst_addr_spec.rb
-- spec/pio/set_eth_src_addr_spec.rb
-- spec/pio/set_ip_dst_addr_spec.rb
-- spec/pio/set_ip_src_addr_spec.rb
-- spec/pio/set_ip_tos_spec.rb
-- spec/pio/set_transport_dst_port_spec.rb
-- spec/pio/set_transport_src_port_spec.rb
-- spec/pio/set_vlan_priority_spec.rb
-- spec/pio/set_vlan_vid_spec.rb
-- spec/pio/strip_vlan_header_spec.rb
-- spec/pio/wildcards_spec.rb
 - spec/spec_helper.rb
-- features/arp_read.feature
-- features/dhcp_read.feature
-- features/echo_read.feature
-- features/features_read.feature
-- features/flow_mod_read.feature
 - features/hello_read.feature
-- features/icmp_read.feature
-- features/lldp_read.feature
-- features/packet_data/aggregate_stats_reply.raw
-- features/packet_data/aggregate_stats_request.raw
-- features/packet_data/arp-storm.pcap
-- features/packet_data/arp.pcap
-- features/packet_data/barrier_reply.raw
-- features/packet_data/barrier_request.raw
+- features/support/env.rb
 - features/packet_data/desc_stats_reply.raw
-- features/packet_data/desc_stats_request.raw
 - features/packet_data/dhcp.pcap
 - features/packet_data/echo_reply.raw
-- features/packet_data/echo_request.raw
-- features/packet_data/error.raw
+- features/packet_data/flow_mod_modify_strict.raw
+- features/packet_data/flow_mod_add.raw
 - features/packet_data/features_reply.raw
+- features/packet_data/packet_in.raw
+- features/packet_data/aggregate_stats_reply.raw
+- features/packet_data/queue_get_config_reply.raw
+- features/packet_data/arp.pcap
 - features/packet_data/features_request.raw
-- features/packet_data/flow_mod_add.raw
-- features/packet_data/flow_mod_delete.raw
-- features/packet_data/flow_mod_delete_strict.raw
-- features/packet_data/flow_mod_modify.raw
-- features/packet_data/flow_mod_modify_strict.raw
-- features/packet_data/flow_removed.raw
-- features/packet_data/flow_stats_reply.raw
 - features/packet_data/flow_stats_request.raw
-- features/packet_data/get_config_reply.raw
+- features/packet_data/port_stats_request.raw
+- features/packet_data/flow_mod_delete_strict.raw
+- features/packet_data/barrier_reply.raw
 - features/packet_data/get_config_request.raw
-- features/packet_data/hello.raw
-- features/packet_data/icmp.pcap
-- features/packet_data/lldp.detailed.pcap
-- features/packet_data/lldp.minimal.pcap
-- features/packet_data/packet_in.raw
-- features/packet_data/packet_out.raw
+- features/packet_data/vendor.raw
 - features/packet_data/port_mod.raw
-- features/packet_data/port_stats_reply.raw
-- features/packet_data/port_stats_request.raw
-- features/packet_data/port_status.raw
-- features/packet_data/queue_get_config_reply.raw
-- features/packet_data/queue_get_config_request.raw
+- features/packet_data/get_config_reply.raw
+- features/packet_data/lldp.minimal.pcap
+- features/packet_data/hello.raw
+- features/packet_data/flow_removed.raw
 - features/packet_data/set_config.raw
+- features/packet_data/port_stats_reply.raw
+- features/packet_data/packet_out.raw
 - features/packet_data/table_stats_reply.raw
-- features/packet_data/table_stats_request.raw
-- features/packet_data/vendor.raw
+- features/packet_data/queue_get_config_request.raw
+- features/packet_data/error.raw
 - features/packet_data/vendor_stats_request.raw
-- features/packet_in_read.feature
-- features/packet_out_read.feature
-- features/step_definitions/packet_data_steps.rb
+- features/packet_data/icmp.pcap
+- features/packet_data/arp-storm.pcap
+- features/packet_data/flow_stats_reply.raw
+- features/packet_data/desc_stats_request.raw
+- features/packet_data/barrier_request.raw
+- features/packet_data/table_stats_request.raw
+- features/packet_data/port_status.raw
+- features/packet_data/flow_mod_modify.raw
+- features/packet_data/flow_mod_delete.raw
+- features/packet_data/lldp.detailed.pcap
+- features/packet_data/aggregate_stats_request.raw
+- features/packet_data/echo_request.raw
+- features/icmp_read.feature
+- features/arp_read.feature
 - features/step_definitions/pending_steps.rb
-- features/support/env.rb
+- features/step_definitions/packet_data_steps.rb
+- features/flow_mod_read.feature
+- features/lldp_read.feature
+- features/dhcp_read.feature
+- features/features_read.feature
+- features/packet_out_read.feature
+- features/packet_in_read.feature
+- features/echo_read.feature
 has_rdoc: