vagrant-bolt 0.1.0 → 0.3.0

data/lib/vagrant-bolt/util/machine.rb

@@ -32,7 +32,7 @@ module VagrantBolt::Util
     # Generate a list of active machines in the environment
     # @param env [Object] The Environment
     # @return [Array<Object>]
-    def self.nodes_in_environment(env)
+    def self.machines_in_environment(env)
       env.active_machines.map { |vm|
         begin
           env.machine(*vm)

data/lib/vagrant-bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VagrantBolt
-  VERSION = '0.1.0'
+  VERSION = '0.3.0'
 end

data/spec/unit/config/bolt_spec.rb

@@ -72,6 +72,7 @@ describe VagrantBolt::Config::Bolt do
   context "defaults" do
     expected_values = {
       nodes: [],
+      targets: [],
       excludes: [],
     }
     expected_values.each do |val, expected|
@@ -86,6 +87,7 @@ describe VagrantBolt::Config::Bolt do
       "command",
       "params",
       "node_list",
+      "target_list",
       "user",
       "password",
       "port",
@@ -99,6 +101,8 @@ describe VagrantBolt::Config::Bolt do
       "verbose",
       "debug",
       "host_key_check",
+      "machine_alias",
+      "machine_name",
       "modulepath",
       "bolt_exe",
       "boltdir",

data/spec/unit/config/global_spec.rb

@@ -20,9 +20,12 @@ describe VagrantBolt::Config::Global do
   end
 
   context "defaults" do
+    before(:each) do
+      allow(File).to receive(:file?).with('/opt/puppetlabs/bin/bolt').and_return(true)
+    end
+
     expected_values = {
-      modulepath: "modules",
-      bolt_exe: "bolt",
+      bolt_exe: "/opt/puppetlabs/bin/bolt",
       boltdir: ".",
     }
     expected_values.each do |val, expected|
@@ -42,12 +45,14 @@ describe VagrantBolt::Config::Global do
       "run_as",
       "ssl",
       "ssl_verify",
+      "connect_timeout",
       "host_key_check",
       "verbose",
       "debug",
       "facts",
       "vars",
       "features",
+      "modulepath",
     ]
     expected_nil.each do |val|
       it "defaults #{val} to nil" do

data/spec/unit/runner/runner_spec.rb

@@ -28,13 +28,11 @@ describe VagrantBolt::Runner do
       allow(result).to receive(:stderr).and_return("")
     end
   end
-  let(:root_path) { '/root/path' }
-  let(:local_data_path) { '/local/data/path' }
-  let(:inventory_path) { "#{local_data_path}/bolt_inventory.yaml" }
+  let(:root_path) { Dir.getwd }
+  let(:local_data_path) { "#{root_path}/.vagrant" }
+  let(:inventory_path) { ".vagrant/bolt_inventory.yaml" }
   before(:each) do
     allow(VagrantBolt::Util::Bolt).to receive(:update_inventory_file).with(iso_env).and_return(inventory_path)
