trema 0.4.6 → 0.4.7

data/ruby/trema/command/netns.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/util"
+require 'trema/util'
 
 
 module Trema
@@ -24,8 +24,8 @@ module Trema
     include Trema::Util
 
 
-    def trema_netns netns
-      sh "sudo ip netns exec #{ netns } #{ ENV[ 'SHELL' ] }"
+    def trema_netns(netns)
+      sh "sudo ip netns exec #{ netns } #{ ENV[ 'SHELL'] }"
     end
   end
 end

data/ruby/trema/command/port_down.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/cli"
-require "trema/util"
+require 'trema/cli'
+require 'trema/util'
 
 
 module Trema
@@ -25,12 +25,12 @@ module Trema
     include Trema::Util
 
 
-    def trema_port_down switch_name, port
-      switch = find_switch_by_name( switch_name )
-      raise "unknown switch: #{ switch_name }" if switch.nil?
+    def trema_port_down(switch_name, port)
+      switch = find_switch_by_name(switch_name)
+      fail "unknown switch: #{ switch_name }" if switch.nil?
 
-      error = switch.bring_port_down( port.to_i )
-      raise error if $?.exitstatus != 0
+      error = switch.bring_port_down(port.to_i)
+      fail error if $?.exitstatus != 0
     end
   end
 end

data/ruby/trema/command/port_up.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/cli"
-require "trema/util"
+require 'trema/cli'
+require 'trema/util'
 
 
 module Trema
@@ -25,12 +25,12 @@ module Trema
     include Trema::Util
 
 
-    def trema_port_up switch_name, port
-      switch = find_switch_by_name( switch_name )
-      raise "unknown switch: #{ switch_name }" if switch.nil?
+    def trema_port_up(switch_name, port)
+      switch = find_switch_by_name(switch_name)
+      fail "unknown switch: #{ switch_name }" if switch.nil?
 
-      error = switch.bring_port_up( port.to_i )
-      raise error if $?.exitstatus != 0
+      error = switch.bring_port_up(port.to_i)
+      fail error if $?.exitstatus != 0
     end
   end
 end

data/ruby/trema/command/reset_stats.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/cli"
-require "trema/util"
+require 'trema/cli'
+require 'trema/util'
 
 
 module Trema
@@ -25,10 +25,10 @@ module Trema
     include Trema::Util
 
 
-    def trema_reset_stats name
-      host = find_host_by_name( name )
-      raise "unknown host: #{ name }" if host.nil?
-      Trema::Cli.new( host ).reset_stats
+    def trema_reset_stats(name)
+      host = find_host_by_name(name)
+      fail "unknown host: #{ name }" if host.nil?
+      Trema::Cli.new(host).reset_stats
     end
   end
 end

data/ruby/trema/command/ruby.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/util"
+require 'trema/util'
 
 
 module Trema
@@ -25,7 +25,7 @@ module Trema
 
 
     def trema_ruby
-      sh "x-www-browser http://rubydoc.info/github/trema/trema/master/frames"
+      sh 'x-www-browser http://rubydoc.info/github/trema/trema/master/frames'
     end
   end
 end

data/ruby/trema/command/run.rb

@@ -16,9 +16,9 @@
 #
 
 
-require "trema/default_openflow_channel_port"
-require "trema/dsl"
-require "trema/util"
+require 'trema/default_openflow_channel_port'
+require 'trema/dsl'
+require 'trema/util'
 
 
 module Trema
@@ -26,27 +26,27 @@ module Trema
     include Trema::Util
 
 
-    def trema_run options
-      @config_file = options[ :conf ] || nil
-      @openflow_port = options[ :port ] || DEFAULT_OPENFLOW_CHANNEL_PORT
+    def trema_run(options)
+      @config_file = options[ :conf] || nil
+      @openflow_port = options[ :port] || DEFAULT_OPENFLOW_CHANNEL_PORT
 
-      if options[ :daemonize ]
+      if options[ :daemonize]
         $run_as_daemon = true
       end
-      if options[ :tremashark ]
+      if options[ :tremashark]
         $use_tremashark = true
       end
-      if options[ :no_flow_cleanup ]
+      if options[ :no_flow_cleanup]
         $no_flow_cleanup = true
       end
 
-      need_cleanup = ( not running? )
+      need_cleanup = (not running?)
 
       if $run_as_daemon
-        Trema::DSL::Runner.new( load_config ).daemonize
+        Trema::DSL::Runner.new(load_config).daemonize
       else
         begin
-          Trema::DSL::Runner.new( load_config ).run
+          Trema::DSL::Runner.new(load_config).run
         rescue SystemExit
           # This is OK
         ensure
@@ -66,29 +66,29 @@ module Trema
       dsl_parser = Trema::DSL::Parser.new
 
       if @config_file
-        config = dsl_parser.parse( @config_file )
-      elsif FileTest.exists?( "./trema.conf" )
-        config = dsl_parser.parse( "./trema.conf" )
+        config = dsl_parser.parse(@config_file)
+      elsif FileTest.exists?('./trema.conf')
+        config = dsl_parser.parse('./trema.conf')
       else
         config = Trema::DSL::Configuration.new
       end
 
       config.port = @openflow_port
 
-      if ARGV[ 0 ]
-        controller_file = ARGV[ 0 ].split.first
+      if ARGV[ 0]
+        controller_file = ARGV[ 0].split.first
         if ruby_controller?
-          require "trema"
+          require 'trema'
           Object.__send__ :include, Trema
-          ARGV.replace ARGV[ 0 ].split[ 1..-1 ]
-          $LOAD_PATH << File.dirname( controller_file )
+          ARGV.replace ARGV[0].split[1..-1]
+          $LOAD_PATH << File.dirname(controller_file)
           load controller_file
         else
           # Assume that the controller is written in C
           stanza = Trema::DSL::Run.new
           stanza.path controller_file
-          stanza.options ARGV[ 0 ].split[ 1..-1 ]
-          Trema::App.new( stanza )
+          stanza.options ARGV[0].split[1..-1]
+          Trema::App.new(stanza)
         end
       end
 
@@ -97,7 +97,7 @@ module Trema
 
 
     def ruby_controller?
-      /\.rb\Z/=~ ARGV[ 0 ].split.first
+      /\.rb\Z/ =~ ARGV[0].split.first
     end
   end
 end

data/ruby/trema/command/send_packets.rb

@@ -16,9 +16,9 @@
 #
 
 
-require "trema/cli"
-require "trema/dsl"
-require "trema/util"
+require 'trema/cli'
+require 'trema/dsl'
+require 'trema/util'
 
 
 module Trema
@@ -26,14 +26,14 @@ module Trema
     include Trema::Util
 
 
-    def trema_send_packets source_name, dest_name, options
-      source = find_host_by_name( source_name )
-      raise "unknown host: #{ source_name }" if source.nil?
+    def trema_send_packets(source_name, dest_name, options)
+      source = find_host_by_name(source_name)
+      fail "unknown host: #{ source_name }" if source.nil?
 
-      dest = find_host_by_name( dest_name )
-      raise "unknown host: #{ dest_name }" if dest.nil?
+      dest = find_host_by_name(dest_name)
+      fail "unknown host: #{ dest_name }" if dest.nil?
 
-      Trema::Cli.new( source ).send_packets( dest, options )
+      Trema::Cli.new(source).send_packets(dest, options)
     end
   end
 end

data/ruby/trema/command/shell.rb

@@ -18,8 +18,8 @@
 #
 
 
-require "irb"
-require "trema/util"
+require 'irb'
+require 'trema/util'
 
 
 include Trema::Util
@@ -28,25 +28,23 @@ include Trema::Util
 module Trema
   module Command
     def shell
-      begin
-        undef :kill
-
-        require "tempfile"
-        require "trema"
-        require "trema/shell"
-        f = Tempfile.open( "irbrc" )
-        f.print <<EOF
+      undef :kill
+
+      require 'tempfile'
+      require 'trema'
+      require 'trema/shell'
+      f = Tempfile.open('irbrc')
+      f.print <<EOF
 include Trema::Shell
 ENV[ "TREMA_HOME" ] = Trema.home
 $config = Trema::DSL::Configuration.new
 $context = Trema::DSL::Context.new( $config )
 EOF
-        f.close
-        load f.path
-        IRB.start
-      ensure
-        cleanup $config
-      end
+      f.close
+      load f.path
+      IRB.start
+    ensure
+      cleanup $config
     end
   end
 end

data/ruby/trema/command/show_stats.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/cli"
-require "trema/util"
+require 'trema/cli'
+require 'trema/util'
 
 
 module Trema
@@ -25,8 +25,8 @@ module Trema
     include Trema::Util
 
 
-    def trema_show_stats hostname, tx, rx
-      cli = get_cli( hostname )
+    def trema_show_stats(hostname, tx, rx)
+      cli = get_cli(hostname)
 
       unless tx || rx
         show_tx_and_rx cli
@@ -41,16 +41,16 @@ module Trema
     ############################################################################
 
 
-    def show_tx_and_rx cli
-      puts "Sent packets:"
+    def show_tx_and_rx(cli)
+      puts 'Sent packets:'
       cli.show_tx_stats
-      puts "Received packets:"
+      puts 'Received packets:'
       cli.show_rx_stats
     end
 
 
-    def get_cli name
-      host = find_host_by_name( name )
+    def get_cli(name)
+      host = find_host_by_name(name)
       exit_now! "unknown host: #{ name }" if host.nil?
       Trema::Cli.new host
     end

data/ruby/trema/command/up.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/util"
+require 'trema/util'
 
 
 module Trema
@@ -24,13 +24,13 @@ module Trema
     include Trema::Util
 
 
-    def trema_up name
-      switch = find_switch_by_name( name )
+    def trema_up(name)
+      switch = find_switch_by_name(name)
       if switch
         switch.run
       else
         # TODO: support vlink
-        raise "Unknown name: #{ name }"
+        fail "Unknown name: #{ name }"
       end
     end
   end

data/ruby/trema/command/version.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/version"
+require 'trema/version'
 
 
 module Trema

data/ruby/trema/controller.rb

@@ -16,11 +16,11 @@
 #
 
 
-require "trema/app"
-require "trema/default-logger"
-require "trema/monkey-patch/integer"
-require "trema/monkey-patch/string"
-require "trema/timers"
+require 'trema/app'
+require 'trema/default-logger'
+require 'trema/monkey-patch/integer'
+require 'trema/monkey-patch/string'
+require 'trema/timers'
 
 
 module Trema
@@ -35,7 +35,7 @@ module Trema
     #
     # @private Just a placeholder for YARD.
     #
-    def self.handler name
+    def self.handler(name)
       # Do nothing.
     end
 
@@ -207,7 +207,7 @@ module Trema
     #
     # @private
     #
-    def self.inherited subclass
+    def self.inherited(subclass)
       subclass.new
     end
 
@@ -228,8 +228,8 @@ module Trema
         ::Process.setsid
         fork do
           STDIN.close
-          STDOUT.reopen "/dev/null", "a"
-          STDERR.reopen "/dev/null", "a"
+          STDOUT.reopen '/dev/null', 'a'
+          STDERR.reopen '/dev/null', 'a'
           self.run!
         end
       end
@@ -242,7 +242,7 @@ module Trema
     # @return [String]
     #
     def name
-      self.class.to_s.split( "::" ).last
+      self.class.to_s.split('::').last
     end
   end
 end

data/ruby/trema/custom-switch.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/hardware-switch"
+require 'trema/hardware-switch'
 
 
 module Trema
@@ -26,8 +26,8 @@ module Trema
 
     log_file { |vswitch| "customswitch.#{ vswitch.name }.log" }
 
-    
-    def initialize stanza
+
+    def initialize(stanza)
       super stanza
     end
 
@@ -43,7 +43,7 @@ module Trema
 
 
     def path
-      File.join( Trema.home, @stanza[ :path ] )
+      File.join(Trema.home, @stanza[ :path])
     end
   end
 end