vagrant-yarrs-and-yamls 0.8.3 → 0.9

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

@@ -1,6 +1,5 @@
 require "vagrant"
-require "yaml"
-require_relative "v1"
+require_relative "api"
 
 module VagrantPlugins
     module YarrsAndYamls
@@ -10,13 +9,7 @@ module VagrantPlugins
             @@config = false
 
             action_hook(:init, :environment_unload) { maybe_create_yaml_file }
-            action_hook(:load_config, Plugin::ALL_ACTIONS) { load_config }
-
-            action_hook(:require_vagrant_plugins, :environment_load) {
-                if ! self.get_config.empty?
-                    self.require_vagrant_plugins(self.get_config["required_plugins"]) if self.get_config["required_plugins"]
-                end
-            }
+            # action_hook(:load_config, Plugin::ALL_ACTIONS) { load_config }
 
             def self.maybe_create_yaml_file
                 ARGV.each do |arg|
@@ -34,8 +27,8 @@ module VagrantPlugins
             end
 
             def self.create_yaml_file
-                source = __FILE__ + '/../../../example.Vagrantfile.yml'
-                dest = Dir.pwd + '/Vagrantfile.yml'
+                source = __FILE__ + '/../../../Yarrs.example.yaml'
+                dest = Dir.pwd + '/Yarrs.example.yaml'
                 self.copy_file source, dest
             end
 
@@ -57,43 +50,6 @@ module VagrantPlugins
                 ext  = File.extname(file)
                 File.join(dir, "#{base}.bak.#{time}#{ext}")
             end
-
-            def self.load_config
-
-                return @@config if @@config
-
-                @@config = []
-                configfile = ''
-
-                # Try Vagrant.local.yml next
-                if File.exists? "Vagrantfile.local.yml"
-                    configfile = "Vagrantfile.local.yml"
-                elsif File.exists? "Vagrantfile.yml"
-                    configfile = "Vagrantfile.yml"
-                end
-
-                # pass in a configfile to load.
-                ARGV.each do |arg|
-                    if arg.include?('--config=')
-                        configfile = arg.gsub('--config=', '')
-                    end
-                end
-
-                #puts "configfile: #{configfile}"
-                if File.exists? configfile
-                    @@config = YAML.load_file(configfile);
-                end
-            end
-
-            def self.get_config
-                @@config
-            end
-
-            def self.require_vagrant_plugins(plugins)
-                plugins.each do |plugin|
-                    system "vagrant plugin install #{plugin}" unless Vagrant.has_plugin? plugin
-                end
-            end
         end
     end
 end

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

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

data/vagrant-yarrs-and-yamls.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
     spec.email         = ["yarr@piratedunbar.com"]
     spec.description   = "Configure your Vagrantfile using YAML"
     spec.summary       = spec.description
-    spec.homepage      = "https://github.com/ptahdunbar/yamls-and-yarrs"
+    spec.homepage      = "https://github.com/ptahdunbar/yarrs-and-yamls"
     spec.license       = "GPL v2+"
     #spec.post_install_message  = ""
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-yarrs-and-yamls
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: !binary |-
+    MC45
 platform: ruby
 authors:
 - Pirate Dunbar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-09-20 00:00:00.000000000 Z
 dependencies: []
 description: Configure your Vagrantfile using YAML
 email:
@@ -22,14 +23,56 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Yarrs.example.yaml
 - example.Vagrantfile
