beaker-vagrant 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 442e5662e70ec7b271fe5bc069c9b21f302db394
-  data.tar.gz: 4ea668eb97e1fb2cea88cff369b01cff7b490973
+  metadata.gz: 74c1cb569c6a0c707030b00ca1a05d16642a0c53
+  data.tar.gz: 91b7008f99327d8e84d668a289430b52b9c4e642
 SHA512:
-  metadata.gz: 0d213b0730388cadf6e92389468f3b5613aa7562b4a484865339f410e695b7085852c2640858667954ba40cb781407c6d28606131eff2b6dbd55c160e9e2aa97
-  data.tar.gz: 8d98786ed2aae6b82002567fab605e1ceb9ad28cff7dcbde1b9c0c59c6b1a95b67f30c5ff5e6669115218b6b4e0cc425e759708af98c21366bcbb56889ae5a9b
+  metadata.gz: 6d9fa34cb3d014bb41bfe680a76a7814d9bf163573e3d86fa5cdab6b3bb32c6743d2357fda231ca157c74f196fe15dfe653d8ebf054e2d6a79c32adcae0838e0
+  data.tar.gz: e64456d0bc01007038eadb0eaa94355818b8f6da4d58ac45373f9be98e22e14183bd01a75ba4888dad6345161d995c82eea9bc110dbf8f003d5fba90d9274bec

data/lib/beaker-vagrant/version.rb

@@ -1,3 +1,3 @@
 module BeakerVagrant
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/beaker/hypervisor/vagrant.rb

@@ -23,11 +23,14 @@ module Beaker
       private_network_string = "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"#{host['netmask'] ||= "255.255.0.0"}\""
       case host['network_mac']
       when 'false'
+        @mac = randmac
         private_network_string << "\n"
       when nil
-        private_network_string << ", :mac => \"#{randmac}\"\n"
+        @mac = randmac
+        private_network_string << ", :mac => \"#{@mac}\"\n"
       else
-        private_network_string << ", :mac => \"#{host['network_mac']}\"\n"
+        @mac = host['network_mac']
+        private_network_string << ", :mac => \"#{@mac}\"\n"
       end
     end
 
@@ -103,6 +106,7 @@ module Beaker
           else
             v_file << "    v.vm.synced_folder '.', '/vagrant', :nfs => true\n"
           end
+          v_file << "    v.vm.base_mac = '#{@mac}'\n"
         end
 
         v_file << self.class.provider_vfile_section(host, options)

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -187,6 +187,30 @@ EOF
       end
     end
 
+    context 'when generating a freebsd config' do
+      before do
+        path = vagrant.instance_variable_get( :@vagrant_path )
+        allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
+        @hosts[0][:platform] = 'freebsd'
+
+        vagrant.make_vfile( @hosts )
+
+        @generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
+      end
+
+      it 'has the proper ssh shell' do
+        expect( @generated_file ).to match /v.ssh.shell = 'sh'\n/
+      end
+
+      it 'has the proper guest setting' do
+        expect( @generated_file ).to match /v.vm.guest = :freebsd\n/
+      end
+
+      it 'sets the vm.base_mac setting' do
+        expect( @generated_file ).to match /v.vm.base_mac = '0123456789'\n/
+      end
+    end
+
     it "uses the memsize defined per vagrant host" do
       path = vagrant.instance_variable_get( :@vagrant_path )
       allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec