WIP Currently 'work for me' integration of berkshelf to master

Tests are still outstanding, but sufficient for time sensitive work

knife-solo.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fog'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'parallel'
+  s.add_development_dependency 'berkshelf'
 
   s.add_dependency 'chef',     chef_version
   s.add_dependency 'net-ssh',  '>= 2.2.2', '< 3.0'

lib/chef/knife/solo_cook.rb

@@ -41,6 +41,16 @@ class SoloCook < Knife
         :long        => '--sync-only',
         :description => 'Only sync the cookbook - do not run Chef'
 
+      option :berksfile,
+        :long        => '--berksfile',
+        :description => 'Berkshelf file to use for configuration',
+        :default    => 'Berksfile'
+
+      option :berkshelf,
+        :long        => '--no-berkshelf',
+        :description => 'Skip berkshelf-chef install',
+        :default    => true
+
       option :librarian,
         :long        => '--no-librarian',
         :description => 'Skip librarian-chef install',
@@ -72,6 +82,7 @@ def run
 
           check_chef_version if config[:chef_check]
           generate_node_config
+          berkshelf_install if config[:berkshelf]
           librarian_install if config[:librarian]
           rsync_kitchen
           add_patches
@@ -195,6 +206,31 @@ def cook
         result = stream_command cmd
         raise "chef-solo failed. See output above." unless result.success?
       end
+
+      def load_berkshelf
+        begin
+          require 'berkshelf'
+        rescue LoadError
+          false
+        else
+          true
+        end
+      end
+
+      def berkshelf_install
+        return unless File.exist?(File.expand_path(config[:berksfile]|| 'Berksfile'))
+        ui.msg 'Berksfile found! Using Berkshelf to install cookbooks...'
+        unless load_berkshelf
+          ui.warn [ "Berkshelf could not be loaded",
+                    "Please add the berkshelf gem to your Gemfile or",
+                    "install it manually with `gem install berkshelf`."
+          ].join(' ')
+        else
+          ui.msg 'Installing Berkshelf cookbooks...'
+          ::Berkshelf::Berksfile.from_file(File.expand_path(config[:berksfile])).install(:path => File.expand_path('cookbooks'))
+        end
+      end
+
     end
   end
 end

test/solo_cook_test.rb

@@ -5,6 +5,7 @@
 require 'chef/cookbook/chefignore'
 require 'chef/knife/solo_cook'
 require 'librarian/action/install'
+require 'berkshelf'
 
 class SuccessfulResult
   def success?
@@ -52,6 +53,40 @@ def test_does_not_run_librarian_if_denied_by_option
     end
   end
 
+  def test_does_not_load_berkshelf_if_no_berksfile
+    in_kitchen do
+      FileUtils.rm_f("Berksfile")
+      cmd = command("somehost")
+      cmd.expects(:load_berkshelf).never
+      cmd.ui.expects(:err).never
+      ::Berkshelf::Berksfile.any_instance.expects(:from_file).never
+      cmd.run
+    end
+  end
+
+  def test_runs_berkshelf_if_berksfile_found
+    in_kitchen do
+      File.open("Berksfile", 'w') { |f| f.write "site: opscode\ncookbook 'ntp'" }
+      b = File.expand_path("Berksfile")
+      cmd = command("somehost")
+      #cmd.ui.expects(:msg).with(regexp_matches(/Berksfile found/))
+      cmd.expects(:berkshelf_install)
+      cmd.expects(:load_berkshelf)
+      #cmd.ui.expects(:err).never
+      #cmd.ui.expects(:msg).with(regexp_matches(/Installing Berkshelf cookbooks/))
+      ::Berkshelf::Berksfile.any_instance.expects(:from_file).with(b) #.expects(:install).with('cookbooks') #.expects(:install)
+      cmd.run
+    end
+  end
+
+  #def test_runs_berkshelf_if_custom_berksfile_specified
+    #in_kitchen do
+      #f = File.open("Berksfile.local", 'w') {}
+      #::Berkshelf::Berksfile.from_file(f).expects(:run)
+      #command("somehost", "--berkshelf_file Berksfile.local").run
+    #end
+  #end
+
   def test_validates_chef_version
     in_kitchen do
       cmd = command("somehost")