vagrant-berkshelf 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f21f3e8d10fc7c1d2205c55b0ae8bca1221777a
-  data.tar.gz: fcd4acefc3f607775f97873bc04206b9bf2fcb08
+  metadata.gz: c61e87ce0b69fd6674f2b48dce071d01c1496656
+  data.tar.gz: a6785183831c2affa91f1072f605c883f64c2aac
 SHA512:
-  metadata.gz: b4308dafc20d438f3c2a1524ed5076258c4b93e7f2291ca63c696fd116ec9aa7d81630c8a19bcda17d1a48fac25c87bcfa28caf6e343bfc66379a803dea72d61
-  data.tar.gz: fe57bc6dc166bf013d2eff69316d3ac0490ae79b6fafc3666052bc5cdadc07b434c0a91b13df7f7dbaf6c70a36bc1f697394b1488a0309258577eac4b7187a3e
+  metadata.gz: 96a14944bb147f7efa91ef76297f6e755fe1787e67c4baa4a5159f6a2f5b22ae437f3ba34471ce4c0d224f8967cb939d244f6f03e3d32064aa6fe9d59869d3c7
+  data.tar.gz: 8838114aef207fe47db28da4650141baa9f6451be9c5d1717a87315e3506aef001fc1b714dcb8dae5b52eb636b3e244d1d597f831a8517cdf4691fbf9d856d5a

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+# 4.0.1
+
+* Bug Fixes
+  * Improved ability to find a Berksfile within a project
+
+# 4.0.0
+
+* Enhancements
+  * Add support for chef-client local mode
+
+* Bug Fixes
+  * Chef Client provider configuration attributes are now properly read from a Berkshelf configuration file
+  * Shared folder is no longer deleted and recreated on each provision
+  * `berksfile_path` config option now defaults to CWD of Vagrantfile
+  * Non-colored terminal output will be used when not available
+  * VM's Berkshelf share will be cleaned up after destroying a VM
+
 # 3.0.1
 
 * Bug Fixes

data/lib/vagrant-berkshelf/action/base.rb

@@ -17,6 +17,7 @@ module VagrantPlugins
         # Provision the VM, calling setup, install, and upload.
         def self.provision
           Vagrant::Action::Builder.new.tap do |b|
+            b.use Action::Save
             b.use Action::Install
             b.use Action::Upload
           end

data/lib/vagrant-berkshelf/action/load.rb

@@ -19,23 +19,12 @@ module VagrantPlugins
             env[:berkshelf].shelf = shelf
           end
 
-          if !provision_enabled?(env)
-            @logger.info "Provisioning disabled, skipping"
-            return @app.call(env)
-          end
-
           if !env[:berkshelf].shelf
             shelf = mkshelf(env)
             env[:machine].ui.detail "The Berkshelf shelf is at #{shelf.inspect}"
 
             @logger.debug "Persisting datafile share to memory"
             env[:berkshelf].shelf = shelf
-
-            @logger.debug "Saving datafile to disk"
-            FileUtils.mkdir_p(datafile_path(env).dirname)
-            datafile_path(env).open("w+") do |f|
-              f.write(env[:berkshelf].shelf)
-            end
           end
 
           @app.call(env)

data/lib/vagrant-berkshelf/action/save.rb

@@ -0,0 +1,27 @@
+require_relative 'base'
+
+module VagrantPlugins
+  module Berkshelf
+    module Action
+      class Save < Base
+        def call(env)
+          if !berkshelf_enabled?(env)
+            @logger.info "Berkshelf disabled, skipping"
+            return @app.call(env)
+          end
+
+          if env[:berkshelf].shelf
+            @logger.debug "Saving datafile to disk"
+            FileUtils.mkdir_p(datafile_path(env).dirname)
+            datafile_path(env).open("w+") do |f|
+              f.write(env[:berkshelf].shelf)
+            end
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end
+

data/lib/vagrant-berkshelf/action/share.rb

@@ -10,11 +10,6 @@ module VagrantPlugins
             return @app.call(env)
           end
 
-          if !provision_enabled?(env)
-            @logger.info "Provisioning disabled, skipping"
-            return @app.call(env)
-          end
-
           if !chef_solo?(env) && !chef_zero?(env)
             @logger.info "Provisioner does not need a share"
             return @app.call(env)

data/lib/vagrant-berkshelf/config.rb

@@ -4,6 +4,8 @@ require 'vagrant/util/hash_with_indifferent_access'
 module VagrantPlugins
   module Berkshelf
     class Config < Vagrant.plugin("2", :config)
+      MAYBE = Object.new.freeze
+
       # The path to the Berksfile to use.
       # @return [String]
       attr_accessor :berksfile_path
@@ -38,19 +40,7 @@ module VagrantPlugins
 
       def finalize!
         @berksfile_path = nil if @berksfile_path == UNSET_VALUE
-
-        if @enabled == UNSET_VALUE
-          if @berksfile_path
-            # Automatically enable if a Berksfile path was given
-            @enabled = true
-          elsif File.exist?("Berksfile")
-            # Automatically enable when a Berksfile is persent
-            @berksfile_path = "Berksfile"
-            @enabled = true
-          end
-        end
-
-        @enabled = false if @enabled == UNSET_VALUE
+        @enabled = MAYBE if @enabled == UNSET_VALUE
 
         @__finalized = true
       end
@@ -58,12 +48,38 @@ module VagrantPlugins
       def validate(machine)
         errors = _detected_errors
 
-        if @enabled
-          if @berksfile_path.to_s.strip.empty?
-            errors << "berksfile_path must be set"
-          else
-            unless Pathname.new(@berksfile_path).absolute?
-              @berksfile_path = File.expand_path(@berksfile_path, machine.env.root_path)
+        if @enabled || @enabled == MAYBE
+          # If no Berksfile path was given, check if one is in the working
+          # directory
+          if !@berksfile_path
+            path = File.expand_path("Berksfile", machine.env.root_path)
+
+            if File.exist?(path)
+              @enabled = true
+              @berksfile_path = path
+            else
+              # Disable the plugin unless it was specifically set to "true". If
+              # the user set the value, we want to return an error, but if the
+              # user did not explicitly enable the plugin, we should just
+              # disable it automatically.
+              @enabled = false unless @enabled == true
+            end
+          end
+
+          if @enabled
+            # Berksfile_path validations
+            if missing?(@berksfile_path)
+              errors << "berksfile_path must be set"
+            else
+              # Expand the path unless it is absolute
+              if !Pathname.new(@berksfile_path).absolute?
+                @berksfile_path = File.expand_path(@berksfile_path, machine.env.root_path)
+              end
+
+              # Ensure the path exists
+              if !File.exist?(@berksfile_path)
+                errors << "Berksfile at '#{@berksfile_path}' does not exist"
+              end
             end
           end
         end
@@ -82,6 +98,10 @@ module VagrantPlugins
           args:           @args,
         }
       end
+
+      def missing?(obj)
+        obj.to_s.strip.empty?
+      end
     end
   end
 end

data/lib/vagrant-berkshelf/plugin.rb

@@ -4,6 +4,7 @@ require_relative 'action/check'
 require_relative 'action/clean'
 require_relative 'action/install'
 require_relative 'action/load'
+require_relative 'action/save'
 require_relative 'action/share'
 require_relative 'action/upload'
 require_relative 'env'

data/lib/vagrant-berkshelf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Berkshelf
-    VERSION = "4.0.0"
+    VERSION = "4.0.1"
   end
 end

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

@@ -10,53 +10,12 @@ describe VagrantPlugins::Berkshelf::Config do
       subject.finalize!
       expect(subject.berksfile_path).to be(nil)
     end
-
-    it "sets the value if it exists" do
-      allow(File).to receive(:exist?)
-        .with("Berksfile")
-        .and_return(true)
-      subject.finalize!
-      expect(subject.berksfile_path).to eq("Berksfile")
-    end
   end
 
   describe "#enabled" do
-    it "is true when there is a Berksfile present" do
-      allow(File).to receive(:exist?)
-        .with("Berksfile")
-        .and_return(true)
+    it "defaults to MAYBE" do
       subject.finalize!
-      expect(subject.enabled).to be(true)
-    end
-
-    it "is false when there is a Berksfile present but it is disabled" do
-      allow(File).to receive(:exist?)
-        .with("Berksfile")
-        .and_return(true)
-        subject.enabled = false
-      subject.finalize!
-      expect(subject.enabled).to be(false)
-    end
-
-    it "is true when a berksfile_path is given" do
-      subject.berksfile_path = "Berksfile"
-      subject.finalize!
-      expect(subject.enabled).to be(true)
-    end
-
-    it "is false when the berksfile_path is given but it is disabled" do
-      subject.berksfile_path = "Berksfile"
-      subject.enabled = false
-      subject.finalize!
-      expect(subject.enabled).to be(false)
-    end
-
-    it "defaults to false" do
-      allow(File).to receive(:exist?)
-        .with("Berksfile")
-        .and_return(false)
-      subject.finalize!
-      expect(subject.enabled).to be(false)
+      expect(subject.enabled).to be(VagrantPlugins::Berkshelf::Config::MAYBE)
     end
   end
 