-- example.Vagrantfile.yml
+- lib/scripts/apache2.sh
+- lib/scripts/apache2_ssl.sh
+- lib/scripts/base.sh
+- lib/scripts/composer.sh
+- lib/scripts/deploy.sh
+- lib/scripts/deploy_init.sh
+- lib/scripts/export_vars.sh
+- lib/scripts/git.sh
+- lib/scripts/hhvm.sh
+- lib/scripts/install-nodejs-modules.sh
+- lib/scripts/mariadb.sh
+- lib/scripts/mysql-create-databases.sh
+- lib/scripts/mysql.sh
+- lib/scripts/mysql_client.sh
+- lib/scripts/newrelic_php.sh
+- lib/scripts/nginx.sh
+- lib/scripts/nginx_site.sh
+- lib/scripts/nodejs.sh
+- lib/scripts/nvm.sh
+- lib/scripts/permissions.sh
+- lib/scripts/php.sh
+- lib/scripts/php_configure.sh
+- lib/scripts/php_xdebug.sh
+- lib/scripts/phpbrew.sh
+- lib/scripts/postfix.sh
+- lib/scripts/pubkeys.sh
+- lib/scripts/rvm.sh
+- lib/scripts/test.sh
+- lib/scripts/tz.sh
+- lib/scripts/wp_env.sh
+- lib/scripts/wpcli.sh
+- lib/templates/apache2.conf
+- lib/templates/apache2_vhost_http.conf
+- lib/templates/apache2_vhost_https.conf
+- lib/templates/apache2_vhost_redirect_http.conf
+- lib/templates/apache2_vhost_redirect_https.conf
+- lib/templates/gitconfig.conf
+- lib/templates/logrotate.conf
+- lib/templates/nginx.conf
+- lib/templates/nginx_vhost.erb
+- lib/templates/proxy_params.conf
+- lib/templates/xdebug.ini
 - lib/vagrant-yarrs-and-yamls.rb
+- lib/vagrant-yarrs-and-yamls/api.rb
 - lib/vagrant-yarrs-and-yamls/plugin.rb
-- lib/vagrant-yarrs-and-yamls/v1.rb
 - lib/vagrant-yarrs-and-yamls/version.rb
 - vagrant-yarrs-and-yamls.gemspec
-homepage: https://github.com/ptahdunbar/yamls-and-yarrs
+homepage: https://github.com/ptahdunbar/yarrs-and-yamls
 licenses:
 - GPL v2+
 metadata: {}
@@ -39,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Configure your Vagrantfile using YAML

data/example.Vagrantfile.yml

@@ -1,8 +0,0 @@
-# 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
-      box: ubuntu/trusty64

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

@@ -1,234 +0,0 @@
-
-def yarrs_and_yamls(config=nil)
-    raise 'Missing required parameter. yarrs_and_yamls(config)' if ! config
-
-    vfile = VagrantPlugins::YarrsAndYamls::Plugin.get_config
-
-    boxes = get_nodes(vfile)
-
-    boxes.each do |hostname, box|
-        config.vm.define hostname do |node|
-            node.vm.box = box["box"]
-            node.vm.box_url = box["box_url"]
-            node.vm.box_check_update = box["box_check_update"]
-            node.vm.boot_timeout = box["boot_timeout"]
-            node.vm.box_download_checksum = box["box_download_checksum"]
-            node.vm.box_download_checksum_type = box["box_download_checksum_type"]
-            node.vm.box_download_client_cert = box["box_download_client_cert"]
-            node.vm.box_download_ca_cert = box["box_download_ca_cert"]
-            node.vm.box_download_ca_path = box["box_download_ca_path"]
-            node.vm.box_download_insecure = box["box_download_insecure"]
-            node.vm.box_version = box["box_version"]
-            node.vm.communicator = box["communicator"]
-            node.vm.graceful_halt_timeout = box["graceful_halt_timeout"]
-            node.vm.guest = box["guest"]
-            node.vm.post_up_message = box["post_up_message"]
-            node.vm.usable_port_range = box["usable_port_range"]
-
-            node.vm.network "private_network", ip: box["ip"], :netmask => "255.255.255.0" if box["ip"]
-
-            if box["forwarded_ports"]
-                box["forwarded_ports"].each do |port|
-                    node.vm.network "forwarded_port", guest: port["guest"], host: port["host"]
-                end
-            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["provision"].each do |script|
-                    node.vm.provision "shell" do |s|
-                        s.inline = script["inline"] if script["inline"]
-                        s.path = script["path"] if script["path"]
-                        s.args = script["args"] if script["args"]
-                        s.privileged = script["privileged"] if script["privileged"]
-                        s.binary = script["binary"] if script["binary"]
-                        s.upload_path = script["upload_path"] if script["upload_path"]
-                        s.keep_color = script["keep_color"] if script["keep_color"]
-                        s.powershell_args = script["powershell_args"] if script["powershell_args"]
-                    end
-                end
-            end
-
-            node.vm.provider :virtualbox do |virtualbox, override|
-                virtualbox.gui = true if box["gui"]
-                virtualbox.cpus = box["cpus"] if box["cpus"]
-                virtualbox.memory = box["memory"] if box["memory"]
-            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
-
-            node.vm.provider :aws do |aws, override|
-                if box["aws"]
-                    override.vm.box_url = "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"
-
-                    # Required parameters
-                    aws.ami = box["aws"]["ami"] if box["aws"]["ami"]
-                    aws.instance_type = box["aws"]["instance_type"] if box["aws"]["instance_type"]
-                    aws.keypair_name = box["aws"]["keypair_name"] if box["aws"]["keypair_name"]
-                    override.ssh.username = box["aws"]["username"] if box["aws"]["username"]
-                    override.ssh.private_key_path = box["aws"]["private_key_path"] if box["aws"]["private_key_path"]
-
-                    # Alternative approach: add keys into your .bashrc or .zshrc profile
-                    # export AWS_SECRET_KEY=secret_key
-                    # export AWS_ACCESS_KEY=secret_key
-                    aws.access_key_id = box["aws"]["access_key_id"] || ENV["AWS_ACCESS_KEY"]
-                    aws.secret_access_key = box["aws"]["secret_access_key"] || ENV["AWS_SECRET_KEY"]
-                    aws.session_token = box["aws"]["session_token"] || ENV["AWS_SESSION_TOKEN"]
-
-                    # optional settings
-                    aws.region = box["aws"]["region"] if box["aws"]["region"]
-                    aws.availability_zone = box["aws"]["availability_zone"] if box["aws"]["availability_zone"]
-                    aws.security_groups = box["aws"]["security_groups"] if box["aws"]["security_groups"]
-                    aws.tags = box["aws"]["tags"] if box["aws"]["tags"]
-                    aws.subnet_id = box["aws"]["subnet_id"] if box["aws"]["subnet_id"]
-                    aws.availability_zone = box["aws"]["availability_zone"] if box["aws"]["availability_zone"]
-                    aws.elastic_ip = box["aws"]["elastic_ip"] if box["aws"]["elastic_ip"]
-                    aws.use_iam_profile = box["aws"]["use_iam_profile"] if box["aws"]["use_iam_profile"]
-                    aws.private_ip_address = box["aws"]["private_ip_address"] if box["aws"]["private_ip_address"]
-                    aws.user_data = box["aws"]["user_data"] if box["aws"]["user_data"]
-                    aws.iam_instance_profile_name = box["aws"]["iam_instance_profile_name"] if box["aws"]["iam_instance_profile_name"]
-                    aws.iam_instance_profile_arn = box["aws"]["iam_instance_profile_arn"] if box["aws"]["iam_instance_profile_arn"]
-                    aws.instance_package_timeout = box["aws"]["instance_package_timeout"] if box["aws"]["instance_package_timeout"]
-                    aws.instance_ready_timeout = box["aws"]["instance_ready_timeout"] if box["aws"]["instance_ready_timeout"]
-                end
-            end
-
-            node.vm.provider :digital_ocean do |digital_ocean, override|
-                if box["digital_ocean"]
-                    override.vm.box_url = "https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box"
-
-                    digital_ocean.token = box["digital_ocean"].include?("token") ? box["digital_ocean"]["token"] : ENV["DIGITAL_OCEAN_TOKEN"]
-
-                    # Optional
-                    override.ssh.private_key_path = box["digital_ocean"]["private_key_path"]
-                    override.ssh.username = box["digital_ocean"]["username"] if box["digital_ocean"]["username"]
-                    digital_ocean.ssh_key_name = box["digital_ocean"].include?("ssh_key_name") ? box["digital_ocean"]["ssh_key_name"] : 'Vagrant'
-                    digital_ocean.image = box["digital_ocean"].include?("image") ? box["digital_ocean"]["image"] : "ubuntu-14-04-x64"
-                    digital_ocean.region = box["digital_ocean"].include?("region") ? box["digital_ocean"]["region"] : "nyc2"
-                    digital_ocean.size = box["digital_ocean"].include?("size") ? box["digital_ocean"]["size"] : "512mb"
-                    digital_ocean.ipv6 = box["digital_ocean"].include?("ipv6") ? box["digital_ocean"]["ipv6"] : false
-                    digital_ocean.private_networking = box["digital_ocean"].include?("private_networking") ? box["digital_ocean"]["private_networking"] : false
-                    digital_ocean.backups_enabled = box["digital_ocean"].include?("backups_enabled") ? box["digital_ocean"]["backups_enabled"] : false
-                    digital_ocean.setup = box["digital_ocean"].include?("setup") ? box["digital_ocean"]["setup"] : true
-                end
-            end
-        end
-
-        yield hostname, box if block_given?
-
-    end
-end
-
-def get_nodes(v=nil)
-    boxes = {}
-
-    return boxes if v["boxes"].empty?
-
-    v["boxes"].collect do |box|
-        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"]
-        boxes[box["hostname"]]["box_url"] = box["box_url"]
-        boxes[box["hostname"]]["box_check_update"] = box["box_check_update"]
-        boxes[box["hostname"]]["boot_timeout"] = box["boot_timeout"]
-        boxes[box["hostname"]]["box_download_checksum"] = box["box_download_checksum"]
-        boxes[box["hostname"]]["box_download_checksum_type"] = box["box_download_checksum_type"]
-        boxes[box["hostname"]]["box_download_client_cert"] = box["box_download_client_cert"]
-        boxes[box["hostname"]]["box_download_ca_cert"] = box["box_download_ca_cert"]
-        boxes[box["hostname"]]["box_download_ca_path"] = box["box_download_ca_path"]
-        boxes[box["hostname"]]["box_download_insecure"] = box["box_download_insecure"]
-        boxes[box["hostname"]]["box_version"] = box["box_version"]
-        boxes[box["hostname"]]["communicator"] = box["communicator"]
-        boxes[box["hostname"]]["graceful_halt_timeout"] = box["graceful_halt_timeout"]
-        boxes[box["hostname"]]["guest"] = box["guest"]
-        boxes[box["hostname"]]["post_up_message"] = box["post_up_message"]
-        boxes[box["hostname"]]["usable_port_range"] = box["usable_port_range"]
-
-        boxes[box["hostname"]]["ip"] = box["ip"] if box["ip"]
-
-        if box["provision"]
-            boxes[box["hostname"]]["provision"] ||= []
-            box["provision"].each do |shell|
-                boxes[box["hostname"]]["provision"].push(shell)
-            end
-        end
-
-        if box["forwarded_ports"]
-            boxes[box["hostname"]]["forwarded_ports"] ||= []
-            box["forwarded_ports"].each do |item|
-                next unless ( item.include?('host') or item.include?('guest') )
-                boxes[box["hostname"]]["forwarded_ports"].push(item)
-            end
-        end
-
-        box["synced_folders"] = box["shared_folders"] if box["shared_folders"]
-
-        if box["synced_folders"]
-            boxes[box["hostname"]]["synced_folders"] ||= []
-            box["synced_folders"].each do |item|
-                next unless ( item.include?('host') or item.include?('guest') )
-                folder_args = item.dup
-                folder_args.delete('host')
-                folder_args.delete('guest')
-                folder_args = Hash[folder_args.map{ |key, value| [key.to_sym, value] }]
-
-                boxes[box["hostname"]]["synced_folders"].push({host: "#{item["host"]}", guest: "#{item["guest"]}", args: folder_args})
-            end
-        end
-
-        if box["ssh"]
-            boxes[box["hostname"]]["ssh"] ||= {}
-            box["ssh"].each do |key, value|
-                boxes[box["hostname"]]["ssh"][key] = value
-            end
-        end
-
-        if box["disable_default_synced_folder"]
-            boxes[box["hostname"]]["synced_folders"] ||= []
-            boxes[box["hostname"]]["synced_folders"].push({ host:".", guest: "/vagrant", args: {id: "vagrant-root", disabled: true}})
-        end
-
-        box["memory"] = box["ram"] if box["ram"]
-        boxes[box["hostname"]]["memory"] = box["memory"] if box["memory"]
-
-        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"
-
-        boxes[box["hostname"]]["aws"] = box["aws"] if box["aws"]
-        boxes[box["hostname"]]["digital_ocean"] = box["digital_ocean"] if box["digital_ocean"]
-    end
-
-    boxes
-end