vagrant-berkshelf 2.0.1 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0d9bbf9d6d41659443ed835c10c67361b44eb4e
-  data.tar.gz: 8094ab33d81a900ef1c856af121be08c46f5fb7e
+  metadata.gz: 62de20b48013f967082c65d1aedb9f29292e694c
+  data.tar.gz: 1172289f2a081195c6fbf72d8311954a6c8b238c
 SHA512:
-  metadata.gz: 967829c95d9d9415dab4d784634b5bd111a0e714340dd1b23356fb2787bce68865d956e897b187d4fc01a40014cfc733b08c10614797262c14ec7f3790d28713
-  data.tar.gz: 0e98e2ee7973f75fdd2497b066a05b2f891b3b580b3ce70444e354f906ed6f87fcb9f0e2f3454a7a9545a4bf0719feae46c94c41c50438c3db68b4f6e209d02c
+  metadata.gz: edd6b97e93c2a74463c16b1bdca1fce19575f94506d8a690625f233ab5e4e5fb52e4b8c14f904db222ca2a24b14d515e13f15a3f66f66a0a72809cf731eb8b7a
+  data.tar.gz: 877fdae6ba5e16e5a3b6920af4759b88cd5288d42ecf65d6bf6ba1dae7a4e83fe9bae5fac6594216c8258669245ef740c99bb33557a34838dcf4d57ffeecd72b

data/.gitignore

@@ -16,3 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 .rspec
+.vagrant
+integration/Berksfile.lock

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 3.0.0
+
+* Enhancements
+  * Now leverages the Berkshelf version installed by ChefDK
+  * Installation process of plugin should be many, many times faster
+
+* Bug Fixes
+  * Fix many installation issues for Windows users
+  * Fix warning output of berkshelf path when berkshelf is disabled but a Berksfile is present
+  * Ensure default values for configuration are properly set
+
 # 2.0.1
 
 * Bug Fixes

data/Gemfile

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

data/README.md

@@ -2,15 +2,14 @@
 
 [![Gem Version](https://badge.fury.io/rb/vagrant-berkshelf.png)](http://badge.fury.io/rb/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.5.2' from the [Vagrant downloads page](http://www.vagrantup.com/downloads.html)
-
-Install the Vagrant Berkshelf plugin
+1. Install [Vagrant](http://www.vagrantup.com/downloads.html) ">= 1.5.2"
+2. Install [ChefDK](http://getchef.com/downloads/chef-dk) ">= 0.2.0"
+3. Install the Vagrant Berkshelf plugin
 
     $ vagrant plugin install vagrant-berkshelf
 
@@ -26,6 +25,13 @@ Once the Vagrant Berkshelf plugin is installed it can be enabled in your Vagrant
 
 The plugin will look in your current working directory for your `Berksfile` by default. Just ensure that your Berksfile exists and when you run `vagrant up`, `vagrant provision`, or `vagrant destroy` the Berkshelf integration will automatically kick in!
 
+> The Vagrant Berkshelf plugin does not support multi-machine Vagrantfiles.
+
+## Getting Help
+
+* If you have an issue: report it on the [issue tracker](https://github.com/berkshelf/berkshelf/issues)
+* If you have a question: visit the #chef or #berkshelf channel on irc.freenode.net
+
 # Authors
 
 - Jamie Winsor (<jamie@vialstudios.com>)

data/integration/Berksfile

@@ -0,0 +1,3 @@
+source "https://supermarket.getchef.com"
+
+cookbook "apt"

data/integration/Gemfile

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+group :development do
+  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"
+end
+
+group :plugins do
+  gem "vagrant-berkshelf", path: "../"
+  gem "vagrant-omnibus"
+end

data/integration/Vagrantfile

@@ -0,0 +1,19 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+Vagrant.require_version ">= 1.5.0"
+
+Vagrant.configure("2") do |config|
+  config.vm.hostname = "vagrant-builder-int"
+  config.vm.box      = "opscode-ubuntu-14.04"
+  config.vm.box_url  = "https://vagrantcloud.com/chef/ubuntu-14.04/version/1/provider/virtualbox.box"
+
+  config.vm.network :private_network, type: "dhcp"
+
+  config.omnibus.chef_version = :latest
+
+  config.vm.provision :chef_client do |chef|
+    chef.chef_server_url     = "https://api.opscode.com/organizations/undeadlabs"
+    chef.validation_key_path = File.expand_path("~/.chef/undeadlabs-validator.pem")
+    chef.run_list            = ["apt::default"]
+  end
+end

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

@@ -23,50 +23,46 @@ module Berkshelf
             return @app.call(env)
           end
 
-          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)
+            vendor(env)
           end
 
           @app.call(env)
-        rescue Berkshelf::BerkshelfError => e
-          raise Berkshelf::VagrantWrapperError.new(e)
+        rescue => ex
+          raise Berkshelf::VagrantWrapperError.new(ex)
         end
 
         private
 
-          def install(env)
+          def vendor(env)
             check_vagrant_version(env)
             env[:berkshelf].ui.info "Updating Vagrant's berkshelf: '#{env[:berkshelf].shelf}'"
             FileUtils.rm_rf(env[:berkshelf].shelf)
 
-            env[:berkshelf].berksfile.vendor(env[:berkshelf].shelf)
+            opts                = env[:machine].config.berkshelf.to_hash
+            berks_opts          = { berksfile: opts[:berksfile_path] }
+            berks_opts[:except] = opts[:except] if opts.has_key?(:except) && !opts[:except].empty?
+            berks_opts[:only]   = opts[:only] if opts.has_key?(:only) && !opts[:only].empty?
+
+            env[:berkshelf].ui.info berks("vendor", env[:berkshelf].shelf, berks_opts)
           end
 
           def warn_disabled_but_berksfile_exists(env)
             env[:berkshelf].ui.warn "Berkshelf plugin is disabled but a Berksfile was found at" +
-              " your configured path: #{env[:global_config].berkshelf.berksfile_path}"
+              " your configured path: #{berksfile_path(env)}"
             env[:berkshelf].ui.warn "Enable the Berkshelf plugin by setting 'config.berkshelf.enabled = true'" +
               " in your vagrant config"
           end
 
           def check_vagrant_version(env)
             unless vagrant_version_satisfies?(">= 1.5")
-              raise Berkshelf::VagrantWrapperError.new(RuntimeError.new("vagrant-berkshelf requires Vagrant 1.5 or later."))
+              raise UnsupportedVagrantVersion.new(">= 1.5")
             end
           end
 
           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
   end

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

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 module Berkshelf
   module Vagrant
     module Action
@@ -22,25 +24,27 @@ module Berkshelf
           end
 
           @app.call(env)
-        rescue Berkshelf::BerkshelfError => e
-          raise Berkshelf::VagrantWrapperError.new(e)
         end
 
         private
 
           def upload(env)
             provisioners(:chef_client, env).each do |provisioner|
-              env[:berkshelf].ui.info "Uploading cookbooks to '#{provisioner.config.chef_server_url}'"
-              env[:berkshelf].berksfile.upload(
-                server_url: provisioner.config.chef_server_url,
-                client_name: env[:berkshelf].config.chef.node_name,
-                client_key: env[:berkshelf].config.chef.client_key,
-                ssl: {
-                  verify: env[:berkshelf].config.ssl.verify
-                },
-                force: true,
-                freeze: false
-              )
+              begin
+                # Temporarily generate a berkshelf configuration to pass to the CLI since not all versions
+                # of the CLI allow overriding all options needed for upload.
+                tmp_config = Tempfile.new("berks-config")
+                config     = BerksConfig.instance.dup
+                config[:chef][:chef_server_url] = provisioner.config.chef_server_url
+                tmp_config.write(config.to_json)
+                tmp_config.flush
+
+                env[:berkshelf].ui.info "Uploading cookbooks to '#{provisioner.config.chef_server_url}'"
+                berks("upload", config: tmp_config.path, berksfile: berksfile_path(env), force: true,
+                  freeze: false)
+              ensure
+                tmp_config.close! unless tmp_config.nil?
+              end
             end
           end
       end

data/lib/berkshelf/vagrant/action.rb

@@ -8,7 +8,6 @@ module Berkshelf
       require_relative 'action/configure_chef'
       require_relative 'action/install'
       require_relative 'action/load_shelf'
-      require_relative 'action/set_ui'
       require_relative 'action/upload'
 
       class << self
@@ -55,7 +54,6 @@ module Berkshelf
         def setup
           @setup ||= ::Vagrant::Action::Builder.new.tap do |b|
             b.use ::Vagrant::Action::Builtin::EnvSet, berkshelf: Berkshelf::Vagrant::Env.new
-            b.use Berkshelf::Vagrant::Action::SetUI
             b.use Berkshelf::Vagrant::Action::LoadShelf
             b.use Berkshelf::Vagrant::Action::ConfigureChef
           end

data/lib/berkshelf/vagrant/berks_config.rb

@@ -0,0 +1,57 @@
+require 'vagrant/util/hash_with_indifferent_access'
+
+module Berkshelf::Vagrant
+  class BerksConfig < ::Vagrant::Util::HashWithIndifferentAccess
+    class << self
+      # @return [String]
+      def store_location
+        File.join(Berkshelf.berkshelf_path, 'config.json')
+      end
+
+      # @return [String]
+      def local_location
+        ENV['BERKSHELF_CONFIG'] || File.join('.', '.berkshelf', 'config.json')
+      end
+
+      # @return [String]
+      def path
+        path = File.exists?(local_location) ? local_location : store_location
+        File.expand_path(path)
+      end
+
+      # @return [String, nil]
+      #   the contents of the file
+      def file
+        File.read(path) if File.exists?(path)
+      end
+
+      def from_json(path)
+        JSON.parse(File.read(path))
+      end
+
+      # Instantiate and return or just return the currently instantiated Berkshelf
+      # configuration
+      #
+      # @return [Config]
+      def instance
+        @instance ||= if file
+          from_json file
+        else
+          new
+        end
+      end
+    end
+
+    def initialize
+      super(chef: ChefConfig.instance, ssl: ::Vagrant::Util::HashWithIndifferentAccess.new(verify: false))
+    end
+
+    def chef
+      self[:chef]
+    end
+
+    def ssl
+      self[:ssl]
+    end
+  end
+end

data/lib/berkshelf/vagrant/chef_config.rb

@@ -0,0 +1,88 @@
+require 'vagrant/util/hash_with_indifferent_access'
+require 'pathname'
+
+module Berkshelf::Vagrant
+  class ChefConfig < ::Vagrant::Util::HashWithIndifferentAccess
+    class << self
+      # Return the most sensible path to the Chef configuration file. This can
+      # be configured by setting a value for the 'CHEF_CONFIG' environment
+      # variable.
+      #
+      # @return [String, nil]
+      def location
+        possibles = []
+
+        possibles << ENV['CHEF_CONFIG'] if ENV['CHEF_CONFIG']
+        possibles << File.join(ENV['KNIFE_HOME'], 'knife.rb') if ENV['KNIFE_HOME']
+        possibles << File.join(Dir.pwd, 'knife.rb')
+
+        # Ascending search for .chef directory siblings
+        Pathname.new(Dir.pwd).ascend do |file|
+          sibling_chef = File.join(file, '.chef')
+          possibles << File.join(sibling_chef, 'knife.rb')
+        end
+
+        possibles << File.join(ENV['HOME'], '.chef', 'knife.rb') if ENV['HOME']
+        possibles.compact!
+
+        location = possibles.find { |loc| File.exists?(File.expand_path(loc)) }
+
+        File.expand_path(location) unless location.nil?
+      end
+
+      def instance
+        @instance ||= from_file(location)
+      end
+
+      def from_file(file = nil)
+        file = file.nil? ? location : file
+        if !file.nil? && File.exist?(file) && File.readable?(file)
+          contents = File.read(file)
+          return parse(contents, file)
+        end
+
+        new
+      end
+
+      def parse(contents, path = nil)
+        new(contents, path)
+      end
+    end
+
+    def initialize(contents = "", path = "")
+      instance_eval(contents, path)
+    end
+
+    def chef_server_url(value = nil)
+      set_or_return(:chef_server_url, value)
+    end
+
+    def client_key(value = nil)
+      set_or_return(:client_key, value)
+    end
+
+    def node_name(value = nil)
+      set_or_return(:node_name, value)
+    end
+
+    def method_missing(m, *args, &block)
+      Proxy.new
+    end
+
+    private
+
+      def set_or_return(key, value)
+        if value.nil?
+          return self[key]
+        else
+          self[key] = value
+        end
+      end
+
+      class Proxy
+        def method_missing(m, *args, &block)
+          self
+        end
+      end
+  end
+end

data/lib/berkshelf/vagrant/config.rb

@@ -1,3 +1,5 @@
+require 'vagrant/util/hash_with_indifferent_access'
+
 module Berkshelf
   module Vagrant
     class Config < ::Vagrant.plugin("2", :config)
@@ -32,12 +34,17 @@ module Berkshelf
       def initialize
         super
 
-        @berksfile_path = File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME)
+        @berksfile_path = UNSET_VALUE
         @except         = Array.new
         @only           = Array.new
-        @node_name      = Berkshelf::Config.instance.chef.node_name
-        @client_key     = Berkshelf::Config.instance.chef.client_key
-        @enabled        = File.exist?(@berksfile_path)
+        @node_name      = BerksConfig.instance.chef[:node_name]
+        @client_key     = BerksConfig.instance.chef[:client_key]
+        @enabled        = UNSET_VALUE
+      end
+
+      def finalize!
+        @berksfile_path = File.join(Dir.pwd, "Berksfile") if @berksfile_path == UNSET_VALUE
+        @enabled        = File.exist?(@berksfile_path) if @enabled == UNSET_VALUE
       end
 
       # @param [String] value
@@ -50,12 +57,18 @@ module Berkshelf
         @client_key = value
       end
 
-      alias_method :to_hash, :instance_variables_hash
+      def to_hash
+        ::Vagrant::Util::HashWithIndifferentAccess.new(instance_variables_hash)
+      end
 
       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 @berksfile_path.nil?
+          @berksfile_path = File.expand_path(@berksfile_path, machine.env.root_path.to_s)
+        end
+        unless @client_key.nil?
+          @client_key = File.expand_path(@client_key, machine.env.root_path.to_s)
+        end
 
         unless [TrueClass, FalseClass].include?(enabled.class)
           errors << "A value for berkshelf.enabled can be true or false."
@@ -76,16 +89,18 @@ module Berkshelf
 
           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."
+              errors << "A configuration must be set node_name when using the chef_client provisioner." +
+                        " Edit your berkshelf configuration and add a value for chef.node_name."
             end
 
             if machine.config.berkshelf.client_key.nil?
-              errors << "A configuration must be set for chef.client_key when using the chef_client provisioner. Run 'berks configure' or edit your configuration."
+              errors << "A configuration must be set for client_key when using the chef_client provisioner." +
+                        " Edit your berkshelf configuration and add a value for chef.client_key."
             end
           end
         end
 
-        { "berkshelf configuration" => errors }
+        {"berkshelf configuration" => errors}
       end
 
       private

data/lib/berkshelf/vagrant/env.rb

@@ -4,17 +4,12 @@ module Berkshelf
     class Env
       # @return [Vagrant::UI::Colored]
       attr_accessor :ui
-      # @return [Berkshelf::Berksfile]
-      attr_accessor :berksfile
       # @return [String]
       attr_accessor :shelf
-      # @return [Berkshelf::Config]
-      attr_accessor :config
 
       def initialize
-        @ui = ::Vagrant::UI::Colored.new
+        @ui               = ::Vagrant::UI::Colored.new
         @ui.opts[:target] = 'Berkshelf'
-        @config = Berkshelf::Config.instance
       end
     end
   end

data/lib/berkshelf/vagrant/env_helpers.rb

@@ -1,7 +1,47 @@
+require 'buff/shell_out'
+require 'json'
+require 'vagrant/util/which'
+
 module Berkshelf
   module Vagrant
     # A module of common helper functions that can be mixed into Berkshelf::Vagrant actions
     module EnvHelpers
+      BERKS_CONSTRAINT = ">= 3.0.0"
+
+      include Buff::ShellOut
+      include ::Vagrant::Util
+
+      # Execute a berkshelf command with the given arguments and flags.
+      #
+      # @overload berks(command, args)
+      #   @param [String] berks CLI command to run
+      #   @param [Object] any number of arguments to pass to CLI
+      # @overload berks(command, args, options)
+      #   @param [String] berks CLI command to run
+      #   @param [Object] any number of arguments to pass to CLI
+      #   @param [Hash] options to convert to flags for the CLI
+      #
+      # @return [String]
+      #   output of the command
+      #
+      # @raise [UnsupportedBerksVersion]
+      #   version of Berks installed does not satisfy the application's constraint
+      # @raise [BerksNotFound]
+      #   berks command is not found in the user's path
+      # @raise [BerksError]
+      #   CLI command failed
+      def berks(command, *args)
+        if defined?(Bundler)
+          Bundler.with_clean_env { run_berks(command, *args) }
+        else
+          run_berks(command, *args)
+        end
+      end
+
+      def berksfile_path(env)
+        env[:machine].env.vagrantfile.config.berkshelf.berksfile_path
+      end
+
       # A file to persist vagrant-berkshelf specific information in between
       # Vagrant runs.
       #
@@ -57,6 +97,64 @@ module Berkshelf
       def provision_disabled?(env)
         env.has_key?(:provision_enabled) && !env[:provision_enabled]
       end
+
+      private
+
+        def berks_version_check!
+          if (exec = Which.which("berks")).nil?
+            raise BerksNotFound
+          end
+
+          unless (response = shell_out("#{exec} version -F json")).success?
+            raise "Couldn't determine Berks version: #{response.inspect}"
+          end
+
+          begin
+            version = Gem::Version.new(JSON.parse(response.stdout)["version"])
+            Gem::Requirement.new(BERKS_CONSTRAINT).satisfied_by?(version)
+            exec
+          rescue => ex
+            raise UnsupportedBerksVersion.new(exec, BERKS_CONSTRAINT, version)
+          end
+        end
+
+        def options_to_flags(opts)
+          opts.map do |key, value|
+            if value.is_a?(TrueClass)
+              "--#{key_to_flag(key)}"
+              next
+            end
+
+            if value.is_a?(FalseClass)
+              "--no-#{key_to_flag(key)}"
+              next
+            end
+
+            if value.is_a?(Array)
+              "--#{key_to_flag(key)}=#{value.join(" ")}"
+              next
+            end
+
+            "--#{key_to_flag(key)}=#{value}"
+          end.join(" ")
+        end
+
+        def run_berks(command, *args)
+          exec      = berks_version_check!
+          options   = args.last.is_a?(Hash) ? args.pop : Hash.new
+          arguments = args.join(" ")
+          flags     = options_to_flags(options)
+
+          command = "#{exec} #{command} #{arguments} #{flags}"
+          unless (response = shell_out(command)).success?
+            raise BerksError.new("Berks command Failed: #{command}, reason: #{response.stderr}")
+          end
+          response.stdout
+        end
+
+        def key_to_flag(key)
+          "#{key.to_s.gsub("_", "-")}"
+        end
     end
   end
 end

data/lib/berkshelf/vagrant/errors.rb

@@ -28,4 +28,44 @@ module Berkshelf
         original.send(fun, *args, &block)
       end
   end
+
+  class BerksError < ::Vagrant::Errors::VagrantError
+    attr_reader :error_message
+
+    def initialize(message)
+      @error_message = message
+      super
+    end
+  end
+
+  class BerksNotFound < ::Vagrant::Errors::VagrantError
+    def error_message
+      "Berks not found. Download the ChefDK from http://downloads.getchef.com/chef-dk and add it to your $PATH."
+    end
+  end
+
+  class UnsupportedBerksVersion < ::Vagrant::Errors::VagrantError
+    def initialize(bin, constraint, version)
+      @bin        = bin
+      @constraint = constraint
+      @version    = version
+      super
+    end
+
+    def error_message
+      "Unsupported Berkshelf version at: #{@bin}. Requires #{@constraint} and got #{@version}." +
+      " Download the latest version of the ChefDK from http://downloads.getchef.com/chef-dk and add it to your $PATH."
+    end
+  end
+
+  class UnsupportedVagrantVersion < ::Vagrant::Errors::VagrantError
+    def initialize(constraint)
+      @constraint = constraint
+      super
+    end
+
+    def error_message
+      "vagrant-berkshelf requires Vagrant #{@constraint}."
+    end
+  end
 end

data/lib/berkshelf/vagrant/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module Vagrant
-    VERSION = "2.0.1"
+    VERSION = "3.0.0.rc1"
   end
 end

data/lib/berkshelf/vagrant.rb

@@ -4,7 +4,6 @@ rescue LoadError
   raise 'The Vagrant Berkshelf plugin must be run within Vagrant.'
 end
 
-require 'berkshelf'
 require 'fileutils'
 require 'json'
 require 'tmpdir'
@@ -13,7 +12,22 @@ require_relative 'vagrant/errors'
 require_relative 'vagrant/version'
 
 module Berkshelf
+  class << self
+    # Returns the filepath to the location Berkshelf will use for
+    # storage; temp files will go here, Cookbooks will be downloaded
+    # to or uploaded from here. By default this is '~/.berkshelf' but
+    # can be overridden by specifying a value for the ENV variable
+    # 'BERKSHELF_PATH'.
+    #
+    # @return [String]
+    def berkshelf_path
+      ENV['BERKSHELF_PATH'] || File.expand_path('~/.berkshelf')
+    end
+  end
+
   module Vagrant
+    require_relative 'vagrant/chef_config'
+    require_relative 'vagrant/berks_config'
     require_relative 'vagrant/action'
     require_relative 'vagrant/config'
     require_relative 'vagrant/env'
@@ -35,7 +49,6 @@ module Berkshelf
       # @return [String]
       #   path to the generated shelf
       def mkshelf(machine_name = nil)
-
         unless File.exist?(shelf_path)
           FileUtils.mkdir_p(shelf_path)
         end

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Berkshelf::Vagrant::Config do
   let(:unset_value) { described_class::UNSET_VALUE }
-  let(:config) { described_class.new }
+  subject { described_class.new.tap {|s| s.finalize! } }
 
   it "sets a path to a Berksfile in the current working directory for berksfile_path" do
     subject.berksfile_path.should eql(File.join(Dir.pwd, "Berksfile"))
@@ -14,7 +14,7 @@ describe Berkshelf::Vagrant::Config do
     end
 
     it "it sets the value of enabled to true" do
-      config.enabled.should be true
+      subject.enabled.should be true
     end
   end
 
@@ -24,7 +24,7 @@ describe Berkshelf::Vagrant::Config do
     end
 
     it "set the value of enabled to false" do
-      config.enabled.should be false
+      subject.enabled.should be false
     end
   end
 
@@ -38,12 +38,12 @@ describe Berkshelf::Vagrant::Config do
     subject.except.should be_empty
   end
 
-  it "sets the value of node_name to the value in the Berkshelf::Config.instance" do
-    subject.node_name.should eql(Berkshelf::Config.instance.chef.node_name)
+  it "sets the value of node_name to the value in the Berkshelf::Vagrant::BerksConfig.instance" do
+    subject.node_name.should eql(Berkshelf::Vagrant::BerksConfig.instance.chef.node_name)
   end
 
-  it "sets the value of client_key to the value in Berkshelf::Config.instance" do
-    subject.client_key.should eql(Berkshelf::Config.instance.chef.client_key)
+  it "sets the value of client_key to the value in Berkshelf::Vagrant::BerksConfig.instance" do
+    subject.client_key.should eql(Berkshelf::Vagrant::BerksConfig.instance.chef.client_key)
   end
 
   describe "#validate" do

data/spec/unit/berkshelf/vagrant_spec.rb

@@ -13,7 +13,6 @@ describe Berkshelf::Vagrant do
     end
 
     describe "::mkshelf" do
-
       it "returns a String" do
         subject.mkshelf().should be_a(String)
       end
@@ -27,7 +26,6 @@ describe Berkshelf::Vagrant do
         machine_name = 'fantastic_machine'
         subject.mkshelf(machine_name).should include(machine_name)
       end
-
     end
   end
 end

data/vagrant-berkshelf.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 1.9.1'
 
-  spec.add_dependency 'berkshelf',    '~> 3.1'
-  spec.add_dependency 'celluloid',    '~> 0.16.0.pre' # must explicitly lock or a gem conflict with vagrant's
-  spec.add_dependency 'celluloid-io', '~> 0.16.0.pre' # dependencies will arise during installation
+  spec.post_install_message = "In order to use the Vagrant-Berkshelf plugin, you must have ChefDK installed.\n" +
+                              "To download the latest ChefDK visit http://getchef.com/downloads/chef-dk."
+
+  spec.add_dependency "buff-shell_out"
 
   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: 2.0.1
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,50 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: berkshelf
+  name: buff-shell_out
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.0.pre
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
-- !ruby/object:Gem::Dependency
-  name: celluloid-io
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.0.pre
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: spork
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +84,18 @@ files:
 - LICENSE.txt
 - README.md
 - Thorfile
+- integration/Berksfile
+- integration/Gemfile
+- integration/Vagrantfile
 - lib/berkshelf/vagrant.rb
 - lib/berkshelf/vagrant/action.rb
 - lib/berkshelf/vagrant/action/clean.rb
 - lib/berkshelf/vagrant/action/configure_chef.rb
 - lib/berkshelf/vagrant/action/install.rb
 - lib/berkshelf/vagrant/action/load_shelf.rb
-- lib/berkshelf/vagrant/action/set_ui.rb
 - lib/berkshelf/vagrant/action/upload.rb
+- lib/berkshelf/vagrant/berks_config.rb
+- lib/berkshelf/vagrant/chef_config.rb
 - lib/berkshelf/vagrant/config.rb
 - lib/berkshelf/vagrant/env.rb
 - lib/berkshelf/vagrant/env_helpers.rb
@@ -136,7 +112,9 @@ homepage: http://berkshelf.com
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message: |-
+  In order to use the Vagrant-Berkshelf plugin, you must have ChefDK installed.
+  To download the latest ChefDK visit http://getchef.com/downloads/chef-dk.
 rdoc_options: []
 require_paths:
 - lib
@@ -147,9 +125,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

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

@@ -1,16 +0,0 @@
-module Berkshelf
-  module Vagrant
-    module Action
-      class SetUI
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          Berkshelf.ui = env[:berkshelf].ui
-          @app.call(env)
-        end
-      end
-    end
-  end
-end