vagabond 0.2.8 → 0.2.10

data/lib/vagabond/kitchen.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 require 'thor'
 require 'chef'
 require 'kitchen'
@@ -5,7 +6,7 @@ require 'kitchen/busser'
 require 'kitchen/loader/yaml'
 require 'vagabond/monkey/kitchen_config'
 
-%w(constants errors helpers vagabondfile vagabond server helpers/cheffile_loader actions/status).each do |dep|
+%w(constants errors helpers vagabondfile vagabond server actions/status actions/ssh).each do |dep|
   require "vagabond/#{dep}"
 end
 
@@ -15,6 +16,7 @@ module Vagabond
     include Thor::Actions
     include Helpers
     include Actions::Status
+    include Actions::SSH
 
     class << self
       def basename
@@ -24,7 +26,11 @@ module Vagabond
 
     self.class_exec(&Vagabond::CLI_OPTIONS)
 
-    attr_reader :kitchen
+    class_option(:isolate,
+      :type => :boolean,
+      :desc => 'Isolate cookbook from parent repository'
+    )
+
     attr_reader :platform_map
     attr_reader :vagabondfile
     attr_reader :ui
@@ -45,13 +51,17 @@ module Vagabond
       :type => :string,
       :desc => 'Specify suite to destroy'
     )
-    def teardown(cookbook)
+    def teardown(cookbook=nil)
+      setup(cookbook, :teardown)
       ui.info "#{ui.color('Vagabond:', :bold)} - Kitchen teardown for cookbook #{ui.color(name, :red)}"
-      plats = [platform || options[:platform] || platform_map.keys].flatten
+      plats = [options[:platform] || platform_map.keys].flatten
       plats.each do |plat|
         validate_platform!(plat)
         ui.info ui.color("  -> Tearing down platform: #{plat}", :red)
-        vagabond_instance(:destroy, plat).send(:execute)
+        kitchen.suites.map(&:name).each do |suite|
+          inst = vagabond_instance(:destroy, plat, :suite_name => suite)
+          inst.destroy
+        end
         ui.info ui.color("  -> Teardown of platform: #{plat} - COMPLETE!", :red)
       end
     end
@@ -79,6 +89,11 @@ module Vagabond
       :type => :string,
       :desc => 'Specify suites to test [suite1,suite2,...]'
     )
+    method_option(:force_berkshelf,
+      :type => :boolean,
+      :default => false,
+      :desc => 'Force use of Berkshelf if Cheffile is also provided'
+    )
     def test(*args)
       cookbook = args.first
       setup(cookbook, :test)
@@ -92,14 +107,9 @@ module Vagabond
           ui.fatal "Requested cluster is not defined: #{options[:cluster]}"
           raise VagabondError::ClusterInvalid.new(cluster_name)
         end
-        serv = Server.new
-        if(@solo && serv.vagabondfile[:local_chef_server].empty?)
-          serv.vagabondfile[:local_chef_server].update(:enabled => true, :zero => true)
-        end
-        internal_config.make_knife_config_if_required(:force)
-        serv.options = options.update(:auto_upload => false)
-        serv.send(:do_create)
-        load_cookbooks(:upload)
+
+        setup_server_if_needed
+
         suites = kitchen.clusters[cluster_name]
         platforms.each do |platform|
           begin
@@ -109,7 +119,7 @@ module Vagabond
                 @results[platform] << {
                   :suite_name => suite_name,
                   :result => false
-                } 
+                }
                 raise VagabondError::HostProvisionFailed.new("#{platform}[#{suite_name}]")
               end
             end
@@ -127,7 +137,8 @@ module Vagabond
             end
           end
         end
-        serv.destroy
+
+        destroy_server_if_needed
       else
         load_cookbooks
         suites = options[:suites] ? options[:suites].split(',') : kitchen.suites.map(&:name)
@@ -135,12 +146,15 @@ module Vagabond
         platforms.each do |platform|
           suites.each do |suite_name|
             runner = lambda do
-              provision_node(platform, suite_name)
-              @results[platform] << {
-                :suite_name => suite_name,
-                :result => test_node(platform, suite_name)
-              }
-              destroy_node(platform, suite_name)
+              begin
+                provision_node(platform, suite_name)
+                @results[platform] << {
+                  :suite_name => suite_name,
+                  :result => test_node(platform, suite_name)
+                }
+              ensure
+                destroy_node(platform, suite_name)
+              end
             end
             if(options[:parallel])
               runners << Thread.new{ runner.call }
@@ -162,7 +176,9 @@ module Vagabond
       @results.each do |platform, infos|
         ui.info "  Platform: #{ui.color(platform, :blue, :bold)}"
         infos.each do |res|
-          ui.info "    Suite: #{res[:suite_name]} -> #{res[:result] ? ui.color('SUCCESS!', :green) : ui.color('FAILED!', :red)}"
+          res_out = res[:result] ? ui.color('SUCCESS!', :green) : ui.color('FAILED!', :red)
+          res_out = ui.color('No tests', :blue) if res[:result] == :no_tests
+          ui.info "    Suite: #{res[:suite_name]} -> #{res_out}"
         end
       end
       raise VagabondError::KitchenTestFailed.new(@results.values.flatten.map{|res| res[:suite_name] unless res[:result]}.compact)
@@ -176,6 +192,9 @@ module Vagabond
 
     protected
 
+    def validate!
+    end
+
     def mappings_key
       :test_mappings
     end
@@ -184,8 +203,9 @@ module Vagabond
       run_list = generate_runlist(platform, suite_name)
       v_inst = vagabond_instance(:up, platform, :suite_name => suite_name, :run_list => run_list)
       v_inst.options[:auto_provision] = true
-      raise "ERROR! No local chef!" unless v_inst.options[:knife_opts]
-      v_inst.send(:execute)
+      v_inst.config[:no_lazy_load] = true
+      v_inst._create
+      v_inst._provision
     end
 
     # TODO: Handle failed provision!
@@ -193,7 +213,7 @@ module Vagabond
       run_list = generate_runlist(platform, suite_name)
       ui.info ui.color("  -> Provisioning suite #{suite_name} on platform: #{platform}", :cyan)
       v_inst = vagabond_instance(:create, platform, :suite_name => suite_name)
-      v_inst.send(:execute)
+      v_inst.create(v_inst.name)
       directory = configure_for(v_inst.name, platform, suite_name, run_list, :dna, :cookbooks)
       v_inst.send(:provision_solo, directory)
     end
@@ -201,29 +221,39 @@ module Vagabond
     def test_node(platform, suite_name)
       v_inst = vagabond_instance(:create, platform, :suite_name => suite_name)
       busser = bus_node(v_inst, suite_name)
-      ui.info "#{ui.color('Kitchen:', :bold)} Running tests..."
-      cmd = busser.run_cmd
-      res = cmd.to_s.empty? ? true : v_inst.send(:direct_container_command, cmd, :live_stream => STDOUT)
-      ui.info "\n  -> #{ui.color('Testing', :bold, :cyan)} #{name} suite #{suite_name} on platform #{platform}: #{res ? ui.color('SUCCESS!', :green, :bold) : ui.color('FAILED', :red)}"
-      res
+      if(busser)
+        ui.info "#{ui.color('Kitchen:', :bold)} Running tests..."
+        cmd = busser.run_cmd
+        res = cmd.to_s.empty? ? true : v_inst.send(:direct_container_command, cmd, :live_stream => STDOUT)
+        ui.info "\n  -> #{ui.color('Testing', :bold, :cyan)} #{name} suite #{suite_name} on platform #{platform}: #{res ? ui.color('SUCCESS!', :green, :bold) : ui.color('FAILED', :red)}"
+        res
+      else
+        ui.info "#{ui.color('Kitchen:', :bold)} No tests found."
+        :no_tests
+      end
     end
 
     def destroy_node(platform, suite_name)
       if(options[:teardown])
         v_inst = vagabond_instance(:destroy, platform, :suite_name => suite_name)
-        v_inst.send(:execute)
+        v_inst.destroy(:no_setup)
       end
     end
 
-    def setup(name, action)
-      @solo = name.to_s.strip.empty?
-      @options = options.dup
-      @vagabondfile = Vagabondfile.new(options[:vagabond_file], :allow_missing)
-      base_setup
-      setup_ui
-      @internal_config = InternalConfiguration.new(@vagabondfile, ui, options)
+    def setup(name, action, *args)
+      @solo = name.to_s.strip.empty? || options[:isolate]
+      @options = Mash.new(@options.dup)
+      vfile = options[:isolate] ? File.join(Dir.pwd, 'Vagabondfile') : options[:vagabond_file]
+      @vagabondfile = Vagabondfile.new(vfile, :allow_missing)
       @name = name || action == :status ? name : discover_name
