vagrant-config_builder 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec26130f2a7f1ace33528a48b3402d5b7e143bb8
-  data.tar.gz: 92997b9a574b4cd4adb95e45a1c1005dd8ae52ff
+  metadata.gz: 2c5ce9607d311e29f749b934d94c2f8a74a73a19
+  data.tar.gz: 3d079a027ca05dbcd2d149164226093b23bffa89
 SHA512:
-  metadata.gz: f13f5321943d414905737ce9e58ae6d600e1d606da4a6503f0915376a164108ad8ffa1e2dbd13e5c1585239e6a4db249059dca6223fad3d8dde1856860b687b3
-  data.tar.gz: db4dc8fb8b6dc34ea2988ab5f05355c9ace42c6ffc9002f0c556da0145200ee4335196dc6db73c752340fe16ca958a613182bad437b5c2770dddf63bd6ca6839
+  metadata.gz: d41a52619b848d2464e294e13f148ef81bdc3251614351f06396ad8516fca5c2c4f0e3329df84548b73e61e5d11f8e1db30fa7c743ce28d0b8c7a4424fc5a9d0
+  data.tar.gz: 00f2b5a3875857ac7011f99de093ddc57aa8fc349d7be98679ab84f3678093cd4715b8072471f6736869114a816fb40ea7611dd67a350a812603d6d5900d801d

data/.travis.yml

@@ -2,6 +2,12 @@
 language: ruby
 sudo: false
 before_install:
+  # TODO: Remove along with all BUNDLER_VERSION hackery once support for
+  # Vagrant < 1.9 is dropped.
+  #
+  # Travis has taken to installing Bundler as a "default" gem which locks
+  # it down and makes it extremely frustrating to use a different version.
+  - "find /home/travis/.rvm/rubies -wholename '*default/bundler-*.gemspec' -delete"
   - gem install bundler --version $BUNDLER_VERSION
 install: bundle _${BUNDLER_VERSION}_ install --without development
 script: bundle _${BUNDLER_VERSION}_ exec rspec --color --format documentation
@@ -14,13 +20,15 @@ env:
 
 matrix:
   include:
-    - rvm: 2.0.0
-      env: TEST_VAGRANT_VERSION=v1.6.5 BUNDLER_VERSION=1.6.9
     - rvm: 2.0.0
       env: TEST_VAGRANT_VERSION=v1.7.4 BUNDLER_VERSION=1.10.5
-
-    - rvm: 2.2.3
-      env: TEST_VAGRANT_VERSION=v1.8.4 BUNDLER_VERSION=1.12.5
-    - rvm: 2.2.3
-      env: TEST_VAGRANT_VERSION=HEAD BUNDLER_VERSION=1.12.5
-
+    - rvm: 2.2.5
+      env: TEST_VAGRANT_VERSION=v1.8.7 BUNDLER_VERSION=1.12.5
+    - rvm: 2.3.4
+      env: TEST_VAGRANT_VERSION=v1.9.8 BUNDLER_VERSION=1.16.1
+    - rvm: 2.4.4
+      env: TEST_VAGRANT_VERSION=v2.0.4 BUNDLER_VERSION=1.16.1
+    - rvm: 2.4.4
+      env: TEST_VAGRANT_VERSION=v2.1.2 BUNDLER_VERSION=1.16.1
+    - rvm: 2.4.4
+      env: TEST_VAGRANT_VERSION=HEAD BUNDLER_VERSION=1.16.1

data/CHANGELOG

@@ -1,6 +1,28 @@
 CHANGELOG
 =========
 
+1.3.0
+-----
+
+2018-08-15
+
+This is a backwards compatible feature release.
+
+  * Added test coverage for Vagrant 1.9, 2.0, and 2.1
+
+  * Deprecated support for vagrant versions earlier than 1.8. These will be
+    removed in the next major release.
+
+  * Synced OpenStack provider options with vagrant-openstack-provider 0.13.0.
+
+  * Synced OpenStack volume_boot option is patched suport merging of multiple
+    configuration blocks.
+
+  * Synced vSphere provider options with vagrant-vsphere 1.13.2.
+
+  * Synced core Vagrant options with Vagrant 2.1.2.
+
+
 1.2.0
 -----
 

data/Gemfile

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
+require 'rubygems/version'
 
-ENV['TEST_VAGRANT_VERSION'] ||= 'v1.8.4'
+vagrant_branch = ENV['TEST_VAGRANT_VERSION'] || 'v2.1.2'
+vagrant_version = nil
 
 # Wrapping gemspec in the :plugins group causes Vagrant 1.5 and newer to
 # automagically load this plugin during acceptance tests.
@@ -9,22 +11,30 @@ group :plugins do
 end
 
 group :development do
-  gem 'yard', '~> 0.8.7'
+  gem 'yard', '~> 0.9.11'
   gem 'redcarpet'
 end
 
 group :test do
-  if ENV['TEST_VAGRANT_VERSION'] == 'HEAD'
-    gem 'vagrant', :github => 'mitchellh/vagrant', :branch => 'master'
+  case vagrant_branch
+  when /head/i
+    gem 'vagrant', :git => 'https://github.com/hashicorp/vagrant.git',
+      :branch => 'master'
   else
-    gem 'vagrant', :github => 'mitchellh/vagrant', :tag => ENV['TEST_VAGRANT_VERSION']
-    # FIXME: Hack to allow Vagrant v1.6.5 to install for tests. Remove when
-    # support for 1.6.5 is dropped.
-    gem 'rack', '< 2'
+    vagrant_version = Gem::Version.new(vagrant_branch.sub(/^v/, ''))
+    gem 'vagrant', :git => 'https://github.com/hashicorp/vagrant.git',
+      :tag => vagrant_branch
   end
 
-  # Pinned on 2/21/2016. Compatible with Vagrant 1.6.x?, 1.7.x? and 1.8.x.
-  gem 'vagrant-spec', :github => 'mitchellh/vagrant-spec', :ref => '9bba7e1'
+  if vagrant_branch.match(/head/i) || (vagrant_version > Gem::Version.new('1.9'))
+    # Pinned on 2018-06-27. Compatible with Vagrant > 1.9. Brings in Rspec 3.
+    gem 'vagrant-spec', :git => 'https://github.com/hashicorp/vagrant-spec.git',
+      :ref => '9413ab2'
+  elsif vagrant_version
+    # Pinned on 2014-12-10. Compatible with Vagrant 1.6.x -- 1.8.7.
+    gem 'vagrant-spec', :git => 'https://github.com/hashicorp/vagrant-spec.git',
+      :ref => '1df5a3a'
+  end
 end
 
 eval_gemfile "#{__FILE__}.local" if File.exists? "#{__FILE__}.local"

data/lib/config_builder/action/version_check.rb

@@ -0,0 +1,27 @@
+require 'vagrant/version'
+require 'rubygems/version'
+
+# Check for deprecated Vagrant versions
+module ConfigBuilder
+  module Action
+    class VersionCheck
+      MINIMUM_VERSION = '1.8.0'
+
+      def initialize(app, env)
+        @app = app
+      end
+
+      def call(env)
+        unless Gem::Version.new(Vagrant::VERSION) > Gem::Version.new(MINIMUM_VERSION)
+          env[:env].ui.warn I18n.t(
+            'config_builder.action.version_check.deprecated_vagrant_version',
+            minimum_version: MINIMUM_VERSION,
+            vagrant_version: Vagrant::VERSION
+          )
+        end
+
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/config_builder/model/provider/openstack.rb

@@ -1,3 +1,5 @@
+require 'config_builder/util'
+
 # @see https://github.com/ggiamarchi/vagrant-openstack-provider
 class ConfigBuilder::Model::Provider::Openstack < ConfigBuilder::Model::Provider::Base
 
@@ -13,12 +15,16 @@ class ConfigBuilder::Model::Provider::Openstack < ConfigBuilder::Model::Provider
   def_model_attribute :openstack_image_url
   def_model_attribute :openstack_orchestration_url
   def_model_attribute :endpoint_type
+  def_model_attribute :ssl_ca_file
+  def_model_attribute :ssl_verify_peer
 
   # Keystone v3 Credentials
   def_model_attribute :identity_api_version
   def_model_attribute :domain_name
   def_model_attribute :project_name
+  def_model_attribute :project_domain_name
   def_model_attribute :interface_type
+  def_model_attribute :user_domain_name
 
   # VM Configuration
   def_model_attribute :server_name
@@ -28,7 +34,9 @@ class ConfigBuilder::Model::Provider::Openstack < ConfigBuilder::Model::Provider
   def_model_attribute :security_groups
   def_model_attribute :user_data
   def_model_attribute :metadata
+  def_model_attribute :meta_args_support
   def_model_attribute :scheduler_hints
+  def_model_attribute :use_legacy_synced_folders
 
   # Floating IPs
   def_model_attribute :floating_ip
@@ -64,12 +72,65 @@ class ConfigBuilder::Model::Provider::Openstack < ConfigBuilder::Model::Provider
   def_model_attribute :server_active_timeout
   def_model_attribute :server_stop_timeout
   def_model_attribute :server_delete_timeout
-  def_model_attribute :http_open_timeout
-  def_model_attribute :http_read_timeout
+  def_model_attribute :http
+  def_model_attribute :floating_ip_assign_timeout
+
+  @@patch_applied = false
+
+  def initialize
+    unless @@patch_applied
+      require 'vagrant-openstack-provider/config'
+      # FIXME: YAY MONKEYPATCHING
+      ::VagrantPlugins::Openstack::Config.prepend(OpenStackConfigPatch)
+      @@patch_applied = true
+    end
+  end
 
   def instance_id
     'openstack'
   end
 
+  # @private
+  def configure_http(config, val)
+    val.each do |k, v|
+      case k.to_sym
+      when :open_timeout
+        config.http.open_timeout = val
+      when :read_timeout
+        config.http.read_timeout = val
+      when :proxy
+        config.http.proxy = val
+      end
+    end
+  end
+
+  # @private
+  def configure_volume_boot(config, val)
+    config.volume_boot = ConfigBuilder::Util.symbolize(val)
+  end
+
   ConfigBuilder::Model::Provider.register('openstack', self)
+
+  # FIXME: PR this change to vagrant-openstack-provider. If a PR is not
+  #        accepted, then update the role filter to merge all provider hashes
+  #        into a single configuration block per-vm so that we don't have to
+  #        worry about how providers feel or don't feel about the subject of
+  #        merging.
+  module OpenStackConfigPatch
+    # A patch for the merge behavior of OpenStack::Config instances that
+    # allows us to merge volume boot settings together. Unpatched OpenStack
+    # just discards its current config and accepts whatever the new config is.
+    # In our case this would be a fragment of a complete volume_boot setting.
+    def merge(other)
+      result = super(other)
+      # Could be UNSET_VALUE or nil
+      current_config = self.volume_boot.is_a?(Hash) ? self.volume_boot : {}
+      new_config = other.volume_boot.is_a?(Hash) ? other.volume_boot : {}
+
+      return result if (current_config.empty? && new_config.empty?)
+
+      result.instance_variable_set(:@volume_boot, current_config.merge(new_config))
+      result
+    end
+  end
 end

data/lib/config_builder/model/provider/vsphere.rb

@@ -24,14 +24,13 @@ class ConfigBuilder::Model::Provider::Vsphere< ConfigBuilder::Model::Provider::B
   def_model_attribute :cpu_count
   def_model_attribute :cpu_reservation
   def_model_attribute :mem_reservation
+  def_model_attribute :real_nic_ip
+  def_model_attribute :ip_address_timeout
+  def_model_attribute :wait_for_sysprep
 
   def_model_attribute :custom_attributes
-
-  def initialize
-    @defaults = {
-      :insecure => false,
-    }
-  end
+  def_model_attribute :extra_config
+  def_model_attribute :notes
 
   def instance_id
     'vsphere'

data/lib/config_builder/model/provisioner/puppet.rb

@@ -43,6 +43,10 @@ class ConfigBuilder::Model::Provisioner::Puppet < ConfigBuilder::Model::Provisio
   #   @return [String] Path to the directory that contains environment files on the host disk.
   def_model_attribute :environment_path
 
+  # @!attribute [rw] environment_variables
+  #   @return [Hash]
+  def_model_attribute :environment_variables
+
   # @!attribute [rw] synced_folder_type
   #   @return [String] The type of synced folders to use when sharing the data required for the provisioner to work properly.
   def_model_attribute :synced_folder_type

data/lib/config_builder/model/provisioner/shell.rb

@@ -41,5 +41,17 @@ class ConfigBuilder::Model::Provisioner::Shell < ConfigBuilder::Model::Provision
   #   @return [Boolean] Whether to run an elevated script in interactive mode on Windows.
   def_model_attribute :powershell_elevated_interactive
 
+  # @!attribute [rw] md5
+  #   @return [String]
+  def_model_attribute :md5
+
+  # @!attribute [rw] sha1
+  #   @return [String]
+  def_model_attribute :sha1
+
+  # @!attribute [rw] sensitive
+  #   @return [Boolean]
+  def_model_attribute :sensitive
+
   ConfigBuilder::Model::Provisioner.register('shell', self)
 end

