vagrant-hosts 1.1.5 → 2.0.0rc1

data/CHANGELOG

@@ -1,6 +1,19 @@
 CHANGELOG
 =========
 
+2.0.0
+-----
+
+2013-09-16
+
+This is a backwards incompatible feature release.
+
+  * (GH-15) Extract guest operating system configuration to capabilities
+  * (GH-15) Add support for Windows guests
+
+Thanks to Reid Vandewiele for doing the heavy lifting of extracting the
+capabilities and adding the Windows guest capability.
+
 1.1.5
 -----
 

data/lib/vagrant-hosts/cap.rb

@@ -0,0 +1,15 @@
+module VagrantHosts
+  module Cap
+    module SyncHosts
+
+      class UnknownVersion < Vagrant::Errors::VagrantError
+        error_key(:unknown_version, 'vagrant_hosts.cap.sync_hosts')
+      end
+
+      require 'vagrant-hosts/cap/sync_hosts/base'
+      require 'vagrant-hosts/cap/sync_hosts/posix'
+      require 'vagrant-hosts/cap/sync_hosts/windows'
+
+    end
+  end
+end

data/lib/vagrant-hosts/{provisioner/linux.rb → cap/sync_hosts/base.rb}

@@ -1,39 +1,34 @@
-class VagrantHosts::Provisioner::Linux
+# Provide an abstract base class for syncing hosts entries
+class VagrantHosts::Cap::SyncHosts::Base
 
-  include VagrantHosts::Provisioner::Hostname
+  def self.sync_hosts(machine, config)
+    new(machine, config).sync!
+  end
 
   def initialize(machine, config)
     @machine, @config = machine, config
-
     @env = @machine.env
   end
 
   def sync!
-    upload_tmphosts
+    hostname = @machine.config.vm.hostname || @machine.name.to_s
+    change_host_name(hostname)
+
+    # call to method not implemented by abstract base class
     update_hosts
   end
 
   private
 
-  def upload_tmphosts
-    cache = Tempfile.new('tmp-hosts')
-    cache.write(format_hosts)
-    cache.flush
-    @machine.communicate.upload(cache.path, '/tmp/hosts')
-  end
-
-  def update_hosts
-    hostname = @machine.config.vm.hostname || @machine.name.to_s
-    change_host_name(hostname)
-    @machine.communicate.sudo('install -m 644 /tmp/hosts /etc/hosts')
-  end
-
-  # Generates content appropriate for a linux hosts file
-  #
-  # @return [String] All hosts in the config joined into hosts records
-  def format_hosts
-    all_hosts.inject('') do |str, (address, aliases)|
-      str << "#{address} #{aliases.join(' ')}\n"
+  # @param name [String] The new hostname to apply on the guest
+  def change_host_name(name)
+    case Vagrant::VERSION
+    when /^1\.1/
+      @machine.guest.change_host_name(name)
+    when /^1\.2/, /^1\.3/
+      @machine.guest.capability(:change_host_name, name)
+    else
+      raise UnknownVersion, :vagrant_version => Vagrant::VERSION
     end
   end
 
@@ -89,4 +84,5 @@ class VagrantHosts::Provisioner::Linux
   def all_machines
     @env.active_machines.map { |vm_id| @env.machine(*vm_id) }
   end
+
 end

data/lib/vagrant-hosts/cap/sync_hosts/posix.rb

@@ -0,0 +1,27 @@
+# Provide a base class for syncing hosts entries on POSIX systems.
+class VagrantHosts::Cap::SyncHosts::POSIX < VagrantHosts::Cap::SyncHosts::Base
+
+  private
+
+  def upload_tmphosts
+    cache = Tempfile.new('tmp-hosts')
+    cache.write(format_hosts)
+    cache.flush
+    @machine.communicate.upload(cache.path, '/tmp/hosts')
+  end
+
+  def update_hosts
+    upload_tmphosts
+    @machine.communicate.sudo('install -m 644 /tmp/hosts /etc/hosts')
+  end
+
+  # Generates content appropriate for a linux hosts file
+  #
+  # @return [String] All hosts in the config joined into hosts records
+  def format_hosts
+    all_hosts.inject('') do |str, (address, aliases)|
+      str << "#{address} #{aliases.join(' ')}\n"
+    end
+  end
+
+end

data/lib/vagrant-hosts/cap/sync_hosts/windows.rb

@@ -0,0 +1,23 @@
+# Provide a base class for syncing hosts entries on Windows systems.
+class VagrantHosts::Cap::SyncHosts::Windows < VagrantHosts::Cap::SyncHosts::Base
+
+  def update_hosts
+    host_entries = []
+    all_hosts.each do |(address, aliases)|
+      aliases.each do |name|
+        host_entries << "#{address} #{name}"
+      end
+    end
+
+    script = []
+    script << '$HostsLocation = "$env:windir\\System32\\drivers\\etc\\hosts";'
+
+    host_entries.each do |entry|
+      script << "\$HostEntry = \"#{entry}\""
+      script << "if (!((gc \$HostsLocation) -contains $HostEntry)) { Add-Content -Path $HostsLocation -Value $HostEntry; }"
+    end
+
+    @machine.communicate.sudo(script.join("\r\n"))
+  end
+
+end

data/lib/vagrant-hosts/plugin.rb

@@ -10,16 +10,35 @@ class VagrantHosts::Plugin < Vagrant.plugin(2)
   Vagrant guests.
   DESC
 
-  provisioner(:hosts) do
-    require_relative 'provisioner'
-    VagrantHosts::Provisioner
-  end
-
   config(:hosts, :provisioner) do
     require_relative 'config'
     VagrantHosts::Config
   end
 
+  provisioner(:hosts) do
+    require_relative 'provisioner/hosts'
+    VagrantHosts::Provisioner::Hosts
+  end
+
+  # Guest capabilities for vagrant-hosts
+
+  guest_capability(:linux, 'sync_hosts') do
+    require_relative 'cap'
+    VagrantHosts::Cap::SyncHosts::POSIX
+  end
+
+  guest_capability(:solaris, 'sync_hosts') do
+    require_relative 'cap'
+    VagrantHosts::Cap::SyncHosts::POSIX
+  end
+
+  guest_capability(:windows, 'sync_hosts') do
+    require_relative 'cap'
+    VagrantHosts::Cap::SyncHosts::Windows
+  end
+
+  # ConfigBuilder tie-ins
+
   def self.config_builder_hook
     require_relative 'config_builder'
   end

data/lib/vagrant-hosts/provisioner/hosts.rb

@@ -0,0 +1,17 @@
+require 'vagrant'
+
+module VagrantHosts
+  module Provisioner
+    class Hosts < Vagrant.plugin('2', :provisioner)
+
+      def initialize(machine, config)
+        super
+      end
+
+      def provision
+        @machine.guest.capability(:sync_hosts, @config)
+      end
+
+    end
+  end
+end

data/lib/vagrant-hosts/version.rb

@@ -1,3 +1,3 @@
 module VagrantHosts
-  VERSION = '1.1.5'
+  VERSION = '2.0.0rc1'
 end

data/templates/locales/en.yml

@@ -1,6 +1,8 @@
 ---
 en:
   vagrant_hosts:
-    unknown_version: |-
-      %{vagrant_version} isn't a recognized Vagrant version, vagrant-hosts can't reliably
-      detect the `change_host_name` method.
+    cap:
+      sync_hosts:
+        unknown_version: |-
+          %{vagrant_version} isn't a recognized Vagrant version, vagrant-hosts can't reliably
+          detect the `change_host_name` method.

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hosts
 version: !ruby/object:Gem::Version
-  version: 1.1.5
-  prerelease: 
+  version: 2.0.0rc1
+  prerelease: 5
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies: []
 description: ! '    Manage static DNS entries and configuration for Vagrant guests.
 
@@ -23,12 +23,14 @@ files:
 - LICENSE
 - README.markdown
 - lib/vagrant-hosts.rb
+- lib/vagrant-hosts/cap.rb
+- lib/vagrant-hosts/cap/sync_hosts/base.rb
+- lib/vagrant-hosts/cap/sync_hosts/posix.rb
+- lib/vagrant-hosts/cap/sync_hosts/windows.rb
 - lib/vagrant-hosts/config.rb
 - lib/vagrant-hosts/config_builder.rb
 - lib/vagrant-hosts/plugin.rb
-- lib/vagrant-hosts/provisioner.rb
-- lib/vagrant-hosts/provisioner/hostname.rb
-- lib/vagrant-hosts/provisioner/linux.rb
+- lib/vagrant-hosts/provisioner/hosts.rb
 - lib/vagrant-hosts/version.rb
 - templates/locales/en.yml
 - vagrant-hosts.gemspec
@@ -48,9 +50,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/vagrant-hosts/provisioner.rb

@@ -1,20 +0,0 @@
-require 'vagrant'
-require 'tempfile'
-
-module VagrantHosts
-  class Provisioner < Vagrant.plugin('2', :provisioner)
-
-    require 'vagrant-hosts/provisioner/hostname'
-    require 'vagrant-hosts/provisioner/linux'
-
-    def initialize(machine, config)
-      @machine, @config = machine, config
-    end
-
-    # @todo use guest capabilities instead of hardcoded provisioner provider
-    def provision
-      driver = Linux.new(@machine, @config)
-      driver.sync!
-    end
-  end
-end

data/lib/vagrant-hosts/provisioner/hostname.rb

@@ -1,27 +0,0 @@
-require 'vagrant'
-require 'vagrant/errors'
-
-# Abstract the details of setting a guest hostname on different versions of
-# Vagrant.
-#
-# Vagrant commit 61d2f9f96fc0f0ef5869c732674f25c4ccc85c8c converts the
-# #change_host_name # method to a capability, which breaks the API between
-# 1.1 and 1.2. :(
-module VagrantHosts::Provisioner::Hostname
-
-  class UnknownVersion < Vagrant::Errors::VagrantError
-    error_key(:unknown_version, 'vagrant_hosts')
-  end
-
-  # @param name [String] The new hostname to apply on the guest
-  def change_host_name(name)
-    case Vagrant::VERSION
-    when /^1\.1/
-      @machine.guest.change_host_name(name)
-    when /^1\.2/, /^1\.3/
-      @machine.guest.capability(:change_host_name, name)
-    else
-      raise UnknownVersion, :vagrant_version => Vagrant::VERSION
-    end
-  end
-end