vagrant-vbguest 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b27a5ae31772514333af8356ddfa5ba9ea6cb05
-  data.tar.gz: 37b68594a7cf11c076a44e436dec2a97d7d999be
+  metadata.gz: 1d20be627ba0f10f4fd74c955394e603e24ef935
+  data.tar.gz: b507d3d65e94b24602af54cefb612e6313717543
 SHA512:
-  metadata.gz: ec93a07e1ff58cbcb36e5e6c24e8af7da531e91aeadeb79f18fbdf54650b32c814e108b3bc5d06d9dc6c7058759ea3a3b386634cc8c83aedc7549e67a59a08d2
-  data.tar.gz: fbf60f60582c323fa197762e8ff090a371775fdcaf8da052441cc6c45603c7590b7a8744c55f3262211b21e6f29619b5fc81f7cb3b67e26f93fa4c3aa2fa1b88
+  metadata.gz: dff39441e77b8107ae61235a2e1bd426040db87b343ca8053e5294a5c587e18fa9982e0dcc40853586224042d48da200307ddd9f93ead601dc29f9c7549e061a
+  data.tar.gz: 83afe84d3dcf534e6ccc37f9b99528efa7c77680c30be4dba54d0c1f3145830aa8c46e8ef0ca1c6572ae5f56525aabda12d8869ea10f5d54a334904e2789face

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.17.1 (2018-12-20)
+
+- CentOS keeps default redhat dependencies if kernel-devel-`uname -r` exists [GH-318]
+
 ## 0.17.0 (2018-12-13)
 
 No changes to 0.17.0.beta2

data/lib/vagrant-vbguest/installers/archlinux.rb

@@ -21,8 +21,7 @@ module VagrantVbguest
       end
 
       def dependencies
-        packages = ['gcc', 'dkms', 'make', 'bzip2']
-        packages.join ' '
+        ['gcc', 'dkms', 'make', 'bzip2'].join(' ')
       end
     end
   end

data/lib/vagrant-vbguest/installers/centos.rb

@@ -9,26 +9,29 @@ module VagrantVbguest
       # Install missing deps and yield up to regular linux installation
       def install(opts=nil, &block)
         install_kernel_deps(opts, &block)
-        super(opts=nil, &block)
+        super
       end
 
       protected
+
       def install_kernel_deps(opts=nil, &block)
-        unless check_devel_info
-          release = release_version
+        unless has_kernel_devel_info?
           update_release_repos(opts, &block)
-          install_kernel_devel(release)
+          install_kernel_devel(opts, &block)
         end
       end
 
-      def check_devel_info
-        communicate.test('yum info kernel-devel-`uname -r`', { sudo: true })
+      def has_kernel_devel_info?
+        unless instance_variable_defined?(:@has_kernel_devel_info)
+          @has_kernel_devel_info = communicate.test('yum info kernel-devel-`uname -r`', sudo: true)
+        end
+        @has_kernel_devel_info
       end
 
       def release_version
         release = nil
         communicate.sudo('cat /etc/centos-release') do |type, data|
-         release = data.to_s[/(\d+\.\d+\.\d+)/, 1]
+          release = data.to_s[/(\d+\.\d+\.\d+)/, 1]
         end
         release
       end
@@ -37,17 +40,20 @@ module VagrantVbguest
         communicate.sudo('yum install -y centos-release', opts, &block)
       end
 
-      def install_kernel_devel(rel, opts=nil, &block)
-        communicate.sudo(
-            "yum install -y kernel-devel-`uname -r` --enablerepo=C#{rel}-base --enablerepo=C#{rel}-updates",
-            opts,
-            &block
-        )
+      def install_kernel_devel(opts=nil, &block)
+        rel = release_version
+        cmd = "yum install -y kernel-devel-`uname -r` --enablerepo=C#{rel}-base --enablerepo=C#{rel}-updates"
+        communicate.sudo(cmd, opts, &block)
       end
 
       def dependencies
-        packages = [ 'gcc', 'binutils', 'make', 'perl', 'bzip2' ]
-        packages.join ' '
+        if has_kernel_devel_info?
+          # keep the original redhat dependencies
+          super
+        else
+          # we should have installed kernel-devel-`uname -r` via install_kernel_devel
+          ['gcc', 'binutils', 'make', 'perl', 'bzip2'].join(' ')
+        end
       end
     end
   end

data/lib/vagrant-vbguest/installers/fedora.rb

@@ -19,8 +19,7 @@ module VagrantVbguest
       end
 
       def dependencies
-        packages = ['kernel-devel-`uname -r`', 'gcc', 'dkms', 'make', 'perl', 'bzip2']
-        packages.join ' '
+        ['kernel-devel-`uname -r`', 'gcc', 'dkms', 'make', 'perl', 'bzip2'].join(' ')
       end
     end
   end

data/lib/vagrant-vbguest/installers/opensuse.rb

@@ -15,7 +15,7 @@ module VagrantVbguest
 
     protected
       def self.has_zypper?(vm)
-        communicate_to(vm).test "which zypper"
+        communicate_to(vm).test("which zypper")
       end
 
       def install_dependencies_cmd
@@ -23,8 +23,7 @@ module VagrantVbguest
       end
 
       def dependencies
-        packages = ['devel_C_C++', 'devel_basis', 'devel_kernel']
-        packages.join ' '
+        ['devel_C_C++', 'devel_basis', 'devel_kernel'].join(' ')
       end
     end
   end

data/lib/vagrant-vbguest/installers/oracle.rb

@@ -10,8 +10,7 @@ module VagrantVbguest
       protected
 
       def dependencies
-        packages = ['kernel-uek-devel-`uname -r`', 'gcc', 'make', 'perl', 'bzip2']
-        packages.join ' '
+        ['kernel-uek-devel-`uname -r`', 'gcc', 'make', 'perl', 'bzip2'].join(' ')
       end
     end
   end

data/lib/vagrant-vbguest/installers/redhat.rb

@@ -20,10 +20,15 @@ module VagrantVbguest
       end
 
       def dependencies
-        packages = [
-          'kernel-devel', 'kernel-devel-`uname -r`', 'gcc', 'binutils', 'make', 'perl', 'bzip2'
-        ]
-        packages.join ' '
+        [
+          'kernel-devel',
+          'kernel-devel-`uname -r`',
+          'gcc',
+          'binutils',
+          'make',
+          'perl',
+          'bzip2'
+        ].join(' ')
       end
     end
   end

data/lib/vagrant-vbguest/installers/suse.rb

@@ -28,7 +28,6 @@ module VagrantVbguest
         "zypper --non-interactive install #{dependencies}"
       end
 
-
       def dependencies
         packages = case os_release["VERSION_ID"].to_f
                    when 10..11.4
@@ -37,7 +36,7 @@ module VagrantVbguest
                      ['kernel-devel', 'gcc', 'make', 'tar']
                    end
 
-        packages.join ' '
+        packages.join(' ')
       end
     end
   end

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.17.0"
+  VERSION = "0.17.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine