vagrant-berkshelf 1.4.0.dev1 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab72184e8817a778c14479ba0240b7428e6ca499
-  data.tar.gz: 014174b38d6b5bcbed17974029eaf14a117aa033
+  metadata.gz: 86228fa24b97269de5159161b4548fec146cd4cf
+  data.tar.gz: c96edc36d6bc0303f7130dd0707dbfc51c39155c
 SHA512:
-  metadata.gz: 931caa0414264ce23e463c696d5dc6a54a53bae4385f65c6347632437d71510b30adf23dc7580c48df75300b011a26bbdb0469d8dfcefda97efc1598275b2d85
-  data.tar.gz: 3ce49237284d8f3c84de4191b4432da3c25d3dfd2fe2d85e2021c187f1ffa06db6559acdf65ae78dbdb0d0efbf045cf4b0294d36eb1b4924e631fbba1a44a90c
+  metadata.gz: 2d48d776c1437b35d853cab2ac2d204f82df395c523cf1a9b601776195b04ea28dc4d071b5d123d328c2b90e6880ce8cd823c7281b402cd5f7e0be1502920f99
+  data.tar.gz: bc0366f8b5c7b933ebdd1d57ae7ad9d5411464410ecb1f310cd78f6d1a7e6a196b7c794e325f0b7b9b4b2713c5f28d79e755d0a2d670fb4ba221341ca57b0d94

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
 notifications:
   irc:

data/CHANGELOG.md

@@ -1,21 +1,42 @@
+# 2.0.0
+
+* Enhancements
+  * Support Vagrant 1.5.x
+
 # 1.3.4
-- Fix undefined constant error when provisioning with Vagrant AWS
+
+* Bug Fixes
+  * Fix undefined constant error when provisioning with Vagrant AWS
 
 # 1.2.0
-- Rename to vagrant-berkshelf
-- Trigger the plugin also on `vagrant reload`
-- Check Vagrant version to see if it's supported
-- cookbooks uploaded via chef_client will be forced and not frozen
-- Fix bug with AWS provisioner
-- Respect --no-provision flag
+
+* Breaking Changes
+  * Rename to vagrant-berkshelf
+
+* Enhancements
+  * Trigger the plugin also on `vagrant reload`
+  * Check Vagrant version to see if it's supported
+  * cookbooks uploaded via chef_client will be forced and not frozen
+  * Respect --no-provision flag
+
+* Bug Fixes
+  * Fix bug with AWS provisioner
 
 # 1.1.2
-- Support Vagrant 1.2
-- Plugin defaults to enabled, if Berksfile exists.
+
+* Enhancements
+  * Support Vagrant 1.2
+  * Plugin defaults to enabled, if Berksfile exists.
 
 # 1.1.0
-- Plugin defaults to disabled. Set 'config.berkshelf.enabled = true' in Vagrant config
+
+* Enhancements
+  * Plugin defaults to disabled. Set 'config.berkshelf.enabled = true' in Vagrant config
 
 # 1.0.0
-- Separated Berkshelf Vagrant plugin into it's own gem (this one)
-- Support Vagrant 1.1.x
+
+* Breaking Changes
+  * Separated Berkshelf Vagrant plugin into it's own gem (this one)
+
+* Enhancements
+  * Support Vagrant 1.1.x

data/CONTRIBUTING.md

