Merge branch 'release/0.30.1'

.gitignore

@@ -2,7 +2,6 @@
 *.rbc
 /.config
 /.idea/
-/Gemfile.lock
 /InstalledFiles
 /bin/
 /coverage/

.rubocop.yml

@@ -12,8 +12,9 @@ AllCops:
 
 Metrics/LineLength:
   Exclude:
+    - 'fixtures/**/*.rb'
     - 'spec/support/*.rb'
-    
+
 Style/StringLiterals:
   EnforcedStyle: single_quotes
 

.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 
-before_install: gem update bundler
+before_install:
+  - gem update bundler
+
 bundler_args: --without development
 
 env:
@@ -9,15 +11,15 @@ env:
     - secure: cbR8GBZyaDxE54pfGkfzhuTQEh3mpcghrx95dL42df3Ei9s3DHCI2Q/yDChUMY3eeqzHUNAt9fPQeDZsMG/aHUrh775bebh28M8zSkUYzv6x1diPnDtywXGutW7MKGak6jw8F+45J6TW4IxNFYMmuWyBu9HOd5VkqWRKvezvqc8=
 
 rvm:
-  - 2.0.0
-  - 2.2.0
+  - 2.2
+  - 2.3
   - ruby-head
-  
+
 matrix:
   allow_failures:
     - rvm: ruby-head
   fast_finish: true
-  
+
 script: bundle exec rake travis
 
 notifications:

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
 ## develop (unreleased)
+### New features
+* [#301](https://github.com/trema/pio/pull/301): Add `NiciraConjunction` action.
+* [#300](https://github.com/trema/pio/pull/300): Add new classes `Pio::Match::PacketReg{0..3}`.
 
 ## 0.30.0 (11/17/2015)
 ### New features

Gemfile

@@ -1,3 +1,35 @@
 source 'https://rubygems.org'
 
-gemspec development_group: :test
+gemspec
+
+gem 'rake'
+
+group :development, :test do
+  gem 'aruba', require: false
+  gem 'codeclimate-test-reporter', require: false
+  gem 'coveralls', require: false
+  gem 'cucumber', require: false
+  gem 'flay', require: false
+  gem 'flog', require: false
+  gem 'reek', require: false
+  gem 'rspec', require: false
+  gem 'rspec-given', require: false
+  gem 'rubocop', require: false
+end
+
+group :development do
+  gem 'guard', require: false
+  gem 'guard-bundler', require: false
+  gem 'guard-cucumber', require: false
+  gem 'guard-rspec', require: false
+  gem 'guard-rubocop', require: false
+  gem 'inch', require: false
+  gem 'listen', require: false
+  gem 'pry', require: false
+  gem 'rb-fchange', require: false
+  gem 'rb-fsevent', require: false
+  gem 'rb-inotify', require: false
+  gem 'relish', require: false
+  gem 'terminal-notifier-guard', require: false
+  gem 'yard', require: false
+end

Gemfile.lock

@@ -0,0 +1,245 @@
+PATH
+  remote: .
+  specs:
+    pio (0.30.1)
+      activesupport (~> 5.0.2)
+      bindata (~> 2.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    archive-tar-minitar (0.5.2)
+    aruba (0.14.2)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
+    ast (2.3.0)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    bindata (2.1.0)
+    builder (3.2.2)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    codeclimate-engine-rb (0.3.1)
+      virtus (~> 1.0)
+    codeclimate-test-reporter (0.6.0)
+      simplecov (>= 0.7.1, < 1.0.0)
+    coderay (1.1.1)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    concurrent-ruby (1.0.5)
+    contracts (0.14.0)
+    coveralls (0.8.15)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+      tins (>= 1.6.0, < 2)
+    cucumber (2.4.0)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.5.0)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 4.0)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.5.0)
+      gherkin (~> 4.0)
+    cucumber-wire (0.0.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    domain_name (0.5.20160309)
+      unf (>= 0.0.5, < 1.0.0)
+    equalizer (0.0.11)
+    erubis (2.7.0)
+    ffi (1.9.14)
+    flay (2.8.1)
+      erubis (~> 2.7.0)
+      path_expander (~> 1.0)
+      ruby_parser (~> 3.0)
+      sexp_processor (~> 4.0)
+    flog (4.4.0)
+      path_expander (~> 1.0)
+      ruby_parser (~> 3.1, > 3.1.0)
+      sexp_processor (~> 4.4)
+    formatador (0.2.5)
+    gherkin (4.0.0)
+    given_core (3.8.0)
+      sorcerer (>= 0.3.7)
+    guard (2.14.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-bundler (2.1.0)
+      bundler (~> 1.0)
+      guard (~> 2.2)
+      guard-compat (~> 1.1)
+    guard-compat (1.2.1)
+    guard-cucumber (2.1.2)
+      cucumber (~> 2.0)
+      guard-compat (~> 1.0)
+      nenv (~> 0.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    guard-rubocop (1.2.0)
+      guard (~> 2.0)
+      rubocop (~> 0.20)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    i18n (0.8.1)
+    ice_nine (0.11.2)
+    inch (0.7.1)
+      pry
+      sparkr (>= 0.2.0)
+      term-ansicolor
+      yard (~> 0.8.7.5)
+    json (2.0.2)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.10)
+    method_source (0.8.2)
+    mime-types (2.99.1)
+    minitest (5.10.1)
+    multi_json (1.12.1)
+    multi_test (0.1.2)
+    nenv (0.3.0)
+    netrc (0.11.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    parser (2.3.1.4)
+      ast (~> 2.2)
+    path_expander (1.0.0)
+    powerpack (0.1.1)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rainbow (2.1.0)
+    rake (11.3.0)
+    rb-fchange (0.0.6)
+      ffi
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    reek (4.4.2)
+      codeclimate-engine-rb (~> 0.3.1)
+      parser (~> 2.3.1, >= 2.3.1.2)
+      rainbow (~> 2.0)
+    relish (0.7.1)
+      archive-tar-minitar (>= 0.5.2)
+      json (>= 1.4.6)
+      rest-client (>= 1.7.2)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-given (3.8.0)
+      given_core (= 3.8.0)
+      rspec (>= 2.14.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.38.0)
+      parser (>= 2.3.0.6, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.7.5)
+    ruby_dep (1.4.0)
+    ruby_parser (3.8.2)
+      sexp_processor (~> 4.1)
+    sexp_processor (4.7.0)
+    shellany (0.0.1)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    sorcerer (1.0.2)
+    sparkr (0.4.1)
+    term-ansicolor (1.4.0)
+      tins (~> 1.0)
+    terminal-notifier-guard (1.7.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tins (1.12.0)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
+    unicode-display_width (1.0.1)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+    yard (0.8.7.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba
+  codeclimate-test-reporter
+  coveralls
+  cucumber
+  flay
+  flog
+  guard
+  guard-bundler
+  guard-cucumber
+  guard-rspec
+  guard-rubocop
+  inch
+  listen
+  pio!
+  pry
+  rake
+  rb-fchange
+  rb-fsevent
+  rb-inotify
+  reek
+  relish
+  rspec
+  rspec-given
+  rubocop
+  terminal-notifier-guard
+  yard
+
+BUNDLED WITH
+   1.14.6

Guardfile

@@ -14,7 +14,7 @@ guard :rubocop do
   watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end
 
-guard :cucumber, cli: '--profile default' do
+guard :cucumber, cmd_additional_args: '--profile default' do
   watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$}) { 'features' }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) do |m|