RubyGems - vagrant-omnibus - Versions diffs - 1.4.1 → 1.5.0 - Mend

vagrant-omnibus 1.4.1 → 1.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (32) hide show

checksums.yaml +4 -4
data/.gitignore +19 -19
data/.rspec +1 -1
data/.travis.yml +18 -8
data/.yardopts +7 -7
data/CHANGELOG.md +98 -196
data/Gemfile +28 -23
data/LICENSE +201 -201
data/README.md +147 -166
data/Rakefile +98 -87
data/TODO.md +5 -5
data/lib/vagrant-omnibus.rb +31 -31
data/lib/vagrant-omnibus/action/install_chef.rb +272 -258
data/lib/vagrant-omnibus/config.rb +104 -128
data/lib/vagrant-omnibus/plugin.rb +78 -55
data/lib/vagrant-omnibus/version.rb +22 -22
data/locales/en.yml +11 -8
data/test/acceptance/aws/Vagrantfile +29 -29
data/test/acceptance/digital_ocean/Vagrantfile +24 -24
data/test/acceptance/rackspace/Vagrantfile +28 -28
data/test/acceptance/virtualbox/Vagrantfile +93 -95
data/test/acceptance/vmware_fusion/Vagrantfile +1 -95
data/test/support/cookbooks/chef-inator/README.md +13 -13
data/test/support/cookbooks/chef-inator/metadata.rb +7 -7
data/test/support/cookbooks/chef-inator/recipes/default.rb +2 -2
data/test/unit/spec_helper.rb +23 -25
data/test/unit/vagrant-omnibus/config_spec.rb +121 -101
data/test/unit/vagrant-omnibus/plugin_spec.rb +83 -0
data/vagrant-omnibus.gemspec +27 -27
metadata +28 -29
data/.rubocop.yml +0 -10
data/.ruby-version +0 -1

data/test/acceptance/digital_ocean/Vagrantfile CHANGED

@@ -1,24 +1,24 @@
-Vagrant.require_plugin('vagrant-omnibus')
-Vagrant.require_plugin('vagrant-digitalocean')
-Vagrant.configure('2') do |config|
-  config.omnibus.chef_version = :latest
-  config.vm.box = 'digital_ocean'
-  config.vm.synced_folder '.', '/vagrant', disabled: true
-  config.vm.provider :digital_ocean do |provider, override|
-    provider.client_id = ENV['DO_CLIENT_ID']
-    provider.api_key = ENV['DO_API_KEY']
-    provider.region = 'New York 1'
-    provider.size = '512MB'
-    provider.image = 'Ubuntu 12.04 x64 Server'
-    override.ssh.private_key_path = '~/.ssh/id_rsa'
-  end
-  config.vm.provision :chef_solo do |chef|
-    chef.cookbooks_path =
-      File.expand_path('../../../support/cookbooks', __FILE__)
-    chef.add_recipe 'chef-inator'
-  end
-end
+Vagrant.require_plugin("vagrant-omnibus")
+Vagrant.require_plugin("vagrant-digitalocean")
+Vagrant.configure("2") do |config|
+  config.omnibus.chef_version = :latest
+  config.vm.box = "digital_ocean"
+  config.vm.synced_folder ".", "/vagrant", disabled: true
+  config.vm.provider :digital_ocean do |provider, override|
+    provider.client_id = ENV["DO_CLIENT_ID"]
+    provider.api_key = ENV["DO_API_KEY"]
+    provider.region = "New York 1"
+    provider.size = "512MB"
+    provider.image = "Ubuntu 12.04 x64 Server"
+    override.ssh.private_key_path = "~/.ssh/id_rsa"
+  end
+  config.vm.provision :chef_solo do |chef|
+    chef.cookbooks_path =
+      File.expand_path("../../../support/cookbooks", __FILE__)
+    chef.add_recipe "chef-inator"
+  end
+end

data/test/acceptance/rackspace/Vagrantfile CHANGED

@@ -1,28 +1,28 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-# plugins don't seem to be auto-loaded from the bundle
-require 'vagrant-omnibus'
-require 'vagrant-rackspace'
-Vagrant.configure('2') do |config|
-  config.omnibus.chef_version = '11.4.0'
-  config.vm.box = 'dummy'
-  config.vm.provider :rackspace do |rackspace|
-    rackspace.username = ENV['DEV_RACKSPACE_USERNAME']
-    rackspace.api_key = ENV['DEV_RACKSPACE_API_KEY']
-    rackspace.flavor = /512MB/
-    rackspace.image = /Ubuntu 12.04/
-    rackspace.public_key_path = '~/.ssh/id_rsa.pub'
-    # TODO: switch this to the `override.ssh.private_key_path` syntax once
-    # `vagrant-rackspace` is updated.
-    config.ssh.private_key_path = '~/.ssh/id_rsa'
-  end
-  config.vm.provision :chef_solo do |chef|
-    chef.cookbooks_path =
-      File.expand_path('../../../support/cookbooks', __FILE__)
-    chef.add_recipe 'chef-inator'
-  end
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+# plugins don't seem to be auto-loaded from the bundle
+require "vagrant-omnibus"
+require "vagrant-rackspace"
+Vagrant.configure("2") do |config|
+  config.omnibus.chef_version = "11.4.0"
+  config.vm.box = "dummy"
+  config.vm.provider :rackspace do |rackspace|
+    rackspace.username = ENV["DEV_RACKSPACE_USERNAME"]
+    rackspace.api_key = ENV["DEV_RACKSPACE_API_KEY"]
+    rackspace.flavor = /512MB/
+    rackspace.image = /Ubuntu 12.04/
+    rackspace.public_key_path = "~/.ssh/id_rsa.pub"
+    # TODO: switch this to the `override.ssh.private_key_path` syntax once
+    # `vagrant-rackspace` is updated.
+    config.ssh.private_key_path = "~/.ssh/id_rsa"
+  end
+  config.vm.provision :chef_solo do |chef|
+    chef.cookbooks_path =
+      File.expand_path("../../../support/cookbooks", __FILE__)
+    chef.add_recipe "chef-inator"
+  end
+end

data/test/acceptance/virtualbox/Vagrantfile CHANGED

@@ -1,95 +1,93 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-# rubocop:disable LineLength
-# plugins don't seem to be auto-loaded from the bundle
-require 'vagrant-omnibus'
-require 'vagrant-windows'
-def box_type
-  @box_type ||= begin
-    # Returns `/Users/schisamo/dev/code/schisamo/vagrant-omnibus/test/acceptance/vmware_fusion`
-    full_dir = File.dirname(File.expand_path(__FILE__))
-    # Returns `vmware_fusion`
-    base_dir = full_dir.split('/').last
-    base_dir.split('_').first
-  end
-end
-Vagrant.configure('2') do |config|
-  config.vm.define :new_chef do |new_chef_config|
-    new_chef_config.vm.box = 'opscode-ubuntu-12.04'
-    new_chef_config.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_ubuntu-12.04_chef-provisionerless.box'
-    new_chef_config.omnibus.chef_version = :latest
-    new_chef_config.vm.provision :chef_solo do |chef|
-      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
-      chef.add_recipe 'chef-inator'
-    end
-  end
-  config.vm.define :old_chef do |old_chef_config|
-    old_chef_config.vm.box = 'opscode-centos-6.5'
-    old_chef_config.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_centos-6.5_chef-provisionerless.box'
-    old_chef_config.omnibus.chef_version = '10.24.0'
-    old_chef_config.vm.provision :chef_solo do |chef|
-      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
-      chef.add_recipe 'chef-inator'
-    end
-  end
-  # We don't have legacy VMware boxes
-  unless box_type == 'vmware'
-    config.vm.define :chef_already_installed do |installed_config|
-      installed_config.vm.box = 'opscode-ubuntu-12.04-chef-11.4.4'
-      installed_config.vm.box_url = 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box'
-      installed_config.omnibus.chef_version = '11.4.4'
-      installed_config.vm.provision :chef_solo do |chef|
-        chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
-        chef.add_recipe 'chef-inator'
-      end
-    end
-  end
-  config.vm.define :chef_on_windows do |win_config|
-    # win_config.vm.guest             = :windows
-    win_config.vm.box               = 'win7x64-pro'
-    # build this yourself https://github.com/misheska/basebox-packer
-    # win_config.vm.box_url           = ''
-    win_config.vm.boot_timeout      = 500
-    win_config.winrm.timeout        = 500
-    win_config.omnibus.chef_version = :latest
-    win_config.vm.provision :chef_solo do |chef|
-      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
-      chef.add_recipe 'chef-inator'
-    end
-  end
-  config.vm.define :no_bash do |c|
-    c.vm.box = 'opscode-freebsd-9.2'
-    c.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_freebsd-9.2_chef-provisionerless.box'
-    c.omnibus.chef_version = :latest
-    c.vm.synced_folder '.', '/vagrant', type: 'rsync', id: 'vagrant-root'
-    # This forces all remote commands to execute under `sh`. If we don't
-    # add this config then all `chef` related commands will execute
-    # with `bash` (which might not be installed).
-    c.ssh.shell = 'sh'
-    c.vm.provision :chef_solo do |chef|
-      chef.synced_folder_type = 'rsync'
-      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
-      chef.add_recipe 'chef-inator'
-    end
-  end
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+# rubocop:disable LineLength
+# plugins don't seem to be auto-loaded from the bundle
+require "vagrant-omnibus"
+def box_type
+  @box_type ||= begin
+    # Returns `/Users/schisamo/dev/code/schisamo/vagrant-omnibus/test/acceptance/vmware_fusion`
+    full_dir = File.dirname(File.expand_path(__FILE__))
+    # Returns `vmware_fusion`
+    base_dir = full_dir.split("/").last
+    base_dir.split("_").first
+  end
+end
+Vagrant.configure("2") do |config|
+  config.vm.define :new_chef do |new_chef_config|
+    new_chef_config.vm.box = "opscode-ubuntu-12.04"
+    new_chef_config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_ubuntu-12.04_chef-provisionerless.box"
+    new_chef_config.omnibus.chef_version = :latest
+    new_chef_config.vm.provision :chef_solo do |chef|
+      chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
+      chef.add_recipe "chef-inator"
+    end
+  end
+  config.vm.define :old_chef do |old_chef_config|
+    old_chef_config.vm.box = "opscode-centos-6.5"
+    old_chef_config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_centos-6.5_chef-provisionerless.box"
+    old_chef_config.omnibus.chef_version = "10.24.0"
+    old_chef_config.vm.provision :chef_solo do |chef|
+      chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
+      chef.add_recipe "chef-inator"
+    end
+  end
+  # We don't have legacy VMware boxes
+  unless box_type == "vmware"
+    config.vm.define :chef_already_installed do |installed_config|
+      installed_config.vm.box = "opscode-ubuntu-12.04-chef-11.4.4"
+      installed_config.vm.box_url = "https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box"
+      installed_config.omnibus.chef_version = "11.4.4"
+      installed_config.vm.provision :chef_solo do |chef|
+        chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
+        chef.add_recipe "chef-inator"
+      end
+    end
+  end
+  config.vm.define :chef_on_windows do |win_config|
+    # win_config.vm.guest             = :windows
+    win_config.vm.box               = "win7x64-pro"
+    # build this yourself https://github.com/misheska/basebox-packer
+    # win_config.vm.box_url           = ''
+    win_config.vm.boot_timeout      = 500
+    win_config.omnibus.chef_version = :latest
+    win_config.vm.provision :chef_solo do |chef|
+      chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
+      chef.add_recipe "chef-inator"
+    end
+  end
+  config.vm.define :no_bash do |c|
+    c.vm.box = "opscode-freebsd-9.2"
+    c.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_freebsd-9.2_chef-provisionerless.box"
+    c.omnibus.chef_version = :latest
+    c.vm.synced_folder ".", "/vagrant", type: "rsync", id: "vagrant-root"
+    # This forces all remote commands to execute under `sh`. If we don't
+    # add this config then all `chef` related commands will execute
+    # with `bash` (which might not be installed).
+    c.ssh.shell = "sh"
+    c.vm.provision :chef_solo do |chef|
+      chef.synced_folder_type = "rsync"
+      chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)
+      chef.add_recipe "chef-inator"
+    end
+  end
+end

data/test/acceptance/vmware_fusion/Vagrantfile CHANGED

@@ -1,95 +1 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-# rubocop:disable LineLength
-# plugins don't seem to be auto-loaded from the bundle
-require 'vagrant-omnibus'
-require 'vagrant-windows'
-def box_type
-  @box_type ||= begin
-    # Returns `/Users/schisamo/dev/code/schisamo/vagrant-omnibus/test/acceptance/vmware_fusion`
-    full_dir = File.dirname(File.expand_path(__FILE__))
-    # Returns `vmware_fusion`
-    base_dir = full_dir.split('/').last
-    base_dir.split('_').first
-  end
-end
-Vagrant.configure('2') do |config|
-  config.vm.define :new_chef do |new_chef_config|
-    new_chef_config.vm.box = 'opscode-ubuntu-12.04'
-    new_chef_config.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_ubuntu-12.04_chef-provisionerless.box'
-    new_chef_config.omnibus.chef_version = :latest
-    new_chef_config.vm.provision :chef_solo do |chef|
-      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
-      chef.add_recipe 'chef-inator'
-    end
-  end
-  config.vm.define :old_chef do |old_chef_config|
-    old_chef_config.vm.box = 'opscode-centos-6.5'
-    old_chef_config.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_centos-6.5_chef-provisionerless.box'
-    old_chef_config.omnibus.chef_version = '10.24.0'
-    old_chef_config.vm.provision :chef_solo do |chef|
-      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
-      chef.add_recipe 'chef-inator'
-    end
-  end
-  # We don't have legacy VMware boxes
-  unless box_type == 'vmware'
-    config.vm.define :chef_already_installed do |installed_config|
-      installed_config.vm.box = 'opscode-ubuntu-12.04-chef-11.4.4'
-      installed_config.vm.box_url = 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box'
-      installed_config.omnibus.chef_version = '11.4.4'
-      installed_config.vm.provision :chef_solo do |chef|
-        chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
-        chef.add_recipe 'chef-inator'
-      end
-    end
-  end
-  config.vm.define :chef_on_windows do |win_config|
-    # win_config.vm.guest             = :windows
-    win_config.vm.box               = 'win7x64-pro'
-    # build this yourself https://github.com/misheska/basebox-packer
-    # win_config.vm.box_url           = ''
-    win_config.vm.boot_timeout      = 500
-    win_config.winrm.timeout        = 500
-    win_config.omnibus.chef_version = :latest
-    win_config.vm.provision :chef_solo do |chef|
-      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
-      chef.add_recipe 'chef-inator'
-    end
-  end
-  config.vm.define :no_bash do |c|
-    c.vm.box = 'opscode-freebsd-9.2'
-    c.vm.box_url = 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/#{box_type}/opscode_freebsd-9.2_chef-provisionerless.box'
-    c.omnibus.chef_version = :latest
-    c.vm.synced_folder '.', '/vagrant', type: 'rsync', id: 'vagrant-root'
-    # This forces all remote commands to execute under `sh`. If we don't
-    # add this config then all `chef` related commands will execute
-    # with `bash` (which might not be installed).
-    c.ssh.shell = 'sh'
-    c.vm.provision :chef_solo do |chef|
-      chef.synced_folder_type = 'rsync'
-      chef.cookbooks_path = File.expand_path('../../../support/cookbooks', __FILE__)
-      chef.add_recipe 'chef-inator'
-    end
-  end
-end
+../virtualbox/Vagrantfile

data/test/support/cookbooks/chef-inator/README.md CHANGED

@@ -1,13 +1,13 @@
-# super-tester cookbook
-# Requirements
-# Usage
-# Attributes
-# Recipes
-# Author
-Author:: YOUR_NAME (<YOUR_EMAIL>)
+# super-tester cookbook
+# Requirements
+# Usage
+# Attributes
+# Recipes
+# Author
+Author:: YOUR_NAME (<YOUR_EMAIL>)

data/test/support/cookbooks/chef-inator/metadata.rb CHANGED

@@ -1,7 +1,7 @@
-name             'chef-inator'
-maintainer       'Dr. Heinz Doofenshmirtz'
-maintainer_email 'heinz@doofenshmirtz-evil-inc.com'
-license          'All rights reserved'
-description      'Uses Chef to take over the Tri-State Area!'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.0'
+name             "chef-inator"
+maintainer       "Dr. Heinz Doofenshmirtz"
+maintainer_email "heinz@doofenshmirtz-evil-inc.com"
+license          "All rights reserved"
+description      "Uses Chef to take over the Tri-State Area!"
+long_description IO.read(File.join(File.dirname(__FILE__), "README.md"))
+version          "0.1.0"

data/test/support/cookbooks/chef-inator/recipes/default.rb CHANGED

@@ -1,2 +1,2 @@
-Chef::Log.info 'CURSE YOU...Perry the Platypus!!!!'
+Chef::Log.info "CURSE YOU...Perry the Platypus!!!!"

data/test/unit/spec_helper.rb CHANGED

@@ -1,25 +1,23 @@
-$LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
-require 'rspec/core'
-require 'vagrant-omnibus'
-RSpec.configure do |config|
-  config.formatter = :documentation
-  # a little syntactic sugar
-  config.alias_it_should_behave_like_to :it_has_behavior, 'has behavior:'
-  # Use color in STDOUT
-  config.color_enabled = true
-  # Use color not only in STDOUT but also in pagers and files
-  config.tty = true
-  # run the examples in random order
-  config.order = :rand
-  # specify metadata with symobls only (ie no '=> true' required)
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.filter_run focus: true
-  config.run_all_when_everything_filtered = true
-end
+$LOAD_PATH.unshift File.expand_path("../../../lib", __FILE__)
+require "rspec/core"
+require "vagrant-omnibus"
+RSpec.configure do |config|
+  config.formatter = :documentation
+  # a little syntactic sugar
+  config.alias_it_should_behave_like_to :it_has_behavior, "has behavior:"
+  # Use color in STDOUT
+  config.color = true
+  # Use color not only in STDOUT but also in pagers and files
+  config.tty = true
+  # run the examples in random order
+  config.order = :rand
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+end