vagrant-bolt 0.1.1 → 0.4.0

data/acceptance/skeletons/base/Puppetfile

@@ -0,0 +1,2 @@
+mod 'puppetlabs-facts', '1.2.0'
+mod 'puppetlabs-ruby_task_helper', '0.5.1'

data/acceptance/skeletons/base/Vagrantfile

@@ -1,11 +1,12 @@
 require 'vagrant-spec/which'
 Vagrant.configure('2') do |config|
-  config.bolt.bolt_exe = Vagrant::Spec::Which.which('bolt')
+  config.bolt.bolt_exe = [Vagrant::Spec::Which.which('ruby'), Vagrant::Spec::Which.which('bolt')]
   config.vm.box = 'box'
   config.vm.define 'server' do |node|
     node.vm.provision :bolt do |bolt|
       bolt.command = :task
       bolt.name    = "facts"
+      bolt.targets = ['server']
     end
   end
 end

data/acceptance/skeletons/provisioner/Vagrantfile

@@ -1,6 +1,6 @@
 require 'vagrant-spec/which'
 Vagrant.configure('2') do |config|
-  config.bolt.bolt_exe = Vagrant::Spec::Which.which('bolt')
+  config.bolt.bolt_exe = [Vagrant::Spec::Which.which('ruby'), Vagrant::Spec::Which.which('bolt')]
   config.vm.box = 'box'
   config.vm.define 'server' do |node|
     node.vm.provision :bolt do |bolt|

data/acceptance/skeletons/trigger/Vagrantfile

@@ -1,6 +1,6 @@
 require 'vagrant-spec/which'
 Vagrant.configure('2') do |config|
-  config.bolt.bolt_exe = Vagrant::Spec::Which.which('bolt')
+  config.bolt.bolt_exe = [Vagrant::Spec::Which.which('ruby'), Vagrant::Spec::Which.which('bolt')]
   config.vm.box = 'box'
   config.vm.define 'server' do |node|
     node.trigger.after :up do |trigger|

data/acceptance/vagrant-spec.config.rb

@@ -11,11 +11,11 @@ ENV['VAGRANT_DISABLE_PLUGIN_INIT'] = '1'
 Vagrant::Spec::Acceptance.configure do |c|
   acceptance_dir = Pathname.new File.expand_path(__dir__)
 
-  c.component_paths = [(acceptance_dir + 'components').to_s]
-  c.skeleton_paths = [(acceptance_dir + 'skeletons').to_s]
+  c.component_paths = ["#{acceptance_dir}/components"]
+  c.skeleton_paths = ["#{acceptance_dir}/skeletons"]
 
   c.provider 'virtualbox',
-             box: (acceptance_dir + 'artifacts' + 'virtualbox.box').to_s,
+             box: "#{acceptance_dir}/artifacts/virtualbox.box",
              env_vars: {
                'VBOX_USER_HOME' => '{{homedir}}',
              }

data/lib/vagrant-bolt/command.rb

@@ -42,21 +42,21 @@ class VagrantBolt::Command < Vagrant.plugin('2', :command)
     execute_bolt_command(bolt_args)
   end
 
-  # Run a bolt command with the inventory path, and boltdir
+  # Run a bolt command with the inventory path, and project
   # @param args [Array<String>] An array containing the bolt arguments
   def execute_bolt_command(args)
     bolt_exe = @env.vagrantfile.config.bolt.bolt_exe
-    boltdir = VagrantBolt::Util::Config.relative_path(@env.vagrantfile.config.bolt.boltdir, @env.root_path)
+    project = VagrantBolt::Util::Config.relative_path(@env.vagrantfile.config.bolt.project, @env.root_path)
     inventoryfile = VagrantBolt::Util::Bolt.inventory_file(@env)
 
     quoted_args = args.flatten.compact.map { |a| "'#{a}'" }
     command = [
-      "\'#{bolt_exe}\'",
+      bolt_exe,
       quoted_args,
-      '--boltdir',
-      "\'#{boltdir}\'",
+      '--project',
+      project,
     ]
     command << ['--inventoryfile', "\'#{inventoryfile}\'"] if File.exist?(inventoryfile)
-    VagrantBolt::Util::Machine.run_command(command.flatten.join(" "), @env.ui)
+    VagrantBolt::Util::Machine.run_command(command.flatten.join(' '), @env.ui)
   end
 end

data/lib/vagrant-bolt/config/bolt.rb

@@ -10,6 +10,7 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
   attr_accessor :name
 
   # @!attribute [rw] nodes
+  # DEPRECATED. Use `targets` instead.
   # Note: The `node_list` will override this setting.
   # @return [Array<String, Symbol>, "ALL"] The nodes to run the task or plan on.
   # Valid values are an array of machine names or the string "ALL".
@@ -17,14 +18,15 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
 
   # @!attribute [rw] excludes
   # Note: The `node_list` will override this setting.
-  # Note: This will be merged with `nodes`, with `excludes` taking precidence.
-  # @return [Array<String, Symbol>] The nodes to exclude from running this task or plan on.
+  # Note: This will be merged with `targets`, with `excludes` taking precidence.
+  # @return [Array<String, Symbol>] The targets to exclude from running this task or plan on.
   # Valid values are an array of machine names.
   attr_accessor :excludes
 
   # @!attribute [rw] node_list
+  # DEPRECATED. Use `target_list` instead.
   # This setting overrides `nodes` and needs to be in the `protocol://ipaddress:port` URI format.
-  # @return [String] The bolt node list. This defaults to the currnet node.
+  # @return [String] The bolt node list. This defaults to the currnet machine.
   attr_accessor :node_list
 
   # @!attribute [rw] params
@@ -39,6 +41,17 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
   # @return [Boolean] If the command should be run with noop. Only valid with tasks and apply.
   attr_accessor :noop
 
+  # @!attribute [rw] targets
+  # Note: The `target_list` will override this setting.
+  # @return [Array<String, Symbol>, "ALL"] The targets to run the task or plan on.
+  # Valid values are an array of machine names or the string "ALL".
+  attr_accessor :targets
+
+  # @!attribute [rw] target_list
+  # This setting overrides `targets` and needs to be in the `protocol://ipaddress:port` URI format.
+  # @return [String] The bolt target list. This defaults to the currnet machine.
+  attr_accessor :target_list
+
   def initialize
     super
     @args         = UNSET_VALUE
@@ -48,40 +61,32 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
     @node_list    = UNSET_VALUE
     @params       = UNSET_VALUE
     @command      = UNSET_VALUE
+    @targets      = []
+    @target_list  = UNSET_VALUE
   end
 
   def finalize!
     @bolt_exe       = nil if @bolt_exe == UNSET_VALUE
     @boltdir        = nil if @boltdir == UNSET_VALUE
-    @host_key_check = nil if @host_key_check == UNSET_VALUE
-    @modulepath     = nil if @modulepath == UNSET_VALUE
-    @port           = nil if @port == UNSET_VALUE
-    @password       = nil if @password == UNSET_VALUE
-    @private_key    = nil if @private_key == UNSET_VALUE
-    @run_as         = nil if @run_as == UNSET_VALUE
-    @ssl            = nil if @ssl == UNSET_VALUE
-    @ssl_verify     = nil if @ssl_verify == UNSET_VALUE
-    @sudo_password  = nil if @sudo_password == UNSET_VALUE
-    @tmpdir         = nil if @tmpdir == UNSET_VALUE
-    @user           = nil if @user == UNSET_VALUE
-    @verbose        = nil if @verbose == UNSET_VALUE
-    @debug          = nil if @debug == UNSET_VALUE
-
+    super
     @args           = nil if @args == UNSET_VALUE
     @name           = nil if @name == UNSET_VALUE
     @node_list      = nil if @node_list == UNSET_VALUE
     @params         = nil if @params == UNSET_VALUE
     @command        = nil if @command == UNSET_VALUE
     @noop           = nil if @noop == UNSET_VALUE
