vagrant-omnibus 1.1.2 → 1.2.0

data/.rubocop.yml

@@ -0,0 +1,8 @@
+AllCops:
+  Excludes:
+    - vendor/**
+    - bin/**
+Encoding:
+  Enabled: false
+MethodLength:
+  Max: 30

data/.travis.yml

@@ -2,4 +2,7 @@ language: ruby
 bundler_args: --without=acceptance
 rvm:
   - 1.9.3
-script: rake test:unit
+  - 2.0.0
+script:
+  - rake test:unit
+  - rake rubocop

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.2.0 (December 17, 2013)
+
+FEATURES:
+
+* PR [#52][]: Change plugin name to correspond to gem name. ([@tmatilai][])
+
+IMPROVEMENTS:
+
+* PR [#48][]: Don't install Chef if `--no-provision` is specified. ([@tmatilai][])
+* PR [#50][]: Update README.md with vagrant-parallels compatibility. ([@wizonesolutions][])
+
+BUG FIXES:
+
+* Issue [#12][]: Ensure plugin is no-op on Windows guests. ([@schisamo][])
+* PR [#53][]: Ensure installed version check works on all platforms. ([@comutt][])
+
 ## 1.1.2 (October 17, 2013)
 
 IMPROVEMENTS:
@@ -63,6 +79,7 @@ BUG FIXES:
 ## 1.0.0 (April 1, 2013)
 
 * The initial release.
+
 <!--- The following link definition list is generated by PimpMyChangelog --->
 [#2]: https://github.com/schisamo/vagrant-omnibus/issues/2
 [#3]: https://github.com/schisamo/vagrant-omnibus/issues/3
@@ -71,6 +88,7 @@ BUG FIXES:
 [#7]: https://github.com/schisamo/vagrant-omnibus/issues/7
 [#8]: https://github.com/schisamo/vagrant-omnibus/issues/8
 [#10]: https://github.com/schisamo/vagrant-omnibus/issues/10
+[#12]: https://github.com/schisamo/vagrant-omnibus/issues/12
 [#15]: https://github.com/schisamo/vagrant-omnibus/issues/15
 [#17]: https://github.com/schisamo/vagrant-omnibus/issues/17
 [#19]: https://github.com/schisamo/vagrant-omnibus/issues/19
@@ -86,6 +104,11 @@ BUG FIXES:
 [#41]: https://github.com/schisamo/vagrant-omnibus/issues/41
 [#43]: https://github.com/schisamo/vagrant-omnibus/issues/43
 [#45]: https://github.com/schisamo/vagrant-omnibus/issues/45
+[#48]: https://github.com/schisamo/vagrant-omnibus/issues/48
+[#50]: https://github.com/schisamo/vagrant-omnibus/issues/50
+[#52]: https://github.com/schisamo/vagrant-omnibus/issues/52
+[#53]: https://github.com/schisamo/vagrant-omnibus/issues/53
+[@comutt]: https://github.com/comutt
 [@matsu911]: https://github.com/matsu911
 [@michfield]: https://github.com/michfield
 [@petecheslock]: https://github.com/petecheslock
@@ -93,4 +116,5 @@ BUG FIXES:
 [@schisamo]: https://github.com/schisamo
 [@smdahlen]: https://github.com/smdahlen
 [@srenatus]: https://github.com/srenatus
-[@tmatilai]: https://github.com/tmatilai
+[@tmatilai]: https://github.com/tmatilai
+[@wizonesolutions]: https://github.com/wizonesolutions

data/README.md

@@ -22,6 +22,7 @@ known to work with the following
 * LXC (ships in [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc))
 * OpenStack (ships in [vagrant-openstack-plugin](https://github.com/cloudbau/vagrant-openstack-plugin))
 * Digital Ocean (ships in [vagrant-digitalocean](https://github.com/smdahlen/vagrant-digitalocean))
+* Parallels Desktop (ships in [vagrant-parallels](https://github.com/yshahin/vagrant-parallels))
 
 ## Installation
 

data/Rakefile

@@ -1,8 +1,10 @@
 require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 require 'yard'
 
+Rubocop::RakeTask.new
 YARD::Rake::YardocTask.new
 
 namespace :test do

data/lib/vagrant-omnibus/action/install_chef.rb

@@ -14,10 +14,10 @@
 # limitations under the License.
 #
 
-require "log4r"
+require 'log4r'
 require 'shellwords'
 
-require "vagrant/util/downloader"
+require 'vagrant/util/downloader'
 
 module VagrantPlugins
   module Omnibus
@@ -26,12 +26,13 @@ module VagrantPlugins
       #
       # This action installs Chef Omnibus packages at the desired version.
       class InstallChef
-
-        INSTALL_SH = "#{ENV['OMNIBUS_INSTALL_URL'] || 'https://www.opscode.com/chef/install.sh'}"
+        INSTALL_SH = "#{ENV['OMNIBUS_INSTALL_URL'] ||
+          'https://www.opscode.com/chef/install.sh'}"
 
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new("vagrantplugins::omnibus::action::installchef")
+          @logger =
+            Log4r::Logger.new('vagrantplugins::omnibus::action::installchef')
           @machine = env[:machine]
           # Config#finalize! SHOULD be called automatically
           @machine.config.omnibus.finalize!
@@ -40,19 +41,23 @@ module VagrantPlugins
         def call(env)
           @app.call(env)
 
-          return unless @machine.communicate.ready?
+          return if !@machine.communicate.ready? ||
+                    !provision_enabled?(env) ||
+                    windows_guest?(env)
 
           desired_version = @machine.config.omnibus.chef_version
           unless desired_version.nil?
             if installed_version == desired_version
-              env[:ui].info I18n.t('vagrant-omnibus.action.installed', {
-                :version => desired_version
-              })
+              env[:ui].info I18n.t(
+                'vagrant-omnibus.action.installed',
+                version: desired_version
+              )
             else
               fetch_install_sh(env)
-              env[:ui].info I18n.t('vagrant-omnibus.action.installing', {
-                :version => desired_version
-              })
+              env[:ui].info I18n.t(
+                'vagrant-omnibus.action.installing',
+                version: desired_version
+              )
               install(desired_version, env)
               recover(env)
             end
@@ -61,11 +66,20 @@ module VagrantPlugins
 
         private
 
+        def windows_guest?(env)
+          env[:machine].config.vm.guest.eql?(:windows)
+        end
+
+        def provision_enabled?(env)
+          env.fetch(:provision_enabled, true)
+        end
+
         def installed_version
           version = nil
-          command = 'echo $(chef-solo --v | awk "{print \\$2}" || "")'
+          command = 'echo $(chef-solo -v)'
           @machine.communicate.sudo(command) do |type, data|
-            version = data.chomp if [:stderr, :stdout].include?(type)
+            v = data.chomp if [:stderr, :stdout].include?(type)
+            version ||= v.split[1] unless v.empty?
           end
           version
         end
@@ -76,9 +90,10 @@ module VagrantPlugins
           shell_escaped_version = Shellwords.escape(version)
 
           @machine.communicate.tap do |comm|
-            comm.upload(@install_sh_temp_path, "install.sh")
-            # TODO - Execute with `sh` once install.sh removes it's bash-isms.
-            comm.sudo("bash install.sh -v #{shell_escaped_version} 2>&1") do |type, data|
+            comm.upload(@install_sh_temp_path, 'install.sh')
+            # TODO: Execute with `sh` once install.sh removes it's bash-isms.
+            install_cmd = "bash install.sh -v #{shell_escaped_version} 2>&1"
+            comm.sudo(install_cmd) do |type, data|
               if [:stderr, :stdout].include?(type)
                 next if data =~ /stdin: is not a tty/
                 env[:ui].info(data)
@@ -91,15 +106,16 @@ module VagrantPlugins
         #
         # Mostly lifted from:
         #
-        #   https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/action/builtin/box_add.rb
+        #   mitchellh/vagrant/blob/master/lib/vagrant/action/builtin/box_add.rb
         #
         def fetch_install_sh(env)
-          @install_sh_temp_path = env[:tmp_path].join(Time.now.to_i.to_s + "-install.sh")
+          @install_sh_temp_path =
+            env[:tmp_path].join(Time.now.to_i.to_s + '-install.sh')
           @logger.info("Downloading install.sh to: #{@install_sh_temp_path}")
 
           url = INSTALL_SH
           if File.file?(url) || url !~ /^[a-z0-9]+:.*$/i
-            @logger.info("URL is a file or protocol not found and assuming file.")
+            @logger.info('Assuming URL is a file.')
             file_path = File.expand_path(url)
             file_path = Vagrant::Util::Platform.cygwin_windows_path(file_path)
             url = "file:#{file_path}"
@@ -120,7 +136,7 @@ module VagrantPlugins
           rescue Vagrant::Errors::DownloaderInterrupted
             # The downloader was interrupted, so just return, because that
             # means we were interrupted as well.
-            env[:ui].info(I18n.t("vagrant-omnibus.download.interrupted"))
+            env[:ui].info(I18n.t('vagrant-omnibus.download.interrupted'))
             return
           end
         end

data/lib/vagrant-omnibus/config.rb

@@ -19,16 +19,17 @@ require 'rubygems/dependency_installer'
 require 'vagrant'
 
 module VagrantPlugins
+  #
   module Omnibus
     # @author Seth Chisamore <schisamo@opscode.com>
-    class Config < Vagrant.plugin("2", :config)
-
+    class Config < Vagrant.plugin('2', :config)
       # @return [String]
       #   The version of Chef to install.
       attr_accessor :chef_version
 
       def initialize
         @chef_version = UNSET_VALUE
+        @logger = Log4r::Logger.new('vagrantplugins::omnibus::config')
       end
 
       def finalize!
@@ -44,31 +45,36 @@ module VagrantPlugins
         errors = []
 
         unless valid_chef_version?(chef_version)
-          msg = "'#{chef_version}' is not a valid version of Chef."
-          msg << "\n\n A list of valid versions can be found at: http://www.opscode.com/chef/install/"
+          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
 
-        { "Omnibus Plugin" => errors }
+        { 'Omnibus Plugin' => errors }
       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
+        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
@@ -78,9 +84,12 @@ module VagrantPlugins
       def valid_chef_version?(version)
         is_valid = false
         begin
-          available = dependency_installer.find_gems_with_sources(chef_gem_dependency(version))
+          available = dependency_installer.find_gems_with_sources(
+            chef_gem_dependency(version)
+          )
           is_valid = true unless available.empty?
-        rescue
+        rescue ArgumentError => e
+          @logger.debug("#{version} is not a valid Chef version: #{e}")
         end
         is_valid
       end
@@ -89,7 +98,7 @@ module VagrantPlugins
         @dependency_installer ||= Gem::DependencyInstaller.new
       end
 
-      def chef_gem_dependency(version=nil)
+      def chef_gem_dependency(version = nil)
         Gem::Dependency.new('chef', version)
       end
     end

data/lib/vagrant-omnibus/plugin.rb

@@ -16,36 +16,38 @@
 
 # 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"
-  raise "The Vagrant Omnibus plugin is only compatible with Vagrant 1.1+"
+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 "Omnibus"
+    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"
+        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:
+        # The AWS provider < v0.4.0 uses a non-standard Provision action
+        # on initial creation:
         #
-        # https://github.com/mitchellh/vagrant-aws/blob/v0.3.0/lib/vagrant-aws/action.rb#L105
+        # 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)
+          hook.after(VagrantPlugins::AWS::Action::TimedProvision,
+                     Action::InstallChef)
         end
       end
 
       config(:omnibus) do
-        require_relative "config"
+        require_relative 'config'
         Config
       end
     end

data/lib/vagrant-omnibus/version.rb

@@ -15,7 +15,8 @@
 #
 
 module VagrantPlugins
+  #
   module Omnibus
-    VERSION = "1.1.2"
+    VERSION = '1.2.0'
   end
 end

data/lib/vagrant-omnibus.rb

@@ -19,6 +19,7 @@ require 'vagrant-omnibus/plugin'
 require 'vagrant-omnibus/config'
 
 module VagrantPlugins
+  #
   module Omnibus
     def self.source_root
       @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))

data/test/acceptance/virtualbox/Vagrantfile

@@ -7,8 +7,8 @@ require 'vagrant-omnibus'
 Vagrant.configure("2") do |config|
 
   config.vm.define :new_chef do |new_chef_config|
-    new_chef_config.vm.box = "canonical-ubuntu-12.04"
-    new_chef_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
+    new_chef_config.vm.box = "opscode-ubuntu-12.04"
+    new_chef_config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box"
 
     new_chef_config.omnibus.chef_version = :latest
 
@@ -19,8 +19,8 @@ Vagrant.configure("2") do |config|
   end
 
   config.vm.define :old_chef do |old_chef_config|
-    old_chef_config.vm.box = "opscode-centos-6.4"
-    old_chef_config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box"
+    old_chef_config.vm.box = "opscode-centos-6.5"
+    old_chef_config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box"
 
     old_chef_config.omnibus.chef_version = '10.24.0'
 

data/test/support/cookbooks/chef-inator/metadata.rb

@@ -1,7 +1,7 @@
-name             "chef-inator"
-maintainer       "Dr. Heinz Doofenshmirtz"
-maintainer_email "heinz@doofenshmirtz-evil-inc.com"
-license          "All rights reserved"
-description      "Uses Chef to take over the Tri-State Area!"
+name             'chef-inator'
+maintainer       'Dr. Heinz Doofenshmirtz'
+maintainer_email 'heinz@doofenshmirtz-evil-inc.com'
+license          'All rights reserved'
+description      'Uses Chef to take over the Tri-State Area!'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.1.0"
+version          '0.1.0'

data/test/support/cookbooks/chef-inator/recipes/default.rb

@@ -1,2 +1,2 @@
 
-Chef::Log.info "CURSE YOU...Perry the Platypus!!!!"
+Chef::Log.info 'CURSE YOU...Perry the Platypus!!!!'

data/test/unit/spec_helper.rb

@@ -20,6 +20,6 @@ RSpec.configure do |config|
 
   # specify metadata with symobls only (ie no '=> true' required)
   config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.filter_run :focus => true
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
 end

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

@@ -7,7 +7,7 @@
 require_relative '../spec_helper'
 
 describe VagrantPlugins::Omnibus::Config do
-  let(:instance){ described_class.new }
+  let(:instance) { described_class.new }
 
   subject(:config) do
     instance.tap do |o|
@@ -16,50 +16,50 @@ describe VagrantPlugins::Omnibus::Config do
     end
   end
 
-  describe "defaults" do
-    its(:chef_version){ should be_nil }
+  describe 'defaults' do
+    its(:chef_version) { should be_nil }
   end
 
-  describe "resolving `:latest` to a real Chef version" do
+  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*/) }
+    its(:chef_version) { should be_a(String) }
+    its(:chef_version) { should match(/\d*\.\d*\.\d*/) }
   end
 
