vagrant-omnibus 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzQxYmJiN2Q2YzI1NGYyMTg4Njk5NmEyNzMwNmZiOTlmMGMyY2QzNw==
+  data.tar.gz: !binary |-
+    NzVlNTBhMmI0ZGI0ODkyYzc0MjA3YzA2NDdiNGQ2NWJjZjAzMTUyYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MDEyMTRjZDlmMzQ4YWQ5MGZiMzliMjk4Mzk5NzQ0NzhhNGI3Yzc3YmU1ZDZi
+    MmQ2MWIxNDM2NjI0M2Q0YjcxZjE3NDNlMGY5N2Q5ZDE1NTRmNTQwNjIzNTEy
+    MWU3ZDA5MjdhODEzMjQwNTcxMTFjN2VlZGM1ZTA4ZDE2NGVmOWM=
+  data.tar.gz: !binary |-
+    YjQ4NWI5NTQwMzc2MmE4YjA0ZTQ5NjI0OTg0ZDBlYzNmZjViMmI1NGJhZGU1
+    ZTM2OGE2MzMzZGQ1ZDc5YzI1YjgxMjFjZTljZTI4NGU2NjM0NjUxY2Y3YTZm
+    MGU3OThiMWY1MjFhNzY0ZDk4YjNmOTA3Zjg5NGY2OWJmNTkwMDk=

data/.rspec

@@ -0,0 +1 @@
+--default_path test/unit

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+script: rake test:unit

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 1.0.2 (April 20, 2013)
+
+IMPROVEMENTS:
+
+* unit test coverage for `VagrantPlugins::Omnibus::Config`
+* Add Rackspace provider acceptance test.
+* Parameterize the acceptance test Rake task, this allows you test run
+  acceptance tests against a single provider.
+
+BUG FIXES:
+
+* convert `Gem::Version` returned by `#retrieve_latest_chef_version` to a
+  string. fixes [GH-2] for realz.
+* RubyGems 2.0 compat: use #empty? to check for results. fixes [GH-6]
+* Ensure 'vagrant-rackspace/action' is loaded. fixes [GH-7]
+* Trigger plugin if machine state is `:active`. fixes [GH-8]
+
 ## 1.0.1 (April 17, 2013)
 
 IMPROVEMENTS:

data/Gemfile

@@ -10,7 +10,8 @@ group :development do
 end
 
 group :test do
-  gem "vagrant-aws", "~> 0.2.1"
+  gem "vagrant-aws", "~> 0.2.2"
+  gem "vagrant-rackspace", "~> 0.1.1"
 end
 
 group :docs do

data/README.md

@@ -1,9 +1,24 @@
 # vagrant-omnibus
 
+[![Gem Version](https://badge.fury.io/rb/vagrant-omnibus.png)](https://badge.fury.io/rb/vagrant-omnibus.png)
+[![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)
+
 A Vagrant plugin that ensures the desired version of Chef is installed via the
 platform-specific Omnibus packages. This proves very useful when using Vagrant
 with provisioner-less baseboxes OR cloud images.
 
+This plugin has been verified to work with the following
+[Vagrant providers](http://docs.vagrantup.com/v2/providers/index.html):
+
+* VirtualBox (part of core)
+* AWS (ships in [vagrant-aws](https://github.com/mitchellh/vagrant-aws) plugin)
+* Rackspace (ships in [vagrant-rackspace](https://github.com/mitchellh/vagrant-rackspace)
+  plugin)
+
+It may work with other Vagrant providers but is not guaranteed to!
+
 ## Installation
 
 Ensure you have downloaded and installed Vagrant 1.1.x from the
@@ -50,7 +65,13 @@ end
 
 ### Unit
 
-Coming soon!
+The unit tests can be run with:
+
+```
+rake test:unit
+```
+
+The test are also executed by Travis CI every time code is pushed to GitHub.
 
 ### Acceptance
 
@@ -60,12 +81,8 @@ Currently this repo ships with a set of basic acceptance tests that will:
 * Attempt to install Chef 11.4.0 using this plugin.
 * Perform a very basic chef-solo run to ensure Chef is in fact installed.
 
-The acceptance tests are run with the following Vagrant providers:
-
-* VirtualBox (part of core)
-* AWS (ships in [vagrant-aws](https://github.com/mitchellh/vagrant-aws) plugin)
-
-The acceptance tests can be run with:
+The acceptance tests are run against the Vagrant providers mentioned above. The
+acceptance tests can be run with:
 
 ```
 rake test:acceptance

data/Rakefile

@@ -8,21 +8,30 @@ YARD::Rake::YardocTask.new
 namespace :test do
 
   RSpec::Core::RakeTask.new(:unit) do |t|
-    t.pattern = "test/unit/**/*_test.rb"
+    t.pattern = "test/unit/**/*_spec.rb"
   end
 
   desc "Run acceptance tests..these actually launch Vagrant sessions."
-  task :acceptance do
+  task :acceptance, :provider do |t, args|
 
-    # ensure AWS dummy box is installed
-    unless system("vagrant box list | grep dummy &>/dev/null")
-      system("vagrant box add dummy https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box")
+    # ensure all required dummy boxen are installed
+    %w{ aws rackspace }.each do |provider|
+      unless system("vagrant box list | grep 'dummy\s*(#{provider})' &>/dev/null")
+        system("vagrant box add dummy https://github.com/mitchellh/vagrant-#{provider}/raw/master/dummy.box")
+      end
     end
 
-    Dir["test/acceptance/*"].each do |provider_test_dir|
+    all_providers = Dir["test/acceptance/*"].map{|dir| File.basename(File.expand_path(dir))}
 
-      provider = File.basename(File.expand_path(provider_test_dir))
+    # If a provider wasn't passed to the task run acceptance tests against
+    # ALL THE PROVIDERS!
+    providers = if args[:provider] && all_providers.include?(args[:provider])
+                  [args[:provider]]
+                else
+                  all_providers
+                end
 
+    providers.each do |provider|
       puts "=================================================================="
       puts "Running acceptance tests against '#{provider}' provider..."
       puts "=================================================================="

data/lib/vagrant-omnibus/action.rb

@@ -20,7 +20,7 @@ module VagrantPlugins
   module Omnibus
     module Action
       autoload :InstallChef, File.expand_path("../action/install_chef", __FILE__)
-      autoload :IsRunning, File.expand_path("../action/is_running", __FILE__)
+      autoload :IsRunningOrActive, File.expand_path("../action/is_running_or_active", __FILE__)
       autoload :ReadChefVersion, File.expand_path("../action/read_chef_version", __FILE__)
 
       # Include the built-in modules so that we can use them as top-level
@@ -31,7 +31,7 @@ module VagrantPlugins
       def self.install_chef
         @install_chef ||= ::Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use Call, IsRunning do |env1, b2|
+          b.use Call, IsRunningOrActive do |env1, b2|
             if env1[:result]
               b2.use ReadChefVersion
               b2.use InstallChef

data/lib/vagrant-omnibus/action/{is_running.rb → is_running_or_active.rb}

@@ -17,24 +17,25 @@
 module VagrantPlugins
   module Omnibus
     module Action
-      # @author Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
       # @author Seth Chisamore <schisamo@opscode.com>
       #
-      # This action checks if the machine is up and running.
+      # This action checks if the machine is running (virtualbox) or active
+      # (aws, rackspace).
       #
-      # This is a direct copy of
-      # `VagrantPlugins::ProviderVirtualBox::Action::IsRunning` that is part of
-      # the VirtualBox provider that ships in core Vagrant.
-      #
-      # @todo find out why this isn't part of `Vagrant::Action::Builtin`
-      class IsRunning
+      class IsRunningOrActive
         def initialize(app, env)
           @app = app
         end
 
         def call(env)
-          # Set the result to be true if the machine is running.
-          env[:result] = env[:machine].state.id == :running
+          # Set the result to be true if the machine is :running or :active.
+          if (env[:machine].state.id == :running) ||
+             (env[:machine].state.id == :active)
+
+            env[:result] = true
+          else
+            env[:result] = false
+          end
 
           # Call the next if we have one (but we shouldn't, since this
           # middleware is built to run with the Call-type middlewares)

data/lib/vagrant-omnibus/config.rb

@@ -56,8 +56,6 @@ module VagrantPlugins
 
       # 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
@@ -72,9 +70,7 @@ module VagrantPlugins
                           best_gem && [best_gem.spec, best_gem.source]
                         end
 
-        latest_version = spec && spec.version
-
-        latest_version
+        spec && spec.version.to_s
       end
 
       # Query RubyGems.org's Ruby API to see if the user-provided Chef version
@@ -83,7 +79,7 @@ module VagrantPlugins
         is_valid = false
         begin
           available = dependency_installer.find_gems_with_sources(chef_gem_dependency(version))
-          is_valid = true if available.any?
+          is_valid = true unless available.empty?
         rescue
         end
         is_valid

data/lib/vagrant-omnibus/plugin.rb

@@ -54,6 +54,10 @@ module VagrantPlugins
         end
 
         if VagrantPlugins.const_defined?("Rackspace")
+          # The `VagrantPlugins::Rackspace` module is missing the autoload for
+          # `VagrantPlugins::Rackspace::Action` so we need to ensure it is
+          # loaded before accessing the module in the after hook below.
+          require 'vagrant-rackspace/action'
           hook.after(VagrantPlugins::Rackspace::Action::CreateServer, Action.install_chef)
         end
 

data/lib/vagrant-omnibus/version.rb

@@ -16,6 +16,6 @@
 
 module VagrantPlugins
   module Omnibus
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/test/acceptance/rackspace/Vagrantfile

@@ -0,0 +1,27 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# plugins don't seem to be auto-loaded from the bundle
+require 'vagrant-omnibus'
+require 'vagrant-rackspace'
+
+Vagrant.configure("2") do |config|
+  config.omnibus.chef_version = '11.4.0'
+
+  config.vm.box = "dummy"
+  config.vm.provider :rackspace do |rackspace|
+    rackspace.username = ENV['DEV_RACKSPACE_USERNAME']
+    rackspace.api_key = ENV['DEV_RACKSPACE_API_KEY']
+    rackspace.flavor = /512MB/
+    rackspace.image = /Ubuntu 12.04/
+    rackspace.public_key_path = "~/.ssh/id_rsa.pub"
+    # TODO - switch this to the `override.ssh.private_key_path` syntax once
+    # `vagrant-rackspace` is updated.
+    config.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

data/test/unit/spec_helper.rb

@@ -1,7 +1,11 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+
+require 'rspec/core'
 require 'vagrant-omnibus'
 
 RSpec.configure do |config|
+  config.formatter = :documentation
+
   # a little syntactic sugar
   config.alias_it_should_behave_like_to :it_has_behavior, 'has behavior:'
 

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

@@ -0,0 +1,71 @@
+# 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'
+
+describe VagrantPlugins::Omnibus::Config do
+  let(:instance){ described_class.new }
+
+  subject(:config) do
+    instance.tap do |o|
+      o.chef_version = chef_version if defined?(chef_version)
+      o.finalize!
+    end
+  end
+
+  describe "defaults" do
+    its(:chef_version){ should be_nil }
+  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 "#validate" do
+    let(:machine) { double('machine') }
+    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
+      result.should be_a(Hash)
+      result.should have_key(error_hash_key)
+    end
+
+    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
+              errors.should be_empty
+            end
+          else
+            it "fails" do
+              errors.should_not be_empty
+            end
+          end
+        end
+      end
+    end # describe chef_version
+  end # describe #validate
+
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-omnibus
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -68,6 +61,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - .yardopts
 - CHANGELOG.md
 - Gemfile
@@ -78,55 +73,52 @@ files:
 - lib/vagrant-omnibus.rb
 - lib/vagrant-omnibus/action.rb
 - lib/vagrant-omnibus/action/install_chef.rb
-- lib/vagrant-omnibus/action/is_running.rb
+- lib/vagrant-omnibus/action/is_running_or_active.rb
 - lib/vagrant-omnibus/action/read_chef_version.rb
 - lib/vagrant-omnibus/config.rb
 - lib/vagrant-omnibus/plugin.rb
 - lib/vagrant-omnibus/version.rb
 - test/acceptance/aws/Vagrantfile
+- test/acceptance/rackspace/Vagrantfile
 - test/acceptance/virtualbox/Vagrantfile
 - test/support/cookbooks/chef-inator/README.md
 - test/support/cookbooks/chef-inator/metadata.rb
 - test/support/cookbooks/chef-inator/recipes/default.rb
 - test/unit/spec_helper.rb
+- test/unit/vagrant-omnibus/config_spec.rb
 - vagrant-omnibus.gemspec
 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: 4157044692282248393
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4157044692282248393
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Vagrant plugin that ensures the desired version of Chef is installed via
   the platform-specific Omnibus packages.
 test_files:
 - test/acceptance/aws/Vagrantfile
+- test/acceptance/rackspace/Vagrantfile
 - test/acceptance/virtualbox/Vagrantfile
 - test/support/cookbooks/chef-inator/README.md
 - test/support/cookbooks/chef-inator/metadata.rb
 - test/support/cookbooks/chef-inator/recipes/default.rb
 - test/unit/spec_helper.rb
+- test/unit/vagrant-omnibus/config_spec.rb
 has_rdoc: