vagrant-berkshelf 3.0.0.rc1 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62de20b48013f967082c65d1aedb9f29292e694c
-  data.tar.gz: 1172289f2a081195c6fbf72d8311954a6c8b238c
+  metadata.gz: fd9966899189fb75274665df559a5d693279061f
+  data.tar.gz: ecd76c0c78750c15facc0bb1eb1c68d377103e76
 SHA512:
-  metadata.gz: edd6b97e93c2a74463c16b1bdca1fce19575f94506d8a690625f233ab5e4e5fb52e4b8c14f904db222ca2a24b14d515e13f15a3f66f66a0a72809cf731eb8b7a
-  data.tar.gz: 877fdae6ba5e16e5a3b6920af4759b88cd5288d42ecf65d6bf6ba1dae7a4e83fe9bae5fac6594216c8258669245ef740c99bb33557a34838dcf4d57ffeecd72b
+  metadata.gz: 84c5f59c692f538ebbbec4f7aa51683ff416cf44d8fdf2f492ffb8a6a5e609e2943f069f6b98872cb6ca216806d215ac5805a84bd74194ff717f1c8f4a005a0e
+  data.tar.gz: ec95dfac8eb37f207e6cff47ccfd9992fdf8350a138b2d725673df819de55b05124f330864746ca5d6b8a420d7f3b02defbde0c74ae3dfcd4a4643efce7ee60e

data/lib/berkshelf/vagrant/berks_config.rb

@@ -19,23 +19,13 @@ module Berkshelf::Vagrant
         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
+        @instance ||= if File.exists?(path) && File.readable?(path)
+          JSON.parse(File.read(path))
         else
           new
         end

data/lib/berkshelf/vagrant/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buff-shell_out