Merge branch 'hotfix/0.6.7'

trema · Sep 9, 2015 · ee8c814 · ee8c814
2 parents 52e865d + 54237a8
commit ee8c814
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@
 ## develop (unreleased)
 
 
+## 0.6.7 (9/9/2015)
+### Bugs fixed
+* [#27](https://github.com/trema/phut/issues/27): Change the option ordering of sysctl to work with CentOS 6.
+
+
 ## 0.6.6 (8/2/2015)
 ### Changes
 * [#26](https://github.com/trema/phut/pull/26): Update pio and other gems.

diff --git a/Guardfile b/Guardfile
@@ -1,7 +1,7 @@
 guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/phut/.+_spec\.rb$})
-  watch(%r{^lib/phut/(.+)\.rb$})     { |m| "spec/phut/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { 'spec' }
+  watch(%r{^lib/phut/(.+)\.rb$}) { |m| "spec/phut/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb') { 'spec' }
 end
 
 guard :bundler do

diff --git a/bin/vhost b/bin/vhost
@@ -15,9 +15,9 @@ module Phut
       desc 'Runs a vhost process'
       command :run do |c|
         desc 'Host name'
-        c.flag [:n,  :name]
+        c.flag [:n, :name]
         desc 'Network interface'
-        c.flag [:I,  :interface]
+        c.flag [:I, :interface]
         desc 'IP address'
         c.flag [:i, :ip_address]
         desc 'MAC address'
@@ -52,7 +52,7 @@ module Phut
       desc 'Terminates a vhost process'
       command :stop do |c|
         desc 'Host name'
-        c.flag [:n,  :name]
+        c.flag [:n, :name]
 
         c.desc 'Location to put socket files'
         c.flag [:S, :socket_dir], default_value: Phut.socket_dir
@@ -62,7 +62,7 @@ module Phut
           begin
             VhostDaemon.process(options[:name], options[:socket_dir]).stop
           rescue DRb::DRbConnError
-            true  # OK
+            true # OK
           end
         end
       end

diff --git a/lib/phut/version.rb b/lib/phut/version.rb
@@ -1,4 +1,4 @@
 # Base module.
 module Phut
-  VERSION = '0.6.6'
+  VERSION = '0.6.7'
 end
diff --git a/lib/phut/virtual_link.rb b/lib/phut/virtual_link.rb
@@ -14,7 +14,7 @@ def initialize(name)
       end
 
       def to_s
-        @name.gsub('.', '_') + port_number_string
+        @name.tr('.', '_') + port_number_string
       end
 
       def inspect
@@ -79,8 +79,8 @@ def find_network_device(vswitch_or_vhost)
 
     def add
       sh "sudo ip link add name #{@device_a} type veth peer name #{@device_b}"
-      sh "sudo /sbin/sysctl -w net.ipv6.conf.#{@device_a}.disable_ipv6=1 -q"
-      sh "sudo /sbin/sysctl -w net.ipv6.conf.#{@device_b}.disable_ipv6=1 -q"
+      sh "sudo /sbin/sysctl -q -w net.ipv6.conf.#{@device_a}.disable_ipv6=1"
+      sh "sudo /sbin/sysctl -q -w net.ipv6.conf.#{@device_b}.disable_ipv6=1"
     end
 
     def up

diff --git a/phut.gemspec b/phut.gemspec
@@ -23,20 +23,20 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0.0'
 
-  gem.add_dependency 'gli', '~> 2.13.1'
-  gem.add_dependency 'pio', '~> 0.24.0'
+  gem.add_dependency 'gli', '~> 2.13.2'
+  gem.add_dependency 'pio', '~> 0.26.0'
   gem.add_dependency 'pry', '~> 0.10.1'
 
   # Docs
   gem.add_development_dependency 'relish'
   gem.add_development_dependency 'yard', '~> 0.8.7.6'
 
   # Development
-  gem.add_development_dependency 'byebug', '~> 5.0.0'
+  gem.add_development_dependency 'byebug', '~> 6.0.2'
   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.3'
+  gem.add_development_dependency 'guard-rspec', '~> 4.6.4'
   gem.add_development_dependency 'guard-rubocop', '~> 1.2.0'
 
   # Test
@@ -47,8 +47,8 @@ Gem::Specification.new do |gem|
   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', '~> 3.1'
+  gem.add_development_dependency 'reek', '~> 3.3.1'
   gem.add_development_dependency 'rspec', '~> 3.3.0'
   gem.add_development_dependency 'rspec-given', '~> 3.7.1'
-  gem.add_development_dependency 'rubocop', '~> 0.32.1'
+  gem.add_development_dependency 'rubocop', '~> 0.34.0'
 end