vagrant-etchosts 0.0.0 → 0.1.0

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org/"
+
+gem 'git-version-bump'

data/README.md

@@ -1,5 +1,3 @@
-# vagrant-etchosts
-
 This is a Vagrant 1.4+ (at least, that's all I've tested it on) plugin to
 add and remove entries from `/etc/hosts` on the machine on which Vagrant is
 running.
@@ -25,3 +23,29 @@ Its limitations are:
    I haven't yet had a need for other addressing schemes, so I haven't added
    them yet.  If you want it, send me a patch or wait until I've found a
    need for multiple networks and/or statically assigned addresses.
+
+
+# Usage
+
+At its most basic, you should just be able to install the plugin:
+
+    vagrant plugin install vagrant-etchosts
+
+Make sure your Vagrantfile defines hostnames for your machine(s):
+
+    config.vm.hostname = "freddy.example.com"
+
+And you're away!  This configuration will add entries for both the FQDN and
+shortname (`freddy.example.com` and `freddy`, in the example above) to the
+host's `/etc/hosts` when the machine is created, and remove them again when
+the machine is destroyed.
+
+If you'd like additional aliases for a machine to be added to /etc/hosts,
+then you'll need to specify them in the config:
+
+    config.etchosts.aliases ["foo", "bar", "baz", "wombat"]
+
+Aliases won't have a shortname variant added, so if you want to have
+shortname aliases, you'll have to specify both versions yourself:
+
+    config.etchosts.aliases ["puppet.example.com", "puppet"]

data/Rakefile

@@ -1,3 +1,5 @@
 require 'bundler/gem_helper'
 
 Bundler::GemHelper.install_tasks
+
+require 'git-version-bump/rake-tasks'

data/lib/vagrant-etchosts/action/add_etc_hosts_entry.rb

@@ -12,9 +12,10 @@ module VagrantPlugins::EtcHosts
 			@app.call(env)
 			
 			# Best place to find the network config?  In the SSH config.
-			addr = env[:machine].ssh_info[:host]
-			fqdn = env[:machine].config.vm.hostname
-			id   = env[:machine].id
+			addr    = env[:machine].ssh_info[:host]
+			fqdn    = env[:machine].config.vm.hostname
+			id      = env[:machine].id
+			aliases = env[:machine].config.etchosts.aliases
 			
 			if fqdn.nil?
 				fqdn = env[:machine].name.to_s
@@ -28,8 +29,8 @@ module VagrantPlugins::EtcHosts
 			begin
 				# Dump existing /etc/hosts content into our temp file
 				tmp.write(File.read(ETC_HOSTS))
-				tmp << "#{addr} #{fqdn} #{shortname}  # VAGRANT ID: #{id}\n"
-				
+				tmp << "#{addr} #{fqdn} #{shortname} #{aliases.join(' ')}  # VAGRANT ID: #{id}\n"
+
 				tmp.close
 				`sudo cp #{tmp.path} /etc/hosts`
 				`sudo pkill -HUP dnsmasq`

data/lib/vagrant-etchosts/config.rb

@@ -0,0 +1,20 @@
+require 'vagrant'
+
+module VagrantPlugins
+	module EtcHosts
+		class Config < Vagrant.plugin("2", :config)
+			attr_accessor :aliases
+
+			def initialize
+				@aliases = UNSET_VALUE
+			end
+
+			def finalize!
+				@aliases = [] if @aliases == UNSET_VALUE
+			end
+
+			def validate(machine)
+			end
+		end
+	end
+end

data/lib/vagrant-etchosts/plugin.rb

@@ -1,5 +1,6 @@
 require 'vagrant-etchosts/action/add_etc_hosts_entry'
 require 'vagrant-etchosts/action/remove_etc_hosts_entry'
+require 'vagrant-etchosts/config'
 
 module VagrantPlugins::EtcHosts
 	class Plugin < Vagrant.plugin("2")
@@ -7,11 +8,15 @@ module VagrantPlugins::EtcHosts
 		description <<-DESC.gsub(/^\t\t\t/, '')
 			This plugin manages the /etc/hosts file on the host machine.
 		DESC
-		
+
+		config(:etchosts) do
+			VagrantPlugins::EtcHosts::Config
+		end
+
 		action_hook(:etchosts, :machine_action_up) do |hook|
 			hook.after ::Vagrant::Action::Builtin::SetHostname, ::VagrantPlugins::EtcHosts::AddEtcHostsEntry
 		end
-		
+
 		action_hook(:etchosts, :machine_action_destroy) do |hook|
 			hook.prepend VagrantPlugins::EtcHosts::RemoveEtcHostsEntry
 		end

data/lib/vagrant-etchosts/version.rb

@@ -1,9 +1,11 @@
+require 'git-version-bump'
+
 module VagrantPlugins
 	module EtcHosts
-		VERSION_MAJOR = 0
-		VERSION_MINOR = 0
-		VERSION_PATCH = 0
+		VERSION_MAJOR = GVB.major_version
+		VERSION_MINOR = GVB.minor_version
+		VERSION_PATCH = GVB.patch_version
 	
-		VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_PATCH}"
+		VERSION = GVB.version
 	end
 end

data/vagrant-etchosts.gemspec

@@ -3,11 +3,12 @@
 lib = File.expand_path('../lib', __FILE__)
 $: << File.expand_path('../lib', __FILE__)
 
-require 'vagrant-etchosts/version'
+require 'git-version-bump'
 
 Gem::Specification.new do |gem|
 	gem.name          = 'vagrant-etchosts'
-	gem.version       = VagrantPlugins::EtcHosts::VERSION
+	gem.version       = GVB.version
+	gem.date          = GVB.date
 	gem.authors       = ['Matt Palmer']
 	gem.email         = ['theshed+vagrant-etchosts@hezmatt.org']
 	gem.description   = %q{A Vagrant plugin that manages the /etc/hosts file on the host}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-etchosts
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,11 +51,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Gemfile
 - README.md
 - Rakefile
 - lib/vagrant-etchosts.rb
 - lib/vagrant-etchosts/action/add_etc_hosts_entry.rb
 - lib/vagrant-etchosts/action/remove_etc_hosts_entry.rb
+- lib/vagrant-etchosts/config.rb
 - lib/vagrant-etchosts/plugin.rb
 - lib/vagrant-etchosts/version.rb
 - vagrant-etchosts.gemspec