vagrant-omnibus 1.4.1 → 1.5.0

data/lib/vagrant-omnibus/config.rb

@@ -1,128 +1,104 @@
-#
-# Copyright (c) 2013, Seth Chisamore
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'rubygems/dependency'
-require 'rubygems/dependency_installer'
-require 'vagrant'
-require 'vagrant/errors'
-require 'vagrant/util/template_renderer'
-
-module VagrantPlugins
-  #
-  module Omnibus
-    # @author Seth Chisamore <schisamo@opscode.com>
-    class Config < Vagrant.plugin('2', :config)
-      # @return [String]
-      #   The version of Chef to install.
-      attr_accessor :chef_version, :install_url, :cache_packages
-
-      def initialize
-        @chef_version = UNSET_VALUE
-        @install_url = UNSET_VALUE
-        @cache_packages = UNSET_VALUE
-        @logger = Log4r::Logger.new('vagrantplugins::omnibus::config')
-      end
-
-      def finalize!
-        if @chef_version == UNSET_VALUE
-          @chef_version = nil
-        elsif @chef_version.to_s == 'latest'
-          # resolve `latest` to a real version
-          @chef_version = retrieve_latest_chef_version
-        end
-        # enable caching by default
-        @cache_packages = true if @cache_packages == UNSET_VALUE
-        # nil means default install.sh|msi
-        @install_url = nil if @install_url == UNSET_VALUE
-      end
-
-      #
-      # Performs validation and immediately raises an exception for any
-      # detected errors.
-      #
-      # @raise [Vagrant::Errors::ConfigInvalid]
-      #   if validation fails
-      #
-      def validate!(machine)
-        finalize!
-        errors = []
-
-        if !chef_version.nil? && !valid_chef_version?(chef_version)
-          msg = <<-EOH
-'#{ chef_version }' is not a valid version of Chef.
-
-A list of valid versions can be found at: http://www.opscode.com/chef/install/
-          EOH
-          errors << msg
-        end
-
-        if errors.any?
-          rendered_errors = Vagrant::Util::TemplateRenderer.render(
-                              'config/validation_failed',
-                              errors: { 'vagrant-omnibus' => errors }
-                            )
-          fail Vagrant::Errors::ConfigInvalid, errors: rendered_errors
-        end
-      end
-
-      private
-
-      # Query RubyGems.org's Ruby API and retrive the latest version of Chef.
-      def retrieve_latest_chef_version
-        available_gems =
-          dependency_installer.find_gems_with_sources(chef_gem_dependency)
-        spec, _source =
-        if available_gems.respond_to?(:last)
-          # DependencyInstaller sorts the results such that the last one is
-          # always the one it considers best.
-          spec_with_source = available_gems.last
-          spec_with_source
-        else
-          # Rubygems 2.0 returns a Gem::Available set, which is a
-          # collection of AvailableSet::Tuple structs
-          available_gems.pick_best!
-          best_gem = available_gems.set.first
-          best_gem && [best_gem.spec, best_gem.source]
-        end
-
-        spec && spec.version.to_s
-      end
-
-      # Query RubyGems.org's Ruby API to see if the user-provided Chef version
-      # is in fact a real Chef version!
-      def valid_chef_version?(version)
-        is_valid = false
-        begin
-          available = dependency_installer.find_gems_with_sources(
-            chef_gem_dependency(version)
-          )
-          is_valid = true unless available.empty?
-        rescue ArgumentError => e
-          @logger.debug("#{version} is not a valid Chef version: #{e}")
-        end
-        is_valid
-      end
-
-      def dependency_installer
-        @dependency_installer ||= Gem::DependencyInstaller.new
-      end
-
-      def chef_gem_dependency(version = nil)
-        Gem::Dependency.new('chef', version)
-      end
-    end
-  end
-end
+#
+# Copyright (c) 2013, Seth Chisamore
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "rubygems/dependency"
+require "rubygems/dependency_installer"
+require "vagrant"
+require "vagrant/errors"
+require "vagrant/util/template_renderer"
+
+module VagrantPlugins
+  #
+  module Omnibus
+    # @author Seth Chisamore <schisamo@chef.io>
+    class Config < Vagrant.plugin("2", :config)
+      # @return [String]
+      #   The version of Chef to install.
+      attr_accessor :chef_version, :install_url, :cache_packages
+
+      def initialize
+        @chef_version = UNSET_VALUE
+        @install_url = UNSET_VALUE
+        @cache_packages = UNSET_VALUE
+        @logger = Log4r::Logger.new("vagrantplugins::omnibus::config")
+      end
+
+      def finalize!
+        if @chef_version == UNSET_VALUE
+          @chef_version = nil
+        end
+        # enable caching by default
+        @cache_packages = true if @cache_packages == UNSET_VALUE
+        # nil means default install.sh|msi
+        @install_url = nil if @install_url == UNSET_VALUE
+      end
+
+      #
+      # Performs validation and immediately raises an exception for any
+      # detected errors.
+      #
+      # @raise [Vagrant::Errors::ConfigInvalid]
+      #   if validation fails
+      #
+      def validate!(machine)
+        finalize!
+        errors = []
+
+        if !chef_version.nil? && !valid_chef_version?(chef_version)
+          msg = <<-EOH
+'#{ chef_version }' is not a valid version of Chef.
+
+A list of valid versions can be found at: https://downloads.chef.io/chef-client/
+          EOH
+          errors << msg
+        end
+
+        if errors.any?
+          rendered_errors = Vagrant::Util::TemplateRenderer.render(
+                              "config/validation_failed",
+                              errors: { "vagrant-omnibus" => errors }
+                            )
+          raise Vagrant::Errors::ConfigInvalid, errors: rendered_errors
+        end
+      end
+
+      private
+
+      # Query RubyGems.org's Ruby API to see if the user-provided Chef version
+      # is in fact a real Chef version!
+      def valid_chef_version?(version)
+        return true if version.to_s == "latest"
+        begin
+          available = dependency_installer.find_gems_with_sources(
+            chef_gem_dependency(version)
+          )
+        rescue ArgumentError => e
+          @logger.debug("#{version} is not a valid Chef version: #{e}")
+          return false
+        end
+        return !available.empty?
+      end
+
+      def dependency_installer
+        @dependency_installer ||= Gem::DependencyInstaller.new
+      end
+
+      def chef_gem_dependency(version = nil)
+        Gem::Dependency.new("chef", version)
+      end
+    end
+  end
+end

data/lib/vagrant-omnibus/plugin.rb

@@ -1,55 +1,78 @@
-#
-# Copyright (c) 2013, Seth Chisamore
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# This is a sanity check to make sure no one is attempting to install
-# this into an early Vagrant version.
-if Vagrant::VERSION < '1.1.0'
-  fail 'The Vagrant Omnibus plugin is only compatible with Vagrant 1.1+'
-end
-
-module VagrantPlugins
-  #
-  module Omnibus
-    # @author Seth Chisamore <schisamo@opscode.com>
-    class Plugin < Vagrant.plugin('2')
-      name 'vagrant-omnibus'
-      description <<-DESC
-      This plugin ensures the desired version of Chef is installed
-      via the platform-specific Omnibus packages.
-      DESC
-
-      action_hook(:install_chef, Plugin::ALL_ACTIONS) do |hook|
-        require_relative 'action/install_chef'
-        hook.after(Vagrant::Action::Builtin::Provision, Action::InstallChef)
-
-        # The AWS provider < v0.4.0 uses a non-standard Provision action
-        # on initial creation:
-        #
-        # mitchellh/vagrant-aws/blob/v0.3.0/lib/vagrant-aws/action.rb#L105
-        #
-        if defined? VagrantPlugins::AWS::Action::TimedProvision
-          hook.after(VagrantPlugins::AWS::Action::TimedProvision,
-                     Action::InstallChef)
-        end
-      end
-
-      config(:omnibus) do
-        require_relative 'config'
-        Config
-      end
-    end
-  end
-end
+#
+# Copyright (c) 2013, Seth Chisamore
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module VagrantPlugins
+  #
+  module Omnibus
+    # @author Seth Chisamore <schisamo@chef.io>
+    class Plugin < Vagrant.plugin("2")
+      name "vagrant-omnibus"
+      description <<-DESC
+      This plugin ensures the desired version of Chef is installed
+      via the platform-specific Omnibus packages.
+      DESC
+
+      VAGRANT_VERSION_REQUIREMENT = ">= 1.1.0"
+
+      # Returns true if the Vagrant version fulfills the requirements
+      #
+      # @param requirements [String, Array<String>] the version requirement
+      # @return [Boolean]
+      def self.check_vagrant_version(*requirements)
+        Gem::Requirement.new(*requirements).satisfied_by?(
+          Gem::Version.new(Vagrant::VERSION)
+        )
+      end
+
+      # Verifies that the Vagrant version fulfills the requirements
+      #
+      # @raise [VagrantPlugins::Omnibus::VagrantVersionError] if this plugin
+      # is incompatible with the Vagrant version
+      def self.check_vagrant_version!
+        unless check_vagrant_version(VAGRANT_VERSION_REQUIREMENT)
+          msg = I18n.t(
+            "vagrant-omnibus.errors.vagrant_version",
+            requirement: VAGRANT_VERSION_REQUIREMENT.inspect
+          )
+          $stderr.puts(msg)
+          raise msg
+        end
+      end
+
+      action_hook(:install_chef, Plugin::ALL_ACTIONS) do |hook|
+        require_relative "action/install_chef"
+        hook.after(Vagrant::Action::Builtin::Provision, Action::InstallChef)
+
+        # The AWS provider < v0.4.0 uses a non-standard Provision action
+        # on initial creation:
+        #
+        # mitchellh/vagrant-aws/blob/v0.3.0/lib/vagrant-aws/action.rb#L105
+        #
+        if defined? VagrantPlugins::AWS::Action::TimedProvision
+          hook.after(
+            VagrantPlugins::AWS::Action::TimedProvision,
+            Action::InstallChef
+          )
+        end
+      end
+
+      config(:omnibus) do
+        require_relative "config"
+        Config
+      end
+    end
+  end
+end

data/lib/vagrant-omnibus/version.rb

@@ -1,22 +1,22 @@
-#
-# Copyright (c) 2013, Seth Chisamore
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module VagrantPlugins
-  #
-  module Omnibus
-    VERSION = '1.4.1'
-  end
-end
+#
+# Copyright (c) 2013, Seth Chisamore
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module VagrantPlugins
+  #
+  module Omnibus
+    VERSION = "1.5.0"
+  end
+end

data/locales/en.yml

@@ -1,8 +1,11 @@
-en:
-  vagrant-omnibus:
-    action:
-      installed: "Chef %{version} Omnibus package is already installed."
-      installing: "Installing Chef %{version} Omnibus package..."
-    download:
-      downloading: "Downloading or copying install.sh..."
-      interrupted: "Install.sh download was interrupted. Exiting."
+en:
+  vagrant-omnibus:
+    action:
+      installed: "Chef %{version} Omnibus package is already installed."
+      installing: "Installing Chef %{version} Omnibus package..."
+    download:
+      downloading: "Downloading or copying install.sh..."
+      interrupted: "Install.sh download was interrupted. Exiting."
+    errors:
+      vagrant_version: |-
+        vagrant-omnibus plugin requires Vagrant version %{requirement}

data/test/acceptance/aws/Vagrantfile

@@ -1,29 +1,29 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# plugins don't seem to be auto-loaded from the bundle
-require 'vagrant-omnibus'
-require 'vagrant-aws'
-
-Vagrant.configure('2') do |config|
-  config.omnibus.chef_version = '11.4.0'
-
-  config.vm.box = 'dummy'
-  config.vm.provider :aws do |aws, override|
-    aws.access_key_id = ENV['DEV_AWS_ACCESS_KEY_ID']
-    aws.secret_access_key = ENV['DEV_AWS_SECRET_ACCESS_KEY']
-    aws.keypair_name = ENV['USER']
-
-    aws.instance_type = 'm1.large'
-    aws.ami = 'ami-2efa9d47' # Ubuntu 12.04 LTS 64-bit instance root store
-
-    override.ssh.username = 'ubuntu'
-    override.ssh.private_key_path = '~/.ssh/id_rsa'
-  end
-
-  config.vm.provision :chef_solo do |chef|
-    chef.cookbooks_path =
-      File.expand_path('../../../support/cookbooks', __FILE__)
-    chef.add_recipe 'chef-inator'
-  end
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# plugins don't seem to be auto-loaded from the bundle
+require "vagrant-omnibus"
+require "vagrant-aws"
+
+Vagrant.configure("2") do |config|
+  config.omnibus.chef_version = "11.4.0"
+
+  config.vm.box = "dummy"
+  config.vm.provider :aws do |aws, override|
+    aws.access_key_id = ENV["DEV_AWS_ACCESS_KEY_ID"]
+    aws.secret_access_key = ENV["DEV_AWS_SECRET_ACCESS_KEY"]
+    aws.keypair_name = ENV["USER"]
+
+    aws.instance_type = "m1.large"
+    aws.ami = "ami-2efa9d47" # Ubuntu 12.04 LTS 64-bit instance root store
+
+    override.ssh.username = "ubuntu"
+    override.ssh.private_key_path = "~/.ssh/id_rsa"
+  end
+
+  config.vm.provision :chef_solo do |chef|
+    chef.cookbooks_path =
+      File.expand_path("../../../support/cookbooks", __FILE__)
+    chef.add_recipe "chef-inator"
+  end
+end