-    allow(iso_env).to receive(:root_path).and_return(root_path)
-    allow(iso_env).to receive(:local_data_path).and_return(local_data_path)
     allow(machine).to receive(:env).and_return(:iso_env)
     allow(machine).to receive(:ssh_info).and_return(
       host: 'foo',
@@ -48,7 +46,7 @@ describe VagrantBolt::Runner do
 
   context 'setup_overrides' do
     before(:each) do
-      allow(VagrantBolt::Util::Machine).to receive(:nodes_in_environment).with(iso_env).and_return([machine, machine2])
+      allow(VagrantBolt::Util::Machine).to receive(:machines_in_environment).with(iso_env).and_return([machine, machine2])
     end
     it 'adds the command and name to the config' do
       result = subject.send(:setup_overrides, 'task', 'foo')
@@ -56,31 +54,47 @@ describe VagrantBolt::Runner do
       expect(result.name).to eq('foo')
     end
 
-    it 'uses the server name for the nodes' do
+    it 'uses the server name for the targets' do
       result = subject.send(:setup_overrides, 'task', 'foo')
-      expect(result.node_list).to eq('server')
+      expect(result.target_list).to eq('server')
     end
 
-    it 'allows for using multiple nodes' do
+    it 'allows for using multiple targets' do
+      config.targets = ['server', 'server2']
+      config.finalize!
+      result = subject.send(:setup_overrides, 'task', 'foo')
+      expect(result.target_list).to eq('server,server2')
+    end
+
+    it 'allows for using nodes parameter' do
       config.nodes = ['server', 'server2']
       config.finalize!
       result = subject.send(:setup_overrides, 'task', 'foo')
-      expect(result.node_list).to eq('server,server2')
+      expect(result.target_list).to eq('server,server2')
     end
 
-    it 'adds all nodes when "all" is specified' do
-      config.nodes = 'all'
+    it 'adds all targets when "all" is specified' do
+      config.targets = 'all'
       config.finalize!
       result = subject.send(:setup_overrides, 'task', 'foo')
-      expect(result.node_list).to eq('server,server2')
+      expect(result.target_list).to eq('server,server2')
     end
 
     it 'does not override specified ssh settings' do
+      config.target_list = 'ssh://test:22'
+      config.user = 'root'
+      config.finalize!
+      result = subject.send(:setup_overrides, 'task', 'foo')
+      expect(result.target_list).to eq('ssh://test:22')
+      expect(result.user).to eq('root')
+    end
+
+    it 'target_list defaults to node_list' do
       config.node_list = 'ssh://test:22'
       config.user = 'root'
       config.finalize!
       result = subject.send(:setup_overrides, 'task', 'foo')
-      expect(result.node_list).to eq('ssh://test:22')
+      expect(result.target_list).to eq('ssh://test:22')
       expect(result.user).to eq('root')
     end
 
@@ -94,6 +108,8 @@ describe VagrantBolt::Runner do
     let(:options) { { notify: [:stdout, :stderr], env: { PATH: nil } } }
     before(:each) do
       allow(Vagrant::Util::Subprocess).to receive(:execute).and_return(subprocess_result)
+      allow(iso_env).to receive(:root_path).and_return(root_path)
+      allow(iso_env).to receive(:local_data_path).and_return(local_data_path)
     end
 
     it 'does not raise an exeption when all parameters are specified' do
@@ -110,11 +126,10 @@ describe VagrantBolt::Runner do
 
     it 'creates a shell execution' do
       config.bolt_exe = 'bolt'
-      config.modulepath = 'modules'
       config.boltdir = '.'
-      config.node_list = 'ssh://test:22'
+      config.target_list = 'ssh://test:22'
       config.finalize!
-      command = "bolt task run 'foo' --boltdir '#{root_path}/.' --modulepath '#{root_path}/modules' --inventoryfile '#{inventory_path}' --nodes 'ssh://test:22'"
+      command = "bolt task run 'foo' --boltdir '.' --inventoryfile '#{inventory_path}' --targets 'ssh://test:22'"
       expect(Vagrant::Util::Subprocess).to receive(:execute).with('bash', '-c', command, options).and_return(subprocess_result)
       subject.run('task', 'foo')
     end

data/spec/unit/util/bolt_spec.rb

@@ -26,9 +26,9 @@ describe VagrantBolt::Util::Bolt do
     end
     let(:machine_hash) do
       {
-        "alias" => "machine",
         "config" => {
           "ssh" => {
+            "connect-timeout" => "30",
             "host-key-check" => false,
             "port" => "22",
             "user" => "vagrant",
@@ -38,8 +38,10 @@ describe VagrantBolt::Util::Bolt do
           },
           "transport" => "ssh",
         },
-        "name" => "ssh://machine:22",
+        "uri" => "ssh://machine:22",
         "facts" => { 'a' => 'b' },
+        "alias" => 'machine',
+        "name" => 'somename',
         "vars" => { 'foo' => 'bar' },
         "features" => ['foo'],
       }
@@ -47,8 +49,9 @@ describe VagrantBolt::Util::Bolt do
     let(:config_hash) { { 'config' => { 'a' => 'b' } } }
     let(:node_hash) do
       {
-        'nodes' => [machine_hash],
+        'targets' => [machine_hash],
         'config' => config_hash['config'],
+        'version' => 2,
       }
     end
     before(:each) do
@@ -56,11 +59,13 @@ describe VagrantBolt::Util::Bolt do
       config.run_as = 'root'
       config.port = '22'
       config.private_key = 'bar'
+      config.connect_timeout = '30'
       config.host_key_check = false
       config.user = 'vagrant'
       config.facts = { 'a' => 'b' }
       config.features = ['foo']
       config.vars = { 'foo' => 'bar' }
+      config.machine_name = 'somename'
       config.finalize!
       allow(machine).to receive_message_chain("config.bolt.inventory_config").and_return(config.inventory_config)
       allow(machine).to receive_message_chain("config.vm.communicator").and_return(:ssh)
@@ -68,7 +73,7 @@ describe VagrantBolt::Util::Bolt do
       allow(env).to receive_message_chain("vagrantfile.config.bolt.inventory_config").and_return(config_hash)
       allow(env).to receive(:active_machines).and_return(['machine'])
       allow(env).to receive(:machine).and_return(machine)
-      allow_any_instance_of(VagrantBolt::Util::Machine).to receive(:nodes_in_environment).with(env).and_return([machine])
+      allow_any_instance_of(VagrantBolt::Util::Machine).to receive(:machines_in_environment).with(env).and_return([machine])
       allow_any_instance_of(VagrantBolt::Util::Machine).to receive(:running?).with(machine).and_return(true)
     end
 
@@ -93,7 +98,7 @@ describe VagrantBolt::Util::Bolt do
       config.node_list = 'ssh://test:22'
       config.user = 'user'
       config.finalize!
-      expected = "bolt task run 'foo' --user \'user\' --inventoryfile '#{inventory_path}' --nodes \'ssh://test:22\'"
+      expected = "bolt task run 'foo' --user \'user\' --inventoryfile '#{inventory_path}' --targets \'ssh://test:22\'"
       expect(subject.generate_bolt_command(config, inventory_path)).to eq(expected)
     end
 

data/tasks/changelog.rake

@@ -0,0 +1,8 @@
+require 'github_changelog_generator/task'
+require_relative '../lib/vagrant-bolt/version'
+
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.user ='oscar-stack'
+  config.project = 'vagrant-bolt'
+  config.future_release = "v#{VagrantBolt::VERSION}"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bolt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jarret Lavallee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies: []
 description: "  Vagrant provisioning with Puppet Bolt\n"
 email:
@@ -22,6 +22,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - Puppetfile
@@ -79,6 +80,7 @@ files:
 - spec/unit/util/config_spec.rb
 - spec/unit/vagrant_spec.rb
 - tasks/acceptance.rake
+- tasks/changelog.rake
 - tasks/spec.rake
 - templates/locales/en.yml
 - vagrant-bolt.gemspec
@@ -102,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Vagrant provisioning with Puppet Bolt