trema 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5d236d112d0ec7ea07f28665ac7def9a03ad148
-  data.tar.gz: 05ee642924ce569f3c2cd3aa565a5534dae6ba30
+  metadata.gz: ae1944272fd94df71dde7f37cae09d3adc26caec
+  data.tar.gz: 4e93bf7477c418a53cb9bdf2365776ce8e866419
 SHA512:
-  metadata.gz: b3e0b32a3d66e9c29a2b0448525a377a480b0bc18c0509b5eab85c0f27ebb78c11e1886bdd31227fe0a421c9880d6abbb969f83635a8f1536be94b6ba3ac5a1f
-  data.tar.gz: d1ebcf9d3b41d159e30b2b778f0783500bff5d5fe41f4afa3eede21b111d134537d8ee5b7e5aa5d5f7ad6579046924ef379508407e18001bdaabad2cf7c7d1e0
+  metadata.gz: 908ea883109bb2c7a65b556f9d700634a0668837c1400d1daa849bbdf915ff44896fb6d40ff32516940950448bc4daf0bf8dff213de1eae9b02028812d293aa9
+  data.tar.gz: fecf42a4b7599f5b8f9177ffc8625b28faf7cd65650591fb57f08608328f04f641d4cf1ececf51e8422fe418626ddac99c130a01502b1afc741f0195de1a04c6

data/.rubocop.yml

@@ -0,0 +1 @@
+inherit_from: rubocop-todo.yml

data/.travis.yml

@@ -1,21 +1,38 @@
 language: ruby
 
-script: "rake travis"
+before_install:
+ - gem update bundler
+ - sudo apt-get update -qq
+ - sudo apt-get install libpcap-dev -qq
+bundler_args: --without development
+
+env:
+  global:
+    - secure: "roJa3FuYA6gLdV0vtUe1GyuAU2WQ+E+jraT9QeKKHRQSU2TKYgeJ7MmxG3vSpIoZsHEdmrZh0UVTrMO436UHAG5V+qbSmP2gld0vSI2qDQ2dXbNoAIVUHex2oCDTa5OC0sJbz9W8Yrd0XoTY0O5gObPn6QfTzAHKgPz7ZC9bBwo="
 
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - ruby-head
 
 branches:
   only:
     - master
     - develop
 
-before_install:
- - sudo apt-get update -qq
- - sudo apt-get install libpcap-dev -qq
- - gem install bundler
+matrix:
+  allow_failures:
+    - rvm: 2.1.0
+    - rvm: ruby-head
+  fast_finish: true
+
+script: bundle exec rake travis
 
 notifications:
-  webhooks: http://trema-hubot.herokuapp.com/hubot/travis?room=1
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/ca7b2e631cab5cddce0d
+    on_success: always
+    on_failure: always
+    on_start: always

data/Gemfile

@@ -1,36 +1,28 @@
-source "https://rubygems.org"
-
+source 'https://rubygems.org'
 
 # Include dependencies from trema.gemspec. DRY!
 gemspec
 
 # Add dependencies required to use your gem here.
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "aruba", "~> 0.5.3"
-  gem "cucumber", "~> 1.3.8"
-  gem "flay", "~> 2.4.0"
-  gem "flog", "~> 4.2.0"
-  gem "rcov", "~> 1.0.0" if RUBY_VERSION < "1.9.0"
-  gem "redcarpet", "~> 2.3.0" if RUBY_VERSION < "1.9.0"
-  gem "redcarpet", "~> 3.0.0" if RUBY_VERSION >= "1.9.0"
-  gem "reek", "~> 1.3.4"
-  gem "relish", "~> 0.7"
-  gem "rspec", "~> 2.14.1"
-  gem "yard", "~> 0.8.7.2"
-  gem 'guard', '~> 1.8.3' if RUBY_VERSION < '1.9.0'
-  gem 'guard', '~> 2.2.2' if RUBY_VERSION >= '1.9.0'
-  gem 'guard-bundler', '~> 1.0.0' if RUBY_VERSION < '1.9.0'
-  gem 'guard-bundler', '~> 2.0.0' if RUBY_VERSION >= '1.9.0'
-  gem 'mime-types', '~> 1.25' if RUBY_VERSION < '1.9.0'
-  gem 'mime-types', '~> 2.0' if RUBY_VERSION >= '1.9.0'
+group :docs do
+  gem 'relish', '~> 0.7'
+  gem 'yard', '~> 0.8.7.4'
 end
 
+group :development do
+  gem 'guard', '~> 2.6.1'
+  gem 'guard-bundler', '~> 2.0.0'
+  gem 'guard-rubocop', '~> 1.1.0'
+end
 
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:
+group :test do
+  gem 'aruba', '~> 0.5.4'
+  gem 'codeclimate-test-reporter', require: nil
+  gem 'cucumber', '~> 1.3.15'
+  gem 'flay', '~> 2.4.0'
+  gem 'flog', '~> 4.2.0'
+  gem 'reek', '~> 1.3.7'
+  gem 'rspec', '~> 2.14.1'
+  gem 'rubocop', '~> 0.20.1', platforms: [:ruby_19, :ruby_20, :ruby_21]
+end

data/Guardfile

@@ -6,3 +6,9 @@ guard :bundler do
   # Uncomment next line if your Gemfile contains the `gemspec' command.
   watch(/^.+\.gemspec/)
 end
+
+guard :rubocop do
+  watch(/.+\.rb$/)
+  watch(/.+\.rake$/)
+  watch(/(?:.+\/)?\.rubocop\.yml$/) { |m| File.dirname(m[0]) }
+end

data/README.md

@@ -1,10 +1,12 @@
 Welcome to Trema
 ================
 
