Merge branch 'feature/trema0.7.1' into develop

trema · Sep 30, 2015 · 41c895b · 41c895b
2 parents 7354bbf + 95c38e8
commit 41c895b
Show file tree

Hide file tree

Showing 10 changed files with 155 additions and 96 deletions.
diff --git a/.hound.yml b/.hound.yml
@@ -0,0 +1,3 @@
+ruby:
+  enabled: true
+  config_file: .rubocop.yml
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'trema', github: 'trema/trema', branch: 'develop'
+gem 'trema'
 
 group :development, :test do
   gem 'aruba', require: false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,77 +1,66 @@
-GIT
-  remote: git://github.com/trema/trema.git
-  revision: ccc3dc6de142c08e118d8271a80f961a6169f971
-  branch: develop
-  specs:
-    trema (0.1.0)
-      bundler (~> 1.10.0)
-      gli (~> 2.13.1)
-      phut (~> 0.5.0)
-      pio (~> 0.20.0)
-      rake
-
 GEM
   remote: https://rubygems.org/
   specs:
     abstract_type (0.0.7)
     adamantium (0.2.0)
       ice_nine (~> 0.11.0)
       memoizable (~> 0.4.0)
-    aruba (0.6.2)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
+    aruba (0.9.0)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    ast (2.1.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
     bindata (2.1.0)
     builder (3.2.2)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
     childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
-    codeclimate-test-reporter (0.4.7)
+    codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
-    coveralls (0.8.1)
+    contracts (0.12.0)
+    coveralls (0.8.2)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-    cucumber (2.0.0)
+    cucumber (2.1.0)
       builder (>= 2.1.2)
-      cucumber-core (~> 1.1.3)
+      cucumber-core (~> 1.3.0)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      gherkin3 (~> 3.1.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (1.1.3)
-      gherkin (~> 2.12.0)
+    cucumber-core (1.3.0)
+      gherkin3 (~> 3.1.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
     equalizer (0.0.11)
-    ffi (1.9.8)
+    ffi (1.9.10)
     flay (2.6.1)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
     flog (4.3.2)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.4)
     formatador (0.2.5)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    given_core (3.7.0)
+    gherkin3 (3.1.1)
+    given_core (3.7.1)
       sorcerer (>= 0.3.7)
-    gli (2.13.1)
-    guard (2.12.5)
+    gli (2.13.2)
+    guard (2.13.0)
       formatador (>= 0.2.4)
-      listen (~> 2.7)
+      listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
@@ -83,90 +72,90 @@ GEM
       guard (~> 2.2)
       guard-compat (~> 1.1)
     guard-compat (1.2.1)
-    guard-rspec (4.5.1)
+    guard-rspec (4.6.4)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     guard-rubocop (1.2.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
-    hitimes (1.2.2)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     ice_nine (0.11.1)
-    inch (0.6.2)
+    inch (0.7.0)
       pry
       sparkr (>= 0.2.0)
       term-ansicolor
       yard (~> 0.8.7.5)
-    json (1.8.2)
-    listen (2.10.0)
-      celluloid (~> 0.16.0)
+    json (1.8.3)
+    listen (3.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
-    mime-types (2.6.1)
-    multi_json (1.11.0)
+    mime-types (2.6.2)
+    multi_json (1.11.2)
     multi_test (0.1.2)
     nenv (0.2.0)
     netrc (0.10.3)
-    notiffany (0.0.6)
+    notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parser (2.2.2.5)
+    parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
-    phut (0.5.0)
-      gli (~> 2.13.0)
-      pio (~> 0.20.0)
+    phut (0.6.11)
+      gli (~> 2.13.2)
+      pio (~> 0.27.0)
       pry (~> 0.10.1)
-    pio (0.20.0)
+    pio (0.27.1)
       bindata (~> 2.1.0)
     powerpack (0.1.1)
+    private_attr (1.1.0)
     procto (0.0.2)
-    pry (0.10.1)
+    pry (0.10.2)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rainbow (2.0.0)
     rake (10.4.2)
-    rb-fsevent (0.9.5)
+    rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    reek (2.2.1)
-      parser (~> 2.2)
+    reek (3.5.0)
+      parser (~> 2.2.2.5)
+      private_attr (~> 1.1)
       rainbow (~> 2.0)
       unparser (~> 0.2.2)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-given (3.7.0)
-      given_core (= 3.7.0)
+      rspec-support (~> 3.3.0)
+    rspec-given (3.7.1)
+      given_core (= 3.7.1)
       rspec (>= 2.14.0)
-    rspec-mocks (3.2.1)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    rubocop (0.31.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    rubocop (0.34.2)
       astrolabe (~> 1.3)
-      parser (>= 2.2.2.1, < 3.0)
+      parser (>= 2.2.2.5, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.7.5)
-    ruby_parser (3.7.0)
+    ruby_parser (3.7.1)
       sexp_processor (~> 4.1)
     sexp_processor (4.6.0)
     shellany (0.0.1)
@@ -178,23 +167,27 @@ GEM
     slop (3.6.0)
     sorcerer (1.0.2)
     sparkr (0.4.1)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    timers (4.0.1)
-      hitimes
-    tins (1.5.2)
+    tins (1.6.0)
+    trema (0.7.1)
+      bundler (~> 1.10.6)
+      gli (~> 2.13.2)
+      phut (~> 0.6.10)
+      pio (~> 0.27.1)
+      rake
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
-    unparser (0.2.3)
+    unparser (0.2.4)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
       concord (~> 0.1.5)
       diff-lcs (~> 1.2.5)
       equalizer (~> 0.0.9)
-      parser (~> 2.2.2, >= 2.2.2.2)
+      parser (~> 2.2.2)
       procto (~> 0.0.2)
     yard (0.8.7.6)
 
@@ -217,8 +210,8 @@ DEPENDENCIES
   rspec
   rspec-given
   rubocop
-  trema!
+  trema
   yard
 
 BUNDLED WITH
-   1.10.0
+   1.10.6
diff --git a/Guardfile b/Guardfile
@@ -1,7 +1,7 @@
 guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib\/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { 'spec' }
+  watch('spec/spec_helper.rb') { 'spec' }
 end
 
 guard :rubocop do

diff --git a/features/learning_switch.feature b/features/learning_switch.feature
@@ -1,11 +1,6 @@
 Feature: "Learning Switch" example
   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:
+    Given a file named "trema.conf" with:
       """
       vswitch('learning') { datapath_id 0xabc }
 

diff --git a/features/multi_learning_switch.feature b/features/multi_learning_switch.feature
@@ -1,11 +1,6 @@
 Feature: "Multi Learning Switch" example
   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:
+    Given a file named "trema.conf" with:
     """
     vswitch('lsw1') { datapath_id 0x1 }
     vswitch('lsw2') { datapath_id 0x2 }

diff --git a/features/step_definitions/README.txt b/features/step_definitions/README.txt
@@ -0,0 +1,2 @@
+A collection of step definitions for use with Trema and Trema apps.
+These steps are highly specific to Trema.
diff --git a/features/step_definitions/show_stats_steps.rb b/features/step_definitions/show_stats_steps.rb
@@ -5,7 +5,7 @@
   step "I run `#{command}`"
 
   result = {}
-  in_current_dir do
+  cd('.') do
     output_from(command).split("\n").each do |each|
       case each
       when /Packets sent/
@@ -30,7 +30,7 @@
   step "I run `#{command}`"
 
   result = Hash.new(0)
-  in_current_dir do
+  cd('.') do
     received = false
     output_from(command).split("\n").each do |each|
       case each
@@ -59,7 +59,7 @@
     step "I run `#{command}`"
 
     result = 0
-    in_current_dir do
+    cd('.') do
       received = false
       output_from(command).split("\n").each do |each|
         case each