trema 0.4.6 → 0.4.7

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

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

data/ruby/trema/flow.rb

@@ -31,15 +31,15 @@ module Trema
     # @return [self] the object that holds the parsed key=value fields
     #   as attributes.
     #
-    def self.parse line
-      flow = self.new
+    def self.parse(line)
+      flow = new
       # to simplify parsing
-      line.sub!(/actions=.*,.*$/) { | match | match.gsub(/,/,'/') }
-      line.strip.split( /[,\s]\s*/ ).each do | each |
-        next unless /(.+)=(.+)/=~ each
+      line.sub!(/actions=.*,.*$/) { | match | match.gsub(/,/, '/') }
+      line.strip.split(/[,\s]\s*/).each do | each |
+        next unless /(.+)=(.+)/ =~ each
         name, value = $1, $2
         attr_reader name.to_sym
-        if ( /\A\d+\Z/=~ value ) or ( /\A0x.+\Z/=~ value )
+        if (/\A\d+\Z/ =~ value) || (/\A0x.+\Z/ =~ value)
           flow.instance_eval "@#{ name }=#{ value }"
         else
           flow.instance_eval "@#{ name }='#{ value }'"
@@ -51,8 +51,8 @@ module Trema
 
     # @return [Boolean] whether a flow is a user registered flow or not.
     def users_flow?
-      not ( ( @actions == "drop" and @priority == 0 ) or
-            @actions == "CONTROLLER:65535" )
+      not ((@actions == 'drop' && @priority == 0) ||
+           @actions == 'CONTROLLER:65535')
     end
   end
 end

data/ruby/trema/hardware-switch.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/openflow-switch"
+require 'trema/openflow-switch'
 
 
 module Trema
@@ -43,7 +43,7 @@ module Trema
     #
     # @return [HardwareSwitch]
     #
-    def initialize stanza
+    def initialize(stanza)
       stanza.validate
       @name = stanza.name
       @stanza = stanza

data/ruby/trema/host.rb

@@ -16,9 +16,9 @@
 #
 
 
-require "trema/cli"
-require "trema/phost"
-require "trema/network-component"
+require 'trema/cli'
+require 'trema/phost'
+require 'trema/network-component'
 
 
 module Trema
@@ -49,10 +49,10 @@ module Trema
     #
     # @api public
     #
-    def initialize stanza
+    def initialize(stanza)
       @stanza = stanza
-      @phost = Phost.new( self )
-      @cli = Cli.new( self )
+      @phost = Phost.new(self)
+      @cli = Cli.new(self)
       @index = Host.instances.size
       Host.add self
     end
@@ -68,7 +68,7 @@ module Trema
     #
     # @api public
     #
-    def method_missing message, *args
+    def method_missing(message, *args)
       @stanza.__send__ :[], message
     end
 
@@ -84,7 +84,7 @@ module Trema
     # @api public
     #
     def ip
-      stanza_ip = @stanza[ :ip ]
+      stanza_ip = @stanza[ :ip]
       if stanza_ip.nil?
         # FIXME: Find unused addresses
         "192.168.0.#{ @index + 1 }"
@@ -105,7 +105,7 @@ module Trema
     # @api public
     #
     def mac
-      stanza_mac = @stanza[ :mac ]
+      stanza_mac = @stanza[ :mac]
       if stanza_mac.nil?
         "00:00:00:00:00:#{ format "%02x", @index + 1 }"
       else
@@ -125,9 +125,9 @@ module Trema
     # @api public
     #
     def netmask
-      stanza_netmask = @stanza[ :netmask ]
+      stanza_netmask = @stanza[ :netmask]
       if stanza_netmask.nil?
-        "255.255.255.255"
+        '255.255.255.255'
       else
         stanza_netmask
       end
@@ -147,7 +147,7 @@ module Trema
     def run!
       @phost.run!
       @cli.set_ip_and_mac_address
-      @cli.enable_promisc if @stanza[ :promisc ]
+      @cli.enable_promisc if @stanza[ :promisc]
       self
     end
 
@@ -177,7 +177,7 @@ module Trema
     #
     # @api public
     #
-    def add_arp_entry hosts
+    def add_arp_entry(hosts)
       hosts.each do | each |
         @cli.add_arp_entry each
       end
@@ -194,9 +194,9 @@ module Trema
     #
     # @api public
     #
-    def send_packet dest, options = {}
-      dest_host = if dest.is_a?( String )
-                    vhost( dest )
+    def send_packet(dest, options = {})
+      dest_host = if dest.is_a?(String)
+                    vhost(dest)
                   else
                     dest
                   end
@@ -212,14 +212,14 @@ module Trema
     # @return [Stat]
     #   the object that represents the results of a particular stats type.
     #
-    def stats type
+    def stats(type)
       case type
       when :tx
         @cli.tx_stats
       when :rx
         @cli.rx_stats
       else
-        raise
+        fail
       end
     end
 

data/ruby/trema/link.rb

@@ -16,11 +16,11 @@
 #
 
 
-require "trema/network-component"
-require "trema/path"
+require 'trema/network-component'
+require 'trema/path'
 
-$LOAD_PATH.unshift File.join( Trema.vendor_ruby_ifconfig, "lib" )
-require "ifconfig"
+$LOAD_PATH.unshift File.join(Trema.vendor_ruby_ifconfig, 'lib')
+require 'ifconfig'
 
 
 module Trema
@@ -69,13 +69,13 @@ module Trema
     #
     # @return [Link]
     #
-    def initialize stanza
+    def initialize(stanza)
       @link_id = Link.instances.size
       @stanza = stanza
       if real_eth?
         @name = real_eth
         @name_peer = nil
-        @peers = @stanza.peers - [ real_eth ]
+        @peers = @stanza.peers - [real_eth]
       else
         @name = "trema#{ @link_id }-0"
         @name_peer = "trema#{ @link_id }-1"
@@ -153,16 +153,16 @@ module Trema
     def real_eth
       interfaces = IfconfigWrapper.new.parse.interfaces
       @stanza.peers.each do | each |
-        return each if interfaces.include?( each )
+        return each if interfaces.include?(each)
       end
-      raise
+      fail
     end
 
 
     def real_eth?
       interfaces = IfconfigWrapper.new.parse.interfaces
       @stanza.peers.each do | each |
-        return true if interfaces.include?( each )
+        return true if interfaces.include?(each)
       end
       false
     end

data/ruby/trema/mac.rb

@@ -15,16 +15,12 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-
-require "rubygems"
-require "pio"
-
+require 'pio'
 
 module Trema
   Mac = Pio::Mac
 end
 
-
 ### Local variables:
 ### mode: Ruby
 ### coding: utf-8-unix

data/ruby/trema/match.c

@@ -569,7 +569,6 @@ match_init( int argc, VALUE *argv, VALUE self ) {
  */
 void
 Init_match() {
-  rb_require( "rubygems" );
   rb_require( "pio" );
   mTrema = rb_eval_string( "Trema" );
   cMatch = rb_define_class_under( mTrema, "Match", rb_cObject );

data/ruby/trema/monkey-patch/integer.rb

@@ -16,9 +16,9 @@
 #
 
 
-require "trema/monkey-patch/integer/base-conversions"
-require "trema/monkey-patch/integer/ranges"
-require "trema/monkey-patch/integer/validators"
+require 'trema/monkey-patch/integer/base-conversions'
+require 'trema/monkey-patch/integer/ranges'
+require 'trema/monkey-patch/integer/validators'
 
 
 class Integer

data/ruby/trema/monkey-patch/integer/base-conversions.rb

@@ -20,7 +20,7 @@ module MonkeyPatch
   module Integer
     module BaseConversions
       def to_hex
-        "%#x" % self
+        '%#x' % self
       end
     end
   end

data/ruby/trema/monkey-patch/integer/ranges.rb

@@ -34,8 +34,8 @@ module MonkeyPatch
       end
 
 
-      def within_range? nbit
-        ( 0 <= self ) and ( self < 2 ** nbit )
+      def within_range?(nbit)
+        (0 <= self) && (self < 2**nbit)
       end
     end
   end

data/ruby/trema/monkey-patch/integer/validators.rb

@@ -22,7 +22,7 @@ module MonkeyPatch
       # nw_tos (IP ToS) value consists of 8 bits, of which only the 6 high-order
       # bits belong to DSCP, the 2 low-order bits must be zero.
       def valid_nw_tos?
-        unsigned_8bit? and self % 4 == 0
+        unsigned_8bit? && self % 4 == 0
       end
     end
   end

data/ruby/trema/monkey-patch/module.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/monkey-patch/module/class-method"
-require "trema/monkey-patch/module/deprecation"
+require 'trema/monkey-patch/module/class-method'
+require 'trema/monkey-patch/module/deprecation'
 
 
 class Module

data/ruby/trema/monkey-patch/module/class-method.rb

@@ -19,8 +19,8 @@
 module MonkeyPatch
   module Module
     module ClassMethod
-      def define_class_method name, &block
-        self.extend ::Module.new {
+      def define_class_method(name, &block)
+        extend ::Module.new {
           define_method name.to_s do
             block.call
           end

data/ruby/trema/monkey-patch/module/deprecation.rb

@@ -19,7 +19,7 @@
 module MonkeyPatch
   module Module
     module Deprecation
-      def deprecate method_pairs
+      def deprecate(method_pairs)
         method_pairs.each do | old_method, new_method |
           define_method old_method do | *args, &block |
             $stderr.puts "Warning: #{ old_method }() is deprecated. Use #{ new_method }()."

data/ruby/trema/monkey-patch/string.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/monkey-patch/string/inflectors"
+require 'trema/monkey-patch/string/inflectors'
 
 
 class String

data/ruby/trema/monkey-patch/string/inflectors.rb

@@ -20,23 +20,23 @@ module MonkeyPatch
   module String
     module Inflectors
       def camelize
-        self.split( /[^a-z0-9]/i ).map do | each |
+        split(/[^a-z0-9]/i).map do | each |
           each.capitalize
         end.join
       end
 
 
       def demodulize
-        self.gsub /^.*::/, ''
+        gsub(/^.*::/, '')
       end
 
 
       def underscore
-        word = self.dup
-        word.gsub! /::/, '/'
-        word.gsub! /([A-Z]+)([A-Z][a-z])/,'\1_\2'
-        word.gsub! /([a-z\d])([A-Z])/,'\1_\2'
-        word.tr! "-", "_"
+        word = dup
+        word.gsub!(/::/, '/')
+        word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+        word.tr! '-', '_'
         word.downcase!
         word
       end

data/ruby/trema/netns.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/network-component"
+require 'trema/network-component'
 
 
 module Trema
@@ -47,7 +47,7 @@ module Trema
     #
     # @api public
     #
-    def initialize stanza
+    def initialize(stanza)
       @stanza = stanza
       Netns.add self
     end
@@ -63,7 +63,7 @@ module Trema
     #
     # @api public
     #
-    def method_missing message, *args
+    def method_missing(message, *args)
       @stanza.__send__ :[], message
     end
 
@@ -79,7 +79,7 @@ module Trema
     # @api public
     #
     def netmask
-      @stanza[ :netmask ] || "255.255.255.255"
+      @stanza[ :netmask] || '255.255.255.255'
     end
 
 
@@ -97,8 +97,8 @@ module Trema
       sh "sudo ip netns add #{ name }"
       sh "sudo ip link set dev #{ interface } netns #{ name }"
       sh "sudo ip netns exec #{ name } ifconfig lo 127.0.0.1"
-      sh "sudo ip netns exec #{ name } ifconfig #{ interface } #{ @stanza[ :ip ] } netmask #{ netmask }" if @stanza[ :ip ]
-      sh "sudo ip netns exec #{ name } route add -net #{ @stanza[ :net ] } gw #{ @stanza[ :gw ] }" if @stanza[ :net ] and @stanza[ :gw ]
+      sh "sudo ip netns exec #{ name } ifconfig #{ interface } #{ @stanza[ :ip] } netmask #{ netmask }" if @stanza[ :ip]
+      sh "sudo ip netns exec #{ name } route add -net #{ @stanza[ :net] } gw #{ @stanza[ :gw] }" if @stanza[ :net] && @stanza[ :gw]
       self
     end
 

data/ruby/trema/network-component.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/ordered-hash"
+require 'trema/ordered-hash'
 
 
 module Trema
@@ -57,7 +57,7 @@ module Trema
     #
     # @api public
     #
-    def self.inherited subclass
+    def self.inherited(subclass)
       subclass.instances ||= OrderedHash.new
     end
 
@@ -80,7 +80,7 @@ module Trema
     #
     # @api public
     #
-    def self.each &block
+    def self.each(&block)
       instances.values.each do | each |
         block.call each
       end
@@ -102,8 +102,8 @@ module Trema
     #
     # @api public
     #
-    def self.[] name
-      instances[ name ]
+    def self.[](name)
+      instances[ name]
     end
 
 
@@ -137,8 +137,8 @@ module Trema
     #
     # @api public
     #
-    def self.add object
-      instances[ object.name ] = object
+    def self.add(object)
+      instances[ object.name] = object
     end
   end
 end