vagrant-xhyve 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 701f6d5e2381b33845d6908ec66a9c885fdb3560
-  data.tar.gz: 484ab4ecc0b48dcc2831424adb42bf41a33c2364
+  metadata.gz: d1b1e29a5e98f8a0d0586c217e0f1ff017b6ca49
+  data.tar.gz: 4bbd11ce1f843b0075ab5b3edb002b437ab283a3
 SHA512:
-  metadata.gz: f2c3171afe29035229dd8b280c4b0139773ae042d107a6a12205b0603ae8d5a9ee9b2f379a6f2e59a1529878003a415fc443612b78a05d57fed231d927d3f2be
-  data.tar.gz: 9c6673a0e8655de1fbcc76e66bf73a9095efb1a901cdad3eba435bebbcfecaba1d4dac6256c7798f0cf112fdec3443506da3701961bd252330df9897b72d50ee
+  metadata.gz: 12a7c22f6097c8d7b68b4e4a25a85acce82356084175faeda2a900af8e2117730e4b937047bf591e96cddb99161a06bc97a725f5d982be8926f4ddde7dee1530
+  data.tar.gz: f2ae14dbd96964160a76c87387b10b092e1b501388008a7e8418c7b94c25ba1d8517642ee484ae3bf8cb7e07c560f0fe9136f033f7961ea601e4c97211b8d74f

data/README.md

@@ -68,7 +68,8 @@ This provider exposes quite a few provider-specific configuration options:
 * `cpus` - The number of CPUs to give the VM
 * `xhyve_binary` - use a custom xhyve version (for example, the version of xhyve
   included with [Docker for Mac Beta](https://docs.docker.com/engine/installation/mac/#docker-for-mac)
-  is interesting. The path is `/Applications/Docker.app/Contents/MacOS/com.docker.hyperkit`
+  is interesting. The path is `/Applications/Docker.app/Contents/MacOS/com.docker.hyperkit`. )
+* kernel_command - send a custom kernel boot command
 
 These can be set like typical provider-specific configuration:
 
@@ -79,7 +80,8 @@ Vagrant.configure("2") do |config|
   config.vm.provider :xhyve do |xhyve|
     xhyve.cpus = 2
     xhyve.memory = "1G"
-    xhyve_xhyve_binary = "/Applications/Docker.app/Contents/MacOS/com.docker.hyperkit"
+    xhyve.xhyve_binary = "/Applications/Docker.app/Contents/MacOS/com.docker.hyperkit"
+    xhyve.kernel_command = "root=/dev/mapper/centos-root ro crashkernel=auto rd.lvm.lv=centos/root rd.lvm.lv=centos/swap acpi=off console=ttyS0 LANG=en_GB.UTF-8" # example for a CentOS installed in a LVM filesystem
   end
 end
 ```
@@ -133,7 +135,7 @@ $ bundle exec rake
 If those pass, you're ready to start developing the plugin. You can test
 the plugin without installing it into your Vagrant environment by just
 creating a `Vagrantfile` in the top level of this directory (it is gitignored)
-and add the following line to your `Vagrantfile` 
+and add the following line to your `Vagrantfile`
 ```ruby
 Vagrant.require_plugin "vagrant-xhyve"
 ```

data/lib/vagrant-xhyve/action/boot.rb

@@ -15,107 +15,41 @@ module VagrantPlugins
         include Vagrant::Util::Retryable
 
         def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_xhyve::action::run_instance")
+          @app = app
         end
 
         def call(env)
+          env[:ui].info(" About to launch vm...")
           # Initialize metrics if they haven't been
           env[:metrics] ||= {}
 
-          env[:ui].info(" About to launch vm")
-          
-          memory = env[:machine].provider_config.memory
-          cpus = env[:machine].provider_config.cpus
-          xhyve_binary = env[:machine].provider_config.xhyve_binary
-
-          # Launch!
-          env[:ui].info(" -- CPUs: #{cpus}") if cpus
-          env[:ui].info(" -- Memory: #{memory}")
-          env[:ui].info(" -- xhyve binary: #{xhyve_binary.to_s}") if xhyve_binary
-
           machine_info_path = File.join(env[:machine].data_dir, "xhyve.json")
-          if File.exist?(machine_info_path) then
+          if File.exist?(machine_info_path)
             machine_json = File.read(machine_info_path)
             machine_options = JSON.parse(machine_json, :symbolize_names => true)
+            log.debug "Machine Options: #{JSON.pretty_generate(machine_options)}"
             machine_uuid = machine_options[:uuid]
-            @logger.debug("Found existing UUID: #{machine_uuid}")
+            pid = machine_options[:pid]
+            mac = machine_options[:mac]
           else
             machine_uuid = SecureRandom.uuid
-            @logger.debug("Created new UUID: #{machine_uuid}")
-          end
-
-          image_dir = File.join(env[:machine].data_dir, "image")
-          vmlinuz_file = File.join(image_dir, "vmlinuz")
-          initrd_file = File.join(image_dir, "initrd.gz")
-          block_devices = []
-
-          0.upto(10).each do |blockidx|
-            block_file = File.join(image_dir, "block#{blockidx}.img")
-            if (File.exist? block_file) then
-              @logger.debug("Found block device #{block_file}")
-              block_devices.push(block_file)
-            else
-              break
-            end
           end
 
-          if block_devices.any? then
-              disk_kernel_parameters = "root=/dev/vda1 ro"
-          else
-              disk_kernel_parameters = ""
-          end
-
-          kernel_parameters = "\"earlyprintk=serial console=ttyS0 #{disk_kernel_parameters}\""
-
-          firmware = "kexec,#{vmlinuz_file},#{initrd_file},#{kernel_parameters}"
-
-          @logger.debug("Machine data_dir: #{env[:machine].data_dir}")
-          @logger.debug("Kernel Options: #{kernel_parameters}")
-          @logger.debug("Block Devices: #{block_devices}")
-
-          xhyve_guest = Util::XhyveGuest.new(
-              kernel: vmlinuz_file,
-              initrd: initrd_file,
-              cmdline: kernel_parameters,
-              blockdevs: block_devices,
-              serial: 'com1',
-              memory: memory,
-              processors: cpus,
-              networking: true,
-              xhyve_binary: xhyve_binary,
-              acpi: true
-          )
-
-          xhyve_pid = xhyve_guest.start
-          @logger.debug(xhyve_guest.options().to_json)
-        
+          guest_config = {
+            pid: pid,
+            mac: mac,
+            uuid: machine_uuid,
+            cmdline: kernel_command(env),
+            memory: memory(env),
+            processors: cpus(env),
+            binary: xhyve_binary(env),
+          }
+
+          xhyve_guest = start_guest(env, guest_config)
           # Immediately save the ID since it is created at this point.
-          env[:machine].id = xhyve_pid
-
-          # wait for ip
-          network_ready_retries = 0
-          network_ready_retries_max = 5
-          while true
-            break if env[:interrupted]
-
-            if xhyve_guest.ip
-                break
-            end
-            if network_ready_retries < network_ready_retries_max then
-                network_ready_retries += 1
-                env[:ui].info("Waiting for IP to be ready...")
-            else
-                raise 'Waited too long for IP to be ready. Your VM probably did not boot.'
-            end
-            sleep 2
-          end
-
-          machine_info_path = File.join(env[:machine].data_dir, "xhyve.json")
-          File.write(machine_info_path, xhyve_guest.options().to_json)
-          
-          @logger.info(" Launched xhyve VM with PID #{xhyve_pid}, MAC: #{xhyve_guest.mac}, and IP #{xhyve_guest.ip}")
+          env[:machine].id = xhyve_guest.uuid
 
+          save_guest_status(env, xhyve_guest)
           # Terminate the instance if we were interrupted
           terminate(env) if env[:interrupted]
 
@@ -138,6 +72,94 @@ module VagrantPlugins
           destroy_env[:force_confirm_destroy] = true
           env[:action_runner].run(Action.action_destroy, destroy_env)
         end
+
+        private
+
+        def block_device_paths(base_path)
+          0.upto(10).map do |blockidx|
+            block_file = File.join(base_path, "block#{blockidx}.img")
+            return block_file if File.exist? block_file
+          end
+        end
+
+        def kernel_file_path(base_path)
+          File.join(base_path, "vmlinuz")
+        end
+
+        def initrd_file_path(base_path)
+          File.join(base_path, "initrd.gz")
+        end
+
+        def memory(env)
+          provider_config(env).memory
+        end
+
+        def cpus(env)
+          provider_config(env).cpus
+        end
+
+        def xhyve_binary(env)
+          provider_config(env).xhyve_binary
+        end
+
+        def kernel_command(env)
+          provider_config(env).kernel_command
+        end
+
+        def provider_config(env)
+          @provider_config ||= env[:machine].provider_config
+        end
+
+        def start_guest(env, config = {})
+          image_dir = File.join(env[:machine].data_dir, "image")
+          default_config = {
+            kernel: kernel_file_path(image_dir),
+            initrd: initrd_file_path(image_dir),
+            blockdevs: block_device_paths(image_dir),
+            serial: 'com1',
+            networking: true,
+            acpi: true
+          }
+          config = default_config.merge(config)
+          log.debug "xhyve configuration: #{JSON.pretty_generate(config)}"
+          xhyve_guest = Util::XhyveGuest.new config
+          xhyve_guest.start
+          xhyve_guest
+        end
+
+        def save_guest_status(env, guest)
+          wait_for_guest_ip(env, guest)
+          machine_info_path = File.join(env[:machine].data_dir, "xhyve.json")
+          log.debug "xhyve configuration: #{JSON.pretty_generate(guest.options)}"
+          File.write(machine_info_path, guest.options().to_json)
+          log.info(" Launched xhyve VM with PID #{guest.pid}, MAC: #{guest.mac}, and IP #{guest.ip}")
+        end
+
+        def wait_for_guest_ip(env, guest)
+          network_ready_retries = 0
+          network_ready_retries_max = 3
+          update_xhyve_status(env, guest.options)
+          while guest.ip.nil?
+            break if env[:interrupted]
+
+            if network_ready_retries < network_ready_retries_max then
+              network_ready_retries += 1
+              env[:ui].info("Waiting for IP to be ready. Try #{network_ready_retries}/#{network_ready_retries_max}...")
+            else
+              raise 'Waited too long for IP to be ready. Your VM probably did not boot.'
+            end
+            sleep 0.5
+          end
+          update_xhyve_status(env, guest.options)
+        end
+
+        def update_xhyve_status(env, status)
+          env[:xhyve_status] = status
+        end
+
+        def log
+          @logger ||= Log4r::Logger.new("vagrant_xhyve::action::boot")
+        end
       end
     end
   end

data/lib/vagrant-xhyve/action/import.rb

@@ -8,50 +8,61 @@ module VagrantPlugins
       # This terminates the running instance.
       class Import
         def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_xhyve::action::import")
+          @app = app
         end
 
         def call(env)
 
           #TODO: Progress bar
           env[:ui].info("Importing box...")
-          # something like:
-          # # tempfile is a File instance
-          # File.open( new_file, 'wb' ) do |f|
-          #   # Read in small 65k chunks to limit memory usage
-          #     f.write(tempfile.read(2**16)) until tempfile.eof?
-          #     end
 
           image_dir = File.join(env[:machine].data_dir, "image")
           box_dir = env[:machine].box.directory
 
-          box_files = [File.join(box_dir, "vmlinuz"), File.join(box_dir, "initrd.gz")]
+          log.debug("Importing box from: #{box_dir}")
 
+          create_image_directory(image_dir)
+          copy_kernel_to(box_dir, image_dir)
+          copy_initrd_to(box_dir, image_dir)
+          copy_block_files_to(box_dir, image_dir)
+          env[:ui].info("Done importing box.")
+
+          @app.call(env)
+        end
+
+        private
+
+        def copy_kernel_to(from, to)
+          copy_file(from, to, "vmlinuz")
+        end
+
+        def copy_initrd_to(from, to)
+          copy_file(from, to, "initrd.gz")
+        end
+
+        def copy_block_files_to(from, to)
           0.upto(10).each do |blockidx|
-            block_file = File.join(box_dir, "block#{blockidx}.img")
-            if (File.exist? block_file) then
-              box_files.push(block_file)
-            else
-              break
-            end
+            filename = "block#{blockidx}.img"
+            copy_file(from, to, filename) if File.exist? File.join(from, filename)
           end
+        end
 
-          FileUtils.mkdir_p(image_dir)
-          FileUtils.cp(box_files, image_dir)
+        def copy_file(from, to, filename)
+          from_box_file_path = File.join(from, filename)
+          to_image_file_path = File.join(to, filename)
 
-          env[:ui].info("Done importing box.")
+          unless File.exist? to_image_file_path
+            log.debug("Copying #{from_box_file_path} to #{to} ")
+            FileUtils.cp(from_box_file_path, to)
+          end
+        end
 
-          @app.call(env)
+        def create_image_directory(path)
+          FileUtils.mkdir_p(path)
         end
 
-        def process_alive(pid)
-          begin
-            Process.getpgid(pid)
-            true
-          rescue Errno::ESRCH
-            false
-          end
+        def log
+          @logger ||= Log4r::Logger.new("vagrant_xhyve::action::import")
         end
       end
     end

data/lib/vagrant-xhyve/action/read_ssh_info.rb

@@ -14,18 +14,12 @@ module VagrantPlugins
 
         def call(env)
           env[:machine_ssh_info] = read_ssh_info(env)
-
           @app.call(env)
         end
 
         def read_ssh_info(env)
-          return nil if env[:machine].id.nil?
-
-          machine_info_path = File.join(env[:machine].data_dir, "xhyve.json")
-          machine_json = File.read(machine_info_path)
-          machine_options = JSON.parse(machine_json, :symbolize_names => true)
-
-          return { :host => machine_options[:ip], :port => 22 }
+          xhyve_status = env[:xhyve_status]
+          return { :host => xhyve_status[:ip], :port => 22 }
         end
       end
     end

data/lib/vagrant-xhyve/action/read_state.rb

@@ -7,31 +7,41 @@ module VagrantPlugins
       # `:machine_state_id` key in the environment.
       class ReadState
         def initialize(app, env)
-          @app    = app
+          @app = app
+          @env = env
           @logger = Log4r::Logger.new("vagrant_xhyve::action::read_state")
         end
 
         def call(env)
-          env[:machine_state_id] = read_state(env[:machine])
 
+          env[:machine_state_id] = read_state(env)
           @app.call(env)
         end
 
-        def read_state(machine)
-          return :not_created if machine.id.nil?
+        private
 
-          xhyve_pid = Integer(machine.id)
-
-          if process_alive(xhyve_pid) then
-              return :running
+        def read_state(env)
+          xhyve_status = read_xhyve_status_file(env)
+          return :not_created if env[:machine].id.nil?
+          env[:xhyve_status] = xhyve_status
+          if process_alive(xhyve_status[:pid])
+            return :running
           else
-              return :stopped
+            return :stopped
           end
         end
 
+        def read_xhyve_status_file(env)
+          xhyve_status_file_path = File.join(env[:machine].data_dir, "xhyve.json")
+          return {} unless File.exist?(xhyve_status_file_path)
+          machine_json = File.read(xhyve_status_file_path)
+          JSON.parse(machine_json, :symbolize_names => true)
+        end
+
         def process_alive(pid)
+          return false if pid.nil?
           begin
-            Process.getpgid(pid)
+            Process.getpgid(pid.to_i)
             true
           rescue Errno::ESRCH
             false

data/lib/vagrant-xhyve/action/stop_instance.rb

@@ -11,27 +11,18 @@ module VagrantPlugins
         end
 
         def call(env)
-          if env[:machine].state.id == :stopped
-            env[:ui].info(I18n.t("vagrant_xhyve.already_status", :status => env[:machine].state.id))
+          if is_process_alive? pid(env)
+            env[:ui].info(I18n.t("vagrant_xhyve.stopping"))
+            kill_xhyve_process(env)
           else
-              env[:ui].info(I18n.t("vagrant_xhyve.stopping"))
-
-              xhyve_pid = env[:machine].id
-
-              if xhyve_pid == nil then
-                @logger.debug("xhyve already gone")
-              elsif process_alive(Integer(xhyve_pid)) then
-                env[:ui].info(" Terminating xhyve instance with PID #{xhyve_pid}")
-                Process.kill(3, Integer(xhyve_pid))
-              else
-                @logger.debug("xhyve PID already gone #{xhyve_pid}")
-              end
+            env[:ui].info(I18n.t("vagrant_xhyve.already_status", status: env[:machine].state.id))
           end
-
+          destroy_xhyve_status_file(env)
           @app.call(env)
         end
 
-        def process_alive(pid)
+        def is_process_alive?(pid)
+          return false if pid == 0
           begin
             Process.getpgid(pid)
             true
@@ -39,6 +30,19 @@ module VagrantPlugins
             false
           end
         end
+
+        def kill_xhyve_process(env)
+          Process.kill(3, pid(env))
+        end
+
+        def destroy_xhyve_status_file(env)
+          xhyve_status_file_path = File.join(env[:machine].data_dir, "xhyve.json")
+          FileUtils.remove_file(xhyve_status_file_path, force: true)
+        end
+
+        def pid(env)
+          @pid ||= env[:xhyve_status][:pid].to_i
+        end
       end
     end
   end

data/lib/vagrant-xhyve/action/terminate_instance.rb

@@ -13,33 +13,17 @@ module VagrantPlugins
         end
 
         def call(env)
-          xhyve_pid = env[:machine].id
-
-          if xhyve_pid == nil then
-            @logger.debug("xhyve already gone")
-          elsif process_alive(Integer(xhyve_pid)) then
-            env[:ui].info(" Terminating xhyve instance with PID #{xhyve_pid}")
-            Process.kill(3, Integer(xhyve_pid))
-          else
-            @logger.debug("xhyve PID already gone #{xhyve_pid}")
-          end
-
-          # Destroy the server and remove the tracking ID
+          stop_instance(env)
+          # Remove the tracking ID
           env[:ui].info(I18n.t("vagrant_xhyve.terminating"))
-          env[:machine].id = nil
-
           FileUtils.rm_rf(env[:machine].data_dir)
 
           @app.call(env)
         end
 
-        def process_alive(pid)
-          begin
-            Process.getpgid(pid)
-            true
-          rescue Errno::ESRCH
-            false
-          end
+        def stop_instance(env)
+          halt_env = env.dup
+          env[:action_runner].run(Action.action_halt, halt_env)
         end
       end
     end

data/lib/vagrant-xhyve/action.rb

@@ -27,6 +27,7 @@ module VagrantPlugins
       def self.action_halt
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
+          b.use ReadState
           b.use Call, IsCreated do |env, b2|
             if env[:result]
               b2.use Call, GracefulHalt, :stopped, :running do |env2, b3|
@@ -83,6 +84,7 @@ module VagrantPlugins
       def self.action_read_ssh_info
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
+          b.use ReadState
           b.use ReadSSHInfo
         end
       end

data/lib/vagrant-xhyve/config.rb

@@ -19,7 +19,7 @@ module VagrantPlugins
       #
       # @return [String]
       attr_accessor :memory
- 
+
 
       # The path to the xhyve binary if you don't want to
       # use the one bundled with xhyve-ruby
@@ -31,18 +31,26 @@ module VagrantPlugins
       #
       # @return [String]
       attr_accessor :mac
-      
+
       # The uuid of the VM
       #
       # @return [String]
       attr_accessor :uuid
 
+      # The kernel command to initialize the machine
+      # The default command assumes that the instalation is done directly on the
+      # disk and not using a lvm. For example, by default, Centos intallation uses
+      # LVM. Moreover, it might be interesting to add new kernel options.
+      # @return [String]
+      attr_accessor :kernel_command
+
       def initialize(region_specific=false)
-        @cpus         = UNSET_VALUE
-        @memory       = UNSET_VALUE
-        @xhyve_binary = UNSET_VALUE
-        @mac          = UNSET_VALUE
-        @uuid         = UNSET_VALUE
+        @cpus           = UNSET_VALUE
+        @memory         = UNSET_VALUE
+        @xhyve_binary   = UNSET_VALUE
+        @mac            = UNSET_VALUE
+        @uuid           = UNSET_VALUE
+        @kernel_command = UNSET_VALUE
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)
@@ -61,7 +69,7 @@ module VagrantPlugins
         @cpus = 1 if @cpus == UNSET_VALUE
         @memory = 1024 if @memory == UNSET_VALUE
         @xhyve_binary = nil if @xhyve_binary == UNSET_VALUE
- 
+        @kernel_command = %Q{"earlyprintk=serial console=ttyS0 root=/dev/vda1 ro"} if @kernel_command == UNSET_VALUE
         # Mark that we finalized
         @__finalized = true
       end

data/lib/vagrant-xhyve/util/vagrant-xhyve.rb

@@ -3,30 +3,19 @@ require 'xhyve'
 module VagrantPlugins
   module XHYVE
     module Util
-      
       # TODO: send all this upstream
       class XhyveGuest < Xhyve::Guest
 
         def initialize(**opts)
-          @xhyve_binary = opts[:xhyve_binary] || Xhyve::BINARY_PATH
-          if opts.has_key? "pid"
-            @pid = pid
-          else
-            @kernel = opts.fetch(:kernel)
-            @initrd = opts.fetch(:initrd)
-            @cmdline = opts.fetch(:cmdline)
-            @blockdevs = [opts[:blockdevs] || []].flatten
-            @memory = opts[:memory] || '500M'
-            @processors = opts[:processors] || '1'
-            @uuid = opts[:uuid] || SecureRandom.uuid
-            @serial = opts[:serial] || 'com1'
-            @acpi = opts[:acpi] || true
-            @networking = opts[:networking] || true
-            @foreground = opts[:foreground] || false
-            @command = build_command
-            @mac = find_mac
+          super.tap do |s|
+            @pid = opts.fetch(:pid, nil)
+            @mac = opts[:mac] unless opts[:mac].nil?
           end
+        end
 
+        def start
+          return @pid if running?
+          super
         end
 
         def options
@@ -46,13 +35,13 @@ module VagrantPlugins
             :command => @command,
             :mac => @mac,
             :ip => ip,
-            :xhyve_binary => @xhyve_binary
+            :binary => @binary
           }
         end
 
         def build_command
           [
-            "#{@xhyve_binary}",
+            "#{@binary}",
             "#{'-A' if @acpi}",
             '-U', @uuid,
             '-m', @memory,
@@ -62,7 +51,7 @@ module VagrantPlugins
             "#{"#{@blockdevs.each_with_index.map { |p, i| "-s #{PCI_BASE + i},virtio-blk,#{p}" }.join(' ')}" unless @blockdevs.empty? }",
             '-s', '31,lpc',
             '-l', "#{@serial},stdio",
-            '-f' "kexec,#{@kernel},#{@initrd},'#{@cmdline}'"
+            '-f', "kexec,#{@kernel},#{@initrd},'#{@cmdline}'"
           ].join(' ')
         end
       end

data/lib/vagrant-xhyve/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module XHYVE
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-xhyve
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Patrick Armstrong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xhyve-ruby
@@ -92,12 +92,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .rspec
 - CHANGELOG.md
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- example_box/README.md
 - example_box/initrd.gz
 - example_box/metadata.json
-- example_box/README.md
 - example_box/vmlinuz
-- Gemfile
+- lib/vagrant-xhyve.rb
+- lib/vagrant-xhyve/action.rb
 - lib/vagrant-xhyve/action/boot.rb
 - lib/vagrant-xhyve/action/import.rb
 - lib/vagrant-xhyve/action/is_created.rb
@@ -111,7 +118,6 @@ files:
 - lib/vagrant-xhyve/action/terminate_instance.rb
 - lib/vagrant-xhyve/action/timed_provision.rb
 - lib/vagrant-xhyve/action/wait_for_state.rb
-- lib/vagrant-xhyve/action.rb
 - lib/vagrant-xhyve/config.rb
 - lib/vagrant-xhyve/errors.rb
 - lib/vagrant-xhyve/plugin.rb
@@ -119,39 +125,33 @@ files:
 - lib/vagrant-xhyve/util/timer.rb
 - lib/vagrant-xhyve/util/vagrant-xhyve.rb
 - lib/vagrant-xhyve/version.rb
-- lib/vagrant-xhyve.rb
-- LICENSE
 - locales/en.yml
-- Rakefile
-- README.md
 - spec/spec_helper.rb
 - spec/vagrant-xhyve/config_spec.rb
 - templates/metadata.json.erb
 - templates/vagrant-aws_package_Vagrantfile.erb
 - vagrant-xhyve.gemspec
-- vendor/xhyve-ruby/example/test.rb
+- vendor/xhyve-ruby/.gitignore
+- vendor/xhyve-ruby/.travis.yml
 - vendor/xhyve-ruby/Gemfile
+- vendor/xhyve-ruby/README.md
+- vendor/xhyve-ruby/Rakefile
+- vendor/xhyve-ruby/example/test.rb
 - vendor/xhyve-ruby/lib/rubygems_plugin.rb
+- vendor/xhyve-ruby/lib/xhyve.rb
 - vendor/xhyve-ruby/lib/xhyve/dhcp.rb
 - vendor/xhyve-ruby/lib/xhyve/guest.rb
 - vendor/xhyve-ruby/lib/xhyve/vendor/xhyve
 - vendor/xhyve-ruby/lib/xhyve/version.rb
-- vendor/xhyve-ruby/lib/xhyve.rb
-- vendor/xhyve-ruby/Rakefile
-- vendor/xhyve-ruby/README.md
 - vendor/xhyve-ruby/spec/fixtures/dhcpd_leases.txt
+- vendor/xhyve-ruby/spec/fixtures/guest/README.md
 - vendor/xhyve-ruby/spec/fixtures/guest/initrd
 - vendor/xhyve-ruby/spec/fixtures/guest/loop.img
-- vendor/xhyve-ruby/spec/fixtures/guest/README.md
 - vendor/xhyve-ruby/spec/fixtures/guest/vmlinuz
 - vendor/xhyve-ruby/spec/lib/dhcp_spec.rb
 - vendor/xhyve-ruby/spec/lib/guest_spec.rb
 - vendor/xhyve-ruby/spec/spec_helper.rb
 - vendor/xhyve-ruby/xhyve-ruby.gemspec
-- .gitignore
-- .rspec
-- vendor/xhyve-ruby/.gitignore
-- vendor/xhyve-ruby/.travis.yml
 homepage: http://github.com/oldpatricka/vagrant-xhyve
 licenses:
 - MIT
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-xhyve
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines in xhyve.