trema 0.4.6 → 0.4.7

data/ruby/trema/switch.rb

@@ -19,21 +19,21 @@
 module Trema
   class Switch
     attr_reader :dpid
-    alias :datapath_id :dpid
+    alias_method :datapath_id, :dpid
 
 
-    def self.inherited subclass
-      at_exit { subclass.new( eval ARGV[ 0 ] ).run! }
+    def self.inherited(subclass)
+      at_exit { subclass.new(eval ARGV[ 0]).run! }
     end
 
 
-    def initialize dpid
+    def initialize(dpid)
       @dpid = dpid
     end
 
 
     def name
-      self.class.to_s.split( "::" ).last
+      self.class.to_s.split('::').last
     end
 
 
@@ -42,8 +42,8 @@ module Trema
     end
 
 
-    def features_request xid
-      send_message FeaturesReply.new( :datapath_id => @dpid, :transaction_id => xid )
+    def features_request(xid)
+      send_message FeaturesReply.new(:datapath_id => @dpid, :transaction_id => xid)
     end
   end
 end

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

@@ -15,7 +15,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-require "trema/stats-helper"
+require 'trema/stats-helper'
 
 
 module Trema
@@ -71,7 +71,7 @@ module Trema
     #   @return [TableStatsReply]
     #     an object that encapsulates the OFPST_STATS_REPLY(OFPST_TABLE) OpenFlow message.
     #
-    def initialize options
+    def initialize(options)
       super FIELDS, options
     end
   end

data/ruby/trema/timers.rb

@@ -17,19 +17,19 @@
 
 
 module Timers
-  def self.included base
+  def self.included(base)
     base.send :include, TimerMethods
     base.send :extend, TimerMethods
   end
 
 
   module TimerMethods
-    lambda {
+    lambda do
       timer_event_handlers = {}
 
 
       Kernel.send :define_method, :add_timer do | handler, interval, event_type |
-        timer_event_handlers[ handler ] = {
+        timer_event_handlers[ handler] = {
           :interval => interval,
           :rest => interval,
           :event_type => event_type
@@ -39,14 +39,14 @@ module Timers
 
       Kernel.send :define_method, :fire_event do
         timer_event_handlers.each do | handler, data |
-          data[ :rest ] -= 1
-          if data[ :rest ] <= 0
+          data[ :rest] -= 1
+          if data[ :rest] <= 0
             __send__ handler
-            data[ :rest ] = data[ :interval ] if data[ :event_type ] == :periodic
+            data[ :rest] = data[ :interval] if data[ :event_type] == :periodic
           end
         end
         timer_event_handlers.delete_if do | handler, data |
-          data[ :rest ] <= 0 && data[ :event_type ] == :oneshot
+          data[ :rest] <= 0 && data[ :event_type] == :oneshot
         end
       end
 
@@ -54,28 +54,28 @@ module Timers
       Kernel.send :define_method, :delete_timer do | handler |
         timer_event_handlers.delete
       end
-    }.call
+    end.call
 
 
-    def add_timer_event handler, interval, event_type
+    def add_timer_event(handler, interval, event_type)
       add_timer handler, interval, event_type
     end
     alias_method :timer_event, :add_timer_event
 
 
-    def delete_timer_event handler
+    def delete_timer_event(handler)
       delete_timer handler
     end
 
 
     # shortcut methods
-    def add_periodic_timer_event handler, interval
+    def add_periodic_timer_event(handler, interval)
       add_timer_event handler, interval, :periodic
     end
     alias_method :periodic_timer_event, :add_periodic_timer_event
 
 
-    def add_oneshot_timer_event handler, interval
+    def add_oneshot_timer_event(handler, interval)
       add_timer_event handler, interval, :oneshot
     end
     alias_method :oneshot_timer_event, :add_oneshot_timer_event

data/ruby/trema/trema.c

@@ -79,7 +79,6 @@ Init_trema() {
   rb_define_const( mTrema, "OFPAT_ENQUEUE", INT2NUM( OFPAT_ENQUEUE ) );
   rb_define_const( mTrema, "OFPAT_VENDOR", INT2NUM( OFPAT_VENDOR ) );
 
-  rb_require( "rubygems" );
   rb_require( "pio" );
   rb_require( "trema/mac" );
   rb_require( "trema/host" );

data/ruby/trema/tremashark.rb

@@ -18,7 +18,7 @@
 #
 
 
-require "trema/executables"
+require 'trema/executables'
 
 
 module Trema

data/ruby/trema/util.rb

@@ -18,18 +18,18 @@
 #
 
 
-require "trema/dsl"
-require "trema/executables"
-require "trema/path"
-require "trema/process"
+require 'trema/dsl'
+require 'trema/executables'
+require 'trema/path'
+require 'trema/process'
 
 
 module Trema::Util
-  def sh cmd
-    ENV[ "TREMA_HOME" ] = Trema.home
+  def sh(cmd)
+    ENV[ 'TREMA_HOME'] = Trema.home
     puts cmd if $verbose
-    unless system( cmd )
-      raise "Command '#{ cmd }' failed!"
+    unless system(cmd)
+      fail "Command '#{ cmd }' failed!"
     end
   end
 
@@ -47,11 +47,11 @@ EOF
   end
 
 
-  def cleanup session
+  def cleanup(session)
     # [FIXME] Use session.switch_manager
-    sm_pid = File.join( Trema.pid, "switch_manager.pid" )
-    if FileTest.exist?( sm_pid )
-      Trema::Process.read( sm_pid ).kill!
+    sm_pid = File.join(Trema.pid, 'switch_manager.pid')
+    if FileTest.exist?(sm_pid)
+      Trema::Process.read(sm_pid).kill!
     end
     session.apps.each do | name, app |
       app.shutdown!
@@ -69,8 +69,8 @@ EOF
       netns.shutdown!
     end
 
-    Dir.glob( File.join Trema.pid, "*.pid" ).each do | each |
-      Trema::Process.read( each ).kill!
+    Dir.glob(File.join Trema.pid, '*.pid').each do | each |
+      Trema::Process.read(each).kill!
     end
   end
 
@@ -81,32 +81,30 @@ EOF
 
 
   def cleanup_current_session
-    begin
-      cleanup Trema::DSL::Context.load_current
-    ensure
-      FileUtils.rm_f Trema::DSL::Context::PATH
-    end
+    cleanup Trema::DSL::Context.load_current
+  ensure
+    FileUtils.rm_f Trema::DSL::Context::PATH
   end
 
 
-  def find_app_by_name name
+  def find_app_by_name(name)
     # [FIXME] Trema apps does not appear in context.apps. why?
-    pid_file = File.join( Trema.pid, "#{ name }.pid" )
-    if FileTest.exist?( pid_file )
-      Trema::Process.read( pid_file )
+    pid_file = File.join(Trema.pid, "#{ name }.pid")
+    if FileTest.exist?(pid_file)
+      Trema::Process.read(pid_file)
     else
       nil
     end
   end
 
 
-  def find_switch_by_name name
-    Trema::DSL::Context.load_current.switches[ name ]
+  def find_switch_by_name(name)
+    Trema::DSL::Context.load_current.switches[ name]
   end
 
 
-  def find_host_by_name name
-    Trema::DSL::Context.load_current.hosts[ name ]
+  def find_host_by_name(name)
+    Trema::DSL::Context.load_current.hosts[ name]
   end
 end
 

data/ruby/trema/vendor-action.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/action"
-require "trema/monkey-patch/integer"
+require 'trema/action'
+require 'trema/monkey-patch/integer'
 
 
 module Trema
@@ -51,18 +51,18 @@ module Trema
     # @raise [TypeError] if body is not an Array.
     # @raise [ArgumentError] if body length is not a multiple of 8.
     #
-    def initialize vendor_id, body = nil
-      unless vendor_id.is_a?( Integer )
-        raise TypeError, "Vendor ID must be an unsigned 32-bit integer"
+    def initialize(vendor_id, body = nil)
+      unless vendor_id.is_a?(Integer)
+        fail TypeError, 'Vendor ID must be an unsigned 32-bit integer'
       end
       unless vendor_id.unsigned_32bit?
-        raise ArgumentError, "Vendor ID must be an unsigned 32-bit integer"
+        fail ArgumentError, 'Vendor ID must be an unsigned 32-bit integer'
       end
-      if ( not body.nil? ) and ( not body.is_a?( Array ) )
-        raise TypeError, "Body must be an Array"
+      if ( body) && ( not body.is_a?(Array))
+        fail TypeError, 'Body must be an Array'
       end
-      if ( not body.nil? ) and ( body.size % 8 != 0 )
-        raise ArgumentError, "Body length must be a multiple of 8"
+      if ( body) && ( body.size % 8 != 0)
+        fail ArgumentError, 'Body length must be a multiple of 8'
       end
 
       @vendor_id = vendor_id

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

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

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.4.6"
+  VERSION = '0.4.7'.freeze
 end
 
 

data/spec/spec_helper.rb

@@ -15,28 +15,28 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
 
-$LOAD_PATH << File.join( File.dirname( __FILE__ ), "..", "ruby" )
-$LOAD_PATH.unshift File.expand_path( File.join File.dirname( __FILE__ ), "..", "vendor", "ruby-ifconfig-1.2", "lib" )
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'ruby')
+$LOAD_PATH.unshift File.expand_path(File.join File.dirname(__FILE__), '..', 'vendor', 'ruby-ifconfig-1.2', 'lib')
 
 
-require "rubygems"
-
-require "rspec"
-require "rspec/autorun"
-require "pio"
-require "trema"
-require "trema/dsl/configuration"
-require "trema/dsl/context"
-require "trema/ofctl"
-require "trema/shell"
-require "trema/util"
+require 'rspec'
+require 'rspec/autorun'
+require 'pio'
+require 'trema'
+require 'trema/dsl/configuration'
+require 'trema/dsl/context'
+require 'trema/ofctl'
+require 'trema/shell'
+require 'trema/util'
 
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir[ "#{ File.dirname( __FILE__ ) }/support/**/*.rb" ].each do | each |
-  require File.expand_path( each )
+Dir[ "#{ File.dirname(__FILE__) }/support/**/*.rb"].each do | each |
+  require File.expand_path(each)
 end
 
 
@@ -51,22 +51,22 @@ end
 include Trema
 
 
-def controller name
-  Trema::App[ name ]
+def controller(name)
+  Trema::App[ name]
 end
 
 
-def vswitch name
-  Trema::OpenflowSwitch[ name ]
+def vswitch(name)
+  Trema::OpenflowSwitch[ name]
 end
 
 
-def vhost name
-  Trema::Host[ name ]
+def vhost(name)
+  Trema::Host[ name]
 end
 
 
-def send_packets source, dest, options = {}
+def send_packets(source, dest, options = {})
   Trema::Shell.send_packets source, dest, options
 end
 
@@ -75,18 +75,16 @@ include Trema::Util
 
 
 class Network
-  def initialize &block
-    @context = Trema::DSL::Parser.new.eval( &block )
+  def initialize(&block)
+    @context = Trema::DSL::Parser.new.eval(&block)
   end
 
 
-  def run controller_class, &test
-    begin
-      trema_run controller_class
-      test.call
-    ensure
-      trema_kill
-    end
+  def run(controller_class, &test)
+    trema_run controller_class
+    test.call
+  ensure
+    trema_kill
   end
 
 
@@ -95,16 +93,16 @@ class Network
   ################################################################################
 
 
-  def trema_run controller_class
+  def trema_run(controller_class)
     controller = controller_class.new
-    if not controller.is_a?( Trema::Controller )
-      raise "#{ controller_class } is not a subclass of Trema::Controller"
+    unless controller.is_a?(Trema::Controller)
+      fail "#{ controller_class } is not a subclass of Trema::Controller"
     end
-    Trema::DSL::Context.new( @context ).dump
+    Trema::DSL::Context.new(@context).dump
 
     app_name = controller.name
     rule = { :port_status => app_name, :packet_in => app_name, :state_notify => app_name }
-    sm = SwitchManager.new( rule, @context.port )
+    sm = SwitchManager.new(rule, @context.port)
     sm.no_flow_cleanup = true
     sm.run!
 
@@ -122,7 +120,7 @@ class Network
       each.up!
     end
     @context.hosts.each do | name, each |
-      each.add_arp_entry @context.hosts.values - [ each ]
+      each.add_arp_entry @context.hosts.values - [each]
     end
 
     @th_controller = Thread.start do
@@ -139,42 +137,42 @@ class Network
   end
 
 
-  def drop_packets_from_unknown_hosts switch
+  def drop_packets_from_unknown_hosts(switch)
     ofctl = Trema::Ofctl.new
-    ofctl.add_flow switch, :priority => 0, :actions => "drop"
+    ofctl.add_flow switch, :priority => 0, :actions => 'drop'
     @context.hosts.each do | name, each |
-      ofctl.add_flow switch, :dl_type => "0x0800", :nw_src => each.ip, :priority => 1, :actions => "controller"
+      ofctl.add_flow switch, :dl_type => '0x0800', :nw_src => each.ip, :priority => 1, :actions => 'controller'
     end
   end
 
 
-  def wait_until_controller_is_up trema_name, timeout = 10
+  def wait_until_controller_is_up(trema_name, timeout = 10)
     elapsed = 0
     loop do
-      raise "Timed out waiting for #{ trema_name }." if elapsed > timeout
-      break if FileTest.exists?( File.join( Trema.pid, "#{ trema_name }.pid" ) )
-      sleep 1
-      elapsed += 1
+      fail "Timed out waiting for #{ trema_name }." if elapsed > timeout
+      break if FileTest.exists?(File.join(Trema.pid, "#{ trema_name }.pid"))
+      sleep 0.1
+      elapsed += 0.1
     end
     sleep 1
   end
 
 
-  def wait_until_all_pid_files_are_deleted timeout = 12
+  def wait_until_all_pid_files_are_deleted(timeout = 12)
     elapsed = 0
     loop do
-      raise "Failed to clean up remaining processes." if elapsed > timeout
-      break if Dir.glob( File.join( Trema.pid, "*.pid" ) ).empty?
-      sleep 1
-      elapsed += 1
+      fail 'Failed to clean up remaining processes.' if elapsed > timeout
+      break if Dir.glob(File.join(Trema.pid, '*.pid')).empty?
+      sleep 0.1
+      elapsed += 0.1
     end
     sleep 1
   end
 end
 
 
-def network &block
-  Network.new &block
+def network(&block)
+  Network.new(&block)
 end