vagrant-omnibus 1.4.1 → 1.5.0

data/test/unit/vagrant-omnibus/config_spec.rb

@@ -1,101 +1,121 @@
-# We have to use `require_relative` until RSpec 2.14.0. As non-standard RSpec
-# default paths are not on the $LOAD_PATH.
-#
-# More info here:
-# https://github.com/rspec/rspec-core/pull/831
-#
-require_relative '../spec_helper'
-
-# rubocop:disable LineLength
-
-describe VagrantPlugins::Omnibus::Config do
-  let(:machine) { double('machine') }
-  let(:instance) { described_class.new }
-
-  subject(:config) do
-    instance.tap do |o|
-      o.chef_version = chef_version if defined?(chef_version)
-      o.install_url = install_url if defined?(install_url)
-      o.cache_packages = cache_packages if defined?(cache_packages)
-      o.finalize!
-    end
-  end
-
-  describe 'defaults' do
-    its(:chef_version) { should be_nil }
-    its(:install_url) { should be_nil }
-    its(:cache_packages) { should be_true }
-  end
-
-  describe 'resolving `:latest` to a real Chef version' do
-    let(:chef_version) { :latest }
-    its(:chef_version) { should be_a(String) }
-    its(:chef_version) { should match(/\d*\.\d*\.\d*/) }
-  end
-
-  describe 'setting a custom `install_url`' do
-    let(:install_url) { 'http://some_path.com/install.sh' }
-    its(:install_url) { should eq('http://some_path.com/install.sh') }
-  end
-
-  describe 'the `cache_packages` config option behaves truthy' do
-    [true, 'something', :cachier].each do |obj|
-      describe "when `#{obj}` (#{obj.class})" do
-        let(:cache_packages) { obj }
-        its(:cache_packages) { should be_true }
-      end
-    end
-    [nil, false].each do |obj|
-      describe "when `#{obj}` (#{obj.class})" do
-        let(:cache_packages) { obj }
-        its(:cache_packages) { should be_false }
-      end
-    end
-  end
-
-  describe 'validate' do
-    it 'should be no-op' do
-      expect(subject.validate(machine)).to eq('VagrantPlugins::Omnibus::Config' => [])
-    end
-  end
-
-  describe '#validate!' do
-    describe 'chef_version validation' do
-      {
-        '11.4.0' => {
-          description: 'valid Chef version string',
-          valid: true
-        },
-        '10.99.99' => {
-          description: 'invalid Chef version string',
-          valid: false
-        },
-        'FUFUFU' => {
-          description: 'invalid RubyGems version string',
-          valid: false
-        }
-      }.each_pair do |version_string, opts|
-        context "#{opts[:description]}: #{version_string}" do
-          let(:chef_version) { version_string }
-          if opts[:valid]
-            it 'passes' do
-              expect { subject.validate!(machine) }.to_not raise_error
-            end
-          else
-            it 'fails' do
-              expect { subject.validate!(machine) }.to raise_error(Vagrant::Errors::ConfigInvalid)
-            end
-          end
-        end
-      end
-    end # describe chef_version
-
-    describe 'not specified chef_version validation' do
-      it 'passes' do
-        Gem::DependencyInstaller.any_instance.stub(:find_gems_with_sources).and_return([])
-        expect { subject.validate!(machine) }.to_not raise_error
-      end
-    end # describe not specified chef_version validation
-
-  end # describe #validate
-end
+require "spec_helper"
+
+# rubocop:disable LineLength
+
+describe VagrantPlugins::Omnibus::Config do
+  let(:machine) { double("machine") }
+  let(:instance) { described_class.new }
+
+  subject(:config) do
+    instance.tap do |o|
+      o.chef_version = chef_version if defined?(chef_version)
+      o.install_url = install_url if defined?(install_url)
+      o.cache_packages = cache_packages if defined?(cache_packages)
+      o.finalize!
+    end
+  end
+
+  context "default values" do
+    describe "#chef_version" do
+      subject { super().chef_version }
+      it { is_expected.to be_nil }
+    end
+
+    describe "#install_url" do
+      subject { super().install_url }
+      it { is_expected.to be_nil }
+    end
+
+    describe "#cache_packages" do
+      subject { super().cache_packages }
+      it { is_expected.to be_truthy }
+    end
+  end
+
+  describe "no longer resolves :latest to a Chef version" do
+    let(:chef_version) { :latest }
+
+    describe "#chef_version" do
+      subject { super().chef_version }
+      it { is_expected.to eql(:latest) }
+    end
+  end
+
+  describe "setting a custom `install_url`" do
+    let(:install_url) { "http://some_path.com/install.sh" }
+
+    describe "#install_url" do
+      subject { super().install_url }
+      it { is_expected.to eq("http://some_path.com/install.sh") }
+    end
+  end
+
+  describe "the `cache_packages` config option behaves truthy" do
+    [true, "something", :cachier].each do |obj|
+      describe "when `#{obj}` (#{obj.class})" do
+        let(:cache_packages) { obj }
+
+        describe "#cache_packages" do
+          subject { super().cache_packages }
+          it { is_expected.to be_truthy }
+        end
+      end
+    end
+    [nil, false].each do |obj|
+      describe "when `#{obj}` (#{obj.class})" do
+        let(:cache_packages) { obj }
+
+        describe "#cache_packages" do
+          subject { super().cache_packages }
+          it { is_expected.to be_falsey }
+        end
+      end
+    end
+  end
+
+  describe "validate" do
+    it "is a be no-op" do
+      expect(subject.validate(machine)).to eq("VagrantPlugins::Omnibus::Config" => [])
+    end
+  end
+
+  describe "#validate!" do
+    describe "chef_version validation" do
+      {
+        "11.4.0" => {
+          description: "valid Chef version string",
+          valid: true,
+        },
+        "10.99.99" => {
+          description: "invalid Chef version string",
+          valid: false,
+        },
+        "FUFUFU" => {
+          description: "invalid RubyGems version string",
+          valid: false,
+        },
+      }.each_pair do |version_string, opts|
+        context "#{opts[:description]}: #{version_string}" do
+          let(:chef_version) { version_string }
+          if opts[:valid]
+            it "passes" do
+              expect { subject.validate!(machine) }.to_not raise_error
+            end
+          else
+            it "fails" do
+              expect { subject.validate!(machine) }.to raise_error(Vagrant::Errors::ConfigInvalid)
+            end
+          end
+        end
+      end
+    end # describe chef_version
+
+    describe "not specified chef_version validation" do
+      it "passes" do
+        allow_any_instance_of(Gem::DependencyInstaller).to receive(:find_gems_with_sources).and_return([])
+        expect { subject.validate!(machine) }.to_not raise_error
+      end
+    end # describe not specified chef_version validation
+
+  end # describe #validate
+end

data/test/unit/vagrant-omnibus/plugin_spec.rb

@@ -0,0 +1,83 @@
+require "spec_helper"
+
+describe VagrantPlugins::Omnibus::Plugin do
+
+  context "action hooks" do
+    let(:hook) { double(append: true, prepend: true) }
+    let(:fake_class) { Class.new }
+
+    it "should hook InstallChef before Provision" do
+      stub_const("VagrantPlugins::Omnibus::Action::InstallChef", fake_class)
+      hook_proc = described_class.components.action_hooks[:__all_actions__][0]
+      hook = double
+      expect(hook).to receive(:after).with(Vagrant::Action::Builtin::Provision, VagrantPlugins::Omnibus::Action::InstallChef)
+      hook_proc.call(hook)
+    end
+  end
+
+  it "should define a config of type :omnibus" do
+    default_config = described_class.components.configs[:top].to_hash[:omnibus]
+    expect(default_config).to be(VagrantPlugins::Omnibus::Config)
+  end
+
+  describe ".check_vagrant_version" do
+    before :each do
+      stub_const("Vagrant::VERSION", "1.2.3")
+    end
+
+    it "accepts single String argument" do
+      expect(described_class.check_vagrant_version("~> 1.1")).to be_truthy
+      expect(described_class.check_vagrant_version("1.2")).to be_falsey
+    end
+
+    it "accepts an Array argument" do
+      expect(described_class.check_vagrant_version([">= 1.1", "< 1.3.0.beta"])).to be_truthy
+      expect(described_class.check_vagrant_version([">= 1.3"])).to be_falsey
+    end
+
+    it "accepts multiple arguments" do
+      expect(described_class.check_vagrant_version(">= 1.0", "<= 1.3")).to be_truthy
+      expect(described_class.check_vagrant_version("~> 1.2", ">= 1.2.5")).to be_falsey
+    end
+  end
+
+  describe ".check_vagrant_version!" do
+    subject { described_class.check_vagrant_version! }
+    let(:requirement) { ">= 1.1.0" }
+    let(:err_msg) { /requires Vagrant version #{Regexp.escape(requirement.inspect)}/ }
+
+    before :each do
+      stub_const(
+        "VagrantPlugins::ProxyConf::Plugin::VAGRANT_VERSION_REQUIREMENT",
+        requirement
+      )
+      stub_const("Vagrant::VERSION", vagrant_version)
+      allow($stderr).to receive(:puts)
+    end
+
+    context "on too old Vagrant version" do
+      let(:vagrant_version) { "1.0.9" }
+      it "raises error" do
+        expect { subject }.to raise_error(err_msg)
+      end
+      it "warns as stderr" do
+        expect($stderr).to receive(:puts).with(err_msg)
+        expect { subject }.to raise_error(err_msg)
+      end
+    end
+
+    context "on exact required Vagrant version" do
+      let(:vagrant_version) { "1.1.0" }
+      it "does not raise" do
+        expect { subject }.not_to raise_error
+      end
+    end
+
+    context "on newer Vagrant version" do
+      let(:vagrant_version) { "1.3.5" }
+      it "does not raise" do
+        expect { subject }.not_to raise_error
+      end
+    end
+  end
+end

data/vagrant-omnibus.gemspec

@@ -1,27 +1,27 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'vagrant-omnibus/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'vagrant-omnibus'
-  spec.version       = VagrantPlugins::Omnibus::VERSION
-  spec.authors       = ['Seth Chisamore']
-  spec.email         = ['schisamo@opscode.com']
-  spec.description   = 'A Vagrant plugin that ensures the desired version of' \
-                       ' Chef is installed via the platform-specific Omnibus' \
-                       ' packages.'
-  spec.summary       = spec.description
-  spec.homepage      = 'https://github.com/schisamo/vagrant-omnibus'
-  spec.license       = 'Apache 2.0'
-
-  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop', '0.18.1'
-end
+# coding: utf-8
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "vagrant-omnibus/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "vagrant-omnibus"
+  spec.version       = VagrantPlugins::Omnibus::VERSION
+  spec.authors       = ["Seth Chisamore"]
+  spec.email         = ["schisamo@chef.io"]
+  spec.description   = "A Vagrant plugin that ensures the desired version of" \
+                       " Chef is installed via the platform-specific Omnibus" \
+                       " packages."
+  spec.summary       = spec.description
+  spec.homepage      = "https://github.com/chef/vagrant-omnibus"
+  spec.license       = "Apache 2.0"
+
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake", "~> 11.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "chefstyle", "~> 0.4.0"
+end

metadata

@@ -1,85 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-omnibus
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: chefstyle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.4.0
 description: A Vagrant plugin that ensures the desired version of Chef is installed
   via the platform-specific Omnibus packages.
 email:
-- schisamo@opscode.com
+- schisamo@chef.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .ruby-version
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -102,8 +100,9 @@ files:
 - test/support/cookbooks/chef-inator/recipes/default.rb
 - test/unit/spec_helper.rb
 - test/unit/vagrant-omnibus/config_spec.rb
+- test/unit/vagrant-omnibus/plugin_spec.rb
 - vagrant-omnibus.gemspec
-homepage: https://github.com/schisamo/vagrant-omnibus
+homepage: https://github.com/chef/vagrant-omnibus
 licenses:
 - Apache 2.0
 metadata: {}
@@ -113,17 +112,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin that ensures the desired version of Chef is installed via
@@ -139,4 +138,4 @@ test_files:
 - test/support/cookbooks/chef-inator/recipes/default.rb
 - test/unit/spec_helper.rb
 - test/unit/vagrant-omnibus/config_spec.rb
-has_rdoc: 
+- test/unit/vagrant-omnibus/plugin_spec.rb