vagrant-vbguest 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc1f6f2bd15b21df77135855d0e54bdcb9fd55fe
-  data.tar.gz: a061a813e16a494c9326d0a2f075dfde2a249541
+  metadata.gz: ec63b20919df037edfd5cc748964d9285308c0f9
+  data.tar.gz: 7c1c9a39baa48fd06d6a63849f278759bf437125
 SHA512:
-  metadata.gz: 8da979cc83735bbcca444ca81c35e0fd9b14fc0d1e0cd22b9f9bc1b9b5c5103d69036b81e2f9189d24ba0de169cbeb0a522c91c4c0e540a249705c2570e5c14d
-  data.tar.gz: fd8f2ffad4995dc674d3fe8e63609b2f62bd86c738735c6cff1c2794113a679c0ad84e89c0778b7949085ad38256c6b736bb4494ad1d7a58b30da879b583b62d
+  metadata.gz: 08db7ea5d28c561e1d7020e49d2c156fb79a7f92f0a9cda5cd88b2eddb223f962ad12c813e9a1105408239ec2d9987f2fdd6933823969e89148407fa2b79c78e
+  data.tar.gz: 66df0d6f87b027c563bd9a4167402510170ac527180e6d0e32b399289e621f59c879f55d1790c7cf74c4ced1f51a94c4c1cf59c74f647cf99c2433640d117d8d

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.13.0 (2016-08-12)
+
+- Fix a bug introduced by upgrading "micormachine". Thanks @omenlabs for [GH-225]
+- Fix a typo in a local variable. Thanks @vdloo for [GH-227]
+- Add a Arch Linux specific installer. Thanks @vdloo, also for fixing some typos in [GH-229]
+- Add a SUSE Linux Enterprise Server (sles) specific installer to address [GH-219] and [GH-216]. Thanks @vpereira, @glookie1 for the hard digging. Thanks @vpereira for [GH-219]. Thanks @bkeepers for the dontenv project, from which I stole it's parser.
+
 ## 0.12.0 (2016-06-16)
 
 - Fix version comparison when version is reported with revision. Thanks @apeabody for [GH-179], [GH-201]

data/lib/vagrant-vbguest.rb

@@ -11,6 +11,8 @@ I18n.reload!
 require "vagrant-vbguest/errors"
 require 'vagrant-vbguest/vagrant_compat'
 
+require 'vagrant-vbguest/helpers'
+
 require 'vagrant-vbguest/machine'
 
 require 'vagrant-vbguest/hosts/base'
@@ -25,6 +27,8 @@ require 'vagrant-vbguest/installers/redhat'
 require 'vagrant-vbguest/installers/oracle'
 require 'vagrant-vbguest/installers/fedora'
 require 'vagrant-vbguest/installers/opensuse'
+require 'vagrant-vbguest/installers/suse'
+require 'vagrant-vbguest/installers/archlinux'
 
 require 'vagrant-vbguest/middleware'
 

data/lib/vagrant-vbguest/helpers.rb

@@ -0,0 +1,6 @@
+module VagrantVbguest
+  module Helpers
+  end
+end
+
+require 'vagrant-vbguest/helpers/os_release'

data/lib/vagrant-vbguest/helpers/os_release.rb

@@ -0,0 +1,177 @@
+# This file uses a the parsing component of the environment file parser
+# dotenv (https://github.com/bkeepers/dotenv) in order to parse the
+# `/etc/os-release` file of systemd, which uses loosely the same format.
+#
+# This parser will only substitute env variables in values which are already
+# present in the parsed Hash. The original parser would try to read it's value
+# from the `ENV` the process is running in. We would need to run this on the
+# vagrant guest.
+#
+# Example:
+#
+#     FOO=123
+#     BAR=$FOO  # => `"BAR" => "123"`
+#     BAZ=$ZORT # => `"BAZ" => "$ZORT"
+#
+# This parser will *not* try to substitute shell commands in a value, since it
+# would require us to let it run on the guest system.
+#
+# Example:
+#
+#     SHA=$(git rev-parse HEAD) # => "SHA"=>"$(git rev-parse HEAD)"
+#
+
+# The original code (https://github.com/bkeepers/dotenv) was licensed under:
+#
+# Copyright (c) 2012 Brandon Keepers
+#
+# MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require "English"
+
+module VagrantVbguest
+  module Helpers
+    module OsRelease
+      class FormatError < SyntaxError; end
+
+      module Substitutions
+        # Substitute variables in a value.
+        #
+        #   HOST=example.com
+        #   URL="https://$HOST"
+        #
+        module Variable
+          class << self
+            VARIABLE = /
+              (\\)?         # is it escaped with a backslash?
+              (\$)          # literal $
+              (?!\()        # shouldnt be followed by paranthesis
+              (\{)?         # allow brace wrapping
+              ([A-Z0-9_]+)? # optional alpha nums
+              (\})?         # closing brace
+            /xi
+
+            def call(value, env)
+              value.gsub(VARIABLE) do |variable|
+                match = $LAST_MATCH_INFO
+
+                if match[1] == '\\'
+                  variable[1..-1]
+                elsif match[4]
+                  env.fetch(match[4]) { match[2..5].join }
+                else
+                  variable
+                end
+              end
+            end
+          end
+        end
+      end
+
+      # This class enables parsing of a string for key value pairs to be returned
+      # and stored in the Environment. It allows for variable substitutions and
+      # exporting of variables.
+      class Parser
+        @substitutions = [Substitutions::Variable]
+
+        LINE = /
+          \A
+          (?:export\s+)?    # optional export
+          ([\w\.]+)         # key
+          (?:\s*=\s*|:\s+?) # separator
+          (                 # optional value begin
+            '(?:\'|[^'])*'  #   single quoted value
+            |               #   or
+            "(?:\"|[^"])*"  #   double quoted value
+            |               #   or
+            [^#\n]+         #   unquoted value
+          )?                # value end
+          (?:\s*\#.*)?      # optional comment
+          \z
+        /x
+
+        class << self
+          attr_reader :substitutions
+
+          def call(string)
+            new(string).call
+          end
+        end
+
+        def initialize(string)
+          @string = string
+          @hash = {}
+        end
+
+        def call
+          @string.split(/[\n\r]+/).each do |line|
+            parse_line(line)
+          end
+          @hash
+        end
+
+        private
+
+        def parse_line(line)
+          if (match = line.match(LINE))
+            key, value = match.captures
+            @hash[key] = parse_value(value || "")
+          elsif line.split.first == "export"
+            if variable_not_set?(line)
+              raise FormatError, "Line #{line.inspect} has an unset variable"
+            end
+          elsif line !~ /\A\s*(?:#.*)?\z/ # not comment or blank line
+            raise FormatError, "Line #{line.inspect} doesn't match format"
+          end
+        end
+
+        def parse_value(value)
+          # Remove surrounding quotes
+          value = value.strip.sub(/\A(['"])(.*)\1\z/, '\2')
+
+          if Regexp.last_match(1) == '"'
+            value = unescape_characters(expand_newlines(value))
+          end
+
+          if Regexp.last_match(1) != "'"
+            self.class.substitutions.each do |proc|
+              value = proc.call(value, @hash)
+            end
+          end
+          value
+        end
+
+        def unescape_characters(value)
+          value.gsub(/\\([^$])/, '\1')
+        end
+
+        def expand_newlines(value)
+          value.gsub('\n', "\n").gsub('\r', "\r")
+        end
+
+        def variable_not_set?(line)
+          !line.split[1..-1].all? { |var| @hash.member?(var) }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module VagrantVbguest
+  module Installers
+    class Archlinux < Linux
+
+      def self.match?(vm)
+        :arch == self.distro(vm)
+      end
+
+      # Install missing deps and yield up to regular linux installation
+      def install(opts=nil, &block)
+        # Update the package list
+        communicate.sudo("pacman -Sy", opts, &block)
+        # Install the dependencies
+        communicate.sudo(install_dependencies_cmd, opts, &block)
+        super
+      end
+
+      protected
+      def install_dependencies_cmd
+        "pacman -S #{dependencies} --noconfirm --needed"
+      end
+
+      def dependencies
+        packages = ['gcc', 'dkms', 'make', 'bzip2']
+        packages.join ' '
+      end
+    end
+  end
+end
+VagrantVbguest::Installer.register(VagrantVbguest::Installers::Archlinux, 5)

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

@@ -6,9 +6,9 @@ module VagrantVbguest
         /\Adebian\d*\Z/ =~ self.distro(vm)
       end
 
-      # installes the correct linux-headers package
-      # installes `dkms` package for dynamic kernel module loading
-      # @param opts [Hash] Optional options Hash wich meight get passed to {Vagrant::Communication::SSH#execute} and firends
+      # installs the correct linux-headers package
+      # installs `dkms` package for dynamic kernel module loading
+      # @param opts [Hash] Optional options Hash which might get passed to {Vagrant::Communication::SSH#execute} and friends
       # @yield [type, data] Takes a Block like {Vagrant::Communication::Base#execute} for realtime output of the command being executed
       # @yieldparam [String] type Type of the output, `:stdout`, `:stderr`, etc.
       # @yieldparam [String] data Data for the given output.
@@ -29,7 +29,7 @@ module VagrantVbguest
 
       def dependencies
         packages = ['linux-headers-`uname -r`']
-        # some Debian system (lenny) dont come with a dkms packe so we neet to skip that.
+        # some Debian system (lenny) don't come with a dkms package so we need to skip that.
         # apt-cache search will exit with 0 even if nothing was found, so we need to grep.
         packages << 'dkms' if communicate.test('apt-cache search --names-only \'^dkms$\' | grep dkms')
         packages.join ' '

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

@@ -12,8 +12,8 @@ module VagrantVbguest
       # @see {Vagrant::Guest::Linux#distro_dispatch}
       # @return [Symbol] One of `:debian`, `:ubuntu`, `:gentoo`, `:fedora`, `:redhat`, `:suse`, `:arch`
       def self.distro(vm)
-        @@ditro ||= {}
-        @@ditro[ vm_id(vm) ] ||= distro_name vm
+        @@distro ||= {}
+        @@distro[ vm_id(vm) ] ||= distro_name vm
       end
 
       # Matches if the operating system name prints "Linux"
@@ -27,6 +27,29 @@ module VagrantVbguest
         communicate_to(vm).test("uname | grep 'Linux'")
       end
 
+      # Reads the `/etc/os-release` for the given `Vagrant::VM` if present, and
+      # returns it's config as a parsed Hash. The result is cached on a per-vm basis.
+      #
+      # @return [Hash|nil] The os-release configuration as Hash, or `nil if file is not present or not parsable.
+      def self.os_release(vm)
+        @@os_release_info ||= {}
+        if !@@os_release_info.has_key?(vm_id(vm)) && communicate_to(vm).test("test -f /etc/os-release")
+          osr_raw = communicate_to(vm).download("/etc/os-release")
+          osr_parsed = begin
+            VagrantVbguest::Helpers::OsRelease::Parser.(osr_raw)
+          rescue VagrantVbguest::Helpers::OsRelease::FormatError => e
+            vm.env.ui.warn(e.message)
+            nil
+          end
+          @@os_release_info[vm_id(vm)] = osr_parsed
+        end
+        @@os_release_info[vm_id(vm)]
+      end
+
+      def os_release
+        self.class.os_release(vm)
+      end
+
       # The temporary path where to upload the iso file to.
       # Configurable via `config.vbguest.iso_upload_path`.
       # Defaults the temp path to `/tmp/VBoxGuestAdditions.iso" for
@@ -37,7 +60,7 @@ module VagrantVbguest
 
       # Mount point for the iso file.
       # Configurable via `config.vbguest.iso_mount_point`.
-      #Ddefaults to "/mnt" for all Linux based systems.
+      # defaults to "/mnt" for all Linux based systems.
       def mount_point
         options[:iso_mount_point] || '/mnt'
       end
@@ -83,7 +106,7 @@ module VagrantVbguest
 
         communicate.sudo('VBoxService --version', :error_check => false) do |type, data|
           service_version = data.to_s[/^(\d+\.\d+.\d+)/, 1]
-          if service_version 
+          if service_version
             if driver_version != service_version
               @env.ui.warn(I18n.t("vagrant_vbguest.guest_version_reports_differ", :driver => driver_version, :service => service_version))
             end

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

@@ -0,0 +1,45 @@
+module VagrantVbguest
+  module Installers
+    class Suse < Linux
+      # To distingish between OpenSuse and SLEs (both shows up as "suse"),
+      # check for presence of the zypper and entry on os-release
+
+      def self.match?(vm)
+        :suse == self.distro(vm) && has_zypper?(vm) && sles?(vm)
+      end
+
+      # Install missing deps and yield up to regular linux installation
+      def install(opts=nil, &block)
+        communicate.sudo(install_dependencies_cmd, opts, &block)
+        super
+      end
+
+    protected
+      def self.sles?(vm)
+        osr = self.os_release(vm)
+        osr && osr["ID"] == "sles"
+      end
+
+      def self.has_zypper?(vm)
+        communicate_to(vm).test "which zypper"
+      end
+
+      def install_dependencies_cmd
+        "zypper --non-interactive install #{dependencies}"
+      end
+
+
+      def dependencies
+        packages = case os_release["VERSION_ID"].to_f
+                   when 10..11.4
+                     ['kernel-default-devel', 'gcc', 'make', 'tar']
+                   when 12.0..13.0
+                     ['kernel-devel', 'gcc', 'make', 'tar']
+                   end
+
+        packages.join ' '
+      end
+    end
+  end
+end
+VagrantVbguest::Installer.register(VagrantVbguest::Installers::Suse, 6)

data/lib/vagrant-vbguest/machine.rb

@@ -45,9 +45,9 @@ module VagrantVbguest
       guest_additions_state.trigger :start
     end
 
-    def installation_ran?; guest_additions_state == :installed end
-    def started?; guest_additions_state == :started end
-    def rebuilt?; guest_additions_state == :rebuilt end
+    def installation_ran?; guest_additions_state.state == :installed end
+    def started?; guest_additions_state.state == :started end
+    def rebuilt?; guest_additions_state.state == :rebuilt end
 
     def reboot;  box_state.trigger :reboot end
     def reboot?; box_state.state == :rebooted end

data/lib/vagrant-vbguest/vagrant_compat/vagrant_1_1/rebootable.rb

@@ -6,7 +6,7 @@ module VagrantVbguest
     module Rebootable
       def reboot(vm, options)
         if reboot? vm, options
-          simle_reboot = Vagrant::Action::Builder.new.tap do |b|
+          simple_reboot = Vagrant::Action::Builder.new.tap do |b|
             b.use Vagrant::Action::Builtin::Call, Vagrant::Action::Builtin::GracefulHalt, :poweroff, :running do |env2, b2|
               if !env2[:result]
                 b2.use VagrantPlugins::ProviderVirtualBox::Action::ForcedHalt
@@ -17,7 +17,7 @@ module VagrantVbguest
               b.use Vagrant::Action::Builtin::WaitForCommunicator, [:starting, :running]
             end
           end
-          @env[:action_runner].run(simle_reboot, @env)
+          @env[:action_runner].run(simple_reboot, @env)
         end
       end
 

data/lib/vagrant-vbguest/version.rb

@@ -1,3 +1,3 @@
 module VagrantVbguest
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/locales/en.yml

@@ -56,6 +56,10 @@ en:
         do_not_inherit_match_method: |-
           Installer classes must provide their own `match?` method.
 
+      os_release_parse_error: |-
+        Error while parsing the /etc/os-release file:
+        %{message}
+
     download:
       started: "Downloading VirtualBox Guest Additions ISO from %{source}"
       with: "Downloading VirtualBox Guest Additions ISO with %{class}..."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vbguest
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Robert Schulze
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: micromachine
@@ -72,9 +72,12 @@ files:
 - lib/vagrant-vbguest/core_ext/string/interpolate.rb
 - lib/vagrant-vbguest/download.rb
 - lib/vagrant-vbguest/errors.rb
+- lib/vagrant-vbguest/helpers.rb
+- lib/vagrant-vbguest/helpers/os_release.rb
 - lib/vagrant-vbguest/hosts/base.rb
 - lib/vagrant-vbguest/hosts/virtualbox.rb
 - lib/vagrant-vbguest/installer.rb
+- lib/vagrant-vbguest/installers/archlinux.rb
 - lib/vagrant-vbguest/installers/base.rb
 - lib/vagrant-vbguest/installers/debian.rb
 - lib/vagrant-vbguest/installers/fedora.rb
@@ -82,6 +85,7 @@ files:
 - lib/vagrant-vbguest/installers/opensuse.rb
 - lib/vagrant-vbguest/installers/oracle.rb
 - lib/vagrant-vbguest/installers/redhat.rb
+- lib/vagrant-vbguest/installers/suse.rb
 - lib/vagrant-vbguest/installers/ubuntu.rb
 - lib/vagrant-vbguest/machine.rb
 - lib/vagrant-vbguest/middleware.rb