pio 0.30.0 → 0.30.2

data/lib/pio/type/ip_address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bindata'
 require 'pio/ipv4_address'
 
@@ -26,6 +28,14 @@ module Pio
       def ==(other)
         get == other
       end
+
+      def to_bytes
+        octets.map(&:to_hex).join(', ')
+      end
+
+      def inspect
+        %("#{get}")
+      end
     end
   end
 end

data/lib/pio/type/ipv6_address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bindata'
 require 'ipaddr'
 

data/lib/pio/type/mac_address.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
 require 'bindata'
 require 'pio/mac'
+require 'pio/monkey_patch/integer'
+require 'pio/monkey_patch/uint'
 
 module Pio
   module Type
@@ -16,6 +20,14 @@ module Pio
                   str + format('%02x', each)
                 end.hex)
       end
+
+      def to_bytes
+        octets.map(&:to_hex).join(', ')
+      end
+
+      def inspect
+        %("#{get}")
+      end
     end
   end
 end

data/lib/pio/udp.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bindata'
 require 'pio/ethernet_header'
 require 'pio/ipv4_header'
@@ -6,12 +8,12 @@ require 'pio/udp_header'
 module Pio
   # UDP packet format
   class Udp < BinData::Record
-    include EthernetHeader
-    include IPv4Header
+    include Ethernet
+    include IPv4
     include UdpHeader
 
     endian :big
-    ethernet_header ether_type: EtherType::IPV4
+    ethernet_header ether_type: Ethernet::Type::IPV4
     ipv4_header ip_protocol: ProtocolNumber::UDP
     udp_header
     rest :udp_payload

data/lib/pio/udp_header.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio/payload'
 
 module Pio
@@ -11,7 +13,7 @@ module Pio
       ip_address :source_ip_address
       ip_address :destination_ip_address
       uint8 :padding
-      uint8 :ip_protocol, value: IPv4Header::ProtocolNumber::UDP
+      uint8 :ip_protocol, value: IPv4::ProtocolNumber::UDP
       uint16 :udp_length
     end
 

data/lib/pio/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Base module.
 module Pio
   # gem version.
-  VERSION = '0.30.0'.freeze
+  VERSION = '0.30.2'
 end

data/lib/pio.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio/parse_error'
 
 require 'pio/arp'
@@ -5,5 +7,5 @@ require 'pio/dhcp'
 require 'pio/icmp'
 require 'pio/lldp'
 require 'pio/mac'
-require 'pio/open_flow'
 require 'pio/udp'
+require 'pio/open_flow'

data/pio.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pio/version'
@@ -8,57 +10,24 @@ Gem::Specification.new do |gem|
   gem.summary = 'Packet parser and generator.'
   gem.description = 'Pure ruby packet parser and generator.'
 
-  gem.license = 'GPL3'
+  gem.licenses = %w[GPLv2 MIT]
 
   gem.authors = ['Yasuhito Takamiya']
   gem.email = ['yasuhito@gmail.com']
   gem.homepage = 'http://github.com/trema/pio'
 
-  gem.files = %w(CONTRIBUTING.md LICENSE Rakefile pio.gemspec)
+  gem.files = %w[CONTRIBUTING.md Rakefile pio.gemspec]
   gem.files += Dir.glob('lib/**/*.rb')
-  gem.files += Dir.glob('bin/**/*')
   gem.files += Dir.glob('spec/**/*')
-  gem.files += Dir.glob('examples/**/*')
 
   gem.require_paths = ['lib']
 
-  gem.extra_rdoc_files = %w(README.md CHANGELOG.md LICENSE CONTRIBUTING.md)
+  gem.extra_rdoc_files = %w[README.md CHANGELOG.md CONTRIBUTING.md]
   gem.test_files = Dir.glob('spec/**/*')
   gem.test_files += Dir.glob('features/**/*')
 
-  gem.required_ruby_version = '>= 2.0.0'
+  gem.required_ruby_version = '>= 2.3.0'
 
   gem.add_dependency 'bindata', '~> 2.1.0'
-  gem.add_dependency 'activesupport', '~> 4.2', '>= 4.2.4'
-
-  gem.add_development_dependency 'bundler', '~> 1.10.6'
-  gem.add_development_dependency 'pry', '~> 0.10.3'
-  gem.add_development_dependency 'rake'
-
-  # Guard
-  gem.add_development_dependency 'guard', '~> 2.13.0'
-  gem.add_development_dependency 'guard-bundler', '~> 2.1.0'
-  gem.add_development_dependency 'guard-cucumber', '~> 1.6.0'
-  gem.add_development_dependency 'guard-rspec', '~> 4.6.4'
-  gem.add_development_dependency 'guard-rubocop', '~> 1.2.0'
-  gem.add_development_dependency 'rb-fchange', '~> 0.0.6'
-  gem.add_development_dependency 'rb-fsevent', '~> 0.9.6'
-  gem.add_development_dependency 'rb-inotify', '~> 0.9.5'
-  gem.add_development_dependency 'terminal-notifier-guard', '~> 1.6.4'
-
-  # Docs
-  gem.add_development_dependency 'inch', '~> 0.7.0'
-  gem.add_development_dependency 'relish', '~> 0.7.1'
-  gem.add_development_dependency 'yard', '~> 0.8.7.6'
-
-  # Test
-  gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.4.8'
-  gem.add_development_dependency 'coveralls', '~> 0.8.3'
-  gem.add_development_dependency 'cucumber', '~> 2.1.0'
-  gem.add_development_dependency 'flay', '~> 2.6.1'
-  gem.add_development_dependency 'flog', '~> 4.3.2'
-  gem.add_development_dependency 'reek', '~> 3.6.0'
-  gem.add_development_dependency 'rspec', '~> 3.3.0'
-  gem.add_development_dependency 'rspec-given', '~> 3.7.1'
-  gem.add_development_dependency 'rubocop', '~> 0.34.2'
+  gem.add_dependency 'activesupport', '~> 5.1.0'
 end

data/spec/pio/arp/reply_spec.rb

@@ -1,8 +1,6 @@
-require 'pio'
+# frozen_string_literal: true
 
-describe Pio::ARP::Reply do
-  Then { Pio::ARP::Reply == Pio::Arp::Reply }
-end
+require 'pio'
 
 describe Pio::Arp::Reply, '.new' do
   ARP_REPLY_DUMP =

data/spec/pio/arp/request_spec.rb

@@ -1,8 +1,6 @@
-require 'pio'
+# frozen_string_literal: true
 
-describe Pio::ARP::Request do
-  Then { Pio::ARP::Request == Pio::Arp::Request }
-end
+require 'pio'
 
 describe Pio::Arp::Request, '.new' do
   ARP_REQUEST_DUMP =

data/spec/pio/arp_spec.rb

@@ -1,8 +1,6 @@
-require 'pio'
+# frozen_string_literal: true
 
-describe Pio::ARP do
-  Then { Pio::ARP == Pio::Arp }
-end
+require 'pio'
 
 describe Pio::Arp do
   describe '.read' do

data/spec/pio/dhcp/ack_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio'
 
 describe Pio::DHCP::Ack do

data/spec/pio/dhcp/discover_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio'
 
 describe Pio::DHCP::Discover do

data/spec/pio/dhcp/offer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio'
 
 describe Pio::DHCP::Offer do

data/spec/pio/dhcp/request_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio'
 
 describe Pio::Dhcp::Request do

data/spec/pio/dhcp_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio'
 
 describe Pio::DHCP do

data/spec/pio/icmp/reply_spec.rb

@@ -1,8 +1,6 @@
-require 'pio'
+# frozen_string_literal: true
 
-describe Pio::ICMP::Reply do
-  Then { Pio::ICMP::Reply == Pio::Icmp::Reply }
-end
+require 'pio'
 
 describe Pio::Icmp::Reply, '.new' do
   context 'with echo_data' do
@@ -12,8 +10,8 @@ describe Pio::Icmp::Reply, '.new' do
         source_mac: '24:db:ac:41:e5:5b',
         source_ip_address: '8.8.8.8',
         destination_ip_address: '192.168.1.102',
-        identifier: 0x123,
-        sequence_number: 0x321,
+        icmp_identifier: 0x123,
+        icmp_sequence_number: 0x321,
         echo_data: 'abcdefghijklmnopqrstuvwabcdefghi'
       )
     end
@@ -77,8 +75,8 @@ describe Pio::Icmp::Reply, '.new' do
           source_mac: '24:db:ac:41:e5:5b',
           source_ip_address: '8.8.8.8',
           destination_ip_address: '192.168.1.102',
-          identifier: 0x123,
-          sequence_number: 0x321
+          icmp_identifier: 0x123,
+          icmp_sequence_number: 0x321
         )
       end
 

data/spec/pio/icmp/request_spec.rb

@@ -1,8 +1,6 @@
-require 'pio'
+# frozen_string_literal: true
 
