vagrant-hostmaster 0.6.2 → 0.6.12

data/README.md

@@ -1,6 +1,6 @@
-# Vagrant::Hostmaster
+# vagrant-hostmaster
 
-TODO: Write a gem description
+vagrant-hostmaster is a Vagrant plugin to manage /etc/hosts entries on both the host OS and guest VMs.
 
 ## Installation
 
@@ -18,7 +18,32 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+    Usage: vagrant hosts <command> [<args>]
+
+    Available subcommands:
+         list
+         remove
+         update
+
+    For help on any individual command run `vagrant hosts COMMAND -h`
+
+### List Host Entries
+
+    vagrant hosts list
+
+### Remove Host Entries
+
+    vagrant hosts remove [<vm-name> [...]]
+
+### Update Host Entries
+
+    vagrant hosts update [<vm-name> [...]]
+
+## TODO
+
+1. add commands to modify guests
+
+2. add provisioning support so that changes are made automatically
 
 ## Contributing
 

data/lib/vagrant/hostmaster.rb

@@ -1,6 +1,7 @@
 require 'vagrant/hostmaster/version'
 require 'vagrant/hostmaster/command/root'
 require 'vagrant/hostmaster/config'
+require 'vagrant/hostmaster/vm'
 
 Vagrant.commands.register(:hosts) { Vagrant::Hostmaster::Command::Root }
 Vagrant.config_keys.register(:hosts) { Vagrant::Hostmaster::Config }

data/lib/vagrant/hostmaster/command/list.rb

@@ -13,20 +13,12 @@ module Vagrant
           raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length != 0
 
           with_target_vms do |vm|
-            list vm
+            Hostmaster::VM.new(vm).list
           end
 
           # Success, exit status 0
           0
         end
-
-        protected
-          def list(vm)
-            type, (address, *) = vm.config.vm.networks.first
-            address ||= '127.0.0.1'
-            signature = "# VAGRANT: #{vm.uuid}"
-            system %Q(grep '#{signature}$' /etc/hosts)
-          end
       end
     end
   end

data/lib/vagrant/hostmaster/command/remove.rb

@@ -12,19 +12,13 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv) do |vm|
-            remove vm
+            @env.ui.info("Removing host entry for #{vm.name} VM. Administrator privileges will be required...", :prefix => false)
+            Hostmaster::VM.new(vm).remove
           end
 
           # Success, exit status 0
           0
         end
-
-        protected
-          def remove(vm)
-            @env.ui.info("Removing host entry for #{vm.name} VM. Administrator privileges will be required...", :prefix => false)
-            signature = "# VAGRANT: #{vm.uuid}"
-            system %Q(sudo sed -e '/#{signature}$/ d' -ibak /etc/hosts)
-          end
       end
     end
   end

data/lib/vagrant/hostmaster/command/update.rb

@@ -12,25 +12,13 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv) do |vm|
-            update vm
+            @env.ui.info("Updating host entry for #{vm.name} VM. Administrator privileges will be required...", :prefix => false)
+            Hostmaster::VM.new(vm).update
           end
 
           # Success, exit status 0
           0
         end
-
-        protected
-          def update(vm)
-            @env.ui.info("Updating host entry for #{vm.name} VM. Administrator privileges will be required...", :prefix => false)
-            type, (address, *) = vm.config.vm.networks.first
-            address ||= '127.0.0.1'
-            signature = "# VAGRANT: #{vm.uuid}"
-            system %Q(sudo sh -c 'sed -e "/#{signature}$/ d" -ibak /etc/hosts')
-            host_names = [vm.config.vm.host_name]
-            host_names += Array(vm.config.hosts.aliases)
-            host_entry = "#{address}  #{host_names.join(' ')}  #{signature}"
-            system %Q(sudo sh -c 'echo "#{host_entry}" >>/etc/hosts')
-          end
       end
     end
   end

data/lib/vagrant/hostmaster/config.rb

@@ -1,6 +1,7 @@
 module Vagrant
   module Hostmaster
     class Config < Vagrant::Config::Base
+      attr_accessor :name
       attr_accessor :aliases
     end
   end

data/lib/vagrant/hostmaster/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Hostmaster
-    VERSION = "0.6.2"
+    VERSION = "0.6.12"
   end
 end

data/lib/vagrant/hostmaster/vm.rb

@@ -0,0 +1,68 @@
+require 'forwardable'
+
+module Vagrant
+  module Hostmaster
+    class VM
+      extend Forwardable
+
+      def_delegators :@vm, :config, :env, :name, :uuid
+
+      def initialize(vm)
+        @vm = vm
+      end
+
+      def add
+        sudo %Q(sh -c 'echo "#{host_entry}" >>/etc/hosts')
+      end
+
+      def list
+        system %Q(grep '#{signature}$' /etc/hosts)
+      end
+
+      def remove
+        sudo %Q(sed -e '/#{signature}$/ d' -ibak /etc/hosts)
+      end
+
+      def update
+        remove && add
+      end
+
+      protected
+        def address
+          @address ||= (addresses && addresses.first || '127.0.0.1')
+        end
+
+        def addresses
+          @network_addresses ||= (network && network.last)
+        end
+
+        def host_aliases
+          @host_aliases ||= Array(config.hosts.aliases)
+        end
+
+        def host_entry
+          @host_entry ||= "#{address}  #{host_names.join(' ')}  #{signature}"
+        end
+
+        def host_name
+          @host_name ||= (config.hosts.name || config.vm.host_name)
+        end
+
+        def host_names
+          @host_names ||= (Array(host_name) + host_aliases)
+        end
+
+        def network
+          @network ||= config.vm.networks.first
+        end
+
+        def signature
+          @signature ||= "# VAGRANT: #{uuid}"
+        end
+
+        def sudo(command)
+          system %Q(sudo #{command})
+        end
+    end
+  end
+end

data/vagrant-hostmaster.gemspec

@@ -4,9 +4,9 @@ require File.expand_path('../lib/vagrant/hostmaster/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["S. Brent Faulkner"]
   gem.email         = ["brent.faulkner@mosaic.com"]
-  gem.description   = %q{Vagrant plugin to modify host and guest hostfiles.}
-  gem.summary       = %q{Vagrant plugin to modify host and guest hostfiles.}
-  gem.homepage      = ""
+  gem.description   = %q{vagrant-hostmaster is a Vagrant plugin to manage /etc/hosts entries on both the host OS and guest VMs.}
+  gem.summary       = %q{Vagrant plugin to manage /etc/hosts entries.}
+  gem.homepage      = "https://github.com/mosaicxm/vagrant-hostmaster"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -15,5 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Vagrant::Hostmaster::VERSION
 
+  gem.add_dependency('vagrant', '~>1.0.3')
   gem.add_development_dependency('rake')
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 12
+  version: 0.6.12
 platform: ruby
 authors: 
 - S. Brent Faulkner
@@ -14,12 +14,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-17 00:00:00 -04:00
+date: 2012-08-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 3
+        version: 1.0.3
+  name: vagrant
+  requirement: *id001
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -27,9 +41,9 @@ dependencies:
         - 0
         version: "0"
   name: rake
-  requirement: *id001
+  requirement: *id002
   prerelease: false
-description: Vagrant plugin to modify host and guest hostfiles.
+description: vagrant-hostmaster is a Vagrant plugin to manage /etc/hosts entries on both the host OS and guest VMs.
 email: 
 - brent.faulkner@mosaic.com
 executables: []
@@ -51,10 +65,11 @@ files:
 - lib/vagrant/hostmaster/command/update.rb
 - lib/vagrant/hostmaster/config.rb
 - lib/vagrant/hostmaster/version.rb
+- lib/vagrant/hostmaster/vm.rb
 - lib/vagrant_init.rb
 - vagrant-hostmaster.gemspec
 has_rdoc: true
-homepage: ""
+homepage: https://github.com/mosaicxm/vagrant-hostmaster
 licenses: []
 
 post_install_message: 
@@ -82,6 +97,6 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Vagrant plugin to modify host and guest hostfiles.
+summary: Vagrant plugin to manage /etc/hosts entries.
 test_files: []