trema 0.4.6 → 0.4.7

data/bin/quality

@@ -18,9 +18,9 @@
 
 
 if ARGV.empty?
-  system "rake quality"
+  system 'rake quality'
 else
-  system %Q{rake quality QUALITY_TARGETS="#{ ARGV.join ' ' }"}
+  system %Q(rake quality QUALITY_TARGETS="#{ ARGV.join ' ' }")
 end
 
 

data/bin/trema

@@ -19,16 +19,16 @@
 #
 
 
-$LOAD_PATH.unshift File.expand_path( File.join File.dirname( __FILE__ ), "..", "ruby" )
+$LOAD_PATH.unshift File.expand_path(File.join File.dirname(__FILE__), '..', 'ruby')
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-require "gli"
-require "trema/command"
-require "trema/util"
-require "trema/version"
-require "trema/default_openflow_channel_port"
+require 'gli'
+require 'trema/command'
+require 'trema/util'
+require 'trema/version'
+require 'trema/default_openflow_channel_port'
 
 
 class BinTrema
@@ -38,34 +38,34 @@ class BinTrema
 
 
   def initialize
-    program_desc "Trema command-line tool"
+    program_desc 'Trema command-line tool'
 
 
-    desc "Displays the current runtime version"
+    desc 'Displays the current runtime version'
     version Trema::VERSION
 
 
-    desc "Be verbose"
-    switch [ :v, :verbose ], :negatable => false
+    desc 'Be verbose'
+    switch [:v, :verbose], :negatable => false
 
 
-    desc "Runs a trema application"
-    arg_name "controller"
+    desc 'Runs a trema application'
+    arg_name 'controller'
     command :run do | c |
-      c.desc "Runs as a daemon"
-      c.switch [ :d, :daemonize ], :negatable => false
+      c.desc 'Runs as a daemon'
+      c.switch [:d, :daemonize], :negatable => false
 
-      c.desc "Enables Trema wireshark plugin"
-      c.switch [ :s, :tremashark ], :negatable => false
+      c.desc 'Enables Trema wireshark plugin'
+      c.switch [:s, :tremashark], :negatable => false
 
       c.desc "Overrides the default openflow channel port #{Trema::DEFAULT_OPENFLOW_CHANNEL_PORT}"
-      c.flag [ :p, :port ]
+      c.flag [:p, :port]
 
-      c.desc "Specifies emulated network configuration"
-      c.flag [ :c, :conf ]
+      c.desc 'Specifies emulated network configuration'
+      c.flag [:c, :conf]
 
-      c.desc "Disables initial flow cleanup for a connected switch"
-      c.switch [ :r, :no_flow_cleanup ], :negatable => false
+      c.desc 'Disables initial flow cleanup for a connected switch'
+      c.switch [:r, :no_flow_cleanup], :negatable => false
 
       c.action do | global_options, options, args |
         trema_run options
@@ -73,11 +73,11 @@ class BinTrema
     end
 
 
-    desc "Terminates a trema process"
-    arg_name "name"
+    desc 'Terminates a trema process'
+    arg_name 'name'
     command :kill do | c |
       c.action do | global_options, options, args |
-        help_now!( "name is required" ) if args.empty?
+        help_now!('name is required') if args.empty?
         args.each do | each |
           trema_kill each
         end
@@ -85,16 +85,16 @@ class BinTrema
     end
 
 
-    desc "Starts a killed trema process again"
-    arg_name "name"
+    desc 'Starts a killed trema process again'
+    arg_name 'name'
     command :up do | c |
       c.action do | global_options, options, args |
-        trema_up args[ 0 ]
+        trema_up args[ 0]
       end
     end
 
 
-    desc "Terminates all trema processes"
+    desc 'Terminates all trema processes'
     command :killall do | c |
       c.action do
         trema_killall
@@ -102,112 +102,112 @@ class BinTrema
     end
 
 
-    desc "Sends UDP packets to destination host"
+    desc 'Sends UDP packets to destination host'
     command :send_packets do | c |
-      c.desc "host that sends packets"
-      c.flag [ :s, :source ]
+      c.desc 'host that sends packets'
+      c.flag [:s, :source]
 
-      c.desc "host that receives packets"
-      c.flag [ :d, :dest ]
+      c.desc 'host that receives packets'
+      c.flag [:d, :dest]
 
-      c.desc "number of times to increment the IP source address"
+      c.desc 'number of times to increment the IP source address'
       c.default_value nil
-      c.flag [ :inc_ip_src ]
+      c.flag [:inc_ip_src]
 
-      c.desc "number of times to increment the IP destination address"
+      c.desc 'number of times to increment the IP destination address'
       c.default_value nil
-      c.flag [ :inc_ip_dst ]
+      c.flag [:inc_ip_dst]
 
-      c.desc "set the initial UDP source port"
-      c.flag [ :tp_src ]
+      c.desc 'set the initial UDP source port'
+      c.flag [:tp_src]
 
-      c.desc "number of times to increment the UDP source port"
+      c.desc 'number of times to increment the UDP source port'
       c.default_value nil
-      c.flag [ :inc_tp_src ]
+      c.flag [:inc_tp_src]
 
-      c.desc "set the initial UDP destination port"
-      c.flag [ :tp_dst ]
+      c.desc 'set the initial UDP destination port'
+      c.flag [:tp_dst]
 
-      c.desc "number of times to increment the UDP destination port"
+      c.desc 'number of times to increment the UDP destination port'
       c.default_value nil
-      c.flag [ :inc_tp_dst ]
+      c.flag [:inc_tp_dst]
 
-      c.desc "send packet rate - packets per second"
-      c.flag [ :pps ]
+      c.desc 'send packet rate - packets per second'
+      c.flag [:pps]
 
-      c.desc "number of packets to send"
-      c.flag [ :n_pkts ]
+      c.desc 'number of packets to send'
+      c.flag [:n_pkts]
 
-      c.desc "time duration to send packets"
-      c.flag [ :duration ]
+      c.desc 'time duration to send packets'
+      c.flag [:duration]
 
-      c.desc "length of UDP payload"
-      c.flag [ :length ]
+      c.desc 'length of UDP payload'
+      c.flag [:length]
 
-      c.desc "increment UDP payload"
+      c.desc 'increment UDP payload'
       c.default_value nil
-      c.flag [ :inc_payload ]
+      c.flag [:inc_payload]
 
       c.action do | global_options, options, args |
-        raise "--source option is mandatory" if options[ :source ].nil?
-        raise "--dest option is mandatory" if options[ :dest ].nil?
+        fail '--source option is mandatory' if options[ :source].nil?
+        fail '--dest option is mandatory' if options[ :dest].nil?
 
-        trema_send_packets options[ :source ], options[ :dest ], options
+        trema_send_packets options[ :source], options[ :dest], options
       end
     end
 
 
     desc "Brings a switch's specified port up"
     command :port_up do | c |
-      c.desc "switch name"
-      c.flag [ :s, :switch ]
+      c.desc 'switch name'
+      c.flag [:s, :switch]
 
-      c.desc "port"
-      c.flag [ :p, :port ]
+      c.desc 'port'
+      c.flag [:p, :port]
 
       c.action do | global_options, options, args |
-        raise "--switch option is mandatory" if options[ :switch ].nil?
-        raise "--port option is mandatory" if options[ :port ].nil?
+        fail '--switch option is mandatory' if options[ :switch].nil?
+        fail '--port option is mandatory' if options[ :port].nil?
 
-        trema_port_up options[ :switch ], options[ :port ]
+        trema_port_up options[ :switch], options[ :port]
       end
     end
 
 
     desc "Brings a switch's specified port down"
     command :port_down do | c |
-      c.desc "switch name"
-      c.flag [ :s, :switch ]
+      c.desc 'switch name'
+      c.flag [:s, :switch]
 
-      c.desc "port"
-      c.flag [ :p, :port ]
+      c.desc 'port'
+      c.flag [:p, :port]
 
       c.action do | global_options, options, args |
-        raise "--switch option is mandatory" if options[ :switch ].nil?
-        raise "--port option is mandatory" if options[ :port ].nil?
+        fail '--switch option is mandatory' if options[ :switch].nil?
+        fail '--port option is mandatory' if options[ :port].nil?
 
-        trema_port_down options[ :switch ], options[ :port ]
+        trema_port_down options[ :switch], options[ :port]
       end
     end
 
 
-    desc "Shows stats of packets"
-    arg_name "host"
+    desc 'Shows stats of packets'
+    arg_name 'host'
     command :show_stats do | c |
-      c.desc "Show stats of packets sent"
-      c.switch [ :t, :tx ], :negatable => false
-      c.desc "Show stats of packets received"
-      c.switch [ :r, :rx ], :negatable => false
+      c.desc 'Show stats of packets sent'
+      c.switch [:t, :tx], :negatable => false
+      c.desc 'Show stats of packets received'
+      c.switch [:r, :rx], :negatable => false
 
       c.action do | global_options, options, args |
-        help_now!( "host is required" ) if args.empty?
-        trema_show_stats args[ 0 ], options[ :tx ], options[ :rx ]
+        help_now!('host is required') if args.empty?
+        trema_show_stats args[ 0], options[ :tx], options[ :rx]
       end
     end
 
 
-    desc "Resets stats of packets"
-    arg_name "hosts..."
+    desc 'Resets stats of packets'
+    arg_name 'hosts...'
     command :reset_stats do | c |
       c.action do | global_options, options, args |
         hosts = args
@@ -221,21 +221,21 @@ class BinTrema
     end
 
 
-    desc "Print all flow entries"
-    arg_name "switches..."
+    desc 'Print all flow entries'
+    arg_name 'switches...'
     command :dump_flows do | c |
       c.action do | global_options, options, args |
-        help_now!( "switches is required" ) if args.empty?
+        help_now!('switches is required') if args.empty?
         trema_dump_flows args
       end
     end
 
 
-    desc "Opens a new shell in the specified network namespace"
-    arg_name "name"
+    desc 'Opens a new shell in the specified network namespace'
+    arg_name 'name'
     command :netns do | c |
       c.action do | global_options, options, args |
-        trema_netns args[ 0 ]
+        trema_netns args[ 0]
       end
     end
 
@@ -248,7 +248,7 @@ class BinTrema
     end
 
 
-    desc "Displays the current runtime version"
+    desc 'Displays the current runtime version'
     command :version do | c |
       c.action do
         trema_version
@@ -260,18 +260,18 @@ class BinTrema
 
 
     pre do | global, command, options, args |
-      $verbose = global[ :verbose ]
+      $verbose = global[ :verbose]
 
-      if global[ :version ]
+      if global[ :version]
         trema_version
         exit_now! nil, 0
       end
 
       assert_trema_is_built
 
-      if FileTest.exist?( Trema.tmp ) and not FileTest.writable?( Trema.tmp )
+      if FileTest.exist?(Trema.tmp) && !FileTest.writable?(Trema.tmp)
         # Trema is system widely installed with gem command
-        sh "sudo chmod o+w -R #{ Trema.tmp }"
+        sh "sudo chmod a+w -R #{ Trema.tmp }"
       end
 
       FileUtils.mkdir_p Trema.log
@@ -290,21 +290,19 @@ class BinTrema
   end
 
 
-  def start argv
-    begin
-      run argv
-    rescue
-      puts $!
-      $!.backtrace.each do | each |
-        puts each
-      end
-      exit
+  def start(argv)
+    run argv
+  rescue
+    puts $!
+    $!.backtrace.each do | each |
+      puts each
     end
+    exit
   end
 end
 
 
-exit BinTrema.new.start( ARGV )
+exit BinTrema.new.start(ARGV)
 
 
 ### Local variables:

data/bin/trema-config

@@ -19,12 +19,12 @@
 #
 
 
-$LOAD_PATH.unshift( File.expand_path( File.dirname( __FILE__ ) + "/../ruby" ) )
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../ruby'))
 
 
-require "fileutils"
-require "optparse"
-require "trema/path"
+require 'fileutils'
+require 'optparse'
+require 'trema/path'
 
 
 $opts = OptionParser.new
@@ -32,10 +32,10 @@ $opts = OptionParser.new
 FileUtils.cd Trema.home do
   $opts.banner = "Usage: #{ File.basename $0 } [OPTIONS ...]"
 
-  $opts.on( "-c", "--cflags" ) do
+  $opts.on('-c', '--cflags') do
     $cflags = true
   end
-  $opts.on( "-l", "--libs" ) do
+  $opts.on('-l', '--libs') do
     $libs = true
   end
 
@@ -48,7 +48,7 @@ FileUtils.cd Trema.home do
   if $libs
     output << "-L#{ Trema.objects }/lib -ltrema -lrt -lpthread -lsqlite3 -ldl"
   end
-  print output.join( " " )
+  print output.join(' ')
 end
 
 

data/build.rb

@@ -19,8 +19,8 @@
 #
 
 
-Dir.chdir File.dirname( __FILE__ ) do
-  result = system( "bundle exec rake #{ ARGV.join ' ' }" )
+Dir.chdir File.dirname(__FILE__) do
+  result = system("bundle exec rake #{ ARGV.join ' ' }")
   abort "#{ $0 } aborted!" unless result
 end
 

data/cruise.rb

@@ -31,18 +31,16 @@ $coverage_threshold = 70.1
 # Load libraries
 ################################################################################
 
-$LOAD_PATH.unshift( File.expand_path( File.dirname( __FILE__ ) + "/ruby" ) )
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/ruby'))
 
-require "rubygems"
-
-require "English"
-require "blocker"
-require "fileutils"
-require "find"
-require "optparse"
-require "stringio"
-require "sub-process"
-require "trema/path"
+require 'English'
+require 'blocker'
+require 'fileutils'
+require 'find'
+require 'optparse'
+require 'stringio'
+require 'sub-process'
+require 'trema/path'
 
 
 include FileUtils
@@ -53,18 +51,18 @@ include FileUtils
 ################################################################################
 
 def path_string
-  paths = ENV[ "PATH" ].split( ":" )
-  paths << Gem::bindir unless paths.include?( Gem::bindir )
-  paths.join ":"
+  paths = ENV[ 'PATH'].split(':')
+  paths << Gem::bindir unless paths.include?(Gem::bindir)
+  paths.join ':'
 end
 
 
-def sh cmd
-  ENV[ "LC_ALL" ] = "C"
-  ENV[ "PATH" ] = path_string
+def sh(cmd)
+  ENV[ 'LC_ALL'] = 'C'
+  ENV[ 'PATH'] = path_string
   puts cmd if $verbose
-  unless system( cmd )
-    raise "Command '#{ cmd }' failed!"
+  unless system(cmd)
+    fail "Command '#{ cmd }' failed!"
   end
 end
 
@@ -81,7 +79,7 @@ class Testee
   attr_writer :lines
 
 
-  def initialize path
+  def initialize(path)
     @path = path
     @lines = 0
     @coverage = 0.0
@@ -89,7 +87,7 @@ class Testee
 
 
   def name
-    File.basename( @path )
+    File.basename(@path)
   end
 
 
@@ -98,15 +96,15 @@ class Testee
 
     n = 0
     in_comment = false
-    File.open( @path, "r" ).each_line do | l |
-      next if /^\s+\/\//=~ l # comments starting with //
-      next if /^\s*$/=~ l # empty lines
-      next if /^\s*\/\*.*\*\//=~l # /* ... */
-      if /^\s*\/\*/=~ l # /*
+    File.open(@path, 'r').each_line do | l |
+      next if /^\s+\/\// =~ l # comments starting with //
+      next if /^\s*$/ =~ l # empty lines
+      next if /^\s*\/\*.*\*\// =~ l # /* ... */
+      if /^\s*\/\*/ =~ l # /*
         in_comment = true
         next
       end
-      if /^\s*\*\//=~ l # */
+      if /^\s*\*\// =~ l # */
         in_comment = false
         next
       end
@@ -122,14 +120,14 @@ class Testee
   end
 
 
-  def coverage= value
+  def coverage=(value)
     if value > @coverage
       @coverage = value
     end
   end
 
 
-  def <=> other
+  def <=>(other)
     @name <=> other.name
   end
 end
@@ -137,7 +135,7 @@ end
 
 def testees
   $c_files.delete_if do | key, value |
-    File.basename( key ) == "trema_wrapper.c"
+    File.basename(key) == 'trema_wrapper.c'
   end
 end
 
@@ -155,38 +153,38 @@ end
 
 
 def lines_total
-  testees.values.inject( 0 ) do | r, each |
+  testees.values.inject(0) do | r, each |
     r += each.lines
   end
 end
 
 
 def lines_tested
-  testees.values.inject( 0 ) do | r, each |
+  testees.values.inject(0) do | r, each |
     r += each.lines_tested
   end
 end
 
 
 def coverage
-  sprintf( "%3.1f", lines_tested / lines_total * 100.0 ).to_f
+  sprintf('%3.1f', lines_tested / lines_total * 100.0).to_f
 end
 
 
 def diff_coverage_threshold
-  sprintf( "%3.1f", ( $coverage_threshold - coverage ).abs ).to_f
+  sprintf('%3.1f', ( $coverage_threshold - coverage).abs).to_f
 end
 
 
-def gcov gcda, dir
+def gcov(gcda, dir)
   file = nil
 
   cmd = "gcov #{ gcda } -o #{ dir } -n"
   SubProcess.create do | shell |
     shell.on_stdout do | l |
-      file = File.expand_path( $1 ) if /^File '(.*)'/=~ l
-      testee = $c_files[ file ]
-      if /^Lines executed:(.*)% of (.*)$/=~ l and not testee.nil?
+      file = File.expand_path($1) if /^File '(.*)'/ =~ l
+      testee = $c_files[ file]
+      if /^Lines executed:(.*)% of (.*)$/ =~ l && testee
         testee.coverage = $1.to_f
         testee.lines = $2.to_i
       end
@@ -195,7 +193,7 @@ def gcov gcda, dir
       $stderr.puts l
     end
     shell.on_failure do
-      raise "'#{ cmd }' failed."
+      fail "'#{ cmd }' failed."
     end
     shell.exec cmd
   end
@@ -203,17 +201,17 @@ end
 
 
 def measure_coverage
-  Find.find( "src/lib", "src/packetin_filter", "src/switch_manager", "src/tremashark", "unittests" ) do | f |
-    if /\.c$/=~ f
-      path = File.expand_path( f )
-      $c_files[ path ] = Testee.new( path )
+  Find.find('src/lib', 'src/packetin_filter', 'src/switch_manager', 'src/tremashark', 'unittests') do | f |
+    if /\.c$/ =~ f
+      path = File.expand_path(f)
+      $c_files[ path] = Testee.new(path)
     end
   end
-  Dir.glob( "unittests/objects/*.gcda" ).each do | each |
-    gcov each, "unittests/objects"
+  Dir.glob('unittests/objects/*.gcda').each do | each |
+    gcov each, 'unittests/objects'
   end
-  Dir.glob( "objects/unittests/*.gcda" ).each do | each |
-    gcov each, "objects/unittests"
+  Dir.glob('objects/unittests/*.gcda').each do | each |
+    gcov each, 'objects/unittests'
   end
 end
 
@@ -222,8 +220,8 @@ end
 # Summaries
 ################################################################################
 
-def banner message
-  return <<-EOF
+def banner(message)
+  <<-EOF
 #{ message }
 ================================================================================
 EOF
@@ -242,8 +240,8 @@ end
 
 
 def coverage_threshold_error
-  return <<-EOF
-#{ banner( "ERROR" ) }
+  <<-EOF
+#{ banner('ERROR') }
 Oops...
 Overall coverage DECREASED to #{ coverage }% !!!
 
@@ -253,8 +251,8 @@ end
 
 
 def update_coverage_threshold_message
-  return <<-EOF
-#{ banner( "WARNING" ) }
+  <<-EOF
+#{ banner('WARNING') }
 Congratulations !
 Overall coverage INCREASED to #{ coverage }% !
 
@@ -274,24 +272,26 @@ def show_summary
   puts <<-EOF
 
 
-#{ banner( "Coverage details" ) }
+#{ banner('Coverage details') }
 #{ coverage_ranking }
 
-#{ banner( "Summary" ) }
-- Total execution time = #{ ( Time.now - $start_time ).to_i } seconds
+#{ banner('Summary') }
+- Total execution time = #{ ( Time.now - $start_time).to_i } seconds
 - Overall coverage = #{ coverage }% (#{ files_not_tested.size }/#{ testees.size } files not yet tested)
 
 
 EOF
 
-  if ( coverage < $coverage_threshold ) and ( diff_coverage_threshold > delta_coverage_threshold )
+  if (coverage < $coverage_threshold) && ( diff_coverage_threshold > delta_coverage_threshold)
     puts coverage_threshold_error
-    puts; puts
-    exit -1
-  elsif ( coverage > $coverage_threshold ) and ( diff_coverage_threshold > delta_coverage_threshold )
+    puts
+    puts
+    exit(-1)
+  elsif (coverage > $coverage_threshold) && ( diff_coverage_threshold > delta_coverage_threshold)
     puts update_coverage_threshold_message
-    puts; puts
-    exit -1
+    puts
+    puts
+    exit(-1)
   end
 end
 
@@ -300,31 +300,44 @@ end
 # Tests
 ################################################################################
 
-def test message
+def test(message)
   puts message
   cd Trema.home do
-    sh "bundle exec rake clean"
+    sh 'bundle exec rake clean'
     begin
       yield
     ensure
-      sh "./trema killall"
+      sh './trema killall' rescue nil
     end
   end
 end
 
 
-def run_unit_test
-  test "Running unit tests ..." do
-    sh "bundle exec rake unittests"
-    sh "bundle exec rake spec"
+def run_unit_tests
+  test 'Running unit tests ...' do
+    sh 'bundle exec rake unittests'
   end
   measure_coverage
 end
 
 
-def run_acceptance_test
-  test "Running acceptance tests ..." do
-    sh "bundle exec rake features"
+def run_rspec
+  test 'Running rspec ...' do
+    sh 'bundle exec rake spec'
+  end
+  measure_coverage
+end
+
+
+def run_ruby_acceptance_tests
+  test 'Running acceptance tests ...' do
+    sh 'bundle exec rake features'
+  end
+end
+
+def run_all_acceptance_tests
+  test 'Running acceptance tests ...' do
+    sh 'bundle exec rake features:all'
   end
 end
 
@@ -335,22 +348,26 @@ end
 
 $options = OptionParser.new
 
-$options.on( "-u", "--unit-test-only" ) do
+$options.on('-u', '--unit-test-only') do
   $unit_test_only = true
 end
 
-$options.on( "-a", "--acceptance-test-only" ) do
+$options.on('-a', '--acceptance-test-only') do
   $acceptance_test_only = true
 end
 
-$options.separator ""
+$options.on('-A', '--all') do
+  $all = true
+end
+
+$options.separator ''
 
-$options.on( "-h", "--help" ) do
+$options.on('-h', '--help') do
   puts $options.to_s
   exit
 end
 
-$options.on( "-v", "--verbose" ) do
+$options.on('-v', '--verbose') do
   $verbose = true
 end
 
@@ -359,9 +376,9 @@ $options.parse! ARGV
 
 def init_cruise
   FileUtils.rm_f File.expand_path(File.join(File.dirname(__FILE__), 'Gemfile.lock'))
-  sh "bundle install"
-  sh "bundle update"
-  sh "bundle exec rake clobber"
+  sh 'bundle install'
+  sh 'bundle update'
+  sh 'bundle exec rake clobber'
 end
 
 
@@ -369,9 +386,18 @@ Blocker.start do
   $start_time = Time.now
   cd Trema.home do
     init_cruise
-    run_unit_test if not $acceptance_test_only
-    run_acceptance_test if not $unit_test_only
-    show_summary if not $acceptance_test_only
+    unless $acceptance_test_only
+      run_unit_tests if $all
+      run_rspec
+    end
+    unless $unit_test_only
+      if $all
+        run_all_acceptance_tests
+      else
+        run_ruby_acceptance_tests
+      end
+    end
+    show_summary if ((not $acceptance_test_only) && $all)
   end
 end