phut 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 681a58fd291ea016d0ffc8d56a9c62fb3ab38568
-  data.tar.gz: 48d70fb96ecac1cbddb1868172d4b8a0af0163ed
+  metadata.gz: 3e6e236d2b8034b01009ef0c8fd37e105117c33c
+  data.tar.gz: d2557b337615017c4bac9a19f1c52965b114b8cc
 SHA512:
-  metadata.gz: e2eab81e9e6b03c262a5debdcec17eb12aa3f565e99fcf27f8e904f68f84b0d1fedf1c29e6deee08a6e4e9a471c937fe8a2d9f76e0a9340e9b69009e82b63427
-  data.tar.gz: bb22c24a34980bc1f7b7284b2f81d04efac05e2345bb41bda36deb105c84a69a04108fdf0d1842b6a955eb79d452c3e9a8904aa53b7f2af72a6b3afe4736ecfc
+  metadata.gz: a9951dde073ebe00310e93d2102ee7ee070fceff3af82962ac3d76beb70d09b77a78ea25707396d45ef3587d792764cb98b7b80b8078f4280d0ef0b3dcaae7ee
+  data.tar.gz: 63519f2963d5ca9d16778982ac62aa41f6f660f8c96b06815112b6f289610e22434ec1e1370616e43e1c9f9537992e2ad9d383dd7742fbf1fdfd3bd48f9f7133

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 ## develop (unreleased)
 
 
+## 0.5.0 (4/22/2015)
+### Misc
+* Pio 0.20.0 (preliminary support of OpenFlow 1.3).
+
+
 ## 0.4.0 (3/19/2015)
 ### New features
 * Add `phut show` command.

data/Guardfile

@@ -16,12 +16,12 @@ guard :rubocop, all_on_start: false do
   watch('bin/phut')
   watch(/.+\.rake$/)
   watch(/.+\.rb$/)
-  watch(/{(?:.+\/)?\.rubocop\.yml$/) { |m| File.dirname(m[0]) }
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end
 
 guard 'cucumber', cli: '--tags ~@sudo --tags ~@shell' do
   watch('bin/phut') { 'features' }
-  watch(/^features\/.+\.feature$/)
+  watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$}) { 'features' }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) do |m|
     Dir[File.join("**/#{m[1]}.feature")][0] || 'features'

data/lib/phut/open_vswitch.rb

@@ -34,7 +34,8 @@ module Phut
       @network_devices.each do |each|
         sh "sudo ovs-vsctl add-port #{bridge_name} #{each}"
       end
-      sh "sudo ovs-vsctl set bridge #{bridge_name} protocols=OpenFlow10" \
+      sh "sudo ovs-vsctl set bridge #{bridge_name}" \
+         " protocols=#{open_flow_protocol}" \
          " other-config:datapath-id=#{dpid_zero_filled}"
       sh "sudo ovs-vsctl set-controller #{bridge_name} tcp:127.0.0.1:6633"\
          " -- set controller #{bridge_name} connection-mode=out-of-band"
@@ -79,6 +80,10 @@ module Phut
       'br' + name
     end
 
+    def open_flow_protocol
+      'OpenFlow' + { 1 => '10', 4 => '13' }.fetch(Pio::OpenFlow::VERSION)
+    end
+
     def restart
       stop
       start

data/lib/phut/version.rb

@@ -1,4 +1,4 @@
 # Base module.
 module Phut
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/phut.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 2.0.0'
 
   gem.add_dependency 'gli', '~> 2.13.0'
-  gem.add_dependency 'pio', '~> 0.18.2'
+  gem.add_dependency 'pio', '~> 0.20.0'
   gem.add_dependency 'pry', '~> 0.10.1'
 
   # Docs
@@ -32,23 +32,23 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'yard', '~> 0.8.7.6'
 
   # Development
-  gem.add_development_dependency 'byebug', '~> 4.0.2'
+  gem.add_development_dependency 'byebug', '~> 4.0.5'
   gem.add_development_dependency 'guard', '~> 2.12.5'
   gem.add_development_dependency 'guard-bundler', '~> 2.1.0'
-  gem.add_development_dependency 'guard-cucumber', '~> 1.5.4'
+  gem.add_development_dependency 'guard-cucumber', '~> 1.6.0'
   gem.add_development_dependency 'guard-rspec', '~> 4.5.0'
   gem.add_development_dependency 'guard-rubocop', '~> 1.2.0'
 
   # Test
   gem.add_development_dependency 'aruba', '~> 0.6.2'
   gem.add_development_dependency 'codeclimate-test-reporter'
-  gem.add_development_dependency 'coveralls', '~> 0.7.11'
-  gem.add_development_dependency 'cucumber', '~> 1.3.19'
+  gem.add_development_dependency 'coveralls', '~> 0.8.1'
+  gem.add_development_dependency 'cucumber', '~> 2.0.0'
   gem.add_development_dependency 'flay', '~> 2.6.1'
   gem.add_development_dependency 'flog', '~> 4.3.2'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'reek', '~> 2.0.2'
+  gem.add_development_dependency 'reek', '~> 2.1.0'
   gem.add_development_dependency 'rspec', '~> 3.2.0'
   gem.add_development_dependency 'rspec-given', '~> 3.7.0'
-  gem.add_development_dependency 'rubocop', '~> 0.29.1'
+  gem.add_development_dependency 'rubocop', '~> 0.30.0'
 end

data/tasks/README.md

@@ -3,4 +3,4 @@ Rake Tasks
 
 A collection of rake tasks for use with [Trema][trema] and Trema apps.
 
-[trema]: https://github.com/trema/trema_ruby
+[trema]: https://github.com/trema/trema

data/tasks/flay.rake

@@ -4,7 +4,7 @@ begin
   require 'flay_task'
   FlayTask.new do |t|
     t.dirs = FileList['lib/**/*.rb'].map do |each|
-      each[/[^\/]+/]
+      each[%r{[^/]+}]
     end.uniq
     t.verbose = true
   end

data/tasks/flog.rake

@@ -10,7 +10,7 @@ begin
     bad_methods = flog.totals.select do |name, score|
       !(/##{flog.no_method}$/ =~ name) && score > threshold
     end
-    bad_methods.sort { |a, b| a[1] <=> b[1] }.reverse.each do |name, score|
+    bad_methods.sort { |a, b| a[1] <=> b[1] }.reverse_each do |name, score|
       printf "%8.1f: %s\n", score, name
     end
     unless bad_methods.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phut
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 4.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 4.0.5
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -198,28 +198,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.11
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.11
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.19
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.19
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: flay
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -310,14 +310,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.30.0
 description: A simple ruby network emulator with capabilities similar to mininet.
 email:
 - yasuhito@gmail.com