trema 0.5.1 → 0.6.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trema
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.1
+        version: 2.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.1
+        version: 2.13.2
 - !ruby/object:Gem::Dependency
   name: phut
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.6.9
 - !ruby/object:Gem::Dependency
   name: pio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: relish
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +114,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.4.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.4.8
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +170,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +212,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.34.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.34.0
 description: Trema is a full-stack, easy-to-use framework for developing OpenFlow
   controllers in Ruby.
 email:
@@ -228,27 +242,60 @@ files:
 - Rakefile
 - bin/.gitignore
 - bin/trema
-- features/cleanup_on_failure.feature
-- features/echo_reply_handler.feature
-- features/logging.feature
-- features/send_flow_mod_add.feature
+- cucumber.yml
+- features/.nav
+- features/api/logging.feature
+- features/api/send_flow_mod_add.feature
+- features/handlers/barrier_reply.feature
+- features/handlers/echo_reply.feature
+- features/handlers/hello_failed.feature
+- features/handlers/packet_in.feature
+- features/handlers/start.feature
+- features/handlers/switch_disconnected.feature
+- features/handlers/switch_ready.feature
+- features/logger/debug.feature
+- features/logger/error.feature
+- features/logger/fatal.feature
+- features/logger/info.feature
+- features/logger/warn.feature
 - features/step_definitions/.gitignore
 - features/step_definitions/.rubocop.yml
 - features/step_definitions/.travis.yml
 - features/step_definitions/Gemfile
 - features/step_definitions/Guardfile
 - features/step_definitions/LICENSE
-- features/step_definitions/README.md
+- features/step_definitions/README.txt
 - features/step_definitions/Rakefile
+- features/step_definitions/dump_flows_steps.rb
+- features/step_definitions/rest_api_steps.rb
 - features/step_definitions/show_stats_steps.rb
+- features/step_definitions/trema_steps.rb
 - features/step_definitions/virtual_link_steps.rb
 - features/support/env.rb
 - features/support/hooks.rb
-- features/trema_delete_link.feature
-- features/trema_killall.feature
-- features/trema_run.feature
-- features/trema_start.feature
-- features/trema_stop.feature
+- features/trema_delete_link/README.md
+- features/trema_delete_link/delete_link.feature
+- features/trema_delete_link/socket_dir_option.feature
+- features/trema_killall/README.md
+- features/trema_killall/all_option.feature
+- features/trema_killall/killall.feature
+- features/trema_killall/socket_dir_option.feature
+- features/trema_run/README.md
+- features/trema_run/conf_option.feature
+- features/trema_run/daemonize_option.feature
+- features/trema_run/log_dir_option.feature
+- features/trema_run/logging_level_option.feature
+- features/trema_run/openflow13_option.feature
+- features/trema_run/pid_dir_option.feature
+- features/trema_run/port_option.feature
+- features/trema_run/run.feature
+- features/trema_run/socket_dir_option.feature
+- features/trema_start/README.md
+- features/trema_start/socket_dir_option.feature
+- features/trema_start/start.feature
+- features/trema_stop/README.md
+- features/trema_stop/socket_dir_option.feature
+- features/trema_stop/stop.feature
 - lib/trema.rb
 - lib/trema/command.rb
 - lib/trema/controller.rb

data/features/cleanup_on_failure.feature

@@ -1,118 +0,0 @@
-Feature: trema run cleanup on failure
-  Background:
-    Given I set the environment variables to:
-      | variable         | value |
-      | TREMA_LOG_DIR    | .     |
-      | TREMA_PID_DIR    | .     |
-      | TREMA_SOCKET_DIR | .     |
-    And a file named "trema.conf" with:
-      """
-      vswitch { datapath_id 0xabc }
-
-      vhost('host1') { ip '192.168.0.1' }
-      vhost('host2') { ip '192.168.0.2' }
-
-      link '0xabc', 'host1'
-      link '0xabc', 'host2'
-      """
-
-  @sudo
-  Scenario: NameError in config file
-    Given a file named "invalid_trema.conf" with:
-      """
-      Foo Bar Baz
-      """
-    And a file named "null_controller.rb" with:
-      """
-      class NullController < Trema::Controller; end
-      """
-    When I run `trema run null_controller.rb -c invalid_trema.conf`
-    Then the output should contain "uninitialized constant Phut::Syntax::Baz (NameError)"
-    And the exit status should not be 0
-    And virtual links should not exist
-    And a file named "NullController.pid" should not exist
-
-  Scenario: SyntaxError in config file
-    Given a file named "invalid_trema.conf" with:
-      """
-      Today is 19 June 2015
-      """
-    And a file named "null_controller.rb" with:
-      """
-      class NullController < Trema::Controller; end
-      """
-    When I run `trema run null_controller.rb -c invalid_trema.conf`
-    Then the output should contain "(SyntaxError)"
-    And the exit status should not be 0
-    And virtual links should not exist
-    And a file named "NullController.pid" should not exist
-
-  Scenario: SyntaxError when loading controller code
-    Given a file named "invalid_ruby.rb" with:
-      """
-      Today is 13 March 2015
-      """
-    When I run `trema run invalid_ruby.rb -c trema.conf`
-    Then the output should contain "(SyntaxError)"
-    And the exit status should not be 0
-    And virtual links should not exist 
-    And the following files should not exist:
-      | vhost.host1.pid        |
-      | vhost.host2.pid        |
-
-  @sudo
-  Scenario: NameError when loading controller code
-    Given a file named "invalid_ruby.rb" with:
-      """
-      class InvalidRuby < Trema::Controller
-        Foo
-        Bar
-        Baz
-      end
-      """
-    When I run `trema run invalid_ruby.rb -c trema.conf`
-    Then the output should contain "uninitialized constant InvalidRuby::Foo (NameError)"
-    And the exit status should not be 0
-    And virtual links should not exist 
-    And the following files should not exist:
-      | InvalidRuby.pid        |
-      | vhost.host1.pid        |
-      | vhost.host2.pid        |
-
-  @sudo
-  Scenario: RuntimeError in Controller#start
-    Given a file named "start_fail.rb" with:
-      """
-      class StartFail < Trema::Controller
-        def start(_args)
-          fail 'bang!'
-        end
-      end
-      """
-    When I run `trema run start_fail.rb -c trema.conf`
-    Then the output should contain "bang! (RuntimeError)"
-    And the exit status should not be 0
-    And virtual links should not exist 
-    And the following files should not exist:
-      | StartFail.pid          |
-      | vhost.host1.pid        |
-      | vhost.host2.pid        |
-
-  @sudo
-  Scenario: RuntimeError in handlers
-    Given a file named "switch_ready_fail.rb" with:
-      """
-      class SwitchReadyFail < Trema::Controller
-        def switch_ready(_dpid)
-          fail 'bang!'
-        end
-      end
-      """
-    When I run `trema -v run switch_ready_fail.rb -c trema.conf`
-    Then the output should contain "bang! (RuntimeError)"
-    And the exit status should not be 0
-    And virtual links should not exist 
-    And the following files should not exist:
-      | SwitchReadyFail.pid    |
-      | vhost.host1.pid        |
-      | vhost.host2.pid        |

data/features/step_definitions/README.md

@@ -1,7 +0,0 @@
-Cucumber Step Definitions
-=========================
-
-A collection of step definitions for use with [Trema][trema] and Trema apps.
-These steps are highly specific to Trema.
-
-[trema]: https://github.com/trema/trema

data/features/trema_run.feature

@@ -1,72 +0,0 @@
-Feature: trema run command
-  Background:
-    Given I set the environment variables to:
-      | variable         | value |
-      | TREMA_LOG_DIR    | .     |
-      | TREMA_PID_DIR    | .     |
-      | TREMA_SOCKET_DIR | .     |
-
-  @sudo
-  Scenario: the default port
-    Given a file named "switch_ready.rb" with:
-      """
-      class SwitchReady < Trema::Controller
-        def switch_ready(dpid)
-          logger.info format('Hello %s!', dpid.to_hex)
-        end
-      end
-      """
-    And a file named "trema.conf" with:
-      """
-      vswitch { datapath_id 0xabc }
-      """
-    When I successfully run `trema -v run switch_ready.rb -c trema.conf -d`
-    And I run `sleep 5`
-    Then the file "SwitchReady.log" should contain "Hello 0xabc!"
-
-  @sudo
-  Scenario: -p option
-    Given a file named "switch_ready.rb" with:
-      """
-      class SwitchReady < Trema::Controller
-        def switch_ready(dpid)
-          logger.info format('Hello %s!', dpid.to_hex)
-        end
-      end
-      """
-    And a file named "trema.conf" with:
-      """
-      vswitch {
-        datapath_id 0xabc
-        port 1234
-      }
-      """
-    When I successfully run `trema -v run -p 1234 switch_ready.rb -c trema.conf -d`
-    And I run `sleep 5`
-    Then the file "SwitchReady.log" should contain "Hello 0xabc!"
-
-  @sudo
-  Scenario: trema run with --openflow13 option
-    Given a file named "null_controller.rb" with:
-      """
-      class NullController < Trema::Controller; end
-      """
-    And a file named "trema.conf" with:
-      """
-      vswitch { datapath_id 0xabc }
-      """
-    When I successfully run `trema -v run null_controller.rb --openflow13 -c trema.conf -d`
-    And I run `sleep 5`
-    Then the output should contain "protocols=OpenFlow13"
-
-  @sudo
-  Scenario: trema run empty file and error
-    Given a file named "empty.rb" with:
-      """
-      """
-    When I run `trema -v run empty.rb`
-    Then the exit status should not be 0
-    And the stderr should contain:
-      """
-      No controller class is defined.
-      """