-  describe "#validate" do
+  describe '#validate' do
     let(:machine) { double('machine') }
-    let(:error_hash_key) { "Omnibus Plugin" }
+    let(:error_hash_key) { 'Omnibus Plugin' }
     let(:result) { subject.validate(machine) }
     let(:errors) { result[error_hash_key] }
 
-    it "returns a Hash with an 'Omnibus Plugin' key" do
+    it 'returns a Hash with an `Omnibus Plugin` key' do
       result.should be_a(Hash)
       result.should have_key(error_hash_key)
     end
 
-    describe "chef_version validation" do
+    describe 'chef_version validation' do
       {
-        "11.4.0" => {
-          :description => "valid Chef version string",
-          :valid => true
+        '11.4.0' => {
+          description: 'valid Chef version string',
+          valid: true
         },
-        "10.99.99" => {
-          :description => "invalid Chef version string",
-          :valid => false
+        '10.99.99' => {
+          description: 'invalid Chef version string',
+          valid: false
         },
-        "FUFUFU" => {
-          :description => "invalid RubyGems 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
+            it 'passes' do
               errors.should be_empty
             end
           else
-            it "fails" do
+            it 'fails' do
               errors.should_not be_empty
             end
           end

data/vagrant-omnibus.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency 'rubocop', '~> 0.15.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-omnibus
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.15.0
 description: A Vagrant plugin that ensures the desired version of Chef is installed
   via the platform-specific Omnibus packages.
 email:
@@ -69,6 +85,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .rubocop.yml
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
@@ -108,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3817557058599650856
+      hash: 1025496382534469721
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3817557058599650856
+      hash: 1025496382534469721
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23