vagrant-berkshelf 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c61e87ce0b69fd6674f2b48dce071d01c1496656
-  data.tar.gz: a6785183831c2affa91f1072f605c883f64c2aac
+  metadata.gz: a4e3d407e177686e548c0032ea30e25eb7b91bc2
+  data.tar.gz: 645273f25a4a346055111516602f2070d5eb4b3c
 SHA512:
-  metadata.gz: 96a14944bb147f7efa91ef76297f6e755fe1787e67c4baa4a5159f6a2f5b22ae437f3ba34471ce4c0d224f8967cb939d244f6f03e3d32064aa6fe9d59869d3c7
-  data.tar.gz: 8838114aef207fe47db28da4650141baa9f6451be9c5d1717a87315e3506aef001fc1b714dcb8dae5b52eb636b3e244d1d597f831a8517cdf4691fbf9d856d5a
+  metadata.gz: 87e6a5e45f3887ebc686ff4b4b03d29987769ba154512a1a31b70854f6e5fc618f675ae41d23888da2c1e59919a642d1f8168191e991916bcc8508bc7a325b93
+  data.tar.gz: 3381607d856c46ae77153255619bfaf27cbe9cfc8567bab36f32d5a880ac249f85364f1745f543c08359ded750a4db533fa52769088a557c417ab7c729c5ac90

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 4.0.2
+
+* Bug Fixes
+  * Don't check Berkshelf version if plugin is disabled
+
 # 4.0.1
 
 * Bug Fixes

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

@@ -7,6 +7,11 @@ module VagrantPlugins
         BERKS_REQUIREMENT = "~> 3.2"
 
         def call(env)
+          if !berkshelf_enabled?(env)
+            @logger.info "Berkshelf disabled, skipping"
+            return @app.call(env)
+          end
+
           check_berks_bin!(env)
           berkshelf_version_check!(env)
 

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

@@ -57,7 +57,7 @@ module VagrantPlugins
             tmpfile.rewind
             yield tmpfile.path
           ensure
-            if defined?(tmpfile)
+            if defined?(tmpfile) && !tmpfile.nil?
               tmpfile.close
               tmpfile.unlink
             end
@@ -70,7 +70,7 @@ module VagrantPlugins
             path = File.expand_path(ENV['BERKSHELF_CONFIG'] || '~/.berkshelf/config.json')
 
             if File.exist?(path)
-              JSON.parse(File.read(), symbolize_names: true)
+              JSON.parse(File.read(path), symbolize_names: true)
             else
               {}
             end
@@ -86,7 +86,7 @@ module VagrantPlugins
                 env[:machine].ui.info "Uploading cookbooks to #{provisioner.config.chef_server_url}"
                 berks("upload",
                   config:    config,
-                  berksfile: provisioner.config.berkshelf.berksfile_path,
+                  berksfile: env[:machine].config.berkshelf.berksfile_path,
                   force:     true,
                   freeze:    false,
                 )

data/lib/vagrant-berkshelf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-berkshelf
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Jamie Winsor
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spork