-describe Pio::ICMP::Request do
-  Then { Pio::ICMP::Request == Pio::Icmp::Request }
-end
+require 'pio'
 
 describe Pio::Icmp do
   Given(:icmp_request) do
@@ -11,8 +9,8 @@ describe Pio::Icmp do
       source_mac: '74:e5:0b:2a:18:f8',
       source_ip_address: '192.168.1.101',
       destination_ip_address: '8.8.8.8',
-      identifier: 0x123,
-      sequence_number: 0x321,
+      icmp_identifier: 0x123,
+      icmp_sequence_number: 0x321,
       echo_data: 'abcdefghijklmnopqrstuvwabcdefghi'
     ).to_binary
   end
@@ -31,8 +29,8 @@ describe Pio::Icmp::Request, '.new' do
         source_mac: '74:e5:0b:2a:18:f8',
         source_ip_address: '192.168.1.101',
         destination_ip_address: '8.8.8.8',
-        identifier: 0x123,
-        sequence_number: 0x321,
+        icmp_identifier: 0x123,
+        icmp_sequence_number: 0x321,
         echo_data: 'abcdefghijklmnopqrstuvwabcdefghi'
       )
     end
@@ -97,8 +95,8 @@ describe Pio::Icmp::Request, '.new' do
         source_mac: '74:e5:0b:2a:18:f8',
         source_ip_address: '192.168.1.101',
         destination_ip_address: '8.8.8.8',
-        identifier: 0x123,
-        sequence_number: 0x321
+        icmp_identifier: 0x123,
+        icmp_sequence_number: 0x321
       )
     end
 

data/spec/pio/icmp_spec.rb

@@ -1,8 +1,6 @@
-require 'pio'
+# frozen_string_literal: true
 
-describe Pio::ICMP do
-  Then { Pio::ICMP == Pio::Icmp }
-end
+require 'pio'
 
 describe Pio::Icmp, '.read' do
   context 'with an ICMP request frame' do
@@ -64,17 +62,17 @@ describe Pio::Icmp, '.read' do
     Then { icmp_request.ether_type == 0x0800 }
     Then { icmp_request.ip_version == 0x4 }
     Then { icmp_request.ip_header_length == 0x5 }
-    Then { icmp_request.ip_type_of_service == 0x0 }
+    Then { icmp_request.ip_type_of_service.zero? }
     Then { icmp_request.ip_total_length == 60 }
     Then { icmp_request.ip_identifier == 0x39d3 }
-    Then { icmp_request.ip_fragment == 0 }
+    Then { icmp_request.ip_fragment.zero? }
     Then { icmp_request.ip_ttl == 128 }
     Then { icmp_request.ip_protocol == 1 }
     Then { icmp_request.ip_header_checksum == 0x2ed0 }
     Then { icmp_request.source_ip_address.to_s == '192.168.1.102' }
     Then { icmp_request.destination_ip_address.to_s == '8.8.8.8' }
     Then { icmp_request.icmp_type == 8 }
-    Then { icmp_request.icmp_code == 0 }
+    Then { icmp_request.icmp_code.zero? }
     Then { icmp_request.icmp_checksum == 0x4c5b }
     Then { icmp_request.icmp_identifier == 0x0100 }
     Then { icmp_request.icmp_sequence_number == 0x0001 }
@@ -137,17 +135,17 @@ describe Pio::Icmp, '.read' do
     Then { icmp_reply.ether_type == 0x0800 }
     Then { icmp_reply.ip_version == 0x4 }
     Then { icmp_reply.ip_header_length == 0x5 }
-    Then { icmp_reply.ip_type_of_service == 0 }
+    Then { icmp_reply.ip_type_of_service.zero? }
     Then { icmp_reply.ip_total_length == 60 }
-    Then { icmp_reply.ip_identifier == 0 }
-    Then { icmp_reply.ip_fragment == 0 }
+    Then { icmp_reply.ip_identifier.zero? }
+    Then { icmp_reply.ip_fragment.zero? }
     Then { icmp_reply.ip_ttl == 45 }
     Then { icmp_reply.ip_protocol == 1 }
     Then { icmp_reply.ip_header_checksum == 0xbba3 }
     Then { icmp_reply.source_ip_address.to_s == '8.8.8.8' }
     Then { icmp_reply.destination_ip_address.to_s == '192.168.1.102' }
