trema 0.4.6 → 0.4.7

data/ruby/trema/daemon.rb

@@ -16,9 +16,9 @@
 #
 
 
-require "fileutils"
-require "trema/monkey-patch/string"
-require "trema/process"
+require 'fileutils'
+require 'trema/monkey-patch/string'
+require 'trema/process'
 
 
 module Trema
@@ -29,12 +29,12 @@ module Trema
       end
 
 
-      def log_file &block
+      def log_file(&block)
         class_variable_set :@@log_file, block
       end
 
 
-      def command &block
+      def command(&block)
         class_variable_set :@@command, block
       end
 
@@ -44,13 +44,13 @@ module Trema
       end
 
 
-      def daemon_id method_id
+      def daemon_id(method_id)
         class_variable_set :@@daemon_id, method_id
       end
     end
 
 
-    def self.included base
+    def self.included(base)
       base.class_eval do
         class_variable_set :@@singleton_daemon, false
         class_variable_set :@@log_file, nil
@@ -63,7 +63,7 @@ module Trema
 
 
     def run
-      raise "'#{ name }' is already running!" if running?
+      fail "'#{ name }' is already running!" if running?
       run!
     end
 
@@ -71,12 +71,12 @@ module Trema
     def run!
       FileUtils.rm_f log_file if log_file
       command_block = self.class.class_eval do
-        class_variable_get( :@@command )
+        class_variable_get(:@@command)
       end
       if command_block
-        sh command_block.call( self )
+        sh command_block.call(self)
       else
-        sh self.__send__( :command )
+        sh __send__(:command)
       end
       wait_until_up
     end
@@ -91,7 +91,7 @@ module Trema
     # @return [undefined]
     #
     def shutdown
-      raise "'#{ name }' is not running!" if not running?
+      fail "'#{ name }' is not running!" unless running?
       shutdown!
     end
 
@@ -105,7 +105,7 @@ module Trema
     # @return [undefined]
     #
     def shutdown!
-      Trema::Process.read( pid_file, name ).kill!
+      Trema::Process.read(pid_file, name).kill!
     end
 
 
@@ -118,7 +118,7 @@ module Trema
     # @return [undefined]
     #
     def restart!
-      return if not running?
+      return unless running?
       shutdown!
       sleep 1
       run!
@@ -147,30 +147,30 @@ module Trema
 
     def log_file
       log_file_block = self.class.class_eval do
-        class_variable_get( :@@log_file )
+        class_variable_get(:@@log_file)
       end
       return nil if log_file_block.nil?
-      name = log_file_block.call( self )
+      name = log_file_block.call(self)
       File.join Trema.log, name
     end
 
 
     def daemon_id
       m = self.class.class_eval do
-        class_variable_get( :@@daemon_id ) || :name
+        class_variable_get(:@@daemon_id) || :name
       end
-      self.__send__ m
+      __send__ m
     end
 
 
     def wait_until_up
       wait = self.class.class_eval do
-        class_variable_get( :@@wait_until_up )
+        class_variable_get(:@@wait_until_up)
       end
-      return if not wait
+      return unless wait
       loop do
         sleep 0.1
-        break if FileTest.exists?( pid_file )
+        break if FileTest.exists?(pid_file)
       end
     end
   end

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

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

data/ruby/trema/dsl.rb

@@ -18,11 +18,11 @@
 #
 
 
-require "trema/dsl/configuration"
-require "trema/dsl/parser"
-require "trema/dsl/runner"
-require "trema/dsl/syntax"
-require "trema/path"
+require 'trema/dsl/configuration'
+require 'trema/dsl/parser'
+require 'trema/dsl/runner'
+require 'trema/dsl/syntax'
+require 'trema/path'
 
 
 ### Local variables:

data/ruby/trema/dsl/configuration.rb

@@ -16,13 +16,13 @@
 #
 
 
-require "trema/default_openflow_channel_port"
-require "trema/app"
-require "trema/host"
-require "trema/link"
-require "trema/openflow-switch"
-require "trema/packetin-filter"
-require "trema/switch-manager"
+require 'trema/default_openflow_channel_port'
+require 'trema/app'
+require 'trema/host'
+require 'trema/link'
+require 'trema/openflow-switch'
+require 'trema/packetin-filter'
+require 'trema/switch-manager'
 
 
 module Trema

data/ruby/trema/dsl/context.rb

@@ -16,21 +16,21 @@
 #
 
 
-require "fileutils"
-require "trema/dsl/configuration"
-require "trema/dsl/syntax"
-require "trema/path"
+require 'fileutils'
+require 'trema/dsl/configuration'
+require 'trema/dsl/syntax'
+require 'trema/path'
 
 
 module Trema
   module DSL
     class Context