-      load_kitchen_yml(@name) unless action == :status
+      if(options[:platform])
+        bases = [platform_map[options[:platform]][:template]]
+      elsif(args.include?(:no_host_provision))
+        bases = []
+      else
+        bases = platform_map.values.collect{|plat| plat[:template]}
+      end
+      base_setup(:config => {:force_bases => bases})
       @action = action
     end
 
@@ -257,7 +287,7 @@ module Vagabond
 
     def write_solo_config(dir)
       File.open(File.join(dir, 'solo.rb'), 'w') do |file|
-        file.write("cookbook_path '#{File.join(vagabondfile.store_directory, 'cookbooks')}'\n")
+        file.write("cookbook_path '#{File.join(vagabondfile.build_private_store, 'cookbooks')}'\n")
       end
       dir
     end
@@ -302,21 +332,26 @@ module Vagabond
     end
 
     def load_cookbooks(*args)
-      if(File.exists?(File.join(vagabondfile.directory, 'Berksfile')))
-        uploader = berks_vendor(args.include?(:upload))
-      else
+      if(File.exists?(File.join(vagabondfile.directory, 'Cheffile')) && !options[:force_berkshelf])
         uploader = librarian_vendor(args.include?(:upload))
+      else
+        uploader = berks_vendor(args.include?(:upload))
       end
       uploader
     end
 
     def berks_vendor(upload=false)
       ui.info 'Cookbooks being vendored via berks'