-    Then { icmp_reply.icmp_type == 0 }
-    Then { icmp_reply.icmp_code == 0 }
+    Then { icmp_reply.icmp_type.zero? }
+    Then { icmp_reply.icmp_code.zero? }
     Then { icmp_reply.icmp_checksum == 0x545b }
     Then { icmp_reply.icmp_identifier == 0x0100 }
     Then { icmp_reply.icmp_sequence_number == 0x0001 }

data/spec/pio/ipv4_address_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio/ipv4_address'
 
 describe Pio::IPv4Address do

data/spec/pio/lldp/options_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio'
 
 describe Pio::Lldp::Options, '.new' do

data/spec/pio/mac_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio/mac'
 
 describe Pio::Mac do

data/spec/pio/monkey_patch/integer_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'pio/monkey_patch/integer'
+
+describe MonkeyPatch::Integer::BaseConversions do
+  describe '0#to_hex' do
+    When(:result) { 0.to_hex }
+    Then { result == '0x00' }
+  end
+
+  describe '1#to_hex' do
+    When(:result) { 1.to_hex }
+    Then { result == '0x01' }
+  end
+
+  describe '250#to_hex' do
+    When(:result) { 250.to_hex }
+    Then { result == '0xfa' }
+  end
+
+  describe '4207849484#to_hex' do
+    When(:result) { 4_207_849_484.to_hex }
+    Then { result == '0xfaceb00c' }
+  end
+end

data/spec/pio/open_flow/nicira_resubmit_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'pio/open_flow/nicira_resubmit'
+
+describe Pio::OpenFlow::NiciraResubmit do
+  describe '.new' do
+    When(:nicira_resubmit) do
+      Pio::OpenFlow::NiciraResubmit.new(port_number)
+    end
+
+    context 'with 1' do
+      Given(:port_number) { 1 }
+
+      Then { nicira_resubmit.action_type == 0xffff }
+      Then { nicira_resubmit.action_length == 16 }
+      Then { nicira_resubmit.vendor == 0x2320 }
+      Then { nicira_resubmit.subtype == 1 }
+      Then { nicira_resubmit.in_port == 1 }
+    end
+  end
+end

data/spec/pio/open_flow/nicira_resubmit_table_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'pio/open_flow/nicira_resubmit_table'
+
+describe Pio::OpenFlow::NiciraResubmitTable do
+  describe '.new' do
+    When(:nicira_resubmit_table) do
+      Pio::OpenFlow::NiciraResubmitTable.new(options)
+    end
+
+    context 'with in_port: 1, table: 1' do
+      Given(:options) { { in_port: 1, table: 1 } }
+
+      Then { nicira_resubmit_table.action_type == 0xffff }
+      Then { nicira_resubmit_table.action_length == 16 }
+      Then { nicira_resubmit_table.vendor == 0x2320 }
+      Then { nicira_resubmit_table.subtype == 14 }
+      Then { nicira_resubmit_table.in_port == 1 }
+      Then { nicira_resubmit_table.table == 1 }
+    end
+  end
+end

data/spec/pio/open_flow10/echo/reply_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio/open_flow10/echo/reply'
 
 describe Pio::OpenFlow10::Echo::Reply do

data/spec/pio/open_flow10/echo/request_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio/open_flow10/echo/request'
 
 describe Pio::OpenFlow10::Echo::Request do

data/spec/pio/open_flow10/enqueue_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio/open_flow10/enqueue'
 
 describe Pio::OpenFlow10::Enqueue do

data/spec/pio/open_flow10/error/hello_failed_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio/open_flow10/error/hello_failed'
 
 describe Pio::OpenFlow10::Error::HelloFailed do
@@ -10,7 +12,7 @@ describe Pio::OpenFlow10::Error::HelloFailed do
     context 'with {}' do
       Given(:options) { {} }
 
-      Then { hello_failed.message_length == 12 }
+      Then { hello_failed.length == 12 }
       Then { hello_failed.error_type == :hello_failed }
       Then { hello_failed.error_code == :incompatible }
       Then { hello_failed.description == '' }
@@ -19,7 +21,7 @@ describe Pio::OpenFlow10::Error::HelloFailed do
     context "with description: 'error description'" do
       Given(:options) { { description: 'error description' } }
 
-      Then { hello_failed.message_length == 29 }
+      Then { hello_failed.length == 29 }
       Then { hello_failed.description == 'error description' }
     end
   end

data/spec/pio/open_flow10/features/reply_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio/open_flow10/features/reply'
 
 describe Pio::OpenFlow10::Features::Reply do

data/spec/pio/open_flow10/features/request_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pio/open_flow10/features/request.rb'
 
 describe Pio::OpenFlow10::Features::Request do