@@ -88,7 +47,7 @@ describe VagrantPlugins::Berkshelf::Config do
     before do
       allow(machine).to receive(:env)
         .and_return(double("env",
-          root_path: "",
+          root_path: File.expand_path("..", __FILE__),
         ))
 
       subject.berksfile_path = "Berksfile"
@@ -98,21 +57,101 @@ describe VagrantPlugins::Berkshelf::Config do
       subject.args = []
     end
 
-    let(:result) { subject.validate(machine) }
+    let(:result) do
+      subject.finalize!
+      subject.validate(machine)
+    end
+
     let(:errors) { result["Berkshelf"] }
 
-    context "when the berksfile_path is nil" do
-      it "returns an error if enabled" do
-        subject.berksfile_path = ""
-        subject.finalize!
-        expect(errors).to include("berksfile_path must be set")
+    context "when enabled is false" do
+      before { subject.enabled = false }
+
+      it "returns no errors" do
+        expect(errors).to be_empty
       end
 
-      it "does not returns an error if disabled" do
+      it "remains disabled even if a Berksfile is present" do
+        allow(File).to receive(:exist?).and_return(true)
+        expect(errors).to be_empty
+        expect(subject.enabled).to be(false)
+      end
+
+      it "remains disabled even if a berksfile_path is given" do
+        subject.berksfile_path = "Custom.Berksfile"
+        expect(errors).to be_empty
+        expect(subject.enabled).to be(false)
+      end
+    end
+
+    context "when no berksfile_path is given" do
+      before { subject.berksfile_path = nil }
+
+      context "when a Berksfile is present" do
+        before { allow(File).to receive(:exist?).and_return(true) }
+
+        it "sets the berksfile_path" do
+          expect(errors).to be_empty
+          expect(subject.berksfile_path).to eq(File.expand_path("../Berksfile", __FILE__))
+        end
+      end
+
+      context "when a Berksfile is not present" do
+        before { allow(File).to receive(:exist?).and_return(false) }
+
+        context "when the plugin is enabled" do
+          it "returns an error" do
+            subject.enabled = true
+            expect(errors).to include("berksfile_path must be set")
+          end
+        end
+
+        context "when the plugin is in MAYBE state" do
+          it "disables the plugin" do
+            subject.enabled = VagrantPlugins::Berkshelf::Config::MAYBE
+            expect(errors).to be_empty
+            expect(subject.enabled).to be(false)
+          end
+        end
+      end
+    end
+
+    context "when a berksfile_path is given" do
+      before { subject.berksfile_path = "Custom.Berksfile" }
+
+      let(:expanded_path) { File.expand_path("../Custom.Berksfile", __FILE__) }
+
+      context "when another Berksfile is present" do
+        before { allow(File).to receive(:exist?).and_return(true) }
+
+        it "does not change the berksfile_path" do
+          expect(errors).to be_empty
+          expect(subject.berksfile_path).to eq(expanded_path)
+        end
+
+        it "expands the path relative to the machine root" do
+          subject.finalize!
+          subject.validate(machine)
+          expect(subject.berksfile_path).to eq(expanded_path)
+        end
+      end
+
+      context "when the given berksfile_path does not exist" do
+        before { allow(File).to receive(:exist?).and_return(false) }
+
+        it "returns an error" do
+          expect(errors).to include("Berksfile at '#{expanded_path}' does not exist")
+        end
+      end
+    end
+
+    context "when the berksfile_path is nil and no Berksfile exists" do
+      before { allow(File).to receive(:exist?).and_return(false) }
+
+      it "returns an error if enabled" do
         subject.berksfile_path = ""
-        subject.enabled = false
         subject.finalize!
-        expect(errors).to eq([])
+        expect(errors).to include("berksfile_path must be set")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-berkshelf
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spork
@@ -78,6 +78,7 @@ files:
 - lib/vagrant-berkshelf/action/clean.rb
 - lib/vagrant-berkshelf/action/install.rb
 - lib/vagrant-berkshelf/action/load.rb
+- lib/vagrant-berkshelf/action/save.rb
 - lib/vagrant-berkshelf/action/share.rb
 - lib/vagrant-berkshelf/action/upload.rb
 - lib/vagrant-berkshelf/config.rb