vagrant-hosts 2.0.0 → 2.1.0

data/CHANGELOG

@@ -1,6 +1,17 @@
 CHANGELOG
 =========
 
+2.1.0
+-----
+
+2013-11-13
+
+This is a backwards compatible feature and bugfix release.
+
+  * (GH-19) Explicitly require 'tempfile' to define Tempfile constant
+  * (GH-18) Add `hosts` command to list machine addresses and generate Puppet
+    manifests to create host entries on the host machine.
+
 2.0.0
 -----
 

data/lib/vagrant-hosts/addresses.rb

@@ -0,0 +1,59 @@
+module VagrantHosts::Addresses
+
+  private
+
+  def all_hosts(config)
+
+    all_hosts = []
+    all_hosts += local_hosts
+
+    if config.autoconfigure
+      all_hosts += vagrant_hosts
+    end
+    all_hosts += config.hosts
+
+    all_hosts
+  end
+
+  # Builds an array containing hostname and aliases for a given machine.
+  def hostnames_for_machine(machine)
+    # Cast any Symbols to Strings
+    machine_name = machine.name.to_s
+    hostname = machine.config.vm.hostname || machine_name
+
+    hostnames = [hostname]
+    # If the hostname is a fqdn, add the first component as an alias.
+    hostnames << hostname.split('.').first if hostname.index('.')
+    # Also add the machine name as an alias.
+    hostnames << machine_name unless hostnames.include? machine_name
+
+    hostnames
+  end
+
+  def local_hosts(machine)
+    [
+      ['127.0.0.1', ['localhost']],
+      ['127.0.1.1', hostnames_for_machine(machine)],
+    ]
+  end
+
+  def vagrant_hosts(env)
+    hosts = []
+
+    all_machines(env).each do |m|
+      m.config.vm.networks.each do |(net_type, opts)|
+        next unless net_type == :private_network
+        addr = opts[:ip]
+        hosts << [addr, hostnames_for_machine(m)]
+      end
+    end
+
+    hosts
+  end
+
+  # @return [Array<Vagrant::Machine>]
+  def all_machines(env)
+    env.active_machines.map { |vm_id| env.machine(*vm_id) }
+  end
+
+end

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

@@ -1,6 +1,9 @@
 # Provide an abstract base class for syncing hosts entries
 class VagrantHosts::Cap::SyncHosts::Base
 
+  require 'vagrant-hosts/addresses'
+  include VagrantHosts::Addresses
+
   def self.sync_hosts(machine, config)
     new(machine, config).sync!
   end
@@ -32,57 +35,4 @@ class VagrantHosts::Cap::SyncHosts::Base
     end
   end
 
-  def all_hosts
-    all_hosts = []
-    all_hosts += local_hosts
-
-    if @config.autoconfigure
-      all_hosts += vagrant_hosts
-    end
-    all_hosts += @config.hosts
-
-    all_hosts
-  end
-
-  # Builds an array containing hostname and aliases for a given machine.
-  def hostnames_for_machine machine
-    # Cast any Symbols to Strings
-    machine_name = machine.name.to_s
-    hostname = machine.config.vm.hostname || machine_name
-
-    hostnames = [hostname]
-    # If the hostname is a fqdn, add the first component as an alias.
-    hostnames << hostname.split('.').first if hostname.index('.')
-    # Also add the machine name as an alias.
-    hostnames << machine_name unless hostnames.include? machine_name
-
-    hostnames
-  end
-
-  def local_hosts
-    [
-      ['127.0.0.1', ['localhost']],
-      ['127.0.1.1', hostnames_for_machine(@machine)],
-    ]
-  end
-
-  def vagrant_hosts
-    hosts = []
-
-    all_machines.each do |m|
-      m.config.vm.networks.each do |(net_type, opts)|
-        next unless net_type == :private_network
-        addr = opts[:ip]
-        hosts << [addr, hostnames_for_machine(m)]
-      end
-    end
-
-    hosts
-  end
-
-  # @return [Array<Vagrant::Machine>]
-  def all_machines
-    @env.active_machines.map { |vm_id| @env.machine(*vm_id) }
-  end
-
 end

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

@@ -1,4 +1,7 @@
 # Provide a base class for syncing hosts entries on POSIX systems.
+
+require 'tempfile'
+
 class VagrantHosts::Cap::SyncHosts::POSIX < VagrantHosts::Cap::SyncHosts::Base
 
   private
@@ -19,7 +22,7 @@ class VagrantHosts::Cap::SyncHosts::POSIX < VagrantHosts::Cap::SyncHosts::Base
   #
   # @return [String] All hosts in the config joined into hosts records
   def format_hosts
-    all_hosts.inject('') do |str, (address, aliases)|
+    all_hosts(@config).inject('') do |str, (address, aliases)|
       str << "#{address} #{aliases.join(' ')}\n"
     end
   end

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

@@ -3,7 +3,7 @@ class VagrantHosts::Cap::SyncHosts::Windows < VagrantHosts::Cap::SyncHosts::Base
 
   def update_hosts
     host_entries = []
-    all_hosts.each do |(address, aliases)|
+    all_hosts(@config).each do |(address, aliases)|
       aliases.each do |name|
         host_entries << "#{address} #{name}"
       end

data/lib/vagrant-hosts/command.rb

@@ -0,0 +1,42 @@
+require 'vagrant'
+module VagrantHosts
+  class Command < Vagrant.plugin('2', :command)
+
+    require 'vagrant-hosts/command/helpers'
+    include VagrantHosts::Command::Helpers
+
+    require 'vagrant-hosts/addresses'
+
+
+    require 'vagrant-hosts/command/puppetize'
+    require 'vagrant-hosts/command/list'
+
+    def initialize(argv, env)
+      @argv     = argv
+      @env      = env
+      @cmd_name = 'hosts'
+
+      split_argv
+      register_subcommands
+
+    end
+
+    def execute
+      invoke_subcommand
+    end
+
+    private
+
+    def register_subcommands
+      @subcommands = Vagrant::Registry.new
+
+      @subcommands.register('puppetize') do
+        VagrantHosts::Command::Puppetize
+      end
+
+      @subcommands.register('list') do
+        VagrantHosts::Command::List
+      end
+    end
+  end
+end

data/lib/vagrant-hosts/command/helpers.rb

@@ -0,0 +1,35 @@
+module VagrantHosts::Command::Helpers
+
+  private
+
+  def split_argv
+    @main_args, @subcommand, @sub_args = split_main_and_subcommand(@argv)
+  end
+
+  def invoke_subcommand
+    if @subcommand and (klass = @subcommands.get(@subcommand))
+      klass.new(@argv, @env).execute
+    elsif @subcommand
+      @env.ui.error "Unrecognized subcommand: #{@subcommand}"
+      print_subcommand_help(:error)
+    else
+      print_subcommand_help
+    end
+  end
+
+  def print_subcommand_help(output = :info)
+    msg = []
+    msg << "Usage: vagrant #{@cmd_name} <command> [<args>]"
+    msg << ''
+    msg << 'Available subcommands:'
+
+    keys = []
+    @subcommands.each { |(key, _)| keys << key }
+    msg += keys.sort.map { |key| "     #{key}" }
+
+    msg << ''
+    msg << "For help on any individual command run `vagrant #{@cmd_name} <command> -h`"
+
+    @env.ui.send(output, msg.join("\n"))
+  end
+end

data/lib/vagrant-hosts/command/list.rb

@@ -0,0 +1,42 @@
+class VagrantHosts::Command::List < Vagrant.plugin('2', :command)
+
+  include VagrantHosts::Command::Helpers
+  include VagrantHosts::Addresses
+
+  def initialize(argv, env)
+    @argv     = argv
+    @env      = env
+    @cmd_name = 'hosts list'
+
+    split_argv
+  end
+
+  def execute
+
+    argv = parse_options(parser)
+
+    @env.ui.info format_hosts
+    0
+  end
+
+  private
+
+  def format_hosts
+    vagrant_hosts(@env).inject('') do |str, (address, aliases)|
+      str << "#{address} #{aliases.join(' ')}\n"
+    end
+  end
+
+
+  def parser
+    OptionParser.new do |o|
+      o.banner = "Usage: vagrant #{@cmd_name} [<args>]"
+      o.separator ''
+
+      o.on('-h', '--help', 'Display this help message') do
+        puts o
+        exit 0
+      end
+    end
+  end
+end

data/lib/vagrant-hosts/command/puppetize.rb

@@ -0,0 +1,42 @@
+class VagrantHosts::Command::Puppetize < Vagrant.plugin('2', :command)
+
+  include VagrantHosts::Command::Helpers
+  include VagrantHosts::Addresses
+
+  def initialize(argv, env)
+    @argv     = argv
+    @env      = env
+    @cmd_name = 'hosts puppetize'
+
+    split_argv
+  end
+
+  def execute
+    argv = parse_options(parser)
+
+    @env.ui.info format_hosts
+    0
+  end
+
+  private
+
+  def format_hosts
+    vagrant_hosts(@env).inject('') do |str, (address, aliases)|
+      str << "host { '#{aliases.shift}':\n  ip => '#{address}',\n"
+      str << "host_aliases => ['#{aliases.join('\', \' ')}'],\n" if (!aliases.empty?)
+      str << "}\n"
+    end
+  end
+
+  def parser
+    OptionParser.new do |o|
+      o.banner = "Usage: vagrant #{@cmd_name} [<args>]"
+      o.separator ''
+
+      o.on('-h', '--help', 'Display this help message') do
+        puts o
+        exit 0
+      end
+    end
+  end
+end

data/lib/vagrant-hosts/plugin.rb

@@ -37,6 +37,11 @@ class VagrantHosts::Plugin < Vagrant.plugin(2)
     VagrantHosts::Cap::SyncHosts::Windows
   end
 
+  command(:hosts) do
+    require_relative 'command'
+    VagrantHosts::Command
+  end
+
   # ConfigBuilder tie-ins
 
   def self.config_builder_hook

data/lib/vagrant-hosts/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hosts
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies: []
 description: ! '    Manage static DNS entries and configuration for Vagrant guests.
 
@@ -23,10 +23,15 @@ files:
 - LICENSE
 - README.markdown
 - lib/vagrant-hosts.rb
+- lib/vagrant-hosts/addresses.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/command.rb
+- lib/vagrant-hosts/command/helpers.rb
+- lib/vagrant-hosts/command/list.rb
+- lib/vagrant-hosts/command/puppetize.rb
 - lib/vagrant-hosts/config.rb
 - lib/vagrant-hosts/config_builder.rb
 - lib/vagrant-hosts/plugin.rb