vagrant-omnibus 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -1,3 +1,21 @@
-## 1.0.0
+## 1.0.1 (April 17, 2013)
+
+IMPROVEMENTS:
+
+* Resolve `latest` to a real Chef version. This ensures the plugin does not
+  attempt to re-install Chef on subsequent provisions. [GH-2]
+* Validate user provided value for omnibus.chef_version is in fact a real Chef
+  version. [GH-4]
+* Retrieve omnibus.chef_version directly from global config.
+* Update development depdendencies to vagrant (1.2.1) and vagrant-aws
+  (0.2.1).
+
+BUG FIXES:
+
+* Plugin now correctly operates in "no-op" node if now "omnibus.chef_version"
+  is not present in the Vagrantfile. [GH-3]
+* Use Ubuntu 12.04 release AMI for acceptance testing.
+
+## 1.0.0 (April 1, 2013)
 
 * The initial release.

data/Gemfile

@@ -6,11 +6,11 @@ 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.1.4"
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.2.1"
 end
 
 group :test do
-  gem "vagrant-aws", "~> 0.1.2"
+  gem "vagrant-aws", "~> 0.2.1"
 end
 
 group :docs do

data/TODO.md

@@ -1,7 +1,5 @@
 # TODO
 
-* Validate `omnibus.chef_version` provided by user is in fact a valid release
-  of Chef.
 * Add support for installing pre-release versions of Chef.
 * Better acceptance test coverage.
 * Unit test coverage.

data/lib/vagrant-omnibus.rb

@@ -1,3 +1,19 @@
+#
+# 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 "pathname"
 require "vagrant-omnibus/plugin"
 

data/lib/vagrant-omnibus/action.rb

@@ -1,3 +1,19 @@
+#
+# 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/action/builder"
 
 module VagrantPlugins

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

@@ -1,3 +1,19 @@
+#
+# 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
     module Action
@@ -12,11 +28,11 @@ module VagrantPlugins
           @app = app
           # Config#finalize! SHOULD be called automatically
           env[:global_config].omnibus.finalize!
-          env["omnibus.desired_chef_version"] ||= env[:global_config].omnibus.chef_version
         end
 
         def call(env)
-          desired_chef_version = env["omnibus.desired_chef_version"]
+          desired_chef_version = env[:global_config].omnibus.chef_version
+
           unless desired_chef_version.nil?
             env[:ui].info("Ensuring Chef is installed at requested version of #{desired_chef_version}.")
             if env[:installed_chef_version] == desired_chef_version
@@ -26,6 +42,7 @@ module VagrantPlugins
               env[:ssh_run_command] = install_chef_command(desired_chef_version)
             end
           end
+
           @app.call(env)
         end
 

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

@@ -1,3 +1,19 @@
+#
+# 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
     module Action

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

@@ -1,3 +1,19 @@
+#
+# 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
     module Action

data/lib/vagrant-omnibus/config.rb

@@ -1,4 +1,22 @@
-require "vagrant"
+#
+# 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'
 
 module VagrantPlugins
   module Omnibus
@@ -14,7 +32,69 @@ module VagrantPlugins
       end
 
       def finalize!
-        @chef_version = nil if @require_chef_version == UNSET_VALUE
+        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
+      end
+
+      def validate(machine)
+        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/"
+          errors << msg
+        end
+
+        { "Omnibus Plugin" => errors }
+      end
+
+      private
+
+      # Query RubyGems.org's Ruby API and retrive the latest version of Chef.
+      def retrieve_latest_chef_version
+        latest_version = nil
+
+        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
+
+        latest_version = spec && spec.version
+
+        latest_version
+      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 if available.any?
+        rescue
+        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

data/lib/vagrant-omnibus/plugin.rb

@@ -1,3 +1,19 @@
+#
+# 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.
+#
+
 begin
   require "vagrant"
 rescue LoadError

data/lib/vagrant-omnibus/version.rb

@@ -1,6 +1,21 @@
+#
+# 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.0.0"
+    VERSION = "1.0.1"
   end
 end

data/test/acceptance/aws/Vagrantfile

@@ -9,15 +9,17 @@ Vagrant.configure("2") do |config|
   config.omnibus.chef_version = '11.4.0'
 
   config.vm.box = "dummy"
-  config.vm.provider :aws do |aws|
+  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.ssh_private_key_path = "~/.ssh/id_rsa"
 
-    aws.ami = "ami-cc970ca5" # Ubuntu 12.04 LTS 64-bit instance root store
+    aws.instance_type = "m1.large"
+    aws.ami = "ami-2efa9d47" # Ubuntu 12.04 LTS 64-bit instance root store
     aws.ssh_username = "ubuntu"
-    config.ssh.username = "ubuntu"
+
+    override.ssh.username = "ubuntu"
+    override.ssh.private_key_path = "~/.ssh/id_rsa"
   end
 
   config.vm.provision :chef_solo do |chef|

data/test/acceptance/virtualbox/Vagrantfile

@@ -5,7 +5,7 @@
 require 'vagrant-omnibus'
 
 Vagrant.configure("2") do |config|
-  config.omnibus.chef_version = '11.4.0'
+  config.omnibus.chef_version = :latest
 
   config.vm.box = "canonical-ubuntu-12.04"
   config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-omnibus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3710912519798650460
+      hash: 4157044692282248393
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3710912519798650460
+      hash: 4157044692282248393
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25