-[![Gem Version](https://badge.fury.io/rb/trema.png)](http://badge.fury.io/rb/trema)
-[![Build Status](https://secure.travis-ci.org/trema/trema.png?branch=develop)](http://travis-ci.org/trema/trema)
-[![Code Climate](https://codeclimate.com/github/trema/trema.png)](https://codeclimate.com/github/trema/trema)
-[![Dependency Status](https://gemnasium.com/trema/trema.png)](https://gemnasium.com/trema/trema)
+[![Gem Version](http://img.shields.io/gem/v/trema.svg?style=flat)][gem]
+[![Build Status](http://img.shields.io/travis/trema/trema/develop.svg?style=flat)][travis]
+[![Code Climate](http://img.shields.io/codeclimate/github/trema/trema.svg?style=flat)][codeclimate]
+[![Coverage Status](http://img.shields.io/codeclimate/coverage/github/trema/trema.svg?style=flat)][codeclimate]
+[![Dependency Status](http://img.shields.io/gemnasium/trema/trema.svg?style=flat)][gemnasium]
+[![Gitter chat](http://img.shields.io/badge/GITTER-trema-blue.svg?style=flat)][gitter]
 
 Trema is a OpenFlow controller framework that includes everything
 needed to create OpenFlow controllers in Ruby and C.
@@ -21,6 +23,12 @@ emulates an OpenFlow-based network and end-hosts is provided for
 testing your own controllers. For debugging, a wireshark plug-in to
 diagnose internal data-flows among functional modules is provided.
 
+[gem]: https://rubygems.org/gems/trema
+[travis]: http://travis-ci.org/trema/trema
+[codeclimate]: https://codeclimate.com/github/trema/trema
+[gemnasium]: https://gemnasium.com/trema/trema
+[gitter]: https://gitter.im/trema/trema
+
 
 Supported Platforms
 -------------------
@@ -57,7 +65,7 @@ Getting Started
     $ sudo /var/lib/gems/1.8/bin/update_rubygems
 
     (In Fedora 16-19)
-    $ sudo yum install gcc make git ruby rubygems ruby-devel libpcap-devel libsqlite3x-devel glib2-devel
+    $ sudo yum install tar gcc make git ruby rubygems ruby-devel libpcap-devel libsqlite3x-devel glib2-devel
 
 2.Install Trema at the command prompt:
 

data/Rakefile

@@ -16,13 +16,12 @@
 #
 
 
-$LOAD_PATH.unshift( File.expand_path( File.dirname( __FILE__ ) + "/ruby" ) )
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/ruby'))
 
 
-require "rubygems"
-require "rake"
-require "trema/executables"
-require "trema/path"
+require 'rake'
+require 'trema/executables'
+require 'trema/path'
 
 
 task :default => :build_trema
@@ -31,7 +30,7 @@ directory Trema.log
 directory Trema.pid
 directory Trema.sock
 
-desc "Build Trema"
+desc 'Build Trema'
 task :build_trema => [
   Trema.log,
   Trema.pid,
@@ -47,135 +46,135 @@ task :build_trema => [
 ]
 
 
-require "paper_house"
-require "trema/version"
+require 'paper_house'
+require 'trema/version'
 
 
 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",
+  '-g',
+  '-std=gnu99',
+  '-D_GNU_SOURCE',
+  '-fno-strict-aliasing',
+  '-Wall',
+  '-Wextra',
+  '-Wformat=2',
+  '-Wcast-qual',
+  '-Wcast-align',
+  '-Wwrite-strings',
+  '-Wconversion',
+  '-Wfloat-equal',
+  '-Wpointer-arith'
 ]
-CFLAGS << "-Werror" if RUBY_VERSION < "1.9.0"
+CFLAGS << '-Werror' if RUBY_VERSION < '1.9.0'
 
 
-desc "Build Trema C library (static library)."
-task "libtrema:static" => "vendor:openflow"
-PaperHouse::StaticLibraryTask.new "libtrema:static" do | task |
-  task.library_name = "libtrema"
+desc 'Build Trema C library (static library).'
+task 'libtrema:static' => 'vendor:openflow'
+PaperHouse::StaticLibraryTask.new 'libtrema:static' do | task |
+  task.library_name = 'libtrema'
   task.target_directory = Trema.lib
   task.sources = "#{ Trema.include }/*.c"
   task.cflags = CFLAGS
-  task.includes = [ Trema.openflow ]
+  task.includes = [Trema.openflow]
 end
 
 
-desc "Build Trema C library (coverage)."
-task "libtrema:gcov" => [ "vendor:openflow" ]
-PaperHouse::StaticLibraryTask.new "libtrema:gcov" do | task |
-  task.library_name = "libtrema"
+desc 'Build Trema C library (coverage).'
+task 'libtrema:gcov' => ['vendor:openflow']
+PaperHouse::StaticLibraryTask.new 'libtrema:gcov' do | task |
+  task.library_name = 'libtrema'
   task.target_directory = "#{ Trema.home }/objects/unittests"
   task.sources = "#{ Trema.include }/*.c"
-  task.includes = [ Trema.openflow ]
-  task.cflags = [ "--coverage" ] + CFLAGS
+  task.includes = [Trema.openflow]
+  task.cflags = ['--coverage'] + CFLAGS
 end
 
 
-desc "Build Trema C library (shared library)."
-task "libtrema:shared" => "vendor:openflow"
-PaperHouse::SharedLibraryTask.new "libtrema:shared" do | task |
-  task.library_name = "libtrema"
+desc 'Build Trema C library (shared library).'
+task 'libtrema:shared' => 'vendor:openflow'
+PaperHouse::SharedLibraryTask.new 'libtrema:shared' do | task |
+  task.library_name = 'libtrema'
   task.target_directory = Trema.lib
   task.version = Trema::VERSION
   task.sources = "#{ Trema.include }/*.c"
-  task.includes = [ Trema.openflow ]
+  task.includes = [Trema.openflow]
   task.cflags = CFLAGS
 end
 
 
-desc "Build Trema Ruby library."
-task "rubylib" => "libtrema:static"
-PaperHouse::RubyExtensionTask.new "rubylib" do | task |
-  task.library_name = "trema"
+desc 'Build Trema Ruby library.'
+task 'rubylib' => 'libtrema:static'
+PaperHouse::RubyExtensionTask.new 'rubylib' do | task |
+  task.library_name = 'trema'
   task.target_directory = Trema.ruby
   task.sources = "#{ Trema.ruby }/trema/*.c"
-  task.includes = [ Trema.include, Trema.openflow ]
+  task.includes = [Trema.include, Trema.openflow]
   task.cflags = CFLAGS
-  task.ldflags = [ "-Wl,-Bsymbolic", "-L#{ Trema.lib }" ]
+  task.ldflags = ['-Wl,-Bsymbolic', "-L#{ Trema.lib }"]
   task.library_dependencies = [
-    "trema",
-    "sqlite3",
-    "pthread",
-    "rt",
-    "dl",
-    "crypt",
-    "m"
+    'trema',
+    'sqlite3',
+    'pthread',
+    'rt',
+    'dl',
+    'crypt',
+    'm'
   ]
 end
 
 
-desc "Build switch manager."
-task :switch_manager => "libtrema:static"
+desc 'Build switch manager.'
+task :switch_manager => 'libtrema:static'
 
 PaperHouse::ExecutableTask.new :switch_manager do | task |
-  task.target_directory = File.dirname( Trema::Executables.switch_manager )
+  task.target_directory = File.dirname(Trema::Executables.switch_manager)
   task.sources = [
-    "src/switch_manager/dpid_table.c",
-    "src/switch_manager/event_forward_entry_manipulation.c",
-    "src/switch_manager/secure_channel_listener.c",
-    "src/switch_manager/switch_manager.c",
-    "src/switch_manager/switch_option.c",
+    'src/switch_manager/dpid_table.c',
+    'src/switch_manager/event_forward_entry_manipulation.c',
+    'src/switch_manager/secure_channel_listener.c',
+    'src/switch_manager/switch_manager.c',
+    'src/switch_manager/switch_option.c'
   ]
-  task.includes = [ Trema.include, Trema.openflow ]
+  task.includes = [Trema.include, Trema.openflow]
   task.cflags = CFLAGS
   task.ldflags = "-L#{ Trema.lib }"
   task.library_dependencies = [
-    "trema",
-    "sqlite3",
-    "pthread",
-    "rt",
-    "dl",
+    'trema',
+    'sqlite3',
+    'pthread',
+    'rt',
+    'dl'
   ]
 end
 
 
-desc "Build switch daemon."
-task :switch_daemon => "libtrema:static"
+desc 'Build switch daemon.'
+task :switch_daemon => 'libtrema:static'
 
 PaperHouse::ExecutableTask.new :switch_daemon do | task |
-  task.executable_name = File.basename( Trema::Executables.switch )
-  task.target_directory = File.dirname( Trema::Executables.switch )
+  task.executable_name = File.basename(Trema::Executables.switch)
+  task.target_directory = File.dirname(Trema::Executables.switch)
   task.sources = [
-    "src/switch_manager/cookie_table.c",
-    "src/switch_manager/event_forward_entry_manipulation.c",
-    "src/switch_manager/ofpmsg_recv.c",
-    "src/switch_manager/ofpmsg_send.c",
-    "src/switch_manager/secure_channel_receiver.c",
-    "src/switch_manager/secure_channel_sender.c",
-    "src/switch_manager/service_interface.c",
-    "src/switch_manager/switch.c",
-    "src/switch_manager/switch_option.c",
-    "src/switch_manager/xid_table.c",
+    'src/switch_manager/cookie_table.c',
+    'src/switch_manager/event_forward_entry_manipulation.c',
+    'src/switch_manager/ofpmsg_recv.c',
+    'src/switch_manager/ofpmsg_send.c',
+    'src/switch_manager/secure_channel_receiver.c',
+    'src/switch_manager/secure_channel_sender.c',
+    'src/switch_manager/service_interface.c',
+    'src/switch_manager/switch.c',
+    'src/switch_manager/switch_option.c',
+    'src/switch_manager/xid_table.c'
   ]
-  task.includes = [ Trema.include, Trema.openflow ]
+  task.includes = [Trema.include, Trema.openflow]
   task.cflags = CFLAGS
   task.ldflags = "-L#{ Trema.lib }"
   task.library_dependencies = [
-    "trema",
-    "sqlite3",
-    "pthread",
-    "rt",
-    "dl",
+    'trema',
+    'sqlite3',
+    'pthread',
+    'rt',
+    'dl'
   ]
 end
 
@@ -184,63 +183,63 @@ end
 # Extract OpenFlow reference implementation
 ################################################################################
 
-task "vendor:openflow" => Trema.openflow_h
+task 'vendor:openflow' => Trema.openflow_h
 file Trema.openflow_h => Trema.objects do
   sh "tar xzf #{ Trema.vendor_openflow }.tar.gz -C #{ Trema.vendor }"
   cp_r "#{ Trema.vendor_openflow }/include/openflow", Trema.objects
 end
 directory Trema.objects
 
-CLOBBER.include( Trema.vendor_openflow ) if FileTest.exists?( Trema.vendor_openflow )
-CLOBBER.include( File.join( Trema.objects, "openflow" ) ) if FileTest.exists?( File.join( Trema.objects, "openflow" ) )
+CLOBBER.include(Trema.vendor_openflow) if FileTest.exists?(Trema.vendor_openflow)
+CLOBBER.include(File.join(Trema.objects, 'openflow')) if FileTest.exists?(File.join(Trema.objects, 'openflow'))
 
 
 ################################################################################
 # Build phost
 ################################################################################
 
-task "vendor:phost" => [ Trema::Executables.phost, Trema::Executables.cli ]
+task 'vendor:phost' => [Trema::Executables.phost, Trema::Executables.cli]
 
 def phost_src
-  File.join Trema.vendor_phost, "src"
+  File.join Trema.vendor_phost, 'src'
 end
 
 def phost_objects
-  FileList[ File.join( phost_src, "*.o" ) ]
+  FileList[ File.join(phost_src, '*.o')]
 end
 
 def phost_vendor_binary
-  File.join phost_src, "phost"
+  File.join phost_src, 'phost'
 end
 
 def phost_cli_vendor_binary
-  File.join phost_src, "cli"
+  File.join phost_src, 'cli'
 end
 
 def phost_clean_targets
-  ( phost_objects + [ phost_vendor_binary, phost_cli_vendor_binary ] ).select do | each |
+  ( phost_objects + [phost_vendor_binary, phost_cli_vendor_binary]).select do | each |
     FileTest.exists? each
   end
 end
 
 file Trema::Executables.phost do
   cd phost_src do
-    sh "make"
+    sh 'make'
   end
-  mkdir_p File.dirname( Trema::Executables.phost )
-  install File.join( phost_src, "phost" ), Trema::Executables.phost, :mode => 0755
+  mkdir_p File.dirname(Trema::Executables.phost)
+  install File.join(phost_src, 'phost'), Trema::Executables.phost, :mode => 0755
 end
 
 file Trema::Executables.cli do
   cd phost_src do
-    sh "make"
+    sh 'make'
   end
-  mkdir_p File.dirname( Trema::Executables.cli )
-  install File.join( phost_src, "cli" ), Trema::Executables.cli, :mode => 0755
+  mkdir_p File.dirname(Trema::Executables.cli)
+  install File.join(phost_src, 'cli'), Trema::Executables.cli, :mode => 0755
 end
 
 CLEAN.include phost_clean_targets
-CLOBBER.include( Trema.phost ) if FileTest.exists?( Trema.phost )
+CLOBBER.include(Trema.phost) if FileTest.exists?(Trema.phost)
 
 
 ################################################################################
@@ -248,10 +247,10 @@ CLOBBER.include( Trema.phost ) if FileTest.exists?( Trema.phost )
 ################################################################################
 
 task :vendor => [
-  "vendor:oflops",
-  "vendor:openflow",
-  "vendor:openvswitch",
-  "vendor:phost",
+  'vendor:oflops',
+  'vendor:openflow',
+  'vendor:openvswitch',
+  'vendor:phost'
 ]
 
 
@@ -259,40 +258,40 @@ task :vendor => [
 # Build Open vSwitch
 ################################################################################
 
-task "vendor:openvswitch" => Trema::Executables.ovs_openflowd
+task 'vendor:openvswitch' => Trema::Executables.ovs_openflowd
 file Trema::Executables.ovs_openflowd do
   sh "tar xzf #{ Trema.vendor_openvswitch }.tar.gz -C #{ Trema.vendor }"
   cd Trema.vendor_openvswitch do
     sh "./configure --prefix=#{ Trema.openvswitch } --with-rundir=#{ Trema.sock }"
-    sh "make install"
-    cp "./tests/test-openflowd", Trema::Executables.ovs_openflowd
+    sh 'make install'
+    cp './tests/test-openflowd', Trema::Executables.ovs_openflowd
   end
 end
 
-CLEAN.include( Trema.vendor_openvswitch ) if FileTest.exists?( Trema.vendor_openvswitch )
-CLOBBER.include( Trema.openvswitch ) if FileTest.exists?( Trema.openvswitch )
+CLEAN.include(Trema.vendor_openvswitch) if FileTest.exists?(Trema.vendor_openvswitch)
+CLOBBER.include(Trema.openvswitch) if FileTest.exists?(Trema.openvswitch)
 
 
 ################################################################################
 # Build packetin filter
 ################################################################################
 
-desc "Build packetin filter."
-task :packetin_filter => "libtrema:static"
+desc 'Build packetin filter.'
+task :packetin_filter => 'libtrema:static'
 
 PaperHouse::ExecutableTask.new :packetin_filter do | task |
-  task.executable_name = File.basename( Trema::Executables.packetin_filter )
-  task.target_directory = File.dirname( Trema::Executables.packetin_filter )
-  task.sources = [ "src/packetin_filter/*.c" ]
-  task.includes = [ Trema.include, Trema.openflow ]
+  task.executable_name = File.basename(Trema::Executables.packetin_filter)
+  task.target_directory = File.dirname(Trema::Executables.packetin_filter)
+  task.sources = ['src/packetin_filter/*.c']
+  task.includes = [Trema.include, Trema.openflow]
   task.cflags = CFLAGS
   task.ldflags = "-L#{ Trema.lib }"
   task.library_dependencies = [
-                               "trema",
-                               "sqlite3",
-                               "pthread",
-                               "rt",
-                               "dl",
+    'trema',
+    'sqlite3',
+    'pthread',
+    'rt',
+    'dl'
                               ]
 end
 
@@ -302,37 +301,37 @@ end
 ################################################################################
 
 def cbench_command
-  File.join Trema.objects, "oflops/bin/cbench"
+  File.join Trema.objects, 'oflops/bin/cbench'
 end
 
-task "vendor:oflops" => cbench_command
+task 'vendor:oflops' => cbench_command
 file cbench_command => Trema.openflow_h do
   sh "tar xzf #{ Trema.vendor_oflops }.tar.gz -C #{ Trema.vendor }"
   cd Trema.vendor_oflops do
     sh "./configure --prefix=#{ Trema.oflops } --with-openflow-src-dir=#{ Trema.vendor_openflow }"
-    sh "make install"
+    sh 'make install'
   end
 end
 
-CLEAN.include( Trema.oflops ) if FileTest.exists?( Trema.oflops )
-CLOBBER.include( Trema.vendor_oflops ) if FileTest.exists?( Trema.vendor_oflops )
+CLEAN.include(Trema.oflops) if FileTest.exists?(Trema.oflops)
+CLOBBER.include(Trema.vendor_oflops) if FileTest.exists?(Trema.vendor_oflops)
 
 
 ################################################################################
 # cmockery
 ################################################################################
 
-task "vendor:cmockery" => Trema.libcmockery_a
+task 'vendor:cmockery' => Trema.libcmockery_a
 file Trema.libcmockery_a do
   sh "tar xzf #{ Trema.vendor_cmockery }.tar.gz -C #{ Trema.vendor }"
   cd Trema.vendor_cmockery do
-    sh "./configure --prefix=#{ Trema.cmockery }"
-    sh "make install"
+    sh "./configure --disable-shared --prefix=#{ Trema.cmockery }"
+    sh 'make install'
   end
 end
 
-CLEAN.include( Trema.vendor_cmockery ) if FileTest.exists?( Trema.vendor_cmockery )
-CLOBBER.include( Trema.cmockery ) if FileTest.exists?( Trema.cmockery )
+CLEAN.include(Trema.vendor_cmockery) if FileTest.exists?(Trema.vendor_cmockery)
+CLOBBER.include(Trema.cmockery) if FileTest.exists?(Trema.cmockery)
 
 
 ################################################################################
@@ -340,45 +339,45 @@ CLOBBER.include( Trema.cmockery ) if FileTest.exists?( Trema.cmockery )
 ################################################################################
 
 $standalone_examples = [
-                        "cbench_switch",
-                        "dumper",
-                        "learning_switch",
-                        "list_switches",
-                        "multi_learning_switch",
-                        "packet_in",
-                        "repeater_hub",
-                        "switch_info",
-                        "switch_monitor",
-                        "traffic_monitor",
+  'cbench_switch',
+  'dumper',
+  'learning_switch',
+  'list_switches',
+  'multi_learning_switch',
+  'packet_in',
+  'repeater_hub',
+  'switch_info',
+  'switch_monitor',
+  'traffic_monitor'
                        ]
 
-desc "Build examples."
+desc 'Build examples.'
 task :examples =>
   $standalone_examples.map { | each | "examples:#{ each }" } +
   [
-   "examples:openflow_switch",
-   "examples:openflow_message",
-   "examples:switch_event_config",
-   "examples:packetin_filter_config"
+    'examples:openflow_switch',
+    'examples:openflow_message',
+    'examples:switch_event_config',
+    'examples:packetin_filter_config'
   ]
 
 $standalone_examples.each do | each |
   name = "examples:#{ each }"
 
-  task name => "libtrema:static"
+  task name => 'libtrema:static'
   PaperHouse::ExecutableTask.new name do | task |
     task.executable_name = each
-    task.target_directory = File.join( Trema.objects, "examples", each )
-    task.sources = [ "src/examples/#{ each }/*.c" ]
-    task.includes = [ Trema.include, Trema.openflow ]
+    task.target_directory = File.join(Trema.objects, 'examples', each)
+    task.sources = ["src/examples/#{ each }/*.c"]
+    task.includes = [Trema.include, Trema.openflow]
     task.cflags = CFLAGS
     task.ldflags = "-L#{ Trema.lib }"
     task.library_dependencies = [
-                                 "trema",
-                                 "sqlite3",
-                                 "pthread",
-                                 "rt",
-                                 "dl",
+      'trema',
+      'sqlite3',
+      'pthread',
+      'rt',
+      'dl'
                                 ]
   end
 end
@@ -389,29 +388,29 @@ end
 ################################################################################
 
 $openflow_switches = [
-                      "hello_switch",
-                      "echo_switch",
+  'hello_switch',
+  'echo_switch'
                      ]
 
-task "examples:openflow_switch" => $openflow_switches.map { | each | "examples:openflow_switch:#{ each }" }
+task 'examples:openflow_switch' => $openflow_switches.map { | each | "examples:openflow_switch:#{ each }" }
 
 $openflow_switches.each do | each |
   name = "examples:openflow_switch:#{ each }"
 
-  task name => "libtrema:static"
+  task name => 'libtrema:static'
   PaperHouse::ExecutableTask.new name do | task |
     task.executable_name = each
-    task.target_directory = File.join( Trema.objects, "examples", "openflow_switch" )
-    task.sources = [ "src/examples/openflow_switch/#{ each }.c" ]
-    task.includes = [ Trema.include, Trema.openflow ]
+    task.target_directory = File.join(Trema.objects, 'examples', 'openflow_switch')
+    task.sources = ["src/examples/openflow_switch/#{ each }.c"]
+    task.includes = [Trema.include, Trema.openflow]
     task.cflags = CFLAGS
     task.ldflags = "-L#{ Trema.lib }"
     task.library_dependencies = [
-                                 "trema",
-                                 "sqlite3",
-                                 "pthread",
-                                 "rt",
-                                 "dl",
+      'trema',
+      'sqlite3',
+      'pthread',
+      'rt',
+      'dl'
                                 ]
   end
 end
@@ -422,32 +421,32 @@ end
 ################################################################################
 
 $openflow_messages = [
-                      "echo",
-                      "features_request",
-                      "hello",
-                      "set_config",
-                      "vendor_action",
+  'echo',
+  'features_request',
+  'hello',
+  'set_config',
+  'vendor_action'
                      ]
 
-task "examples:openflow_message" => $openflow_messages.map { | each | "examples:openflow_message:#{ each }" }
+task 'examples:openflow_message' => $openflow_messages.map { | each | "examples:openflow_message:#{ each }" }
 
 $openflow_messages.each do | each |
   name = "examples:openflow_message:#{ each }"
 
-  task name => "libtrema:static"
+  task name => 'libtrema:static'
   PaperHouse::ExecutableTask.new name do | task |
     task.executable_name = each
-    task.target_directory = File.join( Trema.objects, "examples", "openflow_message" )
-    task.sources = [ "src/examples/openflow_message/#{ each }.c" ]
-    task.includes = [ Trema.include, Trema.openflow ]
+    task.target_directory = File.join(Trema.objects, 'examples', 'openflow_message')
+    task.sources = ["src/examples/openflow_message/#{ each }.c"]
+    task.includes = [Trema.include, Trema.openflow]
     task.cflags = CFLAGS
     task.ldflags = "-L#{ Trema.lib }"
     task.library_dependencies = [
-                                 "trema",
-                                 "sqlite3",
-                                 "pthread",
-                                 "rt",
-                                 "dl",
+      'trema',
+      'sqlite3',
+      'pthread',
+      'rt',
+      'dl'
                                 ]
   end
 end
@@ -458,31 +457,31 @@ end
 ###############################################################################
 
 $switch_event_config = [
-                        "add_forward_entry",
-                        "delete_forward_entry",
-                        "set_forward_entries",
-                        "dump_forward_entries",
+  'add_forward_entry',
+  'delete_forward_entry',
+  'set_forward_entries',
+  'dump_forward_entries'
                        ]
 
-task "examples:switch_event_config" => $switch_event_config.map { | each | "examples:switch_event_config:#{ each }" }
+task 'examples:switch_event_config' => $switch_event_config.map { | each | "examples:switch_event_config:#{ each }" }
 
 $switch_event_config.each do | each |
   name = "examples:switch_event_config:#{ each }"
 
-  task name => "libtrema:static"
+  task name => 'libtrema:static'
   PaperHouse::ExecutableTask.new name do | task |
     task.executable_name = each
-    task.target_directory = File.join( Trema.objects, "examples", "switch_event_config" )
-    task.sources = [ "src/examples/switch_event_config/#{ each }.c" ]
-    task.includes = [ Trema.include, Trema.openflow ]
+    task.target_directory = File.join(Trema.objects, 'examples', 'switch_event_config')
+    task.sources = ["src/examples/switch_event_config/#{ each }.c"]
+    task.includes = [Trema.include, Trema.openflow]
     task.cflags = CFLAGS
     task.ldflags = "-L#{ Trema.lib }"
     task.library_dependencies = [
-                                 "trema",
-                                 "sqlite3",
-                                 "pthread",
-                                 "rt",
-                                 "dl",
+      'trema',
+      'sqlite3',
+      'pthread',
+      'rt',
+      'dl'
                                 ]
   end
 end
@@ -493,32 +492,32 @@ end
 ################################################################################
 
 $packetin_filter_config = [
-                           "add_filter",
-                           "delete_filter",
-                           "delete_filter_strict",
-                           "dump_filter",
-                           "dump_filter_strict",
+  'add_filter',
+  'delete_filter',
+  'delete_filter_strict',
+  'dump_filter',
+  'dump_filter_strict'
                           ]
 
-task "examples:packetin_filter_config" => $packetin_filter_config.map { | each | "examples:packetin_filter_config:#{ each }" }
+task 'examples:packetin_filter_config' => $packetin_filter_config.map { | each | "examples:packetin_filter_config:#{ each }" }
 
 $packetin_filter_config.each do | each |
   name = "examples:packetin_filter_config:#{ each }"
 
-  task name => "libtrema:static"
+  task name => 'libtrema:static'
   PaperHouse::ExecutableTask.new name do | task |
     task.executable_name = each
-    task.target_directory = File.join( Trema.objects, "examples", "packetin_filter_config" )
-    task.sources = [ "src/examples/packetin_filter_config/#{ each }.c", "src/examples/packetin_filter_config/utils.c"]
-    task.includes = [ Trema.include, Trema.openflow ]
+    task.target_directory = File.join(Trema.objects, 'examples', 'packetin_filter_config')
+    task.sources = ["src/examples/packetin_filter_config/#{ each }.c", 'src/examples/packetin_filter_config/utils.c']
+    task.includes = [Trema.include, Trema.openflow]
     task.cflags = CFLAGS
     task.ldflags = "-L#{ Trema.lib }"
     task.library_dependencies = [
-                                 "trema",
-                                 "sqlite3",
-                                 "pthread",
-                                 "rt",
-                                 "dl",
+      'trema',
+      'sqlite3',
+      'pthread',
+      'rt',
+      'dl'
                                 ]
   end
 end
@@ -529,77 +528,75 @@ end
 ################################################################################
 
 def cbench_command
-  File.join Trema.objects, "oflops/bin/cbench"
+  File.join Trema.objects, 'oflops/bin/cbench'
 end
 
 
 def cbench_latency_mode_options
-  "--port 6653 --switches 1 --loops 10 --delay 1000"
+  '--port 6653 --switches 1 --loops 10 --delay 1000'
 end
 
 
 def cbench_throughput_mode_options
-  cbench_latency_mode_options + " --throughput"
+  cbench_latency_mode_options + ' --throughput'
 end
 
 
-def cbench controller, options
-  begin
-    sh "#{ controller }"
-    sh "#{ cbench_command } #{ options }"
-  ensure
-    sh "./trema killall"
-  end
+def cbench(controller, options)
+  sh "#{ controller }"
+  sh "#{ cbench_command } #{ options }"
+ensure
+  sh './trema killall'
 end
 
 
 def cbench_c_controller
-  "./trema run ./objects/examples/cbench_switch/cbench_switch -d"
+  './trema run ./objects/examples/cbench_switch/cbench_switch -d'
 end
 
 
 def cbench_ruby_controller
-  "./trema run src/examples/cbench_switch/cbench-switch.rb -d"
+  './trema run src/examples/cbench_switch/cbench-switch.rb -d'
 end
 
 
-def run_cbench controller
+def run_cbench(controller)
   cbench controller, cbench_latency_mode_options
   cbench controller, cbench_throughput_mode_options
 end
 
 
-def cbench_profile options
-  valgrind = "valgrind --tool=callgrind --trace-children=yes"
+def cbench_profile(options)
+  valgrind = 'valgrind --tool=callgrind --trace-children=yes'
   begin
     sh "#{ valgrind } #{ cbench_c_controller }"
     sh "#{ cbench_command } #{ options }"
   ensure
-    sh "./trema killall"
+    sh './trema killall'
   end
 end
 
-CLEAN.include FileList[ "callgrind.out.*" ]
+CLEAN.include FileList[ 'callgrind.out.*']
 
 
-desc "Run the c cbench switch controller to benchmark"
-task "cbench" => "cbench:ruby"
+desc 'Run the c cbench switch controller to benchmark'
+task 'cbench' => 'cbench:ruby'
 
 
-desc "Run the c cbench switch controller to benchmark"
-task "cbench:c" => :default do
+desc 'Run the c cbench switch controller to benchmark'
+task 'cbench:c' => :default do
   run_cbench cbench_c_controller
 end
 
 
-desc "Run the ruby cbench switch controller to benchmark"
-task "cbench:ruby" => :default do
+desc 'Run the ruby cbench switch controller to benchmark'
+task 'cbench:ruby' => :default do
   run_cbench cbench_ruby_controller
 end
 
 
-desc "Run cbench with profiling enabled."
-task "cbench:profile" => :default do
+desc 'Run cbench with profiling enabled.'
+task 'cbench:profile' => :default do
   cbench_profile cbench_latency_mode_options
   cbench_profile cbench_throughput_mode_options
 end
@@ -610,32 +607,32 @@ end
 ################################################################################
 
 $management_commands = [
-                       "application",
-                       "echo",
-                       "set_logging_level",
-                       "show_stats",
+  'application',
+  'echo',
+  'set_logging_level',
+  'show_stats'
                       ]
 
-desc "Build management commands."
+desc 'Build management commands.'
 task :management_commands => $management_commands.map { | each | "management:#{ each }" }
 
 $management_commands.each do | each |
   name = "management:#{ each }"
 
-  task name => "libtrema:static"
+  task name => 'libtrema:static'
   PaperHouse::ExecutableTask.new name do | task |
     task.executable_name = each
-    task.target_directory = File.join( Trema.objects, "management" )
-    task.sources = [ "src/management/#{ each }.c" ]
-    task.includes = [ Trema.include, Trema.openflow ]
+    task.target_directory = File.join(Trema.objects, 'management')
+    task.sources = ["src/management/#{ each }.c"]
+    task.includes = [Trema.include, Trema.openflow]
     task.cflags = CFLAGS
     task.ldflags = "-L#{ Trema.lib }"
     task.library_dependencies = [
-                                 "trema",
-                                 "sqlite3",
-                                 "pthread",
-                                 "rt",
-                                 "dl",
+      'trema',
+      'sqlite3',
+      'pthread',
+      'rt',
+      'dl'
                                 ]
   end
 end
@@ -645,106 +642,106 @@ end
 # Tremashark
 ################################################################################
 
-desc "Build tremashark."
-task :tremashark => [ :packet_capture, :syslog_relay, :stdin_relay, :openflow_wireshark_plugin, "libtrema:static" ]
+desc 'Build tremashark.'
+task :tremashark => [:packet_capture, :syslog_relay, :stdin_relay, :openflow_wireshark_plugin, 'libtrema:static']
 
 PaperHouse::ExecutableTask.new :tremashark do | task |
-  task.executable_name = File.basename( Trema::Executables.tremashark )
-  task.target_directory = File.dirname( Trema::Executables.tremashark )
+  task.executable_name = File.basename(Trema::Executables.tremashark)
+  task.target_directory = File.dirname(Trema::Executables.tremashark)
   task.sources = [
-                  "src/tremashark/pcap_queue.c",
-                  "src/tremashark/queue.c",
-                  "src/tremashark/tremashark.c",
+    'src/tremashark/pcap_queue.c',
+    'src/tremashark/queue.c',
+    'src/tremashark/tremashark.c'
                  ]
-  task.includes = [ Trema.include, Trema.openflow ]
+  task.includes = [Trema.include, Trema.openflow]
   task.cflags = CFLAGS
   task.ldflags = "-L#{ Trema.lib }"
   task.library_dependencies = [
-                               "trema",
-                               "sqlite3",
-                               "pthread",
-                               "rt",
-                               "dl",
-                               "pcap"
+    'trema',
+    'sqlite3',
+    'pthread',
+    'rt',
+    'dl',
+    'pcap'
                               ]
 end
 
 
-task :packet_capture => "libtrema:static"
+task :packet_capture => 'libtrema:static'
 
 PaperHouse::ExecutableTask.new :packet_capture do | task |
-  task.executable_name = File.basename( Trema::Executables.packet_capture )
-  task.target_directory = File.dirname( Trema::Executables.packet_capture )
+  task.executable_name = File.basename(Trema::Executables.packet_capture)
+  task.target_directory = File.dirname(Trema::Executables.packet_capture)
   task.sources = [
-                  "src/tremashark/packet_capture.c",
-                  "src/tremashark/queue.c",
+    'src/tremashark/packet_capture.c',
+    'src/tremashark/queue.c'
                  ]
-  task.includes = [ Trema.include, Trema.openflow ]
+  task.includes = [Trema.include, Trema.openflow]
   task.cflags = CFLAGS
   task.ldflags = "-L#{ Trema.lib }"
   task.library_dependencies = [
-                               "trema",
-                               "sqlite3",
-                               "pthread",
-                               "rt",
-                               "dl",
-                               "pcap"
+    'trema',
+    'sqlite3',
+    'pthread',
+    'rt',
+    'dl',
+    'pcap'
                               ]
 end
 
 
-task :syslog_relay => "libtrema:static"
+task :syslog_relay => 'libtrema:static'
 
 PaperHouse::ExecutableTask.new :syslog_relay do | task |
-  task.executable_name = File.basename( Trema::Executables.syslog_relay )
-  task.target_directory = File.dirname( Trema::Executables.syslog_relay )
-  task.sources = [ "src/tremashark/syslog_relay.c" ]
-  task.includes = [ Trema.include, Trema.openflow ]
+  task.executable_name = File.basename(Trema::Executables.syslog_relay)
+  task.target_directory = File.dirname(Trema::Executables.syslog_relay)
+  task.sources = ['src/tremashark/syslog_relay.c']
+  task.includes = [Trema.include, Trema.openflow]
   task.cflags = CFLAGS
   task.ldflags = "-L#{ Trema.lib }"
   task.library_dependencies = [
-                               "trema",
-                               "sqlite3",
-                               "pthread",
-                               "rt",
-                               "dl",
-                               "pcap"
+    'trema',
+    'sqlite3',
+    'pthread',
+    'rt',
+    'dl',
+    'pcap'
                               ]
 end
 
 
-task :stdin_relay => "libtrema:static"
+task :stdin_relay => 'libtrema:static'
 
 PaperHouse::ExecutableTask.new :stdin_relay do | task |
-  task.executable_name = File.basename( Trema::Executables.stdin_relay )
-  task.target_directory = File.dirname( Trema::Executables.stdin_relay )
-  task.sources = [ "src/tremashark/stdin_relay.c" ]
-  task.includes = [ Trema.include, Trema.openflow ]
+  task.executable_name = File.basename(Trema::Executables.stdin_relay)
+  task.target_directory = File.dirname(Trema::Executables.stdin_relay)
+  task.sources = ['src/tremashark/stdin_relay.c']
+  task.includes = [Trema.include, Trema.openflow]
   task.cflags = CFLAGS
   task.ldflags = "-L#{ Trema.lib }"
   task.library_dependencies = [
-                               "trema",
-                               "sqlite3",
-                               "pthread",
-                               "rt",
-                               "dl",
-                               "pcap"
+    'trema',
+    'sqlite3',
+    'pthread',
+    'rt',
+    'dl',
+    'pcap'
                               ]
 end
 
 
-$packet_openflow_so = File.join( Trema.vendor_openflow_git, "utilities", "wireshark_dissectors", "openflow", "packet-openflow.so" )
-$wireshark_plugins_dir = File.join( File.expand_path( "~" ), ".wireshark", "plugins" )
-$wireshark_plugin = File.join( $wireshark_plugins_dir, File.basename( $packet_openflow_so ) )
+$packet_openflow_so = File.join(Trema.vendor_openflow_git, 'utilities', 'wireshark_dissectors', 'openflow', 'packet-openflow.so')
+$wireshark_plugins_dir = File.join(File.expand_path('~'), '.wireshark', 'plugins')
+$wireshark_plugin = File.join($wireshark_plugins_dir, File.basename($packet_openflow_so))
 
 file $packet_openflow_so do
   sh "tar xzf #{ Trema.vendor_openflow_git }.tar.gz -C #{ Trema.vendor }"
-  cd File.dirname( $packet_openflow_so ) do
-    sh "make"
+  cd File.dirname($packet_openflow_so) do
+    sh 'make'
   end
 end
 
-file $wireshark_plugin => [ $packet_openflow_so, $wireshark_plugins_dir ] do
+file $wireshark_plugin => [$packet_openflow_so, $wireshark_plugins_dir] do
   cp $packet_openflow_so, $wireshark_plugins_dir
 end
 
@@ -752,7 +749,7 @@ directory $wireshark_plugins_dir
 
 task :openflow_wireshark_plugin => $wireshark_plugin
 
-CLEAN.include( Trema.vendor_openflow_git ) if FileTest.exists?( Trema.vendor_openflow_git )
+CLEAN.include(Trema.vendor_openflow_git) if FileTest.exists?(Trema.vendor_openflow_git)
 
 
 ################################################################################
@@ -760,7 +757,7 @@ CLEAN.include( Trema.vendor_openflow_git ) if FileTest.exists?( Trema.vendor_ope
 ################################################################################
 
 begin
-  require "bundler/gem_tasks"
+  require 'bundler/gem_tasks'
 rescue LoadError
   $stderr.puts $!.to_s
 end
@@ -771,7 +768,7 @@ end
 ################################################################################
 
 task :relish do
-  sh "relish push trema/trema"
+  sh 'relish push trema/trema'
 end
 
 
@@ -781,28 +778,28 @@ end
 
 def libtrema_unit_tests
   {
-    :byteorder_test => [ :log, :utility, :wrapper, :trema_wrapper ],
-    :daemon_test => [ :log, :utility, :wrapper, :trema_wrapper ],
-    :ether_test => [ :buffer, :log, :utility, :wrapper, :trema_wrapper ],
+    :byteorder_test => [:log, :utility, :wrapper, :trema_wrapper],
+    :daemon_test => [:log, :utility, :wrapper, :trema_wrapper],
+    :ether_test => [:buffer, :log, :utility, :wrapper, :trema_wrapper],
     :external_callback_test => [],
-    :messenger_test => [ :doubly_linked_list, :hash_table, :event_handler, :linked_list, :utility, :wrapper, :timer, :log, :trema_wrapper ],
-    :openflow_application_interface_test => [ :buffer, :byteorder, :hash_table, :doubly_linked_list, :linked_list, :log, :openflow_message, :packet_info, :stat, :trema_wrapper, :utility, :wrapper ],
-    :openflow_message_test => [ :buffer, :byteorder, :linked_list, :log, :packet_info, :utility, :wrapper, :trema_wrapper ],
-    :packet_info_test => [ :buffer, :log, :utility, :wrapper, :trema_wrapper ],
-    :stat_test => [ :hash_table, :doubly_linked_list, :log, :utility, :wrapper, :trema_wrapper ],
-    :timer_test => [ :log, :utility, :wrapper, :doubly_linked_list, :trema_wrapper ],
-    :trema_test => [ :utility, :log, :wrapper, :doubly_linked_list, :trema_private, :trema_wrapper ],
+    :messenger_test => [:doubly_linked_list, :hash_table, :event_handler, :linked_list, :utility, :wrapper, :timer, :log, :trema_wrapper],
+    :openflow_application_interface_test => [:buffer, :byteorder, :hash_table, :doubly_linked_list, :linked_list, :log, :openflow_message, :packet_info, :stat, :trema_wrapper, :utility, :wrapper],
+    :openflow_message_test => [:buffer, :byteorder, :linked_list, :log, :packet_info, :utility, :wrapper, :trema_wrapper],
+    :packet_info_test => [:buffer, :log, :utility, :wrapper, :trema_wrapper],
+    :stat_test => [:hash_table, :doubly_linked_list, :log, :utility, :wrapper, :trema_wrapper],
+    :timer_test => [:log, :utility, :wrapper, :doubly_linked_list, :trema_wrapper],
+    :trema_test => [:utility, :log, :wrapper, :doubly_linked_list, :trema_private, :trema_wrapper]
   }
 end
 
 
-def test_c_files test
-  names = [ test.to_s.gsub( /_test$/, "" ) ] + libtrema_unit_tests[ test ]
+def test_c_files(test)
+  names = [test.to_s.gsub(/_test$/, '')] + libtrema_unit_tests[ test]
   names.collect do | each |
     if each == :buffer
-      [ "src/lib/buffer.c", "unittests/buffer_stubs.c" ]
+      ['src/lib/buffer.c', 'unittests/buffer_stubs.c']
     elsif each == :wrapper
-      [ "src/lib/wrapper.c", "unittests/wrapper_stubs.c" ]
+      ['src/lib/wrapper.c', 'unittests/wrapper_stubs.c']
     else
       "src/lib/#{ each }.c"
     end
@@ -810,28 +807,28 @@ def test_c_files test
 end
 
 
-directory "objects/unittests"
+directory 'objects/unittests'
 
 task :build_old_unittests => libtrema_unit_tests.keys.map { | each | "unittests:#{ each }" }
 
 libtrema_unit_tests.keys.each do | each |
   PaperHouse::ExecutableTask.new "unittests:#{ each }" do | task |
     name = "unittests:#{ each }"
-    task name => [ "vendor:cmockery", "vendor:openflow", "objects/unittests" ]
+    task name => ['vendor:cmockery', 'vendor:openflow', 'objects/unittests']
 
     task.executable_name = each.to_s
-    task.target_directory = File.join( Trema.home, "unittests/objects" )
-    task.sources = test_c_files( each ) + [ "unittests/lib/#{ each }.c" ]
-    task.includes = [ Trema.include, Trema.openflow, File.dirname( Trema.cmockery_h ), "unittests" ]
-    task.cflags = [ "-DUNIT_TESTING", "--coverage", CFLAGS ]
-    task.ldflags = "-DUNIT_TESTING -L#{ File.dirname Trema.libcmockery_a } --coverage --static"
+    task.target_directory = File.join(Trema.home, 'unittests/objects')
+    task.sources = test_c_files(each) + ["unittests/lib/#{ each }.c"]
+    task.includes = [Trema.include, Trema.openflow, File.dirname(Trema.cmockery_h), 'unittests']
+    task.cflags = ['-DUNIT_TESTING', '--coverage', CFLAGS]
+    task.ldflags = "-DUNIT_TESTING -L#{ File.dirname Trema.libcmockery_a } --coverage"
     task.library_dependencies = [
-                                 "cmockery",
-                                 "sqlite3",
-                                 "pthread",
-                                 "rt",
-                                 "dl",
-                                 "pcap"
+      'cmockery',
+      'sqlite3',
+      'pthread',
+      'rt',
+      'dl',
+      'pcap'
                                 ]
   end
 end
@@ -839,54 +836,54 @@ end
 
 # new unittest
 $tests = [
-          "objects/unittests/buffer_test",
-          "objects/unittests/doubly_linked_list_test",
-          "objects/unittests/ether_test",
-          "objects/unittests/event_forward_interface_test",
-          "objects/unittests/hash_table_test",
-          "objects/unittests/linked_list_test",
-          "objects/unittests/log_test",
-          "objects/unittests/packetin_filter_interface_test",
-          "objects/unittests/packet_info_test",
-          "objects/unittests/packet_parser_test",
-          "objects/unittests/persistent_storage_test",
-          "objects/unittests/trema_private_test",
-          "objects/unittests/utility_test",
-          "objects/unittests/wrapper_test",
-          "objects/unittests/match_table_test",
-          "objects/unittests/message_queue_test",
-          "objects/unittests/management_interface_test",
-          "objects/unittests/management_service_interface_test",
+  'objects/unittests/buffer_test',
+  'objects/unittests/doubly_linked_list_test',
+  'objects/unittests/ether_test',
+  'objects/unittests/event_forward_interface_test',
+  'objects/unittests/hash_table_test',
+  'objects/unittests/linked_list_test',
+  'objects/unittests/log_test',
+  'objects/unittests/packetin_filter_interface_test',
+  'objects/unittests/packet_info_test',
+  'objects/unittests/packet_parser_test',
+  'objects/unittests/persistent_storage_test',
+  'objects/unittests/trema_private_test',
+  'objects/unittests/utility_test',
+  'objects/unittests/wrapper_test',
+  'objects/unittests/match_table_test',
+  'objects/unittests/message_queue_test',
+  'objects/unittests/management_interface_test',
+  'objects/unittests/management_service_interface_test'
          ]
 
-task :build_unittests => $tests.map { | each | "unittests:" + File.basename( each ) }
+task :build_unittests => $tests.map { | each | 'unittests:' + File.basename(each) }
 
 $tests.each do | _each |
-  each = File.basename( _each )
+  each = File.basename(_each)
 
-  task "unittests:#{ each }" => [ "libtrema:gcov", "vendor:cmockery" ]
+  task "unittests:#{ each }" => ['libtrema:gcov', 'vendor:cmockery']
   PaperHouse::ExecutableTask.new "unittests:#{ each }" do | task |
     task.executable_name = each.to_s
-    task.target_directory = File.join( Trema.home, "unittests/objects" )
-    task.sources = [ "unittests/lib/#{ each }.c", "unittests/cmockery_trema.c" ]
-    task.includes = [ Trema.include, Trema.openflow, File.dirname( Trema.cmockery_h ), "unittests" ]
-    task.cflags = [ "--coverage", CFLAGS ]
-    task.ldflags = "-L#{ File.dirname Trema.libcmockery_a } -Lobjects/unittests --coverage --static"
+    task.target_directory = File.join(Trema.home, 'unittests/objects')
+    task.sources = ["unittests/lib/#{ each }.c", 'unittests/cmockery_trema.c']
+    task.includes = [Trema.include, Trema.openflow, File.dirname(Trema.cmockery_h), 'unittests']
+    task.cflags = ['--coverage', CFLAGS]
+    task.ldflags = "-L#{ File.dirname Trema.libcmockery_a } -Lobjects/unittests --coverage"
     task.library_dependencies = [
-                                 "trema",
-                                 "cmockery",
-                                 "sqlite3",
-                                 "pthread",
-                                 "rt",
-                                 "dl",
+      'trema',
+      'cmockery',
+      'sqlite3',
+      'pthread',
+      'rt',
+      'dl'
                                 ]
   end
 end
 
 
-desc "Run unittests"
-task :unittests => [ :build_old_unittests, :build_unittests ] do
-  Dir.glob( "unittests/objects/*_test" ).each do | each |
+desc 'Run unittests'
+task :unittests => [:build_old_unittests, :build_unittests] do
+  Dir.glob('unittests/objects/*_test').each do | each |
     puts "Running #{ each }..."
     sh each
   end
@@ -897,41 +894,41 @@ end
 # Tests
 ################################################################################
 
-task :travis => [ :clobber, :build_trema, "spec:travis" ]
+task :travis => [:clobber, :build_trema, 'spec:travis']
 
 
 begin
-  require "rspec/core"
-  require "rspec/core/rake_task"
+  require 'rspec/core'
+  require 'rspec/core/rake_task'
 
   task :spec => :build_trema
   RSpec::Core::RakeTask.new do | task |
     task.verbose = $trace
-    task.pattern = FileList[ "spec/**/*_spec.rb" ]
-    task.rspec_opts = "--format documentation --color"
+    task.pattern = FileList[ 'spec/**/*_spec.rb']
+    task.rspec_opts = '--format documentation --color'
   end
 
-  task "spec:actions" => :build_trema
-  RSpec::Core::RakeTask.new( "spec:actions" ) do | task |
+  task 'spec:actions' => :build_trema
+  RSpec::Core::RakeTask.new('spec:actions') do | task |
     task.verbose = $trace
-    task.pattern = FileList[ "spec/**/*_spec.rb" ]
-    task.rspec_opts = "--tag type:actions --format documentation --color"
+    task.pattern = FileList[ 'spec/**/*_spec.rb']
+    task.rspec_opts = '--tag type:actions --format documentation --color'
   end
 
 
-  task "spec:travis" => :build_trema
-  RSpec::Core::RakeTask.new( "spec:travis" ) do | task |
+  task 'spec:travis' => :build_trema
+  RSpec::Core::RakeTask.new('spec:travis') do | task |
     task.verbose = $trace
-    task.pattern = FileList[ "spec/trema/hello_spec.rb", "spec/trema/echo-*_spec.rb" ]
-    task.rspec_opts = "--tag ~sudo --format documentation --color"
+    task.pattern = FileList[ 'spec/trema/hello_spec.rb', 'spec/trema/echo-*_spec.rb']
+    task.rspec_opts = '--tag ~sudo --format documentation --color'
   end
 
 
   task :rcov => :build_trema
-  RSpec::Core::RakeTask.new( :rcov ) do | spec |
-    spec.pattern = "spec/**/*_spec.rb"
+  RSpec::Core::RakeTask.new(:rcov) do | spec |
+    spec.pattern = 'spec/**/*_spec.rb'
     spec.rcov = true
-    spec.rcov_opts = [ "-x", "gems" ]
+    spec.rcov_opts = ['-x', 'gems']
   end
 rescue LoadError
   $stderr.puts $!.to_s
@@ -939,10 +936,16 @@ end
 
 
 begin
-  require "cucumber/rake/task"
+  require 'cucumber/rake/task'
+
   task :features => :build_trema
-  Cucumber::Rake::Task.new( :features ) do | t |
-    t.cucumber_opts = "features --tags ~@wip"
+  Cucumber::Rake::Task.new(:features) do | t |
+    t.cucumber_opts = '--tags @critical --tags ~@wip'
+  end
+
+  task 'features:all' => :build_trema
+  Cucumber::Rake::Task.new('features:all') do | t |
+    t.cucumber_opts = '--tags ~@wip'
   end
 rescue LoadError
   $stderr.puts $!.to_s
@@ -953,21 +956,21 @@ end
 # Code Quality Tasks
 ################################################################################
 
-$ruby_sources = FileList[ "ruby/**/*.rb", "src/**/*.rb" ]
+$ruby_sources = FileList[ 'ruby/**/*.rb', 'src/**/*.rb']
 
 
-desc "Enforce Ruby code quality with static analysis of code"
-task :quality => [ :reek, :flog, :flay ]
+desc 'Enforce Ruby code quality with static analysis of code'
+task :quality => [:reek, :flog, :flay]
 
 
 begin
-  require "reek/rake/task"
+  require 'reek/rake/task'
 
   Reek::Rake::Task.new do | t |
     t.fail_on_error = false
     t.verbose = false
-    t.ruby_opts = [ "-rubygems" ]
-    t.reek_opts = "--quiet"
+    t.ruby_opts = ['-rubygems']
+    t.reek_opts = '--quiet'
     t.source_files = $ruby_sources
   end
 rescue LoadError
@@ -976,21 +979,21 @@ end
 
 
 begin
-  require "flog"
+  require 'flog'
 
-  desc "Analyze for code complexity"
+  desc 'Analyze for code complexity'
   task :flog do
-    flog = Flog.new( :continue => true )
-    flog.flog *$ruby_sources
+    flog = Flog.new(:continue => true)
+    flog.flog(*$ruby_sources)
     threshold = 10
 
     bad_methods = flog.totals.select do | name, score |
-      ( not ( /##{flog.no_method}$/=~ name ) ) and score > threshold
+      ( not ( /##{flog.no_method}$/ =~ name)) && score > threshold
     end
     bad_methods.sort do | a, b |
-      a[ 1 ] <=> b[ 1 ]
+      a[ 1] <=> b[ 1]
     end.reverse.each do | name, score |
-      puts "%8.1f: %s" % [ score, name ]
+      puts '%8.1f: %s' % [score, name]
     end
     unless bad_methods.empty?
       $stderr.puts "#{ bad_methods.size } methods have a flog complexity > #{ threshold }"
@@ -1002,12 +1005,12 @@ end
 
 
 begin
-  require "flay"
-  require "flay_task"
+  require 'flay'
+  require 'flay_task'
 
   FlayTask.new do | t |
     t.dirs = $ruby_sources.collect do | each |
-      each[ /[^\/]+/ ]
+      each[ /[^\/]+/]
     end.uniq
     t.threshold = 0
     t.verbose = true
@@ -1017,17 +1020,21 @@ rescue LoadError
 end
 
 
+task :travis => :rubocop
+task :quality => :rubocop
+
+
 ################################################################################
 # YARD
 ################################################################################
 
 begin
-  require "yard"
+  require 'yard'
 
   YARD::Rake::YardocTask.new do | t |
-   t.files = [ "ruby/trema/**/*.c", "ruby/trema/**/*.rb" ]
-   t.options = [ "--no-private" ]
-   t.options << "--debug" << "--verbose" if $trace
+   t.files = ['ruby/trema/**/*.c', 'ruby/trema/**/*.rb']
+   t.options = ['--no-private']
+   t.options << '--debug' << '--verbose' if $trace
   end
 rescue LoadError
   $stderr.puts $!.to_s
@@ -1038,9 +1045,9 @@ end
 # TODO, FIXME etc.
 ################################################################################
 
-desc "Print list of notes."
+desc 'Print list of notes.'
 task :notes do
-  keywords = [ "TODO", "FIXME", "XXX" ]
+  keywords = ['TODO', 'FIXME', 'XXX']
   keywords.each do | each |
     system "find src unittests -name '*.c' | xargs grep -n #{ each }"
     system "find ruby spec features -name '*.rb' | xargs grep -n #{ each }"
@@ -1048,8 +1055,4 @@ task :notes do
 end
 
 
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:
+Dir.glob('tasks/*.rake').each { |each| import each }