+    # Use nodes if targets is not specified.
+    @targets        = @nodes if @targets.empty?
+    @target_list    = @node_list if (@target_list == UNSET_VALUE) || @target_list.nil?
   end
 
   def merge(other)
     super.tap do |result|
       new_excludes = (excludes + other.excludes.dup).flatten.uniq
       result.instance_variable_set(:@excludes, new_excludes.to_a)
-      unless nodes.to_s.casecmp("all").zero?
-        new_nodes = (nodes + other.nodes.dup).flatten.uniq
-        result.instance_variable_set(:@nodes, new_nodes.to_a)
+      unless targets.to_s.casecmp("all").zero?
+        new_targets = (targets + other.targets.dup).flatten.uniq
+        result.instance_variable_set(:@targets, new_targets.to_a)
       end
     end
   end
@@ -90,9 +95,9 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
     errors = _detected_errors
     errors << I18n.t('vagrant-bolt.config.bolt.errors.invalid_command', command: @command.to_s) if !@command.nil? && !['task', 'plan', 'command'].include?(@command.to_s)
 
-    if @nodes.nil? || (!(@nodes.is_a? Array) && !@nodes.to_s.casecmp("all").zero?)
+    if @targets.nil? || (!(@targets.is_a? Array) && !@targets.to_s.casecmp("all").zero?)
       errors << I18n.t('vagrant-bolt.config.bolt.errors.invalid_data_command',
-                       item: 'nodes',
+                       item: 'targets',
                        command: 'array')
     end
 
@@ -121,8 +126,10 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
   def blacklist
     [
       'nodes',
+      'targets',
       'excludes',
       'node_list',
+      'target_list',
       'bolt_exe',
       'args',
       'command',
@@ -130,6 +137,8 @@ class VagrantBolt::Config::Bolt < VagrantBolt::Config::Global
       'vars',
       'facts',
       'features',
+      'boltdir',
+      'run_as',
     ]
   end
 end

data/lib/vagrant-bolt/config/global.rb

@@ -6,7 +6,7 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
   attr_accessor :bolt_exe
 
   # @!attribute [rw] boltdir
-  # @return [String] The bolt working directory. Defaults to `.`
+  # @return [String] DEPRECATED use `project`. The bolt working directory. Defaults to `.`
   attr_accessor :boltdir
 
   # @!attribute [rw] host_key_check
@@ -17,6 +17,14 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
   # @return [Boolean] If the connection should check the host key on the remote host (linux)
   attr_accessor :host_key_check
 
+  # @!attribute [rw] machine_alias
+  # @return [String] The alias of the machine to set in the bolt inventory
+  attr_accessor :machine_alias
+
+  # @!attribute [rw] machine_name
+  # @return [String] The name of the machine to set in the bolt inventory
+  attr_accessor :machine_name
+
   # @!attribute [rw] modulepath
   # @return [String] The path to the modules.
   attr_accessor :modulepath
@@ -37,6 +45,10 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
   # @return [String] The path of the private_key to authenticate on the machine.
   attr_accessor :private_key
 
+  # @!attribute [rw] project
+  # @return [String] The bolt project. Defaults to `.`
+  attr_accessor :project
+
   # @!attribute [rw] run_as
   # @return [String] User to run as using privilege escalation.
   attr_accessor :run_as
@@ -82,10 +94,13 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
     @boltdir         = UNSET_VALUE
     @connect_timeout = UNSET_VALUE
     @host_key_check  = UNSET_VALUE
+    @machine_alias   = UNSET_VALUE
+    @machine_name    = UNSET_VALUE
     @modulepath      = UNSET_VALUE
     @password        = UNSET_VALUE
     @port            = UNSET_VALUE
     @private_key     = UNSET_VALUE
+    @project         = UNSET_VALUE
     @run_as          = UNSET_VALUE
     @ssl             = UNSET_VALUE
     @ssl_verify      = UNSET_VALUE
@@ -100,14 +115,17 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
   end
 
   def finalize!
-    @bolt_exe        = 'bolt' if @bolt_exe == UNSET_VALUE
+    @bolt_exe        = bolt_exe_path if @bolt_exe == UNSET_VALUE
     @boltdir         = '.' if @boltdir == UNSET_VALUE
     @connect_timeout = nil if @connect_timeout == UNSET_VALUE
     @host_key_check  = nil if @host_key_check == UNSET_VALUE
+    @machine_alias   = nil if @machine_alias == UNSET_VALUE
+    @machine_name    = nil if @machine_name == UNSET_VALUE
     @modulepath      = nil if @modulepath == UNSET_VALUE
     @port            = nil if @port == UNSET_VALUE
     @password        = nil if @password == UNSET_VALUE
     @private_key     = nil if @private_key == UNSET_VALUE
+    @project         = @boltdir if @project == UNSET_VALUE || @project.nil?
     @run_as          = nil if @run_as == UNSET_VALUE
     @ssl             = nil if @ssl == UNSET_VALUE
     @ssl_verify      = nil if @ssl_verify == UNSET_VALUE
@@ -121,6 +139,14 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
     @vars            = nil if @vars == UNSET_VALUE
   end
 
+  # Get the full path to the bolt executable
+  # @return [String] The path to the bolt exe
+  def bolt_exe_path
+    return '/opt/puppetlabs/bin/bolt' if !Vagrant::Util::Platform.windows? && File.file?('/opt/puppetlabs/bin/bolt')
+
+    Vagrant::Util::Which.which('bolt') || 'bolt'
+  end
+
   def validate(_machine)
     errors = _detected_errors
 
@@ -137,6 +163,8 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
 
       if group_objects.include?(key)
         config[key] = value
+      elsif %r{machine_\w+}.match?(key)
+        config[key.sub('machine_', '')] = value
       else
         setting_map.each do |transport, settings|
           next unless settings.include?(key)
@@ -168,7 +196,6 @@ class VagrantBolt::Config::Global < Vagrant.plugin('2', :config)
       'winrm': [
         'user',
         'password',
-        'run_as',
         'ssl',
         'ssl_verify',
         'port',

data/lib/vagrant-bolt/config_builder/config.rb

@@ -13,7 +13,7 @@ class VagrantBolt::ConfigBuilder::Config < ConfigBuilder::Model::Base
   def_model_attribute :bolt_exe
 
   # @!attribute [rw] boltdir
-  # @return [String] The bolt working directory. Defaults to `.`
+  # @return [String] DEPRECATED use `project`.  The bolt working directory. Defaults to `.`
   def_model_attribute :boltdir
 
   # @!attribute [rw] debug
@@ -28,6 +28,14 @@ class VagrantBolt::ConfigBuilder::Config < ConfigBuilder::Model::Base
   # @return [Boolean] If the connection should check the host key on the remote host (linux)
   def_model_attribute :host_key_check
 
+  # @!attribute [rw] machine_alias
+  # @return [String] The alias of the machine to set in the bolt inventory
+  def_model_attribute :machine_alias
+
+  # @!attribute [rw] machine_name
+  # @return [String] The name of the machine to set in the bolt inventory
+  def_model_attribute :machine_name
+
   # @!attribute [rw] modulepath
   # @return [String] The path to the modules.
   def_model_attribute :modulepath
@@ -37,21 +45,23 @@ class VagrantBolt::ConfigBuilder::Config < ConfigBuilder::Model::Base
   def_model_attribute :name
 
   # @!attribute [rw] nodes
+  # DEPRECATED. Use `targets` instead.
   # Note: The `node_list` will override this setting.
   # @return [Array<String, Symbol>, "ALL"] The nodes to run the task or plan on.
   # Valid values are an array of machine names or the string "ALL".
   def_model_attribute :nodes
 
   # @!attribute [rw] excludes
-  # Note: The `node_list` will override this setting.
-  # Note: This will be merged with `nodes`, with `excludes` taking precidence.
-  # @return [Array<String, Symbol>] The nodes to exclude from running this task or plan on.
+  # Note: The `target_list` will override this setting.
+  # Note: This will be merged with `targets`, with `excludes` taking precidence.
+  # @return [Array<String, Symbol>] The targets to exclude from running this task or plan on.
   # Valid values are an array of machine names.
   def_model_attribute :excludes
 
   # @!attribute [rw] node_list
+  # DEPRECATED. Use `target_list` instead.
   # This setting overrides `nodes` and needs to be in the `protocol://ipaddress:port` URI format
-  # @return [String] The bolt node list. This defaults to the currnet node.
+  # @return [String] The bolt node list. This defaults to the current node.
   def_model_attribute :node_list
 
   # @!attribute [rw] noop
@@ -62,6 +72,10 @@ class VagrantBolt::ConfigBuilder::Config < ConfigBuilder::Model::Base
   # @return [Hash] The paramater hash for the task or plan
   def_model_attribute :params
 
+  # @!attribute [rw] project
+  # @return [String] The bolt working directory. Defaults to `.`
+  def_model_attribute :project
+
   # @!attribute [rw] command
   # @return [Symbol] Whether bolt should use a task or plan
   def_model_attribute :command
@@ -98,6 +112,17 @@ class VagrantBolt::ConfigBuilder::Config < ConfigBuilder::Model::Base
   # @return [Boolean] If the connection should verify SSL on with WinRM (Windows)
   def_model_attribute :ssl_verify
 
+  # @!attribute [rw] targets
+  # Note: The `target_list` will override this setting.
+  # @return [Array<String, Symbol>, "ALL"] The targets to run the task or plan on.
+  # Valid values are an array of machine names or the string "ALL".
+  def_model_attribute :targets
+
+  # @!attribute [rw] target_list
+  # This setting overrides `targets` and needs to be in the `protocol://ipaddress:port` URI format
+  # @return [String] The bolt target list. This defaults to the current target.
+  def_model_attribute :target_list
+
   # @!attribute [rw] tmpdir
   # @return [String] The directory to upload and execute temporary files on the target
   def_model_attribute :tmpdir
@@ -129,6 +154,8 @@ class VagrantBolt::ConfigBuilder::Config < ConfigBuilder::Model::Base
       with_attr(:debug)           { |val| bolt.debug           = val }
       with_attr(:connect_timeout) { |val| bolt.connect_timeout = val }
       with_attr(:host_key_check)  { |val| bolt.host_key_check  = val }
+      with_attr(:machine_alias)   { |val| bolt.machine_alias   = val }
+      with_attr(:machine_name)    { |val| bolt.machine_name    = val }
       with_attr(:modulepath)      { |val| bolt.modulepath      = val }
       with_attr(:name)            { |val| bolt.name            = val }
       with_attr(:nodes)           { |val| bolt.nodes           = val }
@@ -140,10 +167,13 @@ class VagrantBolt::ConfigBuilder::Config < ConfigBuilder::Model::Base
       with_attr(:password)        { |val| bolt.password        = val }
       with_attr(:port)            { |val| bolt.port            = val }
       with_attr(:private_key)     { |val| bolt.private_key     = val }
+      with_attr(:project)         { |val| bolt.project         = val }
       with_attr(:run_as)          { |val| bolt.run_as          = val }
       with_attr(:sudo_password)   { |val| bolt.sudo_password   = val }
       with_attr(:ssl)             { |val| bolt.ssl             = val }
       with_attr(:ssl_verify)      { |val| bolt.ssl_verify      = val }
+      with_attr(:targets)         { |val| bolt.targets         = val }
+      with_attr(:target_list)     { |val| bolt.target_list     = val }
       with_attr(:tmpdir)          { |val| bolt.tmpdir          = val }
       with_attr(:verbose)         { |val| bolt.verbose         = val }
       with_attr(:facts)           { |val| bolt.facts           = val }

data/lib/vagrant-bolt/config_builder/monkey_patches.rb

@@ -29,7 +29,8 @@ module VagrantBolt::ConfigBuilder::MonkeyPatches
 
   def eval_bolt_triggers_root(vm_root_config)
     # Configure the vm bolt object if the options exist
-    triggers = attr(:bolt_triggers) || [] # rubocop:disable Style/Attr
+    triggers = attr(:bolt_triggers) || []
+
     triggers.each do |config|
       f = VagrantBolt::ConfigBuilder::Triggers.new_from_hash(config)
       f.call(vm_root_config)

data/lib/vagrant-bolt/config_builder/provisioner.rb

@@ -13,7 +13,7 @@ class VagrantBolt::ConfigBuilder::Provisioner < ConfigBuilder::Model::Provisione
   def_model_attribute :bolt_exe
 
   # @!attribute [rw] boltdir
-  # @return [String] The bolt working directory. Defaults to `.`
+  # @return [String] DEPRECATED use `project`. The bolt working directory. Defaults to `.`
   def_model_attribute :boltdir
 
   # @!attribute [rw] debug
@@ -28,6 +28,14 @@ class VagrantBolt::ConfigBuilder::Provisioner < ConfigBuilder::Model::Provisione
   # @return [Boolean] If the connection should check the host key on the remote host (linux)
   def_model_attribute :host_key_check
 
+  # @!attribute [rw] machine_alias
+  # @return [String] The alias of the machine to set in the bolt inventory
+  def_model_attribute :machine_alias
+
+  # @!attribute [rw] machine_name
+  # @return [String] The name of the machine to set in the bolt inventory
+  def_model_attribute :machine_name
+
   # @!attribute [rw] modulepath
   # @return [String] The path to the modules.
   def_model_attribute :modulepath
@@ -37,6 +45,7 @@ class VagrantBolt::ConfigBuilder::Provisioner < ConfigBuilder::Model::Provisione
   def_model_attribute :name
 
   # @!attribute [rw] nodes
+  # DEPRECATED. Use `targets` instead.
   # Note: The `node_list` will override this setting.
   # @return [Array<String, Symbol>, "ALL"] The nodes to run the task or plan on.
   # Valid values are an array of machine names or the string "ALL".
@@ -47,9 +56,9 @@ class VagrantBolt::ConfigBuilder::Provisioner < ConfigBuilder::Model::Provisione
   def_model_attribute :noop
 
   # @!attribute [rw] excludes
-  # Note: The `node_list` will override this setting.
-  # Note: This will be merged with `nodes`, with `excludes` taking precidence.
-  # @return [Array<String, Symbol>] The nodes to exclude from running this task or plan on.
+  # Note: The `target_list` will override this setting.
+  # Note: This will be merged with `targets`, with `excludes` taking precidence.
+  # @return [Array<String, Symbol>] The targets to exclude from running this task or plan on.
   # Valid values are an array of machine names.
   def_model_attribute :excludes
 
@@ -82,6 +91,10 @@ class VagrantBolt::ConfigBuilder::Provisioner < ConfigBuilder::Model::Provisione
   # @return [String] The path of the private_key to authenticate on the machine.
   def_model_attribute :private_key
 
+  # @!attribute [rw] project
+  # @return [String] The bolt working directory. Defaults to `.`
+  def_model_attribute :project
+
   # @!attribute [rw] run_as
   # @return [String] User to run as using privilege escalation.
   def_model_attribute :run_as
@@ -98,6 +111,17 @@ class VagrantBolt::ConfigBuilder::Provisioner < ConfigBuilder::Model::Provisione
   # @return [Boolean] If the connection should verify SSL on with WinRM (Windows)
   def_model_attribute :ssl_verify
 
+  # @!attribute [rw] targets
+  # Note: The `target_list` will override this setting.
+  # @return [Array<String, Symbol>, "ALL"] The targets to run the task or plan on.
+  # Valid values are an array of machine names or the string "ALL".
+  def_model_attribute :targets
+
+  # @!attribute [rw] target_list
+  # This setting overrides `targets` and needs to be in the `protocol://ipaddress:port` URI format
+  # @return [String] The bolt target list. This defaults to the current target.
+  def_model_attribute :target_list
+
   # @!attribute [rw] tmpdir
   # @return [String] The directory to upload and execute temporary files on the target
   def_model_attribute :tmpdir