berkshelf-vagrant 1.0.3 → 1.0.4

data/Gemfile

@@ -1,13 +1,9 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in berkshelf-vagrant.gemspec
 gemspec
 
 group :development do
   gem 'vagrant', github: "mitchellh/vagrant", tag: "v1.1.2"
-end
-
-group :test do
   gem 'coolline'
   gem 'guard', '>= 1.5.0'
   gem 'guard-rspec'
@@ -16,7 +12,6 @@ group :test do
   gem 'redcarpet'
   gem 'yard'
   gem 'fuubar'
-  gem 'rspec'
 
   require 'rbconfig'
 

data/lib/berkshelf/vagrant/config.rb

@@ -18,20 +18,24 @@ module Berkshelf
       #   and copied to Vagrant's shelf
       attr_accessor :except
 
-      def initialize
-        super
+      # @return [String]
+      #   the Chef node name (client name) to use to authenticate with the remote
+      #   chef server to upload cookbooks when using the chef client provisioner
+      attr_accessor :node_name
 
-        @berksfile_path = UNSET_VALUE
-        @except         = UNSET_VALUE
-        @only           = UNSET_VALUE
+      # @return [String]
+      #   a filepath to a chef client key to use to authenticate with the remote
+      #   chef server to upload cookbooks when using the chef client provisioner
+      attr_accessor :client_key
 
-        finalize! # temporary workaround for configuration loading race condition
-      end
+      def initialize
+        super
 
-      def finalize!
-        @berksfile_path = File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME) if @berksfile_path == UNSET_VALUE
-        @except         = Array.new if @except == UNSET_VALUE
-        @only           = Array.new if @only == UNSET_VALUE
+        @berksfile_path = File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME)
+        @except         = Array.new
+        @only           = Array.new
+        @node_name      = Berkshelf::Config.instance.chef.node_name
+        @client_key     = Berkshelf::Config.instance.chef.client_key
       end
 
       # @param [String] value
@@ -49,17 +53,25 @@ module Berkshelf
       def validate(machine)
         errors = Array.new
 
+        if machine.config.berkshelf.berksfile_path.nil?
+          errors << "berkshelf.berksfile_path cannot be nil."
+        end
+
+        unless File.exist?(machine.config.berkshelf.berksfile_path)
+          errors << "No Berskfile was found at #{machine.config.berkshelf.berksfile_path}."
+        end
+
         if !except.empty? && !only.empty?
-          errors.add("A value for berkshelf.empty and berkshelf.only cannot both be defined.")
+          errors << "A value for berkshelf.empty and berkshelf.only cannot both be defined."
         end
 
         if chef_client?(machine.env)
-          if Berkshelf::Config.instance.chef.node_name.nil?
-            errors.add("A configuration must be set for chef.node_name when using the chef_client provisioner. Run 'berks configure' or edit your configuration.")
+          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
 
-          if Berkshelf::Config.instance.chef.client_key.nil?
-            errors.add("A configuration must be set for chef.client_key when using the chef_client provisioner. Run 'berks configure' or edit your configuration.")
+          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."
           end
         end
 

data/lib/berkshelf/vagrant/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module Vagrant
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'bundler'
+require 'bundler/setup'
 require 'spork'
 
 Spork.prefork do
@@ -9,23 +9,11 @@ Spork.prefork do
   require 'rspec'
 
   RSpec.configure do |config|
-    config.mock_with :rspec
     config.treat_symbols_as_metadata_keys_with_true_values = true
-    config.filter_run focus: true
     config.run_all_when_everything_filtered = true
+    config.filter_run focus: true
 
-    config.around(:each) do
-      clean_tmp_path
-    end
-  end
-
-  def clean_tmp_path
-    FileUtils.rm_rf(tmp_path)
-    FileUtils.mkdir_p(tmp_path)
-  end
-
-  def tmp_path
-    File.join(APP_ROOT, 'spec', 'tmp')
+    config.order = 'random'
   end
 end
 

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

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe Berkshelf::Vagrant::Config do
+  let(:unset_value) { described_class::UNSET_VALUE }
+
+  subject { described_class.new }
+
+  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"))
+  end
+
+  it "sets the value of only to an empty array" do
+    subject.only.should be_a(Array)
+    subject.only.should be_empty
+  end
+
+  it "sets the value of except to an empty array" do
+    subject.except.should be_a(Array)
+    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)
+  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)
+  end
+
+  describe "#validate" do
+    let(:env) { double('env') }
+    let(:config) { double('config', berkshelf: subject) }
+    let(:machine) { double('machine', config: config, env: env) }
+
+    before(:each) do
+      subject.finalize!
+      subject.should_receive(:chef_client?).with(env).and_return(true)
+    end
+
+    let(:result) { subject.validate(machine) }
+
+    it "returns a Hash with a 'berkshelf configuration' key" do
+      result.should be_a(Hash)
+      result.should have_key("berkshelf configuration")
+    end
+
+    context "when all validations pass" do
+      before(:each) do
+        File.should_receive(:exist?).with(subject.berksfile_path).and_return(true)
+      end
+
+      it "contains an empty Array for the 'berkshelf configuration' key" do
+        result["berkshelf configuration"].should be_a(Array)
+        result["berkshelf configuration"].should be_empty
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -216,6 +216,7 @@ files:
 - lib/berkshelf/vagrant/plugin.rb
 - lib/berkshelf/vagrant/version.rb
 - spec/spec_helper.rb
+- spec/unit/berkshelf/vagrant/config_spec.rb
 - spec/unit/berkshelf/vagrant/errors_spec.rb
 - spec/unit/berkshelf/vagrant_spec.rb
 homepage: http://berkshelf.com
@@ -239,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2373621278737506155
+      hash: -3541994389694666662
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -248,6 +249,7 @@ specification_version: 3
 summary: A Vagrant plugin to add Berkshelf integration to the Chef provisioners
 test_files:
 - spec/spec_helper.rb
+- spec/unit/berkshelf/vagrant/config_spec.rb
 - spec/unit/berkshelf/vagrant/errors_spec.rb
 - spec/unit/berkshelf/vagrant_spec.rb
 has_rdoc: