trema 0.4.6 → 0.4.7

data/features/trema_commands/dump_flows.feature

@@ -1,3 +1,4 @@
+@ruby
 Feature: dump_flows command
 
   In order to inspect all flow entries in a Trema virtual switch

data/features/trema_commands/help.feature

@@ -1,3 +1,4 @@
+@ruby
 Feature: help command
 
   In order to understand how to use Trema

data/features/trema_commands/help_option.feature

@@ -1,3 +1,4 @@
+@ruby
 Feature: --help option
 
   Use the --help option or just type trema to display the usage of trema command.

data/features/trema_commands/kill.feature

@@ -1,3 +1,4 @@
+@ruby
 Feature: kill command
 
   In order to test event handling or just kill unwanted processes

data/features/trema_commands/killall.feature

@@ -1,3 +1,4 @@
+@ruby
 Feature: killall command
 
   In order to cleanup the previous trema session

data/features/trema_commands/port_down.feature

@@ -1,3 +1,4 @@
+@ruby
 Feature: port_down command
 
   Use this command to ensure that your controller detects network

data/features/trema_commands/port_up.feature

@@ -1,3 +1,4 @@
+@ruby
 Feature: port_up command
 
   Use this command to ensure that your controller detects network

data/features/trema_commands/reset_stats.feature

@@ -1,3 +1,4 @@
+@ruby
 Feature: reset_stats command
 
   In order to reset the stats of sent/received packets

data/features/trema_commands/run.feature

@@ -1,3 +1,4 @@
+@ruby
 Feature: run command
 
   In order to launch trema applications

data/features/trema_commands/send_packets.feature

@@ -1,3 +1,4 @@
+@ruby
 Feature: send_packets command
 
   In order to send/receive packets between virtual hosts
@@ -17,7 +18,7 @@ Feature: send_packets command
       """
     And I run `trema run ../../src/examples/learning_switch/learning-switch.rb -c learning_switch.conf -d`
 
-  @slow_process
+  @slow_process @critical
   Scenario: Sending packets
     When I run `trema send_packets --source host1 --dest host2 --n_pkts=2`
      And I run `trema send_packets --source host2 --dest host1 --n_pkts=1`

data/features/trema_commands/show_stats.feature

@@ -1,3 +1,4 @@
+@ruby
 Feature: show_stats command
 
   In order to get the stats of sent/received packets

data/features/trema_commands/up.feature

@@ -1,3 +1,4 @@
+@ruby
 Feature: up command
 
   In order to restart killed processes

data/features/trema_commands/version.feature

@@ -1,3 +1,4 @@
+@ruby
 Feature: version command
 
   In order to know the current version of Trema

data/features/trema_commands/version_option.feature

@@ -1,3 +1,4 @@
+@ruby
 Feature: --version option
 
   Use the --version option to display the current runtime version.

data/rubocop-todo.yml

@@ -0,0 +1,159 @@
+# This configuration was generated by `rubocop --auto-gen-config`.
+# The point is for the user to remove these configuration records
+# one by one as the offences are removed from the code base.
+
+Encoding:
+  Enabled: false
+
+AssignmentInCondition:
+  Enabled: false
+
+BlockAlignment:
+  Enabled: false
+
+BlockNesting:
+  Enabled: false
+
+BracesAroundHashParameters:
+  Enabled: false
+
+CaseIndentation:
+  Enabled: false
+
+ClassAndModuleCamelCase:
+  Enabled: false
+
+ClassAndModuleChildren:
+  Enabled: false
+
+ClassLength:
+  Enabled: false
+
+ClassMethods:
+  Enabled: false
+
+ClassVars:
+  Enabled: false
+
+CollectionMethods:
+  Enabled: false
+
+ColonMethodCall:
+  Enabled: false
+
+ConstantName:
+  Enabled: false
+
+CyclomaticComplexity:
+  Enabled: false
+
+Documentation:
+  Enabled: false
+
+EmptyLineBetweenDefs:
+  Enabled: false
+
+EmptyLines:
+  Enabled: false
+
+EmptyLinesAroundAccessModifier:
+  Enabled: false
+
+EmptyLinesAroundBody:
+  Enabled: false
+
+EmptyLiteral:
+  Enabled: false
+
+EndAlignment:
+  Enabled: false
+
+Eval:
+  Enabled: false
+
+FileName:
+  Enabled: false
+
+FormatString:
+  Enabled: false
+
+For:
+  Enabled: false
+
+GlobalVars:
+  Enabled: false
+
+HandleExceptions:
+  Enabled: false
+
+HashSyntax:
+  Enabled: false
+
+IfUnlessModifier:
+  Enabled: false
+
+IndentationWidth:
+  Enabled: false
+
+LineLength:
+  Enabled: false
+
+MethodLength:
+  Enabled: false
+
+MultilineBlockChain:
+  Enabled: false
+
+Not:
+  Enabled: false
+
+NumericLiterals:
+  Enabled: false
+
+ParameterLists:
+  Enabled: false
+
+ParenthesesAroundCondition:
+  Enabled: false
+
+ParenthesesAsGroupedExpression:
+  Enabled: false
+
+PerlBackrefs:
+  Enabled: false
+
+RedundantException:
+  Enabled: false
+
+RegexpLiteral:
+  Enabled: false
+
+RescueModifier:
+  Enabled: false
+
+Semicolon:
+  Enabled: false
+
+SpaceAroundEqualsInParameterDefault:
+  Enabled: false
+
+SpecialGlobalVars:
+  Enabled: false
+
+TrailingBlankLines:
+  Enabled: false
+
+TrivialAccessors:
+  Enabled: false
+
+UselessAssignment:
+  Enabled: false
+
+WhileUntilDo:
+  Enabled: false
+
+WhileUntilModifier:
+  Enabled: false
+
+WordArray:
+  Enabled: false

data/ruby/blocker.rb

@@ -32,36 +32,34 @@ class Blocker
   class BlockerError < RuntimeError; end
 
 
-  PATH = "/tmp/cruise.lock"
+  PATH = '/tmp/cruise.lock'
 
 
-  def self.start &code_block
-    begin
-      block
-      code_block.call
-    rescue BlockerError, Errno::EACCES
-      $stderr.puts "Another process is already running. Please wait for a while."
-      sleep 10
-      retry
-    ensure
-      release
-    end
+  def self.start(&code_block)
+    block
+    code_block.call
+  rescue BlockerError, Errno::EACCES
+    $stderr.puts 'Another process is already running. Please wait for a while.'
+    sleep 10
+    retry
+  ensure
+    release
   end
 
 
   def self.block
-    lock = File.open( PATH, "a+" )
-    locked = lock.flock( File::LOCK_EX | File::LOCK_NB )
+    lock = File.open(PATH, 'a+')
+    locked = lock.flock(File::LOCK_EX | File::LOCK_NB)
     unless locked
       lock.close
-      raise BlockerError
+      fail BlockerError
     end
   end
 
 
   def self.release
-    File.open( PATH, "w" ) do | lock |
-      lock.flock( File::LOCK_UN | File::LOCK_NB )
+    File.open(PATH, 'w') do | lock |
+      lock.flock(File::LOCK_UN | File::LOCK_NB)
       lock.close
       File.delete lock.path
     end

data/ruby/extconf.rb

@@ -16,25 +16,25 @@
 #
 
 
-require "mkmf"
+require 'mkmf'
 
 
-$CFLAGS = "-g -std=gnu99 -D_GNU_SOURCE -fno-strict-aliasing -Wall -Wextra -Wformat=2 -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wfloat-equal -Wpointer-arith"
-$LDFLAGS = "-Wl,-Bsymbolic"
+$CFLAGS = '-g -std=gnu99 -D_GNU_SOURCE -fno-strict-aliasing -Wall -Wextra -Wformat=2 -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wfloat-equal -Wpointer-arith'
+$LDFLAGS = '-Wl,-Bsymbolic'
 
 
-dir_config "trema"
-dir_config "openflow"
+dir_config 'trema'
+dir_config 'openflow'
 
 
-def error_exit message
+def error_exit(message)
   $stderr.puts message
   exit false
 end
 
 
-def error_lib_missing lib, package
-  return <<-EOF
+def error_lib_missing(lib, package)
+  <<-EOF
 ERROR: #{ lib } not found!
 
 Please install #{ package } with following command:
@@ -43,23 +43,23 @@ EOF
 end
 
 
-unless find_library( "pthread", "pthread_create" )
-  error_exit error_lib_missing( "libpthread", "libc6-dev" )
+unless find_library('pthread', 'pthread_create')
+  error_exit error_lib_missing('libpthread', 'libc6-dev')
 end
 
-unless find_library( "rt", "clock_gettime" )
-  error_exit error_lib_missing( "librt", "libc6-dev" )
+unless find_library('rt', 'clock_gettime')
+  error_exit error_lib_missing('librt', 'libc6-dev')
 end
 
-unless find_library( "dl", "dlopen" )
-  error_exit error_lib_missing( "libdl", "libc6-dev" )
+unless find_library('dl', 'dlopen')
+  error_exit error_lib_missing('libdl', 'libc6-dev')
 end
 
-unless find_library( "sqlite3", "sqlite3_open" )
-  error_exit error_lib_missing( "libsqlite3", "libsqlite3-dev" )
+unless find_library('sqlite3', 'sqlite3_open')
+  error_exit error_lib_missing('libsqlite3', 'libsqlite3-dev')
 end
 
-unless find_library( "trema", "create_hello" )
+unless find_library('trema', 'create_hello')
   error_exit <<-EOF
 ERROR: Trema is not compiled yet!
 
@@ -69,8 +69,8 @@ EOF
 end
 
 
-$CFLAGS << " -Werror" # must be added after find_library
-create_makefile "trema", "trema"
+$CFLAGS << ' -Werror' # must be added after find_library
+create_makefile 'trema', 'trema'
 
 
 ### Local variables:

data/ruby/sub-process.rb

@@ -58,7 +58,7 @@ module SubProcess
     attr_reader :env
 
 
-    def initialize command, env = {}
+    def initialize(command, env = {})
       @command = command
       @env = env
     end
@@ -66,7 +66,7 @@ module SubProcess
 
     def start
       @env.each_pair do | key, value |
-        ENV[ key ]= value
+        ENV[key] = value
       end
       Kernel.exec @command
     end
@@ -79,7 +79,7 @@ module SubProcess
     attr_reader :stderr
 
 
-    def initialize stdin, stdout, stderr
+    def initialize(stdin, stdout, stderr)
       @stdin = stdin
       @stdout = stdout
       @stderr = stderr
@@ -87,7 +87,7 @@ module SubProcess
 
 
     def close
-      [ @stdin, @stdout, @stderr ].each do | each |
+      [@stdin, @stdout, @stderr].each do | each |
         unless each.closed?
           each.close
         end
@@ -98,9 +98,9 @@ module SubProcess
 
   class Process
     def initialize
-      stdin, stdout, stderr = Array.new( 3 ) { IO.pipe }
-      @child = SubProcess::PipeSet.new( stdin[ 1 ], stdout[ 0 ], stderr[ 0 ] )
-      @parent = SubProcess::PipeSet.new( stdin[ 0 ], stdout[ 1 ], stderr[ 1 ] )
+      stdin, stdout, stderr = Array.new(3) { IO.pipe }
+      @child = SubProcess::PipeSet.new(stdin[ 1], stdout[ 0], stderr[ 0])
+      @parent = SubProcess::PipeSet.new(stdin[ 0], stdout[ 1], stderr[ 1])
     end
 
 
@@ -109,8 +109,8 @@ module SubProcess
     end
 
 
-    def popen command, &block
-      @pid = fork_child( command )
+    def popen(command, &block)
+      @pid = fork_child(command)
       # Parent process
       @parent.close
       begin
@@ -127,7 +127,7 @@ module SubProcess
     ############################################################################
 
 
-    def fork_child command
+    def fork_child(command)
       Kernel.fork do
         @child.close
         redirect_child_io
@@ -146,14 +146,14 @@ module SubProcess
 
 
   class IoHandlerThread
-    def initialize io, method
+    def initialize(io, method)
       @io = io
       @method = method
     end
 
 
     def start
-      Thread.new( @io, @method ) do | io, method |
+      Thread.new(@io, @method) do | io, method |
         while io.gets do
           method.call $LAST_READ_LINE
         end
@@ -163,12 +163,12 @@ module SubProcess
 
 
   class Shell
-    def self.open debug_options = {}, &block
-      block.call self.new( debug_options )
+    def self.open(debug_options = {}, &block)
+      block.call new(debug_options)
     end
 
 
-    def initialize debug_options
+    def initialize(debug_options)
       @debug_options = debug_options
     end
 
@@ -178,34 +178,34 @@ module SubProcess
     end
 
 
-    def on_stdout &block
+    def on_stdout(&block)
       @on_stdout = block
     end
 
 
-    def on_stderr &block
+    def on_stderr(&block)
       @on_stderr = block
     end
 
 
-    def on_exit &block
+    def on_exit(&block)
       @on_exit = block
     end
 
 
-    def on_success &block
+    def on_success(&block)
       @on_success = block
     end
 
 
-    def on_failure &block
+    def on_failure(&block)
       @on_failure = block
     end
 
 
-    def exec command, env = { "LC_ALL" => "C" }
-      on_failure { raise "command #{ command } failed" } unless @on_failure
-      SubProcess::Process.new.popen SubProcess::Command.new( command, env ) do | stdout, stderr |
+    def exec(command, env = { 'LC_ALL' => 'C' })
+      on_failure { fail "command #{ command } failed" } unless @on_failure
+      SubProcess::Process.new.popen SubProcess::Command.new(command, env) do | stdout, stderr |
         handle_child_output stdout, stderr
       end.wait
       handle_exitstatus
@@ -218,9 +218,9 @@ module SubProcess
     ############################################################################
 
 
-    def handle_child_output stdout, stderr
-      tout = SubProcess::IoHandlerThread.new( stdout, method( :do_stdout ) ).start
-      terr = SubProcess::IoHandlerThread.new( stderr, method( :do_stderr ) ).start
+    def handle_child_output(stdout, stderr)
+      tout = SubProcess::IoHandlerThread.new(stdout, method(:do_stdout)).start
+      terr = SubProcess::IoHandlerThread.new(stderr, method(:do_stderr)).start
       tout.join
       terr.join
     end
@@ -239,14 +239,14 @@ module SubProcess
     end
 
 
-    def do_stdout line
+    def do_stdout(line)
       if @on_stdout
         @on_stdout.call line
       end
     end
 
 
-    def do_stderr line
+    def do_stderr(line)
       if @on_stderr
         @on_stderr.call line
       end
@@ -275,7 +275,7 @@ module SubProcess
   end
 
 
-  def create debug_options = {}, &block
+  def create(debug_options = {}, &block)
     Shell.open debug_options, &block
   end
   module_function :create