data/lib/config_builder/model/ssh.rb

@@ -2,6 +2,10 @@
 #
 # @see http://docs.vagrantup.com/v2/vagrantfile/ssh_settings.html
 class ConfigBuilder::Model::SSH < ConfigBuilder::Model::Base
+  # @!attribute [rw] export_command_template
+  #   @return [String]
+  def_model_attribute :export_command_template
+
   # @!attribute [rw] username
   #   @return [String] This sets the username that Vagrant will SSH as by
   #     default. Providers are free to override this if they detect a more
@@ -104,6 +108,10 @@ class ConfigBuilder::Model::SSH < ConfigBuilder::Model::Base
   #     command that is being executed.
   def_model_attribute :sudo_command
 
+  # @!attribute [rw] ssh_command
+  #   @return [String]
+  def_model_attribute :ssh_command
+
   def to_proc
     Proc.new do |global_config|
       ssh = global_config.ssh

data/lib/config_builder/model/vm.rb

@@ -93,6 +93,12 @@ class ConfigBuilder::Model::VM < ConfigBuilder::Model::Base
   #   start.
   def_model_option :autostart
 
+  # @!attribute [rw] primary
+  #   @return [Boolean] If true, the box will be the default machine used when
+  #   a specific machine in a multi-machine environment is not specified.
+  #   If false, vagrant must be given the box name explicitly for some commands.
+  def_model_option :primary
+
   # @!attribute [rw] allowed_synced_folder_types
   #   @return [Array<String>]
   def_model_attribute :allowed_synced_folder_types

data/lib/config_builder/model/winrm.rb

@@ -2,6 +2,14 @@
 #
 # @see http://docs.vagrantup.com/v2/vagrantfile
 class ConfigBuilder::Model::WinRM < ConfigBuilder::Model::Base
+  # @!attribute [rw] basic_auth_only
+  #   @return [Boolean]
+  def_model_attribute :basic_auth_only
+
+  # @!attribute [rw] codepage
+  #   @return [String]
+  def_model_attribute :codepage
+
   # @!attribute [rw] username
   #   @return [String] This sets the username that Vagrant will WinRM as by
   #     default. Providers are free to override this if they detect a more

data/lib/config_builder/plugin.rb

@@ -10,6 +10,12 @@ module VagrantPlugins
       action_hook('ConfigBuilder: load extensions', :environment_load) do |hook|
         hook.prepend(::ConfigBuilder::Action::LoadExtensions)
       end
+
+      # Internal action hooks
+      action_hook('Vagrant Config Builder: vagrant version check', :environment_load) do |hook|
+        require 'config_builder/action/version_check'
+        hook.prepend(::ConfigBuilder::Action::VersionCheck)
+      end
     end
   end
 end

data/lib/config_builder/util.rb

@@ -0,0 +1,18 @@
+module ConfigBuilder
+  # Utility functions.
+  module Util
+    # Recursively cast hash keys to symbols
+    #
+    # @param hash [Hash] A hash of keys and values.
+    #
+    # @return [Hash] The same hash, but with all keys transformed to symbols.
+    def self.symbolize(hash)
+      transformed_data = hash.map do |k, v|
+                           v = symbolize(v) if v.is_a?(Hash)
+                           [k.to_sym, v]
+                         end
+
+      Hash[transformed_data]
+    end
+  end
+end

data/lib/config_builder/version.rb

@@ -1,3 +1,3 @@
 module ConfigBuilder
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/spec/integration/vagrant/root_config_spec.rb

@@ -30,7 +30,7 @@ describe 'Vagrant Integration: ConfigBuilder::Model::Root' do
     subject { root_config.ssh }
 
     it 'sets Vagrant config.ssh parameters' do
-      expect(subject.insert_key).to be_false
+      expect(subject.insert_key).to be_falsey
       expect(subject.username).to eq 'AzureDiamond'
       expect(subject.password).to eq 'hunter2'
     end

data/spec/integration/vagrant/vm_config_spec.rb

@@ -22,7 +22,7 @@ describe 'Vagrant Integration: ConfigBuilder::Model::VM' do
     let(:config_data) {
       {'vms' =>
         [
-          {'name' => 'machine1'},
+          {'name' => 'machine1', 'primary' => true},
           {'name' => 'machine2', 'autostart' => false},
         ]
       }
@@ -37,7 +37,13 @@ describe 'Vagrant Integration: ConfigBuilder::Model::VM' do
     it 'sets the autostart option when defining machines' do
       test_vm = subject.defined_vms[:machine2]
 
-      expect(test_vm.options[:autostart]).to be_false
+      expect(test_vm.options[:autostart]).to be_falsey
+    end
+
+    it 'sets the primary option when defining machines' do
+      test_vm = subject.defined_vms[:machine1]
+
+      expect(test_vm.options[:primary]).to be_truthy
     end
   end
 
@@ -82,7 +88,7 @@ describe 'Vagrant Integration: ConfigBuilder::Model::VM' do
     end
 
     it 'configures Vagrant synced folders' do
-      expect(subject.synced_folders['/vagrant'][:disabled]).to be_true
+      expect(subject.synced_folders['/vagrant'][:disabled]).to be_truthy
     end
 
     it 'configures Vagrant private networks' do

data/spec/integration/vagrant/vm_provisioner_spec.rb

@@ -36,7 +36,7 @@ describe 'Vagrant Integration: ConfigBuilder::Model::Provisioner' do
     subject { env.machine(:test, :dummy).config.vm }
 
     it 'defines provisioners' do
-      expect(subject.provisioners).to have(2).items
+      expect(subject.provisioners.length).to eq(2)
     end
 
     it 'sets provisioner names' do

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 # Disable Vagrant autoloading so that other plugins defined in the Gemfile for
 # Acceptance tests are not loaded.
 ENV['VAGRANT_NO_PLUGINS'] = '1'
+ENV['VAGRANT_DISABLE_PLUGIN_INIT'] = '1'
 
 require 'vagrant-spec/unit'
 require 'config_builder'

data/spec/unit/loader/yaml_spec.rb

@@ -69,7 +69,7 @@ roles:
       end
 
       it 'concatenates subarrays' do
-        expect(config['roles']['base']['private_networks']).to have(2).items
+        expect(config['roles']['base']['private_networks'].length).to eq(2)
       end
     end
   end

data/templates/locales/en.yml

@@ -1,6 +1,12 @@
 ---
 en:
   config_builder:
+    action:
+      version_check:
+        deprecated_vagrant_version: |-
+          The vagrant-hosts plugin has deprecated support for Vagrant
+          versions older than %{minimum_version}. Support for version %{vagrant_version}
+          will be removed in the next major release of the plugin.
     class_registry:
       unknown_entry: |-
         Unable to locate a class associated with the identifier %{identifier} in the registry

data/vagrant-config_builder.gemspec

@@ -12,14 +12,13 @@ Gem::Specification.new do |gem|
   gem.homepage = 'https://github.com/oscar-stack/vagrant-config_builder'
 
   gem.has_rdoc = true
-  gem.license  = 'Apache 2.0'
+  gem.license  = 'Apache-2.0'
 
   gem.files        = %x{git ls-files -z}.split("\0")
   gem.require_path = 'lib'
 
-  gem.add_runtime_dependency 'deep_merge', '~> 1.0.0'
+  gem.add_runtime_dependency 'deep_merge', '~> 1.0'
 
   # Pinned for compatibility with vagrant-spec.
   gem.add_development_dependency 'rake', '~> 10.0'
-  gem.add_development_dependency 'rspec', '~> 2.14.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-config_builder
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Adrien Thebo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -39,20 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.14.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.14.0
 description: 
 email:
 - adrien@somethingsinistral.net
@@ -76,6 +62,7 @@ files:
 - examples/vms.yaml
 - lib/config_builder.rb
 - lib/config_builder/action/load_extensions.rb
+- lib/config_builder/action/version_check.rb
 - lib/config_builder/class_registry.rb
 - lib/config_builder/extension_handler.rb
 - lib/config_builder/filter.rb
@@ -117,6 +104,7 @@ files:
 - lib/config_builder/model_delegator.rb
 - lib/config_builder/plugin.rb
 - lib/config_builder/runner.rb
+- lib/config_builder/util.rb
 - lib/config_builder/version.rb
 - lib/vagrant-config_builder.rb
 - spec/integration/vagrant/root_config_spec.rb
@@ -134,7 +122,7 @@ files:
 - vagrant-config_builder.gemspec
 homepage: https://github.com/oscar-stack/vagrant-config_builder
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -152,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Generate Vagrant configurations from arbitrary data