phut 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9587515648d4e65339222fa10a78e30ef81a16a5
-  data.tar.gz: cffdace032fcfc3917f583ef8d4d4aad55ece21d
+  metadata.gz: 93c4f48db653fc79b4c05fb2fefb693ba7da9376
+  data.tar.gz: 0c9bf84cea1791a45abda96344ea7850edeb7b46
 SHA512:
-  metadata.gz: 2baffca17ddc7e0c3a1fe3f93eb9258ff163390408f5168240a90d9e2ff51c54a7d8419ed51cc630662cf7029d8b41c21e437e5d01c43fdedad33fb64fb561d9
-  data.tar.gz: ad07badcd1c36897307557a6cecbb8aacde0eaf8c225de15ece9402e2665dcaa129f8b6d3a859227d90ccb8264a69281c7744487e5eb25004ba0033abacca5ba
+  metadata.gz: 40ef132b4975f3550e5e7c929b77a951f881a68c735f9f84564c5f5e57d3d5ab3e73547243c941b00590b8b0de2262b5746d3e258dc0d7dc168ff378d6c8642f
+  data.tar.gz: 5bfc674069f766cebed9ed28efe800806ad0498817ef661b191c3e84b963a06c8837ed4fe32ad3e2141c40412532b8ea0b59287768d8c04b2e02366311e90e17

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 ## develop (unreleased)
 
 
+## 0.6.6 (8/2/2015)
+### Changes
+* [#26](https://github.com/trema/phut/pull/26): Update pio and other gems.
+
+
 ## 0.6.5 (6/29/2015)
 ### Changes
 * [#25](https://github.com/trema/phut/pull/25): Update pio and other gems.

data/features/step_definitions/phut_steps.rb

@@ -2,8 +2,10 @@ require 'phut'
 
 When(/^I do phut run "(.*?)"$/) do |file_name|
   @config_file = file_name
-  run_opts = "-p #{@pid_dir} -l #{@log_dir} -s #{@socket_dir}"
-  step %(I run `phut -v run #{run_opts} #{@config_file}`)
+  cd('.') do
+    run_opts = "-p #{@pid_dir} -l #{@log_dir} -s #{@socket_dir}"
+    step %(I run `phut -v run #{run_opts} #{@config_file}`)
+  end
 end
 
 When(/^I do phut kill "(.*?)"$/) do |name|
@@ -27,14 +29,11 @@ Then(/^a vswitch named "(.*?)" should not be running$/) do |name|
 end
 
 Then(/^a vhost named "(.*?)" launches$/) do |name|
-  in_current_dir do
-    pid_file = File.join(File.expand_path(@pid_dir), "vhost.#{name}.pid")
-    step %(a file named "#{pid_file}" should exist)
-  end
+  step %(a file named "vhost.#{name}.pid" should exist)
 end
 
 Then(/^a link is created between "(.*?)" and "(.*?)"$/) do |name_a, name_b|
-  in_current_dir do
+  cd('.') do
     link = Phut::Parser.new.parse(@config_file).fetch([name_a, name_b].sort)
     expect(link).to be_up
   end

data/features/support/hooks.rb

@@ -12,7 +12,7 @@ Before('@sudo') do
 end
 
 After('@sudo') do
-  in_current_dir do
+  cd('.') do
     Phut.pid_dir = @pid_dir
     Phut.log_dir = @log_dir
     Phut.socket_dir = @socket_dir

data/lib/phut/open_vswitch.rb

@@ -1,3 +1,4 @@
+require 'pio'
 require 'phut/null_logger'
 require 'phut/setting'
 require 'phut/shell_runner'
@@ -37,7 +38,7 @@ module Phut
         sh "sudo ovs-vsctl add-port #{bridge_name} #{each}"
       end
       sh "sudo ovs-vsctl set bridge #{bridge_name}" \
-         " protocols=#{open_flow_protocol}" \
+         " protocols=#{Pio::OpenFlow.version}" \
          " other-config:datapath-id=#{dpid_zero_filled}"
       sh "sudo ovs-vsctl set-controller #{bridge_name} "\
          "tcp:127.0.0.1:#{@port_number} "\
@@ -88,10 +89,6 @@ 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.6.5'
+  VERSION = '0.6.6'
 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.1'
-  gem.add_dependency 'pio', '~> 0.23.0'
+  gem.add_dependency 'pio', '~> 0.24.0'
   gem.add_dependency 'pry', '~> 0.10.1'
 
   # Docs
@@ -33,22 +33,22 @@ Gem::Specification.new do |gem|
 
   # Development
   gem.add_development_dependency 'byebug', '~> 5.0.0'
-  gem.add_development_dependency 'guard', '~> 2.12.7'
+  gem.add_development_dependency 'guard', '~> 2.13.0'
   gem.add_development_dependency 'guard-bundler', '~> 2.1.0'
   gem.add_development_dependency 'guard-cucumber', '~> 1.6.0'
-  gem.add_development_dependency 'guard-rspec', '~> 4.6.0'
+  gem.add_development_dependency 'guard-rspec', '~> 4.6.3'
   gem.add_development_dependency 'guard-rubocop', '~> 1.2.0'
 
   # Test
-  gem.add_development_dependency 'aruba', '~> 0.6.2'
+  gem.add_development_dependency 'aruba', '~> 0.8.1'
   gem.add_development_dependency 'codeclimate-test-reporter'
   gem.add_development_dependency 'coveralls', '~> 0.8.2'
-  gem.add_development_dependency 'cucumber', '~> 2.0.0'
+  gem.add_development_dependency 'cucumber', '~> 2.0.2'
   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.2.1'
+  gem.add_development_dependency 'reek', '~> 3.1'
   gem.add_development_dependency 'rspec', '~> 3.3.0'
-  gem.add_development_dependency 'rspec-given', '~> 3.7.0'
+  gem.add_development_dependency 'rspec-given', '~> 3.7.1'
   gem.add_development_dependency 'rubocop', '~> 0.32.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phut
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.7
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.7
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.6.3
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: flay
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -296,14 +296,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement