vagrant-ghost 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00e6088d25f9a6bb0f8263c070bc193e1cb6de56
-  data.tar.gz: 7280630cbdd5046a72a6c09d65d8fce5671e5955
+  metadata.gz: 9afd17339bc082e2e0a359c4f11156557cac95aa
+  data.tar.gz: 9bae581d4c37e661ac2d82614e7d89a8d8c44115
 SHA512:
-  metadata.gz: a0947cc9714545dcc268d7c387f46a8c57ad86fa45e4408522c7d807fef878c85bf820cd1cde34530434670f9cc38ef8a32ba3cf8708dcebd8525f653211ad2c
-  data.tar.gz: ddf2b6047cbdb3268bfde3ddf62df23c0c6518b336a9dbad3db932a4b832d93dd4824333f561bc706dc0d79d632b265f6ef3b4a48c50f77dc92813c08ee4842d
+  metadata.gz: 6a96421c35a2b16aaa5d54ded9bb1d45f290e6833726d324b5cffd56a76ab6c1385158b897e53843d2f78634a971f50a257101fc287d745f4c251e46f0b765e7
+  data.tar.gz: 72cfaccb79fb6cf51e5430a346ea7fd67b1c6e5f15f2e461e15bd46fea57824225366691b55d5f2e0da3e55873e5d8821505aef087e2d4e3a13dc80f57891aac

data/README.md

@@ -22,12 +22,15 @@ At the moment, the only things you need, are the hostname and a :private_network
  
     config.vm.network :private_network, ip: "192.168.3.10"
     config.vm.hostname = "www.testing.de"
-    config.hostsupdater.aliases = ["alias.testing.de", "alias2.somedomain.com"]
+    config.ghost.aliases = ["alias.testing.de", "alias2.somedomain.com"]
  
 This ip and the hostname will be used for the entry in the /etc/hosts file.
  
 ##  Changelog
 
+### 0.1.2
+* Make the CLI command scan a local hosts setup files (`/config/hosts` and `/aliases`) to rebuild the hosts map
+
 ### 0.1.1
 * Update the CLI to a "primary" command
 * Make sure help doesn't try to fire a host update

data/lib/vagrant-ghost/Ghost.rb

@@ -24,9 +24,32 @@ module VagrantPlugins
 
 			def getHostnames
 				hostnames = Array(@machine.config.vm.hostname)
+
+				# Regenerate hostsfile
+				paths = Dir[File.join( 'config', '**', 'hosts' )]
+				hosts = paths.map do |path|
+					lines = File.readlines(path).map(&:chomp)
+					lines.grep(/\A[^#]/)
+				end.flatten.uniq
+
+				# Pull in managed aliases
+				local = Dir[File.join( '**', 'aliases' )]
+				local_hosts = local.map do |path|
+					lines = File.readlines(path).map(&:chomp)
+					lines.grep(/\A[^#]/)
+				end.flatten.uniq
+
+				# Merge our lists together
+				aliases = ( hosts << local_hosts ).flatten!
+
+				# Concat with the local hostname
+				hostnames.concat( aliases )
+
+				# Update the achine configuration
 				if @machine.config.ghost.aliases
-					hostnames.concat(@machine.config.ghost.aliases)
+					@machine.config.ghost.aliases = aliases
 				end
+
 				return hostnames
 			end
 

data/lib/vagrant-ghost/command.rb

@@ -8,12 +8,29 @@ module VagrantPlugins
 			end
 
 			def execute
-				cmd, cmd_args, argv, options = parse_args
-				cmd && cmd_args or return nil
+				options = {}
+				options[:provider] = @env.default_provider
+
+				opts = OptionParser.new do |o|
+					o.banner = 'Usage: vagrant ghost'
+					o.separator ''
+
+					o.on('-h', '--help', 'Print this help') do
+						safe_puts(opts.help)
+						return
+					end
+
+					o.on('--provider provider', String, 'Update machines with the specific provider.') do |provider|
+						options[:provider] = provider
+					end
+				end
+
+				argv = parse_options(opts)
+				return if !argv
 
 				@ui = @env.ui
 
-				with_target_vms(argv, options) do |machine|
+				with_target_vms(argv, reverse: true) do |machine|
 					@machine = machine
 
 					# Always remove hosts to make sure old entries don't stick around
@@ -42,39 +59,6 @@ module VagrantPlugins
 				false
 			end
 
-			private
-
-			def parse_args
-				options = {}
-				opts = OptionParser.new do |o|
-					o.banner = 'Usage: vagrant ghost [vm-name]'
-					o.separator ''
-
-					o.on('-h', '--help', 'Print this help') do
-						safe_puts(opts.help)
-					end
-
-					o.on('--provider provider', String, 'Update machines with the specific provider.') do |provider|
-						options[:provider] = provider
-					end
-				end
-
-				argv = split_main_and_subcommand(@argv.dup)
-				exec_args, cmd, cmd_args = argv[0], argv[1], argv[2]
-
-				# show help
-				if !cmd || exec_args.any? { |a| a == '-h' || a == '--help' }
-					safe_puts(opts.help)
-					return nil
-				end
-
-				options[:provider] ||= @env.default_provider
-
-				# remove extra "--" arge added by Vagrant
-				cmd_args.delete_if { |a| a == '--' }
-
-				return cmd, cmd_args, parse_options(opts), options
-			end
 		end
 	end
 end

data/lib/vagrant-ghost/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Ghost
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ghost
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - John P Bloch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler