berkshelf-vagrant 1.1.0 → 1.1.2

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rspec

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.1.0
+- 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

data/lib/berkshelf/vagrant/config.rb

@@ -2,8 +2,6 @@ module Berkshelf
   module Vagrant
     # @author Jamie Winsor <reset@riotgames.com>
     class Config < ::Vagrant.plugin("2", :config)
-      include Berkshelf::Vagrant::EnvHelpers
-
       # @return [String]
       #   path to the Berksfile to use with Vagrant
       attr_reader :berksfile_path
@@ -75,7 +73,7 @@ module Berkshelf
             errors << "A value for berkshelf.empty and berkshelf.only cannot both be defined."
           end
 
-          if chef_client?(machine.env)
+          if machine.env.config_global.vm.provisioners.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

data/lib/berkshelf/vagrant/env.rb

@@ -14,7 +14,11 @@ module Berkshelf
       attr_accessor :config
 
       def initialize
-        @ui     = ::Vagrant::UI::Colored.new('Berkshelf')
+        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
         @config = Berkshelf::Config.instance
       end
     end

data/lib/berkshelf/vagrant/env_helpers.rb

@@ -21,9 +21,7 @@ module Berkshelf
       #
       # @return [Array]
       def provisioners(name, env)
-        config_global = env.respond_to?(:config_global) ? env.config_global : env[:global_config]
-
-        config_global.vm.provisioners.select { |prov| prov.name == name }
+        env[:machine].config.vm.provisioners.select { |prov| prov.name == name }
       end
 
       # Determine if the given vagrant environment contains a chef_solo provisioner

data/lib/berkshelf/vagrant/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module Vagrant
-    VERSION = "1.1.0"
+    VERSION = "1.1.2"
   end
 end

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

@@ -42,7 +42,7 @@ describe Berkshelf::Vagrant::Config do
     context "when the plugin is enabled" do
       before(:each) do
         subject.stub(enabled: true)
-        subject.should_receive(:chef_client?).with(env).and_return(true)
+        env.stub_chain(:config_global, :vm, :provisioners, :any?)
       end
 
       let(:result) { subject.validate(machine) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2045934776218572655
+      hash: -547127228269075134
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23