-      PATH = File.join( Trema.tmp, ".context" )
+      PATH = File.join(Trema.tmp, '.context')
 
 
       def self.load_current
-        if FileTest.exists?( PATH )
-          Marshal.load( IO.read PATH )
+        if FileTest.exists?(PATH)
+          Marshal.load(IO.read PATH)
         else
           Configuration.new
         end
@@ -38,7 +38,7 @@ module Trema
 
 
 
-      def initialize config
+      def initialize(config)
         @config = config
       end
 
@@ -52,8 +52,8 @@ module Trema
       # @return [Configuration]
       #
       def dump
-        File.open( PATH, "w" ) do | f |
-          f.print Marshal.dump( @config )
+        File.open(PATH, 'w') do | f |
+          f.print Marshal.dump(@config)
         end
         @config
       end

data/ruby/trema/dsl/custom-switch.rb

@@ -18,18 +18,18 @@
 #
 
 
-require "trema/dsl/switch"
+require 'trema/dsl/switch'
 
 
 module Trema
   module DSL
     class CustomSwitch < Switch
-      def initialize name = nil
+      def initialize(name = nil)
         super name
       end
 
 
-      def path filepath
+      def path(filepath)
         @path = filepath
       end
     end

data/ruby/trema/dsl/link.rb

@@ -24,8 +24,8 @@ module Trema
       attr_reader :peers
 
 
-      def initialize peer0, peer1
-        @peers = [ peer0, peer1 ]
+      def initialize(peer0, peer1)
+        @peers = [peer0, peer1]
       end
     end
   end

data/ruby/trema/dsl/netns.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/dsl/stanza"
-require "trema/dsl/syntax-error"
+require 'trema/dsl/stanza'
+require 'trema/dsl/syntax-error'
 
 
 module Trema
@@ -36,7 +36,7 @@ module Trema
       #
       # @api public
       #
-      def ip str
+      def ip(str)
         @ip = str
         if @name.nil?
           @name = @ip
@@ -54,17 +54,17 @@ module Trema
       #
       # @api public
       #
-      def netmask str
+      def netmask(str)
         @netmask = str
       end
 
 
-      def route options
-        if options[ :net ].nil? or options[ :gw ].nil?
-          raise ":net and :gw option is a mandatory"
+      def route(options)
+        if options[ :net].nil? || options[ :gw].nil?
+          fail ':net and :gw option is a mandatory'
         end
-        @net = options[ :net ]
-        @gw = options[ :gw ]
+        @net = options[ :net]
+        @gw = options[ :gw]
       end
     end
   end

data/ruby/trema/dsl/parser.rb

@@ -18,23 +18,23 @@
 #
 
 
-require "trema/dsl/context"
-require "trema/dsl/syntax"
+require 'trema/dsl/context'
+require 'trema/dsl/syntax'
 
 
 module Trema
   module DSL
     class Parser
-      def parse file_name
+      def parse(file_name)
         configure do | config |
-          Syntax.new( config ).instance_eval IO.read( file_name ), file_name
+          Syntax.new(config).instance_eval IO.read(file_name), file_name
         end
       end
 
 
-      def eval &block
+      def eval(&block)
         configure do | config |
-          Syntax.new( config ).instance_eval &block
+          Syntax.new(config).instance_eval(&block)
         end
       end
 
@@ -44,19 +44,19 @@ module Trema
       ################################################################################
 
 
-      def configure &block
+      def configure(&block)
         config = Configuration.new
         block.call config
         Trema::Link.each do | each |
           peers = each.peers
-          config.hosts[ peers[ 0 ] ].interface = each.name if config.hosts[ peers[ 0 ] ]
-          config.hosts[ peers[ 1 ] ].interface = each.name_peer if config.hosts[ peers[ 1 ] ]
-          config.netnss[ peers[ 0 ] ].interface = each.name if config.netnss[ peers[ 0 ] ]
-          config.netnss[ peers[ 1 ] ].interface = each.name_peer if config.netnss[ peers[ 1 ] ]
-          config.switches[ peers[ 0 ] ] << each.name if config.switches[ peers[ 0 ] ]
-          config.switches[ peers[ 1 ] ] << each.name_peer if config.switches[ peers[ 1 ] ]
+          config.hosts[ peers[ 0]].interface = each.name if config.hosts[ peers[ 0]]
+          config.hosts[ peers[ 1]].interface = each.name_peer if config.hosts[ peers[ 1]]
+          config.netnss[ peers[ 0]].interface = each.name if config.netnss[ peers[ 0]]
+          config.netnss[ peers[ 1]].interface = each.name_peer if config.netnss[ peers[ 1]]
+          config.switches[ peers[ 0]] << each.name if config.switches[ peers[ 0]]
+          config.switches[ peers[ 1]] << each.name_peer if config.switches[ peers[ 1]]
         end
-        Context.new( config ).dump
+        Context.new(config).dump
       end
     end
   end

data/ruby/trema/dsl/rswitch.rb

@@ -18,7 +18,7 @@
 #
 
 
-require "trema/dsl/switch"
+require 'trema/dsl/switch'
 
 
 module Trema
@@ -27,12 +27,12 @@ module Trema
       attr_reader :path
 
 
-      def initialize name = nil
+      def initialize(name = nil)
         super name
       end
 
 
-      def file path
+      def file(path)
         @path = path
       end
     end

data/ruby/trema/dsl/run.rb

@@ -18,21 +18,21 @@
 #
 
 
-require "trema/dsl/stanza"
+require 'trema/dsl/stanza'
 
 
 module Trema
   module DSL
     class Run < Stanza
-      def path _path
+      def path(_path)
         @path = _path
         if @name.nil?
-          @name = File.basename( @path )
+          @name = File.basename(@path)
         end
       end
 
 
-      def options *_options
+      def options(*_options)
         @options = _options
       end
     end

data/ruby/trema/dsl/runner.rb

@@ -18,13 +18,13 @@
 #
 
 
-require "trema/tremashark"
+require 'trema/tremashark'
 
 
 module Trema
   module DSL
     class Runner
-      def initialize context
+      def initialize(context)
         @context = context
       end
 
@@ -43,35 +43,35 @@ module Trema
 
       def maybe_run_switch_manager
         # FIXME
-        return if FileTest.exists? File.join( Trema.pid, "switch_manager.pid" )
+        return if FileTest.exists? File.join(Trema.pid, 'switch_manager.pid')
 
         switch_manager =
-          if @context.switch_manager and @context.apps.values.size > 0
+          if @context.switch_manager && @context.apps.values.size > 0
             last_app = @context.apps.values.last.name
-            if not @context.switch_manager.rule.has_key?( :port_status )
-              @context.switch_manager.rule[ :port_status ] = last_app
+            unless @context.switch_manager.rule.key?(:port_status)
+              @context.switch_manager.rule[ :port_status] = last_app
             end
-            if not @context.switch_manager.rule.has_key?( :packet_in )
-              @context.switch_manager.rule[ :packet_in ] = last_app
+            unless @context.switch_manager.rule.key?(:packet_in)
+              @context.switch_manager.rule[ :packet_in] = last_app
             end
-            if not @context.switch_manager.rule.has_key?( :state_notify )
-              @context.switch_manager.rule[ :state_notify ] = last_app
+            unless @context.switch_manager.rule.key?(:state_notify)
+              @context.switch_manager.rule[ :state_notify] = last_app
             end
-            if not @context.switch_manager.rule.has_key?( :vendor )
-              @context.switch_manager.rule[ :vendor ] = last_app
+            unless @context.switch_manager.rule.key?(:vendor)
+              @context.switch_manager.rule[ :vendor] = last_app
             end
             @context.switch_manager
           else
             if @context.apps.values.size == 0
-              rule = { :port_status => "default", :packet_in => "default", :state_notify => "default", :vendor => "default" }
+              rule = { :port_status => 'default', :packet_in => 'default', :state_notify => 'default', :vendor => 'default' }
             elsif @context.apps.values.size == 1
-              app_name = @context.apps.values[ 0 ].name
+              app_name = @context.apps.values[ 0].name
               rule = { :port_status => app_name, :packet_in => app_name, :state_notify => app_name, :vendor => app_name }
             else
               # two or more apps without switch_manager.
-              raise "No event routing configured. Use `event' directive to specify event routing."
+              fail "No event routing configured. Use `event' directive to specify event routing."
             end
-            SwitchManager.new( rule, @context.port )
+            SwitchManager.new(rule, @context.port)
           end
         switch_manager.no_flow_cleanup = true if $no_flow_cleanup
         switch_manager.run!
@@ -132,7 +132,7 @@ module Trema
         end
 
         @context.hosts.each do | name, host |
-          host.add_arp_entry @context.hosts.values - [ host ]
+          host.add_arp_entry @context.hosts.values - [host]
         end
       end
 
@@ -147,11 +147,11 @@ module Trema
       def maybe_run_apps
         return if @context.apps.values.empty?
 
-        @context.apps.values[ 0..-2 ].each do | each |
+        @context.apps.values[ 0..-2].each do | each |
           each.daemonize!
         end
-        trap( "SIGINT" ) do
-          print( "\nterminated\n" )
+        trap('SIGINT') do
+          print("\nterminated\n")
           exit(0)
         end
         pid = ::Process.fork do