+      if(vagabondfile[:local_chef_server][:berkshelf].is_a?(Hash))
+        berks_opts = vagabondfile[:local_chef_server][:berkshelf][:options]
+        berks_path = vagabondfile[:local_chef_server][:berkshelf][:path]
+      end
       berk_uploader = Uploader::Berkshelf.new(
-        vagabondfile.generate_store_path, options.merge(
+        vagabondfile, vagabondfile.build_private_store, options.merge(
           :ui => ui,
-          :berksfile => File.join(vagabondfile.directory, 'Berksfile'),
-          :chef_server_url => options[:knife_opts].to_s.split(' ').last
+          :berksfile => File.join(vagabondfile.directory, berks_path || 'Berksfile'),
+          :chef_server_url => options[:knife_opts].to_s.split(' ').last,
+          :berks_opts => berks_opts
         )
       )
       upload ? berk_uploader.upload : berk_uploader.prepare
@@ -326,12 +361,13 @@ module Vagabond
     def librarian_vendor(upload=false)
       ui.info 'Cookbooks being vendored with librarian'
       unless(File.exists?(cheffile = File.join(vagabondfile.directory, 'Cheffile')))
-        File.open(cheffile = File.join(vagabondfile.generate_store_path, 'Cheffile'), 'w') do |file|
+        ui.warn 'Writing custom Cheffile to provide any required dependency resolution'
+        File.open(cheffile = File.join(vagabondfile.build_private_store, 'Cheffile'), 'w') do |file|
           file.write custom_cheffile
         end
       end
       librarian_uploader = Uploader::Librarian.new(
-        vagabondfile.generate_store_path,
+        vagabondfile, vagabondfile.build_private_store,
         options.merge(
           :ui => ui,
           :cheffile => cheffile
@@ -343,18 +379,20 @@ module Vagabond
 
     def bus_node(v_inst, suite_name)
       test_path = options[:cluster] ? 'test/cluster' : 'test/integration'
-      unless(::Kitchen::Busser::DEFAULT_TEST_ROOT == c_path = File.join(cookbook_path, test_path))
-        ::Kitchen::Busser.send(:remove_const, :DEFAULT_TEST_ROOT)
-        ::Kitchen::Busser.const_set(:DEFAULT_TEST_ROOT, c_path)
-      end
-      busser = ::Kitchen::Busser.new(suite_name)
-      ui.info "#{ui.color('Kitchen:', :bold)} Setting up..."
-      %w(setup_cmd sync_cmd).each do |cmd|
-        com = busser.send(cmd)
-        next if com.to_s.empty?
-        v_inst.send(:direct_container_command, com)
+      if(File.directory?(c_path = File.join(cookbook_path, test_path)))
+        unless(::Kitchen::Busser::DEFAULT_TEST_ROOT == c_path)
+          ::Kitchen::Busser.send(:remove_const, :DEFAULT_TEST_ROOT)
+          ::Kitchen::Busser.const_set(:DEFAULT_TEST_ROOT, c_path)
+        end
+        busser = ::Kitchen::Busser.new(suite_name)
+        ui.info "#{ui.color('Kitchen:', :bold)} Setting up..."
+        %w(setup_cmd sync_cmd).each do |cmd|
+          com = busser.send(cmd)
+          next if com.to_s.empty?
+          v_inst.send(:direct_container_command, com)
+        end
+        busser
       end
-      busser
     end
 
     def vagabond_instance(action, platform, args={})
@@ -368,7 +406,6 @@ module Vagabond
         :ui => ui
       )
       v.vagabondfile = vagabondfile
-      v.vagabondfile.generate_store_path
       v.internal_config.force_bases = platform_map[platform][:template]
       v.internal_config.ensure_state
       v.mappings_key = :test_mappings
@@ -382,6 +419,13 @@ module Vagabond
       v
     end
 
+    def kitchen
+      unless(@kitchen)
+        load_kitchen_yml(name)
+      end
+      @kitchen
+    end
+
     def load_kitchen_yml(name)
       @kitchen = ::Kitchen::Config.new(
         :kitchen_root => cookbook_path,
@@ -396,6 +440,9 @@ module Vagabond
       @platform_map ||= Mash[
         *(
           kitchen.platforms.map do |plat|
+            if(defined?(::Kitchen::Platform::Cheflike))
+              plat.extend(::Kitchen::Platform::Cheflike)
+            end
             [
               plat.name, Mash.new(
                 :template => plat.name.gsub('.', '').gsub('-', '_'),
@@ -416,6 +463,9 @@ module Vagabond
       kitchen_suite = kitchen.suites.detect do |k_s|
         k_s.name == suite
       end
+      if(defined?(::Kitchen::Suite::Cheflike))
+        kitchen_suite.extend(::Kitchen::Suite::Cheflike)
+      end
       if(kitchen_suite && kitchen_suite.run_list)
         r |= kitchen_suite.run_list
       end

data/lib/vagabond/knife.rb

@@ -1,5 +1,9 @@
+#encoding: utf-8
 require 'thor'
-require File.join(File.dirname(__FILE__), 'cookbooks/lxc/libraries/lxc.rb')
+require 'elecksee/lxc'
+
+#TODO: Remove this when elecksee gets updated
+require 'chef/log'
 
 %w(helpers vagabondfile internal_configuration).each do |dep|
   require "vagabond/#{dep}"

data/lib/vagabond/layout.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 module Vagabond
   class Layout
 

data/lib/vagabond/monkey/kitchen_config.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 require 'kitchen/config'
 
 module Vagabond

data/lib/vagabond/notify_mash.rb

@@ -0,0 +1,25 @@
+require 'chef/mash'
+
+class NotifyMash < BasicObject
+
+  def initialize(*args)
+    @notifications = []
+    @mash = ::Mash.new(*args)
+  end
+
+  def add_notification(&block)
+    @notifications << block
+  end
+
+  def method_missing(sym, *args)
+    start_state = @mash.hash
+    result = @mash.send(sym, *args)
+    if(start_state != @mash.hash)
+      @notifications.each do |notify|
+        notify.call(self)
+      end
+    end
+    result
+  end
+  
+end

data/lib/vagabond/server.rb

@@ -1,9 +1,10 @@
+#encoding: utf-8
 require 'vagabond/vagabond'
 require 'mixlib/cli'
 require 'digest/md5'
 
 module Vagabond
-  
+
   class Server < Vagabond
 
     class << self
@@ -13,7 +14,7 @@ module Vagabond
     end
 
     self.class_exec(false, &Vagabond::COMMANDS)
-    
+
     def initialize(*args)
       super
       @name = 'server'
@@ -50,11 +51,12 @@ module Vagabond
     def upload_roles
       am_uploading('roles') do
         if(File.directory?(File.join(base_dir, 'roles')))
-          com = "knife role from file #{File.join(base_dir, 'roles/*')} #{options[:knife_opts]}"
-          debug(com)
-          cmd = Mixlib::ShellOut.new(com, :live_stream => options[:debug])
-          cmd.run_command
-          cmd.error!
+          %w(rb json js).each do |ext|
+            next if Dir.glob(File.join(base_dir, "roles", "*.#{ext}")).size == 0
+            cmd = knife_command("role from file #{File.join(base_dir, "roles/*.#{ext}")}")
+            cmd.run_command
+            cmd.error!
+          end
         end
       end
     end
@@ -64,13 +66,12 @@ module Vagabond
       am_uploading('data bags') do
         if(File.directory?(File.join(base_dir, 'data_bags')))
           Dir.glob(File.join(base_dir, "data_bags/*")).each do |b|
-            next if %w(. ..).include?(b)
+            next if %w(. ..).include?(b) || !File.directory?(b)
             coms = [
-              "knife data bag create #{File.basename(b)} #{options[:knife_opts]}",
-              "knife data bag from file #{File.basename(b)} #{options[:knife_opts]} --all"
+              "data bag create #{File.basename(b)}",
+              "data bag from file #{File.basename(b)} --all"
             ].each do |com|
-              debug(com)
-              cmd = Mixlib::ShellOut.new(com, :live_stream => options[:debug])
+              cmd = knife_command(com)
               cmd.run_command
               cmd.error!
             end
@@ -83,11 +84,12 @@ module Vagabond
     def upload_environments
       am_uploading('environments') do
         if(File.directory?(File.join(base_dir, 'environments')))
-          com = "knife environment from file #{File.join(base_dir, 'environments/*')} #{options[:knife_opts]}"
-          debug(com)
-          cmd = Mixlib::ShellOut.new(com, :live_stream => options[:debug])
-          cmd.run_command
-          cmd.error!
+          %w(rb json js).each do |ext|
+            next if Dir.glob(File.join(base_dir, "environments", "*.#{ext}")).size == 0
+            cmd = knife_command("environment from file #{File.join(base_dir, "environments/*.#{ext}")}")
+            cmd.run_command
+            cmd.error!
+          end
         end
       end
     end
@@ -100,7 +102,13 @@ module Vagabond
         elsif(vagabondfile[:local_chef_server][:berkshelf])
           berks_upload
         else
-          raw_upload
+          if(File.exists?(File.join(vagabondfile.directory, 'Cheffile')))
+            librarian_upload
+          elsif(File.exists?(File.join(vagabondfile.directory, 'Berksfile')))
+            berks_upload
+          else
+            raw_upload
+          end
         end
       end
     end
@@ -113,58 +121,82 @@ module Vagabond
     def setup(action, name=nil, *args)
       super(action, 'server', *args)
     end
-    
+
     def am_uploading(thing)
       ui.info "#{ui.color('Local chef server:', :bold)} Uploading #{ui.color(thing, :green)}"
       yield
       ui.info ui.color("  -> UPLOADED #{thing.upcase}", :green)
     end
-    
-    def do_create
-      @lxc = Lxc.new(generated_name)
-      unless(@lxc.exists?)
-        com = "#{options[:sudo]}lxc-clone -n #{generated_name} -o #{@base_template}"
-        debug(com)
-        cmd = Mixlib::ShellOut.new(com, :live_stream => options[:debug])
-        cmd.run_command
-        cmd.error!
+
+    def server_base
+      if(vagabondfile[:local_chef_server][:zero] || options[:force_zero])
+        base = 'vb-zero-server'
       else
-        ui.warn 'Found server instance not if configuration. Adding and moving on.'
+        version = vagabondfile[:local_chef_server][:version]
+        unless(version)
+          # TODO: Bad magic. Make configurable!
+          matches = Dir.new('/var/lib/lxc').find_all{|i| i.match(/^vb-server-\d+_\d+_\d+$/)}
+          matches.map!{|i| i.sub('vb-server-', '').gsub('_', '.')}
+          version = matches.sort{|x,y| Gem::Version.new(x) <=> Gem::Version.new(y)}.last
+        end
+        base = "vb-server-#{version.gsub('.', '_')}"
+        unless(Lxc.new(base).exists?)
+          raise VagabondError::ErchefBaseMissing.new("Required base container is missing: #{base}")
+        end
       end
-      @internal_config[:mappings][name] = generated_name
-      @internal_config.save
-      ui.info ui.color('  -> Chef Server container created!', :cyan)
-      lxc.start
-      ui.info ui.color('  -> Chef Server CREATED!', :green)
-      do_provision
-      auto_upload if vagabondfile[:local_chef_server][:auto_upload]
+      base
+    end
+
+    def do_create
+      config = Mash.new
+      # TODO: Pull custom IP option if provided
+      config[:daemon] = true
+      config[:original] = server_base
+
+      ephemeral = Lxc::Ephemeral.new(config)
+      e_name = ephemeral.name
+      internal_config[mappings_key][name] = e_name
+      ephemeral.start!(:fork)
+      @lxc = Lxc.new(e_name)
+      @lxc.wait_for_state(:running)
     end
 
     def do_provision
-      if(vagabondfile[:local_chef_server][:zero])
+      if(vagabondfile[:local_chef_server][:zero] || options[:force_zero])
         ui.info ui.color('  -> Bootstrapping chef-zero...', :cyan)
         tem_file = File.expand_path(File.join(File.dirname(__FILE__), 'bootstraps/server-zero.erb'))
-        options[:knife_opts] = " --server-url http://#{lxc.container_ip(20, true)}"
+        knife_config :server_url => "http://#{lxc.container_ip(20, true)}"
       else
         ui.info ui.color('  -> Bootstrapping erchef...', :cyan)
         tem_file = File.expand_path(File.join(File.dirname(__FILE__), 'bootstraps/server.erb'))
-        options[:knife_opts] = " --server-url https://#{lxc.container_ip(20, true)}"
+        knife_config :server_url => "https://#{lxc.container_ip(20, true)}"
       end
-      com = "#{options[:sudo]}knife bootstrap #{lxc.container_ip(10, true)} --template-file #{tem_file} -i /opt/hw-lxc-config/id_rsa"
-      cmd = Mixlib::ShellOut.new(com, :live_stream => options[:debug], :timeout => 1200)
-      debug(com)
+      # Scrub before bootstrap
+      direct_container_command('rm -rf /var/chef-host/cookbooks')
+      # And bootstrap
+      cmd = knife_command(
+        "bootstrap #{lxc.container_ip(10, true)} --sync-directory " <<
+        "\"#{internal_config.cookbook_path}:/var/chef-host/cookbooks\" --template-file " <<
+        "#{tem_file} -i #{Settings[:ssh_key]}"
+      )
       cmd.run_command
       cmd.error!
+      ui.info ui.color('  -> COMPLETE', :green)
+      auto_upload if vagabondfile[:local_chef_server][:auto_upload]
     end
-    
+
     def berks_upload
       ui.info 'Cookbooks being uploaded via berks'
+      if(vagabondfile[:local_chef_server][:berkshelf].is_a?(Hash))
+        berks_opts = vagabondfile[:local_chef_server][:berkshelf][:options]
+        berks_path = vagabondfile[:local_chef_server][:berkshelf][:path]
+      end
       berk_uploader = Uploader::Berkshelf.new(
-        vagabondfile.directory, options.merge(
+        vagabondfile, vagabondfile.build_private_store, options.merge(
           :ui => ui,
-          :berksfile => File.join(vagabondfile.directory, vagabondfile[:local_chef_server][:berkshelf][:path] || 'Berksfile'),
+          :berksfile => File.join(vagabondfile.directory, berks_path || 'Berksfile'),
           :chef_server_url => options[:knife_opts].to_s.split(' ').last,
-          :berks_opts => vagabondfile[:local_chef_server][:berkshelf][:options]
+          :berks_opts => berks_opts
         )
       )
       berk_uploader.upload
@@ -173,17 +205,17 @@ module Vagabond
     def librarian_upload
       ui.info 'Cookbooks being uploaded with librarian'
       librarian_uploader = Uploader::Librarian.new(
-        vagabondfile.generate_store_path, options.merge(
+        vagabondfile, vagabondfile.build_private_store, options.merge(
           :ui => ui,
           :cheffile => File.join(vagabondfile.directory, 'Cheffile')
         )
       )
       librarian_uploader.upload
     end
-    
+
     def raw_upload
       ui.info 'Cookbooks being uploaded via knife'
-      knife_uploader = Uploader::Knife.new(vagabondfile.directory, options.merge(:ui => ui))
+      knife_uploader = Uploader::Knife.new(vagabondfile, vagabondfile.directory, options.merge(:ui => ui))
       knife_uploader.upload
     end