vagrant-omnibus 1.1.0 → 1.1.1

data/CHANGELOG.md

@@ -1,8 +1,19 @@
+## 1.1.1 (September 4, 2013)
+
+BUG FIXES:
+
+* PR [#28][]: Include OpenStack provider into the list of working providers. ([@srenatus][])
+* PR [#32][], Issue [#31][]: No need to do sudo in sudo ([@matsu911][])
+* PR [#32][], Issue [#32][]: Fix the curl line to install the requested Chef version ([@tmatilai][])
+* PR [#37][]: Document that newer than v1.1.x Vagrant is fine, too. ([@tmatilai][])
+* PR [#38][]: Drop unneeded ConfigValidate action call ([@tmatilai][])
+* Issue [#27][]: Properly shell escape version strings ([@schisamo][])
+
 ## 1.1.0 (June 21, 2013)
 
 FEATURES:
 
-* PR [#23][], Issues [#17][], [#19][], [#21][], [#23][]: Support for all Vagrant providers that hook into `Vagrant::Action::Builtin::Provision` for provisioning. ([@smdahlen][], [@michfield][], [@rjocoleman][])
+* PR [#23][], Issue [#17][], Issue [#19][], Issue [#21][], Issue [#23][]: Support for all Vagrant providers that hook into `Vagrant::Action::Builtin::Provision` for provisioning. ([@smdahlen][], [@michfield][], [@rjocoleman][])
 * Issue [#15][]: Multi-VM Vagrantfiles are now fully supported. A global `omnibus.chef_version` will install the same version of Chef on all VMs OR declare a separate Chef version in the config block for each individual VM! ([@smdahlen][], [@schisamo][])
 * PR [#10][]: Optionally change the location of `install.sh` via the `OMNIBUS_INSTALL_URL` environment variable. Default is still https://www.opscode.com/chef/install.sh. , ([@petecheslock][])
 
@@ -16,10 +27,10 @@ IMPROVEMENTS:
 
 BUG FIXES:
 
-* Fixes [#2][]: Convert `Gem::Version` returned by `#retrieve_latest_chef_version` to a string. ([@schisamo][])
-* Fixes [#6][]: RubyGems 2.0 compat: use #empty? to check for results. ([@schisamo][])
-* Fixes [#7][]: Ensure 'vagrant-rackspace/action' is loaded. ([@schisamo][])
-* Fixes [#8][]: Trigger plugin if machine state is `:active`. ([@schisamo][])
+* Issue [#2][]: Convert `Gem::Version` returned by `#retrieve_latest_chef_version` to a string. ([@schisamo][])
+* Issue [#6][]: RubyGems 2.0 compat: use #empty? to check for results. ([@schisamo][])
+* Issue [#7][]: Ensure 'vagrant-rackspace/action' is loaded. ([@schisamo][])
+* Issue [#8][]: Trigger plugin if machine state is `:active`. ([@schisamo][])
 
 ## 1.0.1 (April 17, 2013)
 
@@ -39,20 +50,29 @@ BUG FIXES:
 
 * The initial release.
 <!--- The following link definition list is generated by PimpMyChangelog --->
-[#2]: https://github.com/schisamo/vagrant/issues/2
-[#3]: https://github.com/schisamo/vagrant/issues/3
-[#4]: https://github.com/schisamo/vagrant/issues/4
-[#6]: https://github.com/schisamo/vagrant/issues/6
-[#7]: https://github.com/schisamo/vagrant/issues/7
-[#8]: https://github.com/schisamo/vagrant/issues/8
-[#10]: https://github.com/schisamo/vagrant/issues/10
-[#15]: https://github.com/schisamo/vagrant/issues/15
-[#17]: https://github.com/schisamo/vagrant/issues/17
-[#19]: https://github.com/schisamo/vagrant/issues/19
-[#21]: https://github.com/schisamo/vagrant/issues/21
-[#23]: https://github.com/schisamo/vagrant/issues/23
+[#2]: https://github.com/schisamo/vagrant-omnibus/issues/2
+[#3]: https://github.com/schisamo/vagrant-omnibus/issues/3
+[#4]: https://github.com/schisamo/vagrant-omnibus/issues/4
+[#6]: https://github.com/schisamo/vagrant-omnibus/issues/6
+[#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
+[#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
+[#21]: https://github.com/schisamo/vagrant-omnibus/issues/21
+[#23]: https://github.com/schisamo/vagrant-omnibus/issues/23
+[#27]: https://github.com/schisamo/vagrant-omnibus/issues/27
+[#28]: https://github.com/schisamo/vagrant-omnibus/issues/28
+[#31]: https://github.com/schisamo/vagrant-omnibus/issues/31
+[#32]: https://github.com/schisamo/vagrant-omnibus/issues/32
+[#37]: https://github.com/schisamo/vagrant-omnibus/issues/37
+[#38]: https://github.com/schisamo/vagrant-omnibus/issues/38
+[@matsu911]: https://github.com/matsu911
 [@michfield]: https://github.com/michfield
 [@petecheslock]: https://github.com/petecheslock
 [@rjocoleman]: https://github.com/rjocoleman
 [@schisamo]: https://github.com/schisamo
-[@smdahlen]: https://github.com/smdahlen
+[@smdahlen]: https://github.com/smdahlen
+[@srenatus]: https://github.com/srenatus
+[@tmatilai]: https://github.com/tmatilai

data/Gemfile

@@ -6,13 +6,13 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.2.1"
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.2.7"
 end
 
 group :test do
-  gem "vagrant-digitalocean", "~> 0.2.0"
-  gem "vagrant-aws", "~> 0.2.2"
-  gem "vagrant-rackspace", "~> 0.1.1"
+  gem "vagrant-digitalocean", "~> 0.3.0"
+  gem "vagrant-aws", "~> 0.3.0"
+  gem "vagrant-rackspace", "~> 0.1.2"
 end
 
 group :docs do

data/README.md

@@ -1,6 +1,6 @@
 # vagrant-omnibus
 
-[![Gem Version](https://badge.fury.io/rb/vagrant-omnibus.png)](https://badge.fury.io/rb/vagrant-omnibus.png)
+[![Gem Version](https://badge.fury.io/rb/vagrant-omnibus.png)](https://rubygems.org/gems/vagrant-omnibus)
 [![Build Status](https://travis-ci.org/schisamo/vagrant-omnibus.png?branch=master)](https://travis-ci.org/schisamo/vagrant-omnibus)
 [![Dependency Status](https://gemnasium.com/schisamo/vagrant-omnibus.png)](https://gemnasium.com/schisamo/vagrant-omnibus)
 [![Code Climate](https://codeclimate.com/github/schisamo/vagrant-omnibus.png)](https://codeclimate.com/github/schisamo/vagrant-omnibus)
@@ -20,10 +20,11 @@ known to work with the following
   plugin)
 * VMWare Fusion (can be [purchased from Hashicorp](http://www.vagrantup.com/vmware))
 * LXC (ships in [vagrant-lxc](https://github.com/fgrehm/vagrant-lxc))
+* OpenStack (ships in [vagrant-openstack-plugin](https://github.com/cloudbau/vagrant-openstack-plugin))
 
 ## Installation
 
-Ensure you have downloaded and installed Vagrant 1.1.x from the
+Ensure you have downloaded and installed Vagrant 1.1 or newer from the
 [Vagrant downloads page](http://downloads.vagrantup.com/).
 
 Installation is performed in the prescribed manner for Vagrant 1.1 plugins.

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

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+require 'shellwords'
+
 module VagrantPlugins
   module Omnibus
     module Action
@@ -63,11 +65,12 @@ module VagrantPlugins
         end
 
         def install(version)
+          shell_escaped_version = Shellwords.escape(version)
           command = <<-INSTALL_OMNIBUS
             if command -v wget &>/dev/null; then
-              wget -qO- #{INSTALL_SH} | sudo bash -s -- -v #{version}
+              wget -qO- #{INSTALL_SH} | bash -s -- -v #{shell_escaped_version}
             elif command -v curl &>/dev/null; then
-              curl -L #{INSTALL_SH} -v #{version} | sudo bash
+              curl -L #{INSTALL_SH} | bash -s -- -v #{shell_escaped_version}
             else
               echo "Neither wget nor curl found. Please install one." >&2
               exit 1

data/lib/vagrant-omnibus/plugin.rb

@@ -31,8 +31,8 @@ module VagrantPlugins
       DESC
 
       action_hook(:install_chef, Plugin::ALL_ACTIONS) do |hook|
-        require_relative "action"
-        hook.after(Vagrant::Action::Builtin::Provision, Action.install_chef)
+        require_relative "action/install_chef"
+        hook.after(Vagrant::Action::Builtin::Provision, Action::InstallChef)
 
         # The AWS provider uses a non-standard Provision action on initial
         # creation:
@@ -40,7 +40,7 @@ module VagrantPlugins
         # https://github.com/mitchellh/vagrant-aws/blob/master/lib/vagrant-aws/action.rb#L105
         #
         if VagrantPlugins.const_defined?("AWS")
-          hook.after(VagrantPlugins::AWS::Action::TimedProvision, Action.install_chef)
+          hook.after(VagrantPlugins::AWS::Action::TimedProvision, Action::InstallChef)
         end
       end
 

data/lib/vagrant-omnibus/version.rb

@@ -16,6 +16,6 @@
 
 module VagrantPlugins
   module Omnibus
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/test/acceptance/aws/Vagrantfile

@@ -6,7 +6,7 @@ require 'vagrant-omnibus'
 require 'vagrant-aws'
 
 Vagrant.configure("2") do |config|
-  config.omnibus.chef_version = '11.4.0'
+  config.omnibus.chef_version = "11.4.0"
 
   config.vm.box = "dummy"
   config.vm.provider :aws do |aws, override|
@@ -16,7 +16,6 @@ Vagrant.configure("2") do |config|
 
     aws.instance_type = "m1.large"
     aws.ami = "ami-2efa9d47" # Ubuntu 12.04 LTS 64-bit instance root store
-    aws.ssh_username = "ubuntu"
 
     override.ssh.username = "ubuntu"
     override.ssh.private_key_path = "~/.ssh/id_rsa"

data/test/acceptance/virtualbox/Vagrantfile

@@ -22,7 +22,7 @@ Vagrant.configure("2") do |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.omnibus.chef_version = "10.24.0"
+    old_chef_config.omnibus.chef_version = '10.24.0'
 
     old_chef_config.vm.provision :chef_solo do |chef|
       chef.cookbooks_path = File.expand_path("../../../support/cookbooks", __FILE__)

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-omnibus
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
+  prerelease: 
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -71,7 +78,6 @@ files:
 - Rakefile
 - TODO.md
 - lib/vagrant-omnibus.rb
-- lib/vagrant-omnibus/action.rb
 - lib/vagrant-omnibus/action/install_chef.rb
 - lib/vagrant-omnibus/config.rb
 - lib/vagrant-omnibus/plugin.rb
@@ -90,26 +96,33 @@ files:
 homepage: https://github.com/schisamo/vagrant-omnibus
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1765446916124495526
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1765446916124495526
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A Vagrant plugin that ensures the desired version of Chef is installed via
   the platform-specific Omnibus packages.
 test_files:

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzNiOTFhOWM4OGRiODViMjA2Zjc5NzY0ZjFiMTIyZGFmMWFmOWJlYg==
-  data.tar.gz: !binary |-
-    N2Y5NTYwODVmODc0YmQwMjRjYjM4YmQ0YjE2Y2JhMGJlOTcwYTc1NQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ODYyNjY0ZDZmM2YxMmMzZTdlYjQyOTk4YzhiY2VmNWNjNzg3ZTAxYmVkZmZh
-    MzdjZDRiNjI3ZGMzMThhODhmNDMyNjNlZjliZTk2NjJjNGU5NGIzYzY5ZDEy
-    ODU0Y2ViMzU1ZWZjMTkxOWVkY2ZhMDU5YzlkMWViNjRjZmNhNGQ=
-  data.tar.gz: !binary |-
-    MGYzYmJjY2IwNDYyNjNlMDVkOWFlOThlNTVhYWI3NjAyODk4NDczMDM0Y2Ux
-    YzBmODQ4YTc5NDJjNjdhYTcyMjVkMTAyZjAzYWVjMjM0YzQxNGExZjIxMzkw
-    ZjU0ZTE1OGQ4YjM3YmM2M2ZlZjM2NzllZDE4MjI2ZTU5NzE4YmI=

data/lib/vagrant-omnibus/action.rb

@@ -1,30 +0,0 @@
-#
-# 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 "vagrant-omnibus/action/install_chef"
-
-module VagrantPlugins
-  module Omnibus
-    module Action
-      def self.install_chef
-        @install_chef ||= ::Vagrant::Action::Builder.new.tap do |b|
-          b.use ::Vagrant::Action::Builtin::ConfigValidate
-          b.use InstallChef
-        end
-      end
-    end
-  end
-end