Fixed for compatibility with Berkshelf 2

matschaffer · Jan 20, 2015 · 9fa1315 · 9fa1315
1 parent 05f5829
commit 9fa1315
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/knife-solo/berkshelf.rb b/lib/knife-solo/berkshelf.rb
@@ -19,8 +19,12 @@ def install!
       path = berkshelf_path
       ui.msg "Installing Berkshelf cookbooks to '#{path}'..."
 
-      berkshelf_options = KnifeSolo::Tools.config_value(config, :berkshelf_options) || {}
-      berksfile = ::Berkshelf::Berksfile.from_file('Berksfile',berkshelf_options)
+      if defined?(::Berkshelf) && Gem::Version.new(::Berkshelf::VERSION) >= Gem::Version.new("3.0.0")
+        berkshelf_options = KnifeSolo::Tools.config_value(config, :berkshelf_options) || {}
+        berksfile = ::Berkshelf::Berksfile.from_file('Berksfile',berkshelf_options)
+      else
+        berksfile = ::Berkshelf::Berksfile.from_file('Berksfile')
+      end
       if berksfile.respond_to?(:vendor)
         FileUtils.rm_rf(path)
         berksfile.vendor(path)