phut 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 294dc8a577002f98917724653bc08adac8c395e2
-  data.tar.gz: fd3cfb217a93bd0be94f56d0fa751ff090a33c9a
+  metadata.gz: cf439f6885b93bd1cb5f5fef8b80a35edefa5ed8
+  data.tar.gz: ed8c7ddd217343b3e572d1373845e869ee68ce16
 SHA512:
-  metadata.gz: daa109a45dc75df7b4af17947074c64a38701c4674ee1f4f8711bb4d72136ac24e9991c8e30d36a2660a8ded1eb5522846b6c49221b442806a85bd37241cd306
-  data.tar.gz: 906de576f01ebc8dedf5d707fabb617097960b368b47b4487d0150fc6c4897351b79cdf1dca3c45772c4046c64b0be9c5fb2cc98f1118b2a25c2c1e1b77160d1
+  metadata.gz: 25fb8ec4082f787dd572bc0b58b6f216b3ef9e54b7398365f5111b5145e898e79118a6b2b3312747153c0f9f1264dab65498b87cbeb695b9242f774a9c2477a7
+  data.tar.gz: 2eb3d617feef2cc265495b53c1a55abd7a5393f19f033e75f2553553ae1bbd9e60cdc0dbf1065af9927b1e5f46ce5d9f8e48d75c7eebec19073fcb1d4fb4785d

data/.gitignore

@@ -2,7 +2,6 @@
 *.rbc
 .bundle
 .config
-Gemfile.lock
 InstalledFiles
 coverage
 lib/bundler/man
@@ -13,6 +12,7 @@ test/tmp
 test/version_tmp
 tmp
 vendor
+/log/*
 
 # YARD artifacts
 .yardoc

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  TargetRubyVersion: 2.3
   Include:
     - Gemfile
     - Guardfile
@@ -7,9 +8,21 @@ AllCops:
     - features/**/*.rb
     - lib/**/*.rb
     - phut.gemspec
-    - spec/**/*.rb
     - tasks/*.rake
 
+Metrics/LineLength:
+  Exclude:
+    - features/step_definitions/*_steps.rb
+    - test/**/*_test.rb
+
+Metrics/MethodLength:
+  Exclude:
+    - test/**/*_test.rb
+
+Metrics/AbcSize:
+  Exclude:
+    - test/**/*_test.rb
+
 Style/StringLiterals:
   EnforcedStyle: single_quotes
 

data/.travis.yml

@@ -1,5 +1,3 @@
-sudo: false
-
 language: ruby
 
 bundler_args: --without development
@@ -8,9 +6,8 @@ cache: bundler
 script: bundle exec rake travis
 
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
+  - 2.3.4
+  - 2.4.1
   - ruby-head
 
 before_install:
@@ -32,4 +29,3 @@ notifications:
 env:
   global:
     - secure: ZQeasm+7jSVYKsEKp34hxA65cObvmSFWvRuOkRVmmbHRkPyopWOc2U1NIvhYfeAZiUzKscKL4ABXL5uiLtUR2+tmLWSGK8NgKzY/xQcGksN7jQKFanbGYbizg6dVnVlTZ9A3INbp8VIr3HmBmYdjs/vTdX5mfDzZgia9ToNxZlw=
-    - secure: iBrnaPXgLJrebRBgs3hrWvMjcB80OUt0XT38DpvgEP/YliELJBQ9qVW/2mcUkSwwsApS6zzgCpfFeWrIxDffwKqLk+BToDWA2FRNQ78gfIunvhEUMJYkxKBm6dBQ0w8kQOuT4dFr/8zQjjfuyQbMJrB3CI+6VNhNnJjIzxTthoQ=

data/Gemfile

@@ -1,4 +1,32 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-# Include dependencies from phut.gemspec. DRY!
-gemspec development_group: :test
+gemspec
+
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
+  "https://github.com/#{repo_name}.git"
+end
+
+gem 'pio', github: 'trema/pio', branch: 'develop'
+
+group :test do
+  gem 'aruba', require: false
+  gem 'cucumber', require: false
+  gem 'faker', require: false
+  gem 'minitest', require: false
+  gem 'rake', require: false
+end
+
+group :metrics do
+  gem 'codeclimate-test-reporter', require: false
+  gem 'flay', require: false
+  gem 'flog', require: false
+  gem 'reek', require: false
+  gem 'rubocop', require: false
+end
+
+group :doc do
+  gem 'yard', require: false
+end

data/Gemfile.lock

@@ -0,0 +1,156 @@
+GIT
+  remote: https://github.com/trema/pio.git
+  revision: 620a7a9b0a4e18bbc38e1c6d641360990ab02607
+  branch: develop
+  specs:
+    pio (0.30.2)
+      activesupport (~> 5.1.0)
+      bindata (~> 2.1.0)
+
+PATH
+  remote: .
+  specs:
+    phut (0.7.8)
+      activesupport (~> 5.1.0)
+      gli (~> 2.16.0)
+      pio (~> 0.30.2)
+      pry (~> 0.10.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.1.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    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.4.0)
+      virtus (~> 1.0)
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
+    coderay (1.1.1)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    concurrent-ruby (1.0.5)
+    contracts (0.14.0)
+    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)
+    equalizer (0.0.11)
+    erubis (2.7.0)
+    faker (1.7.3)
+      i18n (~> 0.5)
+    ffi (1.9.18)
+    flay (2.9.0)
+      erubis (~> 2.7.0)
+      path_expander (~> 1.0)
+      ruby_parser (~> 3.0)
+      sexp_processor (~> 4.0)
+    flog (4.6.1)
+      path_expander (~> 1.0)
+      ruby_parser (~> 3.1, > 3.1.0)
+      sexp_processor (~> 4.8)
+    gherkin (4.0.0)
+    gli (2.16.0)
+    i18n (0.8.1)
+    ice_nine (0.11.2)
+    json (2.1.0)
+    method_source (0.8.2)
+    minitest (5.10.1)
+    multi_json (1.12.1)
+    multi_test (0.1.2)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    path_expander (1.0.1)
+    powerpack (0.1.1)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rainbow (2.2.2)
+      rake
+    rake (12.0.0)
+    reek (4.6.2)
+      codeclimate-engine-rb (~> 0.4.0)
+      parser (>= 2.4.0.0, < 2.5)
+      rainbow (~> 2.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.48.1)
+      parser (>= 2.3.3.1, < 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.8.1)
+    ruby_parser (3.9.0)
+      sexp_processor (~> 4.1)
+    sexp_processor (4.9.0)
+    simplecov (0.13.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.2.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.9.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba
+  codeclimate-test-reporter
+  cucumber
+  faker
+  flay
+  flog
+  minitest
+  phut!
+  pio!
+  rake
+  reek
+  rubocop
+  yard
+
+BUNDLED WITH
+   1.14.6

data/README.md

@@ -3,7 +3,6 @@ phut
 
 [![Build Status](http://img.shields.io/travis/trema/phut/develop.svg?style=flat)][travis]
 [![Code Climate](http://img.shields.io/codeclimate/github/trema/phut.svg?style=flat)][codeclimate]
-[![Coverage Status](http://img.shields.io/codeclimate/coverage/github/trema/phut.svg?style=flat)][coveralls]
 [![Dependency Status](http://img.shields.io/gemnasium/trema/phut.svg?style=flat)][gemnasium]
 [![Gitter chat](http://img.shields.io/badge/GITTER-phut-blue.svg?style=flat)][gitter]
 
@@ -11,7 +10,6 @@ Virtual network in seconds
 
 [travis]: http://travis-ci.org/trema/phut
 [codeclimate]: https://codeclimate.com/github/trema/phut
-[coveralls]: https://coveralls.io/r/trema/phut
 [gemnasium]: https://gemnasium.com/trema/phut
 [gitter]: https://gitter.im/trema/phut
 
@@ -47,3 +45,10 @@ Then you can pass the network configuration to `phut run`.
 ```
 $ bundle exec phut run phut.conf
 ```
+
+## License
+
+Phut is released under the GNU General Public License version 2.0 or MIT License:
+
+* http://www.gnu.org/licenses/gpl-2.0.html
+* http://www.opensource.org/licenses/MIT

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib')
 
 require 'rake/clean'
@@ -5,8 +7,7 @@ require 'rake/clean'
 RELISH_PROJECT = 'trema/phut'
 
 task default: :test
-task test: [:spec, :cucumber, :quality]
-task travis: [:spec, 'cucumber:travis', :quality]
-task quality: [:rubocop, :reek, :flog, :flay]
+task travis: ['cucumber:travis', :quality]
+task quality: %i[rubocop reek flog flay]
 
 Dir.glob('tasks/*.rake').each { |each| import each }

data/bin/phut

@@ -1,19 +1,16 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'rubygems'
 require 'bundler'
 Bundler.setup :default
 
 require 'gli'
-require 'logger'
 require 'phut'
 require 'pry'
 
-$stdout.sync = true
-
 module Phut
   # /bin/phut command
-  # rubocop:disable ModuleLength
   module App
     extend GLI::App
 
@@ -22,37 +19,25 @@ module Phut
     version Phut::VERSION
 
     desc 'Be verbose'
-    switch [:v, :verbose], negatable: false
+    switch %i[v verbose], negatable: false
 
     command :shell do |c|
-      c.action do |_global_options, _options, _args|
-        Pry.prompt =
-          [
-            proc { 'phut> ' },
-            proc { 'phut* ' }
-          ]
-        Pry::Commands.block_command 'pid_dir' do |dir|
-          Phut.pid_dir = dir
-        end
-        Pry::Commands.block_command 'log_dir' do |dir|
-          Phut.log_dir = dir
-        end
-        Pry::Commands.block_command 'socket_dir' do |dir|
-          Phut.socket_dir = dir
-        end
-        Pry::Commands.block_command 'vswitch' do |dpid|
-          if Phut::OpenVswitch.find_by(name: dpid)
-            fail(Phut::OpenVswitch::AlreadyRunning,
-                 "Open vSwitch (dpid = #{dpid}) is already running!")
-          end
-          Phut::OpenVswitch.create(dpid).run
-        end
-        Pry::Commands.block_command 'dump_flows' do |dpid|
-          puts Phut::OpenVswitch.dump_flows(dpid)
-        end
-        Pry::Commands.block_command 'kill' do |dpid|
-          Phut::OpenVswitch.shutdown(dpid)
-        end
+      c.desc 'Location to put pid files'
+      c.flag %i[P pid_dir], default_value: Phut.pid_dir
+      c.desc 'Location to put log files'
+      c.flag %i[L log_dir], default_value: Phut.log_dir
+      c.desc 'Location to put socket files'
+      c.flag %i[S socket_dir], default_value: Phut.socket_dir
+
+      c.action do |_global_options, options, _args|
+        Phut.pid_dir = options.fetch(:pid_dir)
+        Phut.log_dir = options.fetch(:log_dir)
+        Phut.socket_dir = options.fetch(:socket_dir)
+
+        Pry.prompt = [proc { 'phut> ' },
+                      proc { 'phut* ' }]
+
+        include Phut
         pry
       end
     end
@@ -61,67 +46,33 @@ module Phut
     arg_name 'FILE'
     command :run do |c|
       c.desc 'Location to put pid files'
-      c.flag [:P, :pid_dir], default_value: Phut.pid_dir
+      c.flag %i[P pid_dir], default_value: Phut.pid_dir
       c.desc 'Location to put log files'
-      c.flag [:L, :log_dir], default_value: Phut.log_dir
+      c.flag %i[L log_dir], default_value: Phut.log_dir
       c.desc 'Location to put socket files'
-      c.flag [:S, :socket_dir], default_value: Phut.socket_dir
+      c.flag %i[S socket_dir], default_value: Phut.socket_dir
 
-      c.action do |global_options, options, args|
-        stdout_logger = Logger.new($stderr).tap do |logger|
-          logger.formatter = proc { |_sev, _dtm, _name, msg| msg + "\n" }
-          logger.level = global_options[:verbose] ? Logger::DEBUG : Logger::INFO
-        end
+      c.action do |_global_options, options, args|
         Phut.pid_dir = options.fetch(:pid_dir)
         Phut.log_dir = options.fetch(:log_dir)
         Phut.socket_dir = options.fetch(:socket_dir)
-        Phut::Parser.new(stdout_logger).parse(args[0]).run
-      end
-    end
 
-    desc 'Shows information on switch'
-    arg_name 'SWITCH'
-    command :show do |c|
-      c.action do |_global_options, _options, args|
-        system "sudo ovs-ofctl show br#{args[0]}"
+        Phut::Parser.new(args[0]).parse
       end
     end
 
     desc 'Stops a virtual network'
-    arg_name 'FILE'
     command :stop do |c|
-      c.desc 'Location to put pid files'
-      c.flag [:P, :pid_dir], default_value: Phut.pid_dir
-      c.desc 'Location to put log files'
-      c.flag [:L, :log_dir], default_value: Phut.log_dir
       c.desc 'Location to put socket files'
-      c.flag [:S, :socket_dir], default_value: Phut.socket_dir
+      c.flag %i[S socket_dir], default_value: Phut.socket_dir
 
-      c.action do |global_options, options, args|
-        stdout_logger = Logger.new($stderr).tap do |logger|
-          logger.formatter = proc { |_sev, _dtm, _name, msg| msg + "\n" }
-          logger.level = global_options[:verbose] ? Logger::DEBUG : Logger::INFO
-        end
-        Phut.pid_dir = options.fetch(:pid_dir)
-        Phut.log_dir = options.fetch(:log_dir)
+      c.action do |_global_options, options, _args|
         Phut.socket_dir = options.fetch(:socket_dir)
-        Phut::Parser.new(stdout_logger).parse(args[0]).stop
-      end
-    end
-
-    desc 'Kills a vswitch or a vhost'
-    arg_name 'NAME'
-    command :kill do |c|
-      c.desc 'Location to find socket files'
-      c.flag [:S, :socket_dir], default_value: Phut.socket_dir
 
-      c.action do |_global_options, options, args|
-        help_now! if args.size != 1
-        begin
-          Phut::VhostDaemon.process(args[0], options[:socket_dir]).stop
-        rescue
-          Phut::OpenVswitch.shutdown(args[0])
-        end
+        Phut::Vswitch.destroy_all
+        Phut::Vhost.destroy_all
+        Phut::Netns.destroy_all
+        Phut::Link.destroy_all
       end
     end
 
@@ -130,16 +81,17 @@ module Phut
         puts "#{exe_name} version #{version_string}"
         exit_now! nil, 0
       end
+
+      if global[:verbose]
+        ENV['GLI_DEBUG'] = 'true'
+        Phut.logger.level = Logger::DEBUG
+      end
+
       true
     end
 
     default_command :shell
 
-    on_error do |e|
-      fail e
-    end
-
     exit run(ARGV)
   end
-  # rubocop:enable ModuleLength
 end