@@ -23,7 +23,7 @@ Install the latest version of [Bundler](http://gembundler.com)
 
 Clone the project
 
-    $ git clone git://github.com/RiotGames/vagrant-berkshelf.git
+    $ git clone git://github.com/berkshelf/vagrant-berkshelf.git
 
 and run:
 

data/Gemfile

@@ -3,7 +3,11 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'vagrant', github: 'mitchellh/vagrant'
+  gem 'vagrant', github: 'mitchellh/vagrant', tag: 'v1.5.2'
+end
+
+group :plugins do
+  gem "vagrant-berkshelf", path: "."
 end
 
 group :guard do

data/README.md

@@ -1,14 +1,13 @@
 # vagrant-berkshelf
 [![Gem Version](https://badge.fury.io/rb/vagrant-berkshelf.png)](http://badge.fury.io/rb/vagrant-berkshelf)
-[![Build Status](https://travis-ci.org/RiotGames/vagrant-berkshelf.png?branch=master)](https://travis-ci.org/RiotGames/vagrant-berkshelf)
-[![Dependency Status](https://gemnasium.com/RiotGames/vagrant-berkshelf.png)](https://gemnasium.com/RiotGames/vagrant-berkshelf)
-[![Code Climate](https://codeclimate.com/github/RiotGames/vagrant-berkshelf.png)](https://codeclimate.com/github/RiotGames/vagrant-berkshelf)
+[![Build Status](https://travis-ci.org/berkshelf/vagrant-berkshelf.png?branch=master)](https://travis-ci.org/berkshelf/vagrant-berkshelf)
+[![Dependency Status](https://gemnasium.com/berkshelf/vagrant-berkshelf.png)](https://gemnasium.com/berkshelf/vagrant-berkshelf)
 
 A Vagrant plugin to add Berkshelf integration to the Chef provisioners
 
 ## Installation
 
-Install Vagrant 1.2.x from the [Vagrant downloads page](http://downloads.vagrantup.com/)
+Install Vagrant 1.5.x from the [Vagrant downloads page](http://downloads.vagrantup.com/)
 
 Install the Vagrant Berkshelf plugin
 
@@ -30,6 +29,6 @@ The plugin will look in your current working directory for your `Berksfile` by d
 - Jamie Winsor (<jamie@vialstudios.com>)
 - Michael Ivey (<michael.ivey@riotgames.com>)
 
-Thank you to all of our [Contributors](https://github.com/RiotGames/vagrant-berkshelf/graphs/contributors), testers, and users.
+Thank you to all of our [Contributors](https://github.com/berkshelf/vagrant-berkshelf/graphs/contributors), testers, and users.
 
-If you'd like to contribute, please see our [contribution guidelines](https://github.com/RiotGames/vagrant-berkshelf/blob/master/CONTRIBUTING.md) first.
+If you'd like to contribute, please see our [contribution guidelines](https://github.com/berkshelf/vagrant-berkshelf/blob/master/CONTRIBUTING.md) first.

data/lib/berkshelf/vagrant.rb

@@ -20,7 +20,7 @@ module Berkshelf
     require_relative 'vagrant/env'
     require_relative 'vagrant/env_helpers'
 
-    TESTED_CONSTRAINT = "~> 1.2.0"
+    TESTED_REQUIREMENTS = [">= 1.1", "< 1.5.0"]
 
     class << self
       # The path to where shelfs are created on the host machine to be mounted in

data/lib/berkshelf/vagrant/action.rb

@@ -16,7 +16,7 @@ module Berkshelf
         # this stack will find retrieve and resolve the cookbook dependencies describe
         # in your configured Berksfile.
         #
-        # Cookbooks will installed into a temporary directory, called a Shelf, and mounted
+        # Cookbooks will install into a temporary directory, called a Shelf, and be mounted
         # into the VM. This mounted path will be appended to the chef_solo.cookbooks_path value.
         #
         # @return [::Vagrant::Action::Builder]

data/lib/berkshelf/vagrant/action/install.rb

@@ -17,14 +17,17 @@ module Berkshelf
           end
 
           unless berkshelf_enabled?(env)
-            if File.exist?(env[:global_config].berkshelf.berksfile_path)
+            if File.exist?(berksfile_path(env))
               warn_disabled_but_berksfile_exists(env)
             end
 
             return @app.call(env)
           end
 
-          env[:berkshelf].berksfile = Berkshelf::Berksfile.from_file(env[:global_config].berkshelf.berksfile_path)
+          opts = env[:machine].config.berkshelf.to_hash.symbolize_keys
+          opts.delete(:except) if opts[:except].empty?
+          opts.delete(:only) if opts[:only].empty?
+          env[:berkshelf].berksfile = Berkshelf::Berksfile.from_file(berksfile_path(env), opts)
 
           if chef_solo?(env)
             install(env)
@@ -42,8 +45,7 @@ module Berkshelf
             env[:berkshelf].ui.info "Updating Vagrant's berkshelf: '#{env[:berkshelf].shelf}'"
             FileUtils.rm_rf(env[:berkshelf].shelf)
 
-            opts = env[:machine].config.berkshelf.to_hash.symbolize_keys
-            env[:berkshelf].berksfile.vendor(env[:berkshelf].shelf, opts)
+            env[:berkshelf].berksfile.vendor(env[:berkshelf].shelf)
           end
 
           def warn_disabled_but_berksfile_exists(env)
@@ -54,20 +56,24 @@ module Berkshelf
           end
 
           def check_vagrant_version(env)
-            unless vagrant_version_satisfies?(">= 1.1")
-              raise Berkshelf::VagrantWrapperError.new(RuntimeError.new("vagrant-berkshelf requires Vagrant 1.1 or later."))
+            unless vagrant_version_satisfies?(">= 1.5")
+              raise Berkshelf::VagrantWrapperError.new(RuntimeError.new("vagrant-berkshelf requires Vagrant 1.5 or later."))
             end
 
-            unless vagrant_version_satisfies?(::Berkshelf::Vagrant::TESTED_CONSTRAINT)
+            unless vagrant_version_satisfies?(::Berkshelf::Vagrant::TESTED_REQUIREMENTS)
               env[:berkshelf].ui.warn "This version of the Berkshelf plugin has not been fully tested on this version of Vagrant."
               env[:berkshelf].ui.warn "You should check for a newer version of vagrant-berkshelf."
-              env[:berkshelf].ui.warn "If you encounter any errors with this version, please report them at https://github.com/RiotGames/vagrant-berkshelf/issues"
+              env[:berkshelf].ui.warn "If you encounter any errors with this version, please report them at https://github.com/berkshelf/vagrant-berkshelf/issues"
               env[:berkshelf].ui.warn "You can also join the discussion in #berkshelf on Freenode."
             end
           end
 
-          def vagrant_version_satisfies?(requirement)
-            Gem::Requirement.new(requirement).satisfied_by? Gem::Version.new(::Vagrant::VERSION)
+          def vagrant_version_satisfies?(requirements)
+            Gem::Requirement.new(requirements).satisfied_by? Gem::Version.new(::Vagrant::VERSION)
+          end
+
+          def berksfile_path(env)
+            env[:machine].env.vagrantfile.config.berkshelf.berksfile_path
           end
       end
     end

data/lib/berkshelf/vagrant/config.rb

@@ -43,17 +43,19 @@ module Berkshelf
 
       # @param [String] value
       def berksfile_path=(value)
-        @berksfile_path = File.expand_path(value)
+        @berksfile_path = value
       end
 
       # @param [String] value
       def client_key=(value)
-        @client_key = File.expand_path(value)
+        @client_key = value
       end
 
       alias_method :to_hash, :instance_variables_hash
 
       def validate(machine)
+        @berksfile_path = File.expand_path(@berksfile_path, machine.env.root_path.to_s)
+        @client_key = File.expand_path(@client_key, machine.env.root_path.to_s)
         errors = Array.new
 
         unless [TrueClass, FalseClass].include?(enabled.class)
@@ -73,7 +75,7 @@ module Berkshelf
             errors << "A value for berkshelf.empty and berkshelf.only cannot both be defined."
           end
 
-          if machine.env.config_global.vm.provisioners.any? { |prov| prov.name == :chef_client }
+          if global_provisioners(machine).any? { |prov| prov.name == :chef_client }
             if machine.config.berkshelf.node_name.nil?
               errors << "A configuration must be set for chef.node_name when using the chef_client provisioner. Run 'berks configure' or edit your configuration."
             end
@@ -86,6 +88,12 @@ module Berkshelf
 
         { "berkshelf configuration" => errors }
       end
+
+      private
+
+        def global_provisioners(machine)
+          machine.env.vagrantfile.config.vm.provisioners
+        end
     end
   end
 end

data/lib/berkshelf/vagrant/env.rb

@@ -14,11 +14,8 @@ module Berkshelf
       attr_accessor :config
 
       def initialize
-        if Gem::Version.new(::Vagrant::VERSION) >= Gem::Version.new("1.2")
-          @ui = ::Vagrant::UI::Colored.new.scope('Berkshelf')
-        else
-          @ui = ::Vagrant::UI::Colored.new('Berkshelf')
-        end
+        @ui = ::Vagrant::UI::Colored.new
+        @ui.opts[:target] = 'Berkshelf'
         @config = Berkshelf::Config.instance
       end
     end

data/lib/berkshelf/vagrant/env_helpers.rb

@@ -9,7 +9,7 @@ module Berkshelf
       #
       # @return [String]
       def cache_file(env)
-        File.join('.vagrant', 'machines', env[:machine].name.to_s, 'berkshelf')
+        File.expand_path(File.join('.vagrant', 'machines', env[:machine].name.to_s, 'berkshelf'), env[:root_path].to_s)
       end
 
       # Filter all of the provisioners of the given vagrant environment with the given name

data/lib/berkshelf/vagrant/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module Vagrant
-    VERSION = "1.4.0.dev1"
+    VERSION = "2.0.0.rc1"
   end
 end

data/spec/unit/berkshelf/vagrant/config_spec.rb

@@ -47,7 +47,7 @@ describe Berkshelf::Vagrant::Config do
   end
 
   describe "#validate" do
-    let(:env) { double('env') }
+    let(:env) { double('env', root_path: Dir.pwd ) }
     let(:config) { double('config', berkshelf: subject) }
     let(:machine) { double('machine', config: config, env: env) }
 
@@ -58,7 +58,7 @@ describe Berkshelf::Vagrant::Config do
     context "when the plugin is enabled" do
       before(:each) do
         subject.stub(enabled: true)
-        env.stub_chain(:config_global, :vm, :provisioners, :any?)
+        env.stub_chain(:vagrantfile, :config, :vm, :provisioners, :any?)
       end
 
       let(:result) { subject.validate(machine) }
@@ -81,7 +81,7 @@ describe Berkshelf::Vagrant::Config do
     end
 
     context "when the plugin is disabled" do
-      let(:machine) { double('machine') }
+      let(:machine) { double('machine', env: env) }
 
       before do
         subject.stub(enabled: false)

data/vagrant-berkshelf.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 1.9.1'
 
-  spec.add_dependency 'berkshelf', '>= 3.0.0.beta3'
+  spec.add_dependency 'berkshelf', '>= 3.0.0.beta7'
 
   spec.add_development_dependency 'spork', '~> 0.9'
   spec.add_development_dependency 'rspec', '~> 2.13'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.4.0.dev1
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta3
+        version: 3.0.0.beta7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta3
+        version: 3.0.0.beta7
 - !ruby/object:Gem::Dependency
   name: spork
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin to add Berkshelf integration to the Chef provisioners