phut 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38a59abc94f4a6e4dc8d9881736b06e5c461a20c
-  data.tar.gz: 9e93f07ecb38aef9907182d681655e3ed9712db5
+  metadata.gz: 9b2838869618793f7529456e67f55820c6312fd4
+  data.tar.gz: b38be67f933c105564abad75ffe2c9e545787757
 SHA512:
-  metadata.gz: 342641815042a8dfb0ce100cb5f3605e563a06a6d48ea30396d458b0b6bf1fdedb323dd521c8118d1b8675148eae89a671576279e5418b57f96195de263204dc
-  data.tar.gz: c92c0c02de7f761540024a219a4a0eb6663dcfa61db066e3f8cf5ae5b6b0ac7b8da6f03f0de119942f809179b068f2562bd0dcf9170fe387f407d32a733e0327
+  metadata.gz: b19c285acc17e89ee19d803c1f161b741cfbd1305692af023f057aac4f06a3a7c37d0d84c31e6cfb52d0d02a2024c76609a495de38ff756cba6d2f2761369eef
+  data.tar.gz: 3f51908add6cd7e341ed596c2dad7d361b3838ad70337d232248d55b1fc8795f3b7b533e1147f7bba875643b5618ac9a77f590f04657d9da3dbf83d7ccd0e331

data/.hound.yml

@@ -0,0 +1,3 @@
+ruby:
+  enabled: true
+  config_file: .rubocop.yml

data/.rubocop.yml

@@ -9,3 +9,9 @@ AllCops:
     - phut.gemspec
     - spec/**/*.rb
     - tasks/*.rake
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+
+Style/DotPosition:
+  EnforcedStyle: trailing

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 ## develop (unreleased)
 
 
+## 0.2.0 (3/2/2015)
+### New features
+* [#19](https://github.com/trema/phut/pull/19): Add `bin/vhost`.
+
+
 ## 0.1.0 (2/23/2015)
 ### Misc
 * The initial release version of phut.

data/Rakefile

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib')
 
 require 'rake/clean'
 
-task default: [:openvswitch, :vhost]
+task default: :openvswitch
 task test: [:spec, :cucumber, :quality]
 task quality: [:rubocop, :reek, :flog]
 task travis: [:spec, 'cucumber:travis', :quality]

data/bin/phut

@@ -62,9 +62,9 @@ module Phut
           logger.formatter = proc { |_sev, _dtm, _name, msg| msg + "\n" }
           logger.level = global_options[:verbose] ? Logger::DEBUG : Logger::INFO
         end
-        Phut.pid_dir = options[:pid_dir]
-        Phut.log_dir = options[:log_dir]
-        Phut.socket_dir = options[:socket_dir]
+        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

data/bin/vhost

@@ -0,0 +1,87 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'gli'
+require 'phut'
+
+module Phut
+  class VhostDaemon
+    # /bin/vhost command
+    module App
+      extend GLI::App
+
+      version Phut::VERSION
+
+      desc 'Runs a vhost process'
+      command :run do |c|
+        desc 'Host name'
+        c.flag [:n,  :name]
+        desc 'Network interface'
+        c.flag [:I,  :interface]
+        desc 'IP address'
+        c.flag [:i, :ip_address]
+        desc 'MAC address'
+        c.flag [:m, :mac_address]
+        c.desc 'ARP entries'
+        c.flag [:a, :arp_entries], negatable: false
+        c.desc 'Promisc mode'
+        c.switch [:p, :promisc], negatable: false
+
+        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.action do |_global_options, options, _args|
+          fail '--name option is mandatory' if options[:name].nil?
+          fail '--interface option is mandatory' if options[:interface].nil?
+          fail '--ip_address option is mandatory' if options[:ip_address].nil?
+          fail '--mac_address option is mandatory' if options[:mac_address].nil?
+          options[:arp_table] =
+            options[:arp_entries].split(',').
+            each_with_object({}) do |each, table|
+              ip_address, mac_address = each.split('/')
+              table[ip_address] = mac_address
+            end
+          VhostDaemon.new(options).run
+        end
+      end
+
+      desc 'Terminates a vhost process'
+      command :stop do |c|
+        desc 'Host name'
+        c.flag [:n,  :name]
+
+        c.desc 'Location to put socket files'
+        c.flag [:S, :socket_dir], default_value: Phut.socket_dir
+
+        c.action do |_global_options, options, _args|
+          fail '--name option is mandatory' if options[:name].nil?
+          begin
+            VhostDaemon.process(options[:name], options[:socket_dir]).stop
+          rescue DRb::DRbConnError
+            true  # OK
+          end
+        end
+      end
+
+      desc 'Sends UDP packets to destination host'
+      command :send_packets do |c|
+        desc 'Source host name'
+        c.flag [:s,  :source]
+
+        c.action do |_global_options, options, _args|
+          fail '--source option is mandatory' if options[:source].nil?
+          VhostDaemon.process(options[:source], options[:socket_dir]).
+            send_packets
+        end
+      end
+
+      default_command :help
+
+      exit run(ARGV)
+    end
+  end
+end

data/features/dsl.feature

@@ -22,5 +22,5 @@ Feature: DSL parser
     Then the exit status should not be 0
     And the stderr should contain:
     """
-    The name 192.168.0.1 conflicts with vhost (name = 192.168.0.1, ip = 192.168.0.1).
+    The name 192.168.0.1 conflicts with vhost (name = 192.168.0.1, IP address = 192.168.0.1).
     """

data/features/step_definitions/phut_steps.rb

@@ -15,7 +15,7 @@ end
 
 Then(/^a vhost named "(.*?)" launches$/) do |name|
   in_current_dir do
-    pid_file = File.join(File.expand_path(@pid_dir), "phost.#{name}.pid")
+    pid_file = File.join(File.expand_path(@pid_dir), "vhost.#{name}.pid")
     step %(a file named "#{pid_file}" should exist)
   end
 end

data/lib/phut.rb

@@ -1,5 +1,5 @@
-require 'phut/cli'
 require 'phut/open_vswitch'
 require 'phut/parser'
 require 'phut/setting'
 require 'phut/version'
+require 'phut/vhost_daemon'

data/lib/phut/configuration.rb

@@ -19,7 +19,7 @@ module Phut
     end
 
     def vhosts
-      @all.values.select { |each| each.is_a? Phost }
+      @all.values.select { |each| each.is_a? Vhost }
     end
 
     def links
@@ -45,7 +45,7 @@ module Phut
 
     def add_vhost(name, attrs)
       check_name_conflict name
-      @all[name] = Phost.new(attrs[:ip], attrs[:promisc], name, @logger)
+      @all[name] = Vhost.new(attrs[:ip], attrs[:promisc], name, @logger)
     end
 
     # This method smells of :reek:LongParameterList

data/lib/phut/raw_socket.rb

@@ -0,0 +1,26 @@
+require 'socket'
+
+module Phut
+  # raw socket
+  class RawSocket
+    ETH_P_ALL = 0x0300
+    SIOCGIFINDEX = 0x8933
+
+    def initialize(interface)
+      @socket =
+        Socket.new(Socket::PF_PACKET, Socket::SOCK_RAW, ETH_P_ALL).tap do |sock|
+          ifreq = [interface].pack('a32')
+          sock.ioctl SIOCGIFINDEX, ifreq
+          sock.bind([Socket::AF_PACKET].pack('s').tap do |sll|
+                      sll << ([ETH_P_ALL].pack 's')
+                      sll << ifreq[16..20]
+                      sll << ("\x00" * 12)
+                    end)
+        end
+    end
+
+    def method_missing(method, *args)
+      @socket.__send__ method, *args
+    end
+  end
+end

data/lib/phut/setting.rb

@@ -5,7 +5,7 @@ module Phut
   # Central configuration repository.
   class Setting
     DEFAULTS = {
-      root: File.expand_path(File.join(__dir__, '..', '..')),
+      root: File.expand_path(File.join(File.dirname(__FILE__), '..', '..')),
       pid_dir: Dir.tmpdir,
       log_dir: Dir.tmpdir,
       socket_dir: Dir.tmpdir

data/lib/phut/syntax.rb

@@ -1,4 +1,4 @@
-require 'phut/phost'
+require 'phut/vhost'
 require 'phut/virtual_link'
 
 module Phut

data/lib/phut/version.rb

@@ -1,4 +1,4 @@
 # Base module.
 module Phut
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/phut/vhost.rb

@@ -0,0 +1,73 @@
+require 'phut/null_logger'
+require 'phut/setting'
+require 'phut/shell_runner'
+require 'pio/mac'
+
+module Phut
+  # An interface class to vhost emulation utility program.
+  class Vhost
+    include ShellRunner
+
+    attr_reader :ip_address
+    attr_reader :mac_address
+    attr_accessor :interface
+
+    def initialize(ip_address, promisc, name = nil, logger = NullLogger.new)
+      @ip_address = ip_address
+      @promisc = promisc
+      @name = name
+      @mac_address = Pio::Mac.new(rand(0xffffffffffff + 1))
+      @logger = logger
+    end
+
+    def name
+      @name || @ip_address
+    end
+
+    def to_s
+      "vhost (name = #{name}, IP address = #{@ip_address})"
+    end
+
+    def run(all_hosts = [])
+      sh "rvmsudo vhost run #{run_options all_hosts}"
+    end
+
+    def stop
+      fail "vhost (name = #{name}) is not running!" unless running?
+      sh "vhost stop -n #{name} -s #{Phut.socket_dir}"
+    end
+
+    def maybe_stop
+      return unless running?
+      stop
+    end
+
+    def running?
+      FileTest.exists?(pid_file)
+    end
+
+    private
+
+    def run_options(all_hosts)
+      ["-n #{name}",
+       "-I #{interface}",
+       "-i #{@ip_address}",
+       "-m #{@mac_address}",
+       "-a #{arp_entries all_hosts}",
+       @promisc ? '--promisc' : nil,
+       "-P #{Phut.pid_dir}",
+       "-L #{Phut.log_dir}",
+       "-S #{Phut.socket_dir}"].compact.join(' ')
+    end
+
+    def arp_entries(all_hosts)
+      all_hosts.map do |each|
+        "#{each.ip_address}/#{each.mac_address}"
+      end.join(',')
+    end
+
+    def pid_file
+      "#{Phut.pid_dir}/vhost.#{name}.pid"
+    end
+  end
+end

data/lib/phut/vhost_daemon.rb

@@ -0,0 +1,148 @@
+require 'drb'
+require 'logger'
+require 'phut/raw_socket'
+require 'pio'
+
+module Phut
+  # vhost daemon process
+  # rubocop:disable ClassLength
+  class VhostDaemon
+    def self.unix_domain_socket(name, socket_dir)
+      "drbunix:#{socket_dir}/vhost.#{name}.ctl"
+    end
+
+    def self.process(name, socket_dir)
+      DRbObject.new_with_uri(unix_domain_socket(name, socket_dir))
+    end
+
+    def initialize(options)
+      @options = options
+      @packets_sent = []
+      @packets_received = []
+    end
+
+    def run
+      start_logging
+      create_pid_file
+      start_daemon
+    rescue
+      shutdown
+    end
+
+    def stop
+      @stop = true
+    end
+
+    def send_packets(dest, npackets)
+      return unless lookup_arp_table(dest.ip_address)
+      udp = create_udp_packet(dest)
+      npackets.times do
+        write_to_raw_socket udp
+        @logger.info "Sent to #{dest.name}: #{udp}"
+      end
+    end
+
+    def stats
+      { tx: @packets_sent, rx: @packets_received }
+    end
+
+    private
+
+    def start_logging
+      @logger = Logger.new(log_file)
+      @logger.info("#{@options.fetch(:name)} started " \
+                   "(interface = #{@options.fetch(:interface)}," \
+                   " IP address = #{@options.fetch(:ip_address)}," \
+                   " MAC address = #{@options.fetch(:mac_address)}," \
+                   " arp_entries = #{@options.fetch(:arp_entries)})")
+    end
+
+    def raw_socket
+      @raw_socket ||= RawSocket.new(@options.fetch(:interface))
+    end
+
+    def lookup_arp_table(ip_address)
+      @options.fetch(:arp_table)[ip_address]
+    end
+
+    def write_to_raw_socket(packet)
+      @packets_sent << packet.snapshot
+      raw_socket.write packet.to_binary_s
+    end
+
+    def create_udp_packet(dest)
+      Pio::Udp.new(source_mac: @options.fetch(:mac_address),
+                   destination_mac: dest.mac_address,
+                   ip_source_address: @options.fetch(:ip_address),
+                   ip_destination_address: dest.ip_address)
+    end
+
+    def log_file
+      "#{@options.fetch(:log_dir)}/vhost.#{@options.fetch(:name)}.log"
+    end
+
+    def read_loop
+      loop do
+        raw_data, = raw_socket.recvfrom(8192)
+        udp = Pio::Udp.read(raw_data)
+        # TODO: Check @options[:promisc]
+        @logger.info "Received: #{udp}"
+        @packets_received << udp.snapshot
+      end
+    end
+
+    def start_daemon
+      Process.daemon
+      trap_sigint
+      update_pid_file
+      start_threads_and_join
+    end
+
+    def start_threads_and_join
+      unix_domain_socket =
+        self.class.unix_domain_socket(@options.fetch(:name),
+                                      @options.fetch(:socket_dir))
+      DRb.start_service(unix_domain_socket, self, UNIXFileMode: 0666)
+      Thread.start { read_loop }.abort_on_exception = true
+      DRb.thread.join
+    end
+
+    def shutdown
+      @logger.error $ERROR_INFO if $ERROR_INFO
+      @logger.info 'Shutting down...'
+      FileUtils.rm pid_file if running?
+      fail $ERROR_INFO if $ERROR_INFO
+    end
+
+    def trap_sigint
+      Thread.start { shutdown_loop }.abort_on_exception = true
+      Signal.trap(:INT) { stop }
+    end
+
+    def shutdown_loop
+      loop do
+        break if @stop
+        sleep 0.1
+      end
+      shutdown
+    end
+
+    def create_pid_file
+      fail "#{@options.fetch(:name)} is already running." if running?
+      update_pid_file
+    end
+
+    def update_pid_file
+      File.open(pid_file, 'w') { |file| file << Process.pid }
+    end
+
+    def running?
+      FileTest.exists?(pid_file)
+    end
+
+    def pid_file
+      File.join @options.fetch(:pid_dir), "vhost.#{@options.fetch(:name)}.pid"
+    end
+  end
+  # rubocop:enable ClassLength
+end

data/phut.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.email = ['yasuhito@gmail.com']
   gem.homepage = 'http://github.com/trema/phut'
 
-  gem.executables = %w(phut)
+  gem.executables = %w(phut vhost)
   gem.files = `git ls-files`.split("\n")
 
   gem.extensions = ['Rakefile']
@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 2.0.0'
 
   gem.add_dependency 'gli', '~> 2.12.3'
-  gem.add_dependency 'pio', '~> 0.15.2'
+  gem.add_dependency 'pio', '~> 0.16.0'
   gem.add_dependency 'pry', '~> 0.10.1'
 
   # Docs

data/spec/phut/parser_spec.rb

@@ -47,7 +47,7 @@ CONFIG
 
       describe '#vhost' do
         Then { config.vhosts.size == 2 }
-        Then { config.fetch('192.168.0.1').ip == '192.168.0.1' }
+        Then { config.fetch('192.168.0.1').ip_address == '192.168.0.1' }
       end
     end
 
@@ -62,7 +62,7 @@ CONFIG
 
       describe '#vhost' do
         Then { config.vhosts.size == 2 }
-        Then { config.fetch('host1').ip == '192.168.0.1' }
+        Then { config.fetch('host1').ip_address == '192.168.0.1' }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phut
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-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.15.2
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -309,12 +309,14 @@ email:
 - yasuhito@gmail.com
 executables:
 - phut
+- vhost
 extensions:
 - Rakefile
 extra_rdoc_files:
 - README.md
 files:
 - .gitignore
+- .hound.yml
 - .rspec
 - .rubocop.yml
 - .ruby-version
@@ -327,6 +329,7 @@ files:
 - README.md
 - Rakefile
 - bin/phut
+- bin/vhost
 - features/dsl.feature
 - features/dsl_link.feature
 - features/dsl_vhost.feature
@@ -337,16 +340,17 @@ files:
 - features/support/env.rb
 - features/support/hooks.rb
 - lib/phut.rb
-- lib/phut/cli.rb
 - lib/phut/configuration.rb
 - lib/phut/null_logger.rb
 - lib/phut/open_vswitch.rb
 - lib/phut/parser.rb
-- lib/phut/phost.rb
+- lib/phut/raw_socket.rb
 - lib/phut/setting.rb
 - lib/phut/shell_runner.rb
 - lib/phut/syntax.rb
 - lib/phut/version.rb
+- lib/phut/vhost.rb
+- lib/phut/vhost_daemon.rb
 - lib/phut/virtual_link.rb
 - phut.gemspec
 - spec/phut/open_vswitch_spec.rb
@@ -361,43 +365,10 @@ files:
 - tasks/relish.rake
 - tasks/rspec.rake
 - tasks/rubocop.rake
-- tasks/vhost.rake
 - vendor/.gitignore
 - vendor/README.md
 - vendor/openvswitch-1.2.2.trema1.tar.gz
 - vendor/openvswitch-1.2.2_librt-check.diff
-- vendor/phost/src/.gitignore
-- vendor/phost/src/Makefile
-- vendor/phost/src/arp.c
-- vendor/phost/src/arp.h
-- vendor/phost/src/cli.c
-- vendor/phost/src/cli.h
-- vendor/phost/src/cmdif.c
-- vendor/phost/src/cmdif.h
-- vendor/phost/src/common.c
-- vendor/phost/src/common.h
-- vendor/phost/src/eth.c
-- vendor/phost/src/eth.h
-- vendor/phost/src/ethdev.c
-- vendor/phost/src/ethdev.h
-- vendor/phost/src/icmp.c
-- vendor/phost/src/icmp.h
-- vendor/phost/src/ipv4.c
-- vendor/phost/src/ipv4.h
-- vendor/phost/src/log.c
-- vendor/phost/src/log.h
-- vendor/phost/src/phost.c
-- vendor/phost/src/phost.h
-- vendor/phost/src/stats.c
-- vendor/phost/src/stats.h
-- vendor/phost/src/tap.c
-- vendor/phost/src/tap.h
-- vendor/phost/src/trx.c
-- vendor/phost/src/trx.h
-- vendor/phost/src/udp.c
-- vendor/phost/src/udp.h
-- vendor/phost/src/utils.c
-- vendor/phost/src/utils.h
 homepage: http://github.com/trema/phut
 licenses:
 - GPL3

data/lib/phut/cli.rb

@@ -1,61 +0,0 @@
-require 'phut/null_logger'
-require 'phut/setting'
-require 'phut/shell_runner'
-
-module Phut
-  # cli command wrapper.
-  class Cli
-    include ShellRunner
-
-    def initialize(host, logger = NullLogger.new)
-      @host = host
-      @logger = logger
-    end
-
-    def send_packets(dest, options = {})
-      n_pkts = options[:n_pkts]
-      sh [executable,
-          "-i #{@host.interface} send_packets",
-          "--ip_dst #{dest.ip}",
-          "--ip_src #{@host.ip}",
-          '--tp_src 1',
-          '--tp_dst 1',
-          '--pps 1',
-          '--length 22',
-          n_pkts ? "--n_pkts=#{n_pkts}" : '--duration 1'].join(' ')
-    end
-
-    def show_tx_stats
-      puts stats(:tx)
-    end
-
-    def show_rx_stats
-      puts stats(:rx)
-    end
-
-    def add_arp_entry(other)
-      sh "sudo #{executable} -i #{@host.interface} add_arp_entry " \
-         "--ip_addr #{other.ip} --mac_addr #{other.mac}"
-    end
-
-    def set_ip_and_mac_address
-      sh "sudo #{executable} -i #{@host.interface} set_host_addr " \
-         "--ip_addr #{@host.ip} --ip_mask #{@host.netmask} " \
-         "--mac_addr #{@host.mac}"
-    end
-
-    def enable_promisc
-      sh "sudo #{executable} -i #{@host.interface} enable_promisc"
-    end
-
-    private
-
-    def executable
-      "#{Phut.root}/vendor/phost/src/cli"
-    end
-
-    def stats(type)
-      `sudo #{executable} -i #{@host.interface} show_stats --#{type}`
-    end
-  end
-end

data/lib/phut/phost.rb

@@ -1,92 +0,0 @@
-require 'phut/cli'
-require 'phut/null_logger'
-require 'phut/setting'
-require 'phut/shell_runner'
-require 'pio/mac'
-
-module Phut
-  # An interface class to phost emulation utility program.
-  class Phost
-    include ShellRunner
-
-    attr_reader :ip
-    attr_reader :mac
-    attr_accessor :interface
-
-    def initialize(ip_address, promisc, name = nil, logger = NullLogger.new)
-      @ip = ip_address
-      @promisc = promisc
-      @name = name
-      @mac = Pio::Mac.new(rand(0xffffffffffff + 1))
-      @logger = logger
-    end
-
-    def name
-      @name || @ip
-    end
-
-    def to_s
-      "vhost (name = #{name}, ip = #{@ip})"
-    end
-
-    def run(hosts = [])
-      sh "sudo #{executable} #{options.join ' '}"
-      sleep 1
-      set_ip_and_mac_address
-      maybe_enable_promisc
-      add_arp_entries hosts
-    end
-
-    def stop
-      fail "phost (name = #{name}) is not running!" unless running?
-      pid = IO.read(pid_file)
-      sh "sudo kill #{pid}"
-    end
-
-    def maybe_stop
-      return unless running?
-      stop
-    end
-
-    def netmask
-      '255.255.255.255'
-    end
-
-    def running?
-      FileTest.exists?(pid_file)
-    end
-
-    private
-
-    def set_ip_and_mac_address
-      Phut::Cli.new(self, @logger).set_ip_and_mac_address
-    end
-
-    def maybe_enable_promisc
-      return unless @promisc
-      Phut::Cli.new(self).enable_promisc
-    end
-
-    def add_arp_entries(hosts)
-      hosts.each do |each|
-        Phut::Cli.new(self).add_arp_entry each
-      end
-    end
-
-    def pid_file
-      "#{Phut.pid_dir}/phost.#{name}.pid"
-    end
-
-    def executable
-      "#{Phut.root}/vendor/phost/src/phost"
-    end
-
-    def options
-      %W(-p #{Phut.pid_dir}
-         -l #{Phut.log_dir}
-         -n #{name}
-         -i #{interface}
-         -D)
-    end
-  end
-end

data/tasks/vhost.rake

@@ -1,32 +0,0 @@
-require 'phut'
-
-def phost_src
-  File.join Phut.root, 'vendor', 'phost', 'src'
-end
-
-def phost_objects
-  FileList[File.join(phost_src, '*.o')]
-end
-
-def phost_vendor_binary
-  File.join phost_src, 'phost'
-end
-
-def phost_cli_vendor_binary
-  File.join phost_src, 'cli'
-end
-
-desc 'Build vhost executables'
-task vhost: [phost_vendor_binary, phost_cli_vendor_binary]
-
-file phost_vendor_binary do
-  cd phost_src do
-    sh 'make'
-  end
-end
-
-file phost_cli_vendor_binary do
-  cd phost_src do
-    sh 'make'
-  end
-end