beaker-vagrant 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93a9b37ab076dd6a9f96004ac770392207eb44716d0982e6b2e75ffbc0b50cde
-  data.tar.gz: dfa41a6583033d37700edecdfcb7b4bbe0bb436bdd0530ac8bdf3d36067a156e
+  metadata.gz: cc3033b00b34521daab9d6221f02c1514cffaff1c64863dcb5643bf964e28f10
+  data.tar.gz: be554ffaf55e253e2ef2c61f86c3b9fec52f043f3ce496d1eb5c898e4c4c9da2
 SHA512:
-  metadata.gz: bb3a8b395078572279174074bc7d99b1da50f3a1d69853e0ba5b9a2cccb4c76398b5320fb907e3684980d7a7b55877402c4fc2aa8839b02057ee7fa2ffea3267
-  data.tar.gz: 99c44d83a570b5c71a61904fb62dfa7017af1ed7b01126543829e548c078a3c51c12ba170db84c2dc343f382e7a277949be9c77334bb60313274b1621b77a2cf
+  metadata.gz: bf38bd6c73c279461c5f9f8a9334a5bbbfb37658dfb0e8463b861fdfbd6c81e1c0132fd8a865a5c3ad08766a89f1ec1792bde7457d9a7d258e2891d5061537c3
+  data.tar.gz: 54d4ecc9660e53f1c49a1e786407ed1c5c20461fc3ff6756cfe1699d91468c0c9fa01b4e5717258d6f70454e825c8d5fda7ec65d3a3ec17bc49365364b57a122

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10

data/.github/workflows/test.yml

@@ -0,0 +1,32 @@
+name: Test
+
+on:
+  - pull_request
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "2.4"
+          - "2.5"
+          - "2.6"
+          - "2.7"
+    env:
+      BUNDLE_WITHOUT: release
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run spec tests
+        run: bundle exec rake test:spec
+      # It seems some additonal setup of Docker may be needed for
+      # the acceptance tests to work.
+      # - name: Run acceptance tests
+      #   run: bundle exec rake test:acceptance

data/.rspec

@@ -1,3 +1,4 @@
 --format documentation
 --color
 --tty
+--fail-fast

data/Rakefile

@@ -6,14 +6,14 @@ namespace :test do
 
     desc "Run spec tests"
     RSpec::Core::RakeTask.new(:run) do |t|
-      t.rspec_opts = ['--color']
+      t.rspec_opts = ['--color', '--format documentation']
       t.pattern = 'spec/'
     end
 
     desc "Run spec tests with coverage"
     RSpec::Core::RakeTask.new(:coverage) do |t|
       ENV['BEAKER_TEMPLATE_COVERAGE'] = 'y'
-      t.rspec_opts = ['--color']
+      t.rspec_opts = ['--color', '--format documentation']
       t.pattern = 'spec/'
     end
 

data/lib/beaker-vagrant/version.rb

@@ -1,3 +1,3 @@
 module BeakerVagrant
-  VERSION = '0.6.6'
+  VERSION = '0.6.7'
 end

data/lib/beaker/hypervisor/vagrant.rb

@@ -16,8 +16,13 @@ module Beaker
       (2 + rand(252)).to_s #don't want a 0, 1, or a 255
     end
 
-    def randip
-      "10.255.#{rand_chunk}.#{rand_chunk}"
+    def randip(hypervisor=nil)
+      case hypervisor
+      when /libvirt/
+        "10.254.#{rand_chunk}.#{rand_chunk}"
+      else
+        "10.255.#{rand_chunk}.#{rand_chunk}"
+      end
     end
 
     def private_network_generator(host)
@@ -57,7 +62,7 @@ module Beaker
 
       hosts.each do |host|
         host.name.tr!('_','-') # Rewrite Hostname with hyphens instead of underscores to get legal hostname
-        host['ip'] ||= randip #use the existing ip, otherwise default to a random ip
+        host['ip'] ||= randip(host.host_hash[:hypervisor]) #use the existing ip, otherwise default to a random ip
         v_file << "  c.vm.define '#{host.name}' do |v|\n"
         v_file << "    v.vm.hostname = '#{host.name}'\n"
         v_file << "    v.vm.box = '#{host['box']}'\n"
@@ -136,6 +141,9 @@ module Beaker
         @logger.debug "created Vagrantfile for VagrantHost #{host.name}"
       end
       v_file << "end\n"
+
+      # In case this is called directly
+      FileUtils.mkdir_p(@vagrant_path)
       File.open(@vagrant_file, 'w') do |f|
         f.write(v_file)
       end
@@ -232,8 +240,7 @@ module Beaker
       @logger = options[:logger]
       @temp_files = []
       @hosts = vagrant_hosts
-      @vagrant_path = File.expand_path(File.join(File.basename(__FILE__), '..', '.vagrant', 'beaker_vagrant_files', File.basename(options[:hosts_file])))
-      FileUtils.mkdir_p(@vagrant_path)
+      @vagrant_path = File.expand_path(File.join(File.basename(__FILE__), '..', '.vagrant', 'beaker_vagrant_files', 'beaker_' + File.basename(options[:hosts_file])))
       @vagrant_file = File.expand_path(File.join(@vagrant_path, "Vagrantfile"))
       @vagrant_env = { "RUBYLIB" => "", "RUBYOPT" => "" }
     end
@@ -254,6 +261,8 @@ module Beaker
     end
 
     def provision(provider = nil)
+      FileUtils.mkdir_p(@vagrant_path)
+
       #setting up new vagrant hosts
       #make sure that any old boxes are dead dead dead
       begin

data/lib/beaker/hypervisor/vagrant_libvirt.rb

@@ -16,6 +16,12 @@ class Beaker::VagrantLibvirt < Beaker::Vagrant
   end
 
   def provision(provider = 'libvirt')
+    # This needs to be unique for every system with the same hostname but does
+    # not affect VirtualBox
+    vagrant_path_digest = Digest::SHA256.hexdigest(@vagrant_path)
+    @vagrant_path = @vagrant_path + '_' + vagrant_path_digest[0..2] + vagrant_path_digest[-3..-1]
+    @vagrant_file = File.expand_path(File.join(@vagrant_path, "Vagrantfile"))
+
     super
   end
 

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -29,11 +29,11 @@ module Beaker
       })
     end
 
-    it "stores the vagrant file in $WORKINGDIR/.vagrant/beaker_vagrant_files/sample.cfg" do
+    it "stores the vagrant file in $WORKINGDIR/.vagrant/beaker_vagrant_files/beaker_sample.cfg" do
       allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
       path = vagrant.instance_variable_get( :@vagrant_path )
 
-      expect( path ).to be === File.join(Dir.pwd, '.vagrant', 'beaker_vagrant_files', 'sample.cfg')
+      expect( path ).to be === File.join(Dir.pwd, '.vagrant', 'beaker_vagrant_files', 'beaker_sample.cfg')
 
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -144,10 +144,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".simplecov"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -196,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Beaker DSL Extension Helpers!

data/.travis.yml

@@ -1,14 +0,0 @@
----
-os:
-  - linux
-before_install:
-  - gem update --system 2.2.1
-  - gem --version
-language: ruby
-script: "bundle exec rake test:spec:run"
-notifications:
-  email: false
-rvm:
-  - 2.6
-  - 2.5
-  - 2.4