vagrant-yarrs-and-yamls 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f1d023f313997f8e4089d80ea241023e4ed7d48
-  data.tar.gz: 8f4bc4ea829cc6bb194d0bd907ee92c97f6f5de0
+  metadata.gz: a918ed74556c378afe57f8a1a8d807944bacbfa3
+  data.tar.gz: 46859a0fd042be964bf93ce46b087500b60a45c8
 SHA512:
-  metadata.gz: 083c1117e9bc38f345aeeabaf23ca0156b8c0cbf6b15b833c377ddd4107292805ba31a5452cfb785b8e2934461fe6a318d6f7bfa85db75eeb9d18d07ffe70bc9
-  data.tar.gz: e59142f392a310e1a47b2c07cb46f3b05e33b8cb769b1fe4253aa9255cee430f07684601bd46c04e8f70f055ea86fae5925899736f1edb73a32a0790bce20464
+  metadata.gz: 2daa3e9d815ebc968534704992dba35fa2d35ffbfe9cb24c126ca9b699b6e9a3818eca9865a6c02a66814c966614bdf31f7fafa1666450dec69d7517a48461c1
+  data.tar.gz: 1d7dd82e506b350390207f47b6ddce504b2e2558a6431fddc7b0038c7e0674fa8e397ff8f22514d92f2defa198c6850d6a65cdff9b2a4da45b5b9db5d7f0d91c

data/.gitignore

@@ -17,4 +17,6 @@ test/version_tmp
 tmp
 .idea
 *.swp
-.vagrant
+.vagrant
+*.yml
+*.bak.*

data/example.Vagrantfile

@@ -6,5 +6,11 @@
 # backwards compatibility). Please don't change it unless you know what
 # you're doing.
 Vagrant.configure(2) do |config|
-  yarrs_and_yamls(config)
+    yarrs_and_yamls(config) do |hostname, settings|
+        config.vm.define hostname do |node|
+            #
+            # Add your settings to Vagrantfile.yml
+            #
+        end
+    end
 end

data/example.Vagrantfile.yml

@@ -1,3 +1,7 @@
+# Vagrantfile.yml accepts all values that normally go in Vagrantfile.
+#
+# For more information and examples, please see the online documentation at
+# https://github.com/ptahdunbar/yarrs-and-yamls
 ---
 boxes:
     - hostname: vagrant

data/lib/vagrant-yarrs-and-yamls/v1.rb

@@ -34,27 +34,27 @@ def yarrs_and_yamls(config=nil)
             end
 
             if box["synced_folders"]
-	            box["synced_folders"].each do |folder|
-	                node.vm.synced_folder folder[:host], folder[:guest], folder[:args]
-	            end
-	        end
-
-	        if box["ssh"]
-	            node.ssh.username = box["ssh"]["username"] if box["ssh"]["username"]
-	            node.ssh.password = box["ssh"]["password"] if box["ssh"]["password"]
-	            node.ssh.host = box["ssh"]["host"] if box["ssh"]["host"]
-	            node.ssh.port = box["ssh"]["port"] if box["ssh"]["port"]
-	            node.ssh.guest_port = box["ssh"]["guest_port"] if box["ssh"]["guest_port"]
-	            node.ssh.private_key_path = box["ssh"]["private_key_path"] if box["ssh"]["private_key_path"]
-	            node.ssh.forward_agent = box["ssh"]["forward_agent"] if box["ssh"]["forward_agent"]
-	            node.ssh.forward_x11 = box["ssh"]["forward_x11"] if box["ssh"]["forward_x11"]
-	            node.ssh.insert_key = box["ssh"]["insert_key"] if box["ssh"]["insert_key"]
-	            node.ssh.proxy_command = box["ssh"]["proxy_command"] if box["ssh"]["proxy_command"]
-	            node.ssh.pty = box["ssh"]["pty"] if box["ssh"]["pty"]
-	            node.ssh.shell = box["ssh"]["shell"] if box["ssh"]["shell"]
-	        end
-
-	        if box["provision"]
+                box["synced_folders"].each do |folder|
+                    node.vm.synced_folder folder[:host], folder[:guest], folder[:args]
+                end
+            end
+
+            if box["ssh"]
+                node.ssh.username = box["ssh"]["username"] if box["ssh"]["username"]
+                node.ssh.password = box["ssh"]["password"] if box["ssh"]["password"]
+                node.ssh.host = box["ssh"]["host"] if box["ssh"]["host"]
+                node.ssh.port = box["ssh"]["port"] if box["ssh"]["port"]
+                node.ssh.guest_port = box["ssh"]["guest_port"] if box["ssh"]["guest_port"]
+                node.ssh.private_key_path = box["ssh"]["private_key_path"] if box["ssh"]["private_key_path"]
+                node.ssh.forward_agent = box["ssh"]["forward_agent"] if box["ssh"]["forward_agent"]
+                node.ssh.forward_x11 = box["ssh"]["forward_x11"] if box["ssh"]["forward_x11"]
+                node.ssh.insert_key = box["ssh"]["insert_key"] if box["ssh"]["insert_key"]
+                node.ssh.proxy_command = box["ssh"]["proxy_command"] if box["ssh"]["proxy_command"]
+                node.ssh.pty = box["ssh"]["pty"] if box["ssh"]["pty"]
+                node.ssh.shell = box["ssh"]["shell"] if box["ssh"]["shell"]
+            end
+
+            if box["provision"]
                 box["provision"].each do |script|
                     node.vm.provision "shell" do |s|
                         s.inline = script["inline"] if script["inline"]
@@ -76,13 +76,13 @@ def yarrs_and_yamls(config=nil)
             end
 
             node.vm.provider :vmware_fusion do |vmware, override|
-	            override.vm.node_url = "http://files.vagrantup.com/precise64_vmware.node"
-	            vmware.gui = true if box["gui"]
-	            vmware.vmx["numvcpus"] = box["cpus"] if box["cpus"]
-	            vmware.vmx["memsize"] = box["cpus"] if box["memory"]
-	        end
+                override.vm.node_url = "http://files.vagrantup.com/precise64_vmware.node"
+                vmware.gui = true if box["gui"]
+                vmware.vmx["numvcpus"] = box["cpus"] if box["cpus"]
+                vmware.vmx["memsize"] = box["cpus"] if box["memory"]
+            end
 
-	        node.vm.provider :aws do |aws, override|
+            node.vm.provider :aws do |aws, override|
                 if box["aws"]
                     override.vm.box_url = "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"
 
@@ -138,6 +138,9 @@ def yarrs_and_yamls(config=nil)
                 end
             end
         end
+
+        yield hostname, box if block_given?
+
     end
 end
 
@@ -150,7 +153,7 @@ def get_nodes(v=nil)
         next unless box["hostname"]
 
         boxes[box["hostname"]] = {}
-        
+
         boxes[box["hostname"]]["box"] = v["box"] if v["box"]
         boxes[box["hostname"]]["box"] = box["box"] if box["box"]
         boxes[box["hostname"]]["box_check_update"] = box["box_check_update"] if box["box_check_update"]
@@ -178,7 +181,7 @@ def get_nodes(v=nil)
                 boxes[box["hostname"]]["provision"].push(shell)
             end
         end
-        
+
         if box["forwarded_ports"]
             boxes[box["hostname"]]["forwarded_ports"] ||= []
             box["forwarded_ports"].each do |item|
@@ -219,7 +222,7 @@ def get_nodes(v=nil)
 
         box["cpus"] = box["cpu"] if box["cpu"]
         boxes[box["hostname"]]["cpus"] = box["cpus"] if box["cpus"]
-        
+
         boxes[box["hostname"]]["gui"] = box["gui"] if box["gui"]
         boxes[box["hostname"]]["disable_vm_optimization"] = box["disable_vm_optimization"] if box.include? "disable_vm_optimization"
 

data/lib/vagrant-yarrs-and-yamls/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
     module YarrsAndYamls
-        VERSION = '0.8.1'
+        VERSION = '0.8.3'
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-yarrs-and-yamls
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors:
 - Pirate Dunbar
@@ -22,7 +22,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- Vagrantfile
 - example.Vagrantfile
 - example.Vagrantfile.yml
 - lib/vagrant-yarrs-and-yamls.rb

data/Vagrantfile

@@ -1,71 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure(2) do |config|
-  # The most common configuration options are documented and commented below.
-  # For a complete reference, please see the online documentation at
-  # https://docs.vagrantup.com.
-
-  # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "base"
-
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # config.vm.network "forwarded_port", guest: 80, host: 8080
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network "public_network"
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  # config.vm.provider "virtualbox" do |vb|
-  #   # Display the VirtualBox GUI when booting the machine
-  #   vb.gui = true
-  #
-  #   # Customize the amount of memory on the VM:
-  #   vb.memory = "1024"
-  # end
-  #
-  # View the documentation for the provider you are using for more
-  # information on available options.
-
-  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
-  # such as FTP and Heroku are also available. See the documentation at
-  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
-  # config.push.define "atlas" do |push|
-  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
-  # end
-
-  # Enable provisioning with a shell script. Additional provisioners such as
-  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
-  # documentation for more information about their specific syntax and use.
-  # config.vm.provision "shell", inline: <<-SHELL
-  #   sudo apt-get update
-  #   sudo apt-get install -y apache2
-  # SHELL
-end