trema 0.4.6 → 0.4.7

data/ruby/trema/port-mod.c

@@ -208,7 +208,6 @@ port_mod_advertise( VALUE self ) {
  */
 void
 Init_port_mod() {
-  rb_require( "rubygems" );
   rb_require( "pio" );
 
   mTrema = rb_eval_string( "Trema" );

data/ruby/trema/port-stats-reply.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/stats-helper"
+require 'trema/stats-helper'
 
 
 module Trema
@@ -95,7 +95,7 @@ module Trema
     #   @return [PortStatsReply]
     #     an object that encapsulates the OFPST_STATS_REPLY(OFPST_PORT) OpenFlow message.
     #
-    def initialize options
+    def initialize(options)
       super FIELDS, options
     end
   end

data/ruby/trema/port-status-add.rb

@@ -46,8 +46,8 @@ module Trema
     #
     # @return [PortStatusAdd]
     #
-    def initialize options
-      super options.merge( :reason => OFPPR_ADD )
+    def initialize(options)
+      super options.merge(:reason => OFPPR_ADD)
     end
   end
 end

data/ruby/trema/port-status-delete.rb

@@ -46,8 +46,8 @@ module Trema
     #
     # @return [PortStatusDelete]
     #
-    def initialize options
-      super options.merge( :reason => OFPPR_DELETE )
+    def initialize(options)
+      super options.merge(:reason => OFPPR_DELETE)
     end
   end
 end

data/ruby/trema/port-status-modify.rb

@@ -46,8 +46,8 @@ module Trema
     #
     # @return [PortStatusModify]
     #
-    def initialize options
-      super options.merge( :reason => OFPPR_MODIFY )
+    def initialize(options)
+      super options.merge(:reason => OFPPR_MODIFY)
     end
   end
 end

data/ruby/trema/port.c

@@ -319,7 +319,6 @@ port_compare( VALUE self, VALUE other ) {
  */
 void
 Init_port() {
-  rb_require( "rubygems" );
   rb_require( "pio" );
 
   mTrema = rb_eval_string( "Trema" );

data/ruby/trema/process.rb

@@ -38,18 +38,18 @@ module Trema
     #
     # @return [Process] the object that encapsulates the process details.
     #
-    def self.read pid_file, name = nil
-      name = File.basename( pid_file.to_s, ".pid" ) if name.nil?
-      return new( pid_file, name )
+    def self.read(pid_file, name = nil)
+      name = File.basename(pid_file.to_s, '.pid') if name.nil?
+      new(pid_file, name)
     end
 
 
-    def initialize pid_file, name
+    def initialize(pid_file, name)
       @name = name
       @pid_file = pid_file
       begin
-        @pid = IO.read( @pid_file ).chomp.to_i
-        @uid = File.stat( @pid_file ).uid
+        @pid = IO.read(@pid_file).chomp.to_i
+        @uid = File.stat(@pid_file).uid
       rescue
         @pid_file = nil
       end
@@ -77,7 +77,7 @@ module Trema
         return
         # return if dead?
       end
-      raise "Failed to shut down #{ @name }"
+      fail "Failed to shut down #{ @name }"
     end
 
 

data/ruby/trema/queue-stats-reply.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/stats-helper"
+require 'trema/stats-helper'
 
 
 module Trema
@@ -62,7 +62,7 @@ module Trema
     #   @return [QueueStatsReply]
     #     an object that encapsulates the OFPST_STATS_REPLY(OFPST_QUEUE) OpenFlow message.
     #
-    def initialize options
+    def initialize(options)
       super FIELDS, options
     end
   end

data/ruby/trema/ruby-switch.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "rbconfig"
-require "trema/hardware-switch"
+require 'rbconfig'
+require 'trema/hardware-switch'
 
 
 module Trema
@@ -25,7 +25,7 @@ module Trema
     include Trema::Daemon
 
 
-    def initialize stanza
+    def initialize(stanza)
       super stanza
     end
 
@@ -41,14 +41,14 @@ module Trema
 
 
     def libruby
-      File.join Trema.home, "ruby"
+      File.join Trema.home, 'ruby'
     end
 
 
     def ruby
       File.join(
-        RbConfig::CONFIG[ "bindir" ],
-        RbConfig::CONFIG[ "ruby_install_name" ] + RbConfig::CONFIG[ "EXEEXT" ]
+        RbConfig::CONFIG[ 'bindir'],
+        RbConfig::CONFIG[ 'ruby_install_name'] + RbConfig::CONFIG[ 'EXEEXT']
       )
     end
   end

data/ruby/trema/send-out-port.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/action"
-require "trema/monkey-patch/integer"
+require 'trema/action'
+require 'trema/monkey-patch/integer'
 
 
 module Trema
@@ -25,7 +25,7 @@ module Trema
   # An action to output a packet to a port.
   #
   class SendOutPort < Action
-    DEFAULT_MAX_LEN = 2 ** 16 - 1
+    DEFAULT_MAX_LEN = 2**16 - 1
 
 
     # @return [Fixnum] the value of attribute {#max_len}
@@ -58,16 +58,16 @@ module Trema
     # @raise [ArgumentError] if port_number is not an unsigned 16-bit integer.
     # @raise [ArgumentError] if max_len is not an unsigned 16-bit integer.
     #
-    def initialize options
+    def initialize(options)
       case options
         when Hash
-          @port_number = options[ :port_number ] || options[ :port ]
-          @max_len = options[ :max_len ] || DEFAULT_MAX_LEN
+          @port_number = options[ :port_number] || options[ :port]
+          @max_len = options[ :max_len] || DEFAULT_MAX_LEN
         when Integer
           @port_number = options
           @max_len = DEFAULT_MAX_LEN
         else
-          raise "Invalid option"
+          fail 'Invalid option'
       end
       check_port_number
       check_max_len
@@ -75,7 +75,7 @@ module Trema
 
 
     def to_s
-      "#{ self.class.to_s }: port_number=#{ @port_number }, max_len=#{ @max_len }"
+      "#{ self.class }: port_number=#{ @port_number }, max_len=#{ @max_len }"
     end
 
 
@@ -86,17 +86,17 @@ module Trema
 
     def check_port_number
       if @port_number.nil?
-        raise ArgumentError, "Port number is a mandatory option"
+        fail ArgumentError, 'Port number is a mandatory option'
       end
       unless @port_number.unsigned_16bit?
-        raise ArgumentError, "Port number must be an unsigned 16-bit integer"
+        fail ArgumentError, 'Port number must be an unsigned 16-bit integer'
       end
     end
 
 
     def check_max_len
       unless @max_len.unsigned_16bit?
-        raise ArgumentError, "Max length must be an unsigned 16-bit integer"
+        fail ArgumentError, 'Max length must be an unsigned 16-bit integer'
       end
     end
   end

data/ruby/trema/set-eth-addr.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/action"
-require "trema/mac"
+require 'trema/action'
+require 'trema/mac'
 
 
 module Trema
@@ -35,13 +35,13 @@ module Trema
     #
     # @private
     #
-    def initialize mac_address
-      @mac_address = Mac.new( mac_address )
+    def initialize(mac_address)
+      @mac_address = Mac.new(mac_address)
     end
 
 
     def to_s
-      "#{ self.class.to_s }: mac_address=#{ @mac_address }"
+      "#{ self.class }: mac_address=#{ @mac_address }"
     end
   end
 end

data/ruby/trema/set-eth-dst-addr.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/set-eth-addr"
+require 'trema/set-eth-addr'
 
 
 module Trema

data/ruby/trema/set-eth-src-addr.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/set-eth-addr"
+require 'trema/set-eth-addr'
 
 
 module Trema

data/ruby/trema/set-ip-addr.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/action"
+require 'trema/action'
 
 
 module Trema
@@ -32,16 +32,16 @@ module Trema
     #
     # @private
     #
-    def initialize ip_address
-      unless ip_address.is_a?( String )
-        raise TypeError, "Source IP address must be a String"
+    def initialize(ip_address)
+      unless ip_address.is_a?(String)
+        fail TypeError, 'Source IP address must be a String'
       end
-      @ip_address = IPAddr.new( ip_address )
+      @ip_address = IPAddr.new(ip_address)
     end
 
 
     def to_s
-      "#{ self.class.to_s }: ip_address=#{ @ip_address }"
+      "#{ self.class }: ip_address=#{ @ip_address }"
     end
   end
 end

data/ruby/trema/set-ip-dst-addr.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/set-ip-addr"
+require 'trema/set-ip-addr'
 
 
 module Trema

data/ruby/trema/set-ip-src-addr.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/set-ip-addr"
+require 'trema/set-ip-addr'
 
 
 module Trema

data/ruby/trema/set-ip-tos.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/action"
-require "trema/monkey-patch/integer"
+require 'trema/action'
+require 'trema/monkey-patch/integer'
 
 
 module Trema
@@ -41,12 +41,12 @@ module Trema
     # @raise [ArgumentError] if type_of_service value is invalid.
     # @raise [TypeError] if type_of_service argument is not an Integer.
     #
-    def initialize type_of_service
-      unless type_of_service.is_a?( Integer )
-        raise TypeError, "ToS must be an unsigned 8-bit integer"
+    def initialize(type_of_service)
+      unless type_of_service.is_a?(Integer)
+        fail TypeError, 'ToS must be an unsigned 8-bit integer'
       end
       unless type_of_service.valid_nw_tos?
-        raise ArgumentError, "Invalid type_of_service (ToS) value."
+        fail ArgumentError, 'Invalid type_of_service (ToS) value.'
       end
       @type_of_service = type_of_service
     end

data/ruby/trema/set-transport-dst-port.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/set-transport-port"
+require 'trema/set-transport-port'
 
 
 module Trema
@@ -36,7 +36,7 @@ module Trema
     # @raise [ArgumentError] if port_number is not an unsigned 16-bit Integer.
     # @raise [TypeError] if port_number is not an Integer.
     #
-    def initialize port_number
+    def initialize(port_number)
       super port_number
     end
   end

data/ruby/trema/set-transport-port.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/action"
-require "trema/monkey-patch/integer"
+require 'trema/action'
+require 'trema/monkey-patch/integer'
 
 
 module Trema
@@ -32,13 +32,13 @@ module Trema
     #
     # @private
     #
-    def initialize port_number
-      error_message = "TCP/UDP port must be an unsigned 16-bit integer"
-      unless port_number.is_a?( Integer )
-        raise TypeError, error_message
+    def initialize(port_number)
+      error_message = 'TCP/UDP port must be an unsigned 16-bit integer'
+      unless port_number.is_a?(Integer)
+        fail TypeError, error_message
       end
       unless port_number.unsigned_16bit?
-        raise ArgumentError, error_message
+        fail ArgumentError, error_message
       end
       @port_number = port_number
     end

data/ruby/trema/set-transport-src-port.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/monkey-patch/integer"
-require "trema/set-transport-port"
+require 'trema/monkey-patch/integer'
+require 'trema/set-transport-port'
 
 
 module Trema
@@ -37,7 +37,7 @@ module Trema
     # @raise [ArgumentError] if port_number is not an unsigned 16-bit Integer.
     # @raise [TypeError] if port_number is not an Integer.
     #
-    def initialize port_number
+    def initialize(port_number)
       super port_number
     end
   end

data/ruby/trema/set-vlan-priority.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/action"
+require 'trema/action'
 
 
 module Trema
@@ -43,12 +43,12 @@ module Trema
     # @raise [ArgumentError] if vlan_priority is not within 0 and 7 inclusive.
     # @raise [TypeError] if vlan_priority is not an Integer.
     #
-    def initialize vlan_priority
-      unless vlan_priority.is_a?( Integer )
-        raise TypeError, "VLAN priority must be an unsigned 8-bit Integer"
+    def initialize(vlan_priority)
+      unless vlan_priority.is_a?(Integer)
+        fail TypeError, 'VLAN priority must be an unsigned 8-bit Integer'
       end
-      unless ( vlan_priority >= 0 and vlan_priority <= 7 )
-        raise ArgumentError, "Valid VLAN priority values are 0 to 7 inclusive"
+      unless ( vlan_priority >= 0 && vlan_priority <= 7)
+        fail ArgumentError, 'Valid VLAN priority values are 0 to 7 inclusive'
       end
       @vlan_priority = vlan_priority
     end