vagrant-butcher 1.1.1 → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmE0ZGRlNDJjMmNhMjk3ZTFmMzEyMjI4NjJlNWYzNjc3ODhiMWMyZA==
-  data.tar.gz: !binary |-
-    NGIxMmRiMTNlMjhlMmQxMWUwZWU4NDIzMWJjMDljYjU3ODhhNzJjMw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NGQ4NmRjMTM3YWJhMDgxMDRiODVlMTE0Mzk4MGM5NjhjOWZkZGI3MWQ4ZmIw
-    MGZkNDA3NWE5OTM4NDY5ZjQ0ZWJmMjFmYzRjMjg4ZWJiYTFlNTkxZjFiNzZj
-    OGYyNDQwM2Y5M2ZmN2YwYzA4NGNjYWY0MzA2ZWM3ZTU0ZDMxYWY=
-  data.tar.gz: !binary |-
-    NTQ2NGYyMDg2N2ZlMjM5MTFkMzRmMDk2MzE4NTg5NjBjMGMzNDQ1ZGUyMGQy
-    NTg5YmRkZGI0ZWU2ZTc4YzhhMGI4ZjY0NGM3N2I3MjJiODY1MmIxY2I5OTE4
-    ZDBlZGM3OTAzYmU4MTE0NjIyODhhYjdiNGNlZDE1MDI3NTU0OGY=
+SHA1:
+  metadata.gz: ca0c243f1bc78d523af45de51eda02479461c5eb
+  data.tar.gz: 7fd4a44a11cb8a079b163ad38485f6828535ddcb
+SHA512:
+  metadata.gz: 4bbba48df2d30503688bc49232c54e12c79815165f47e0af1566c1e1cf12fa96e792b03e2f6b51ebcd403f53d584f5132fae0980a3c68b2f6dcc39c72fc4e819
+  data.tar.gz: 92fc213d56dc3eaefad1d826ca50a82c23828936b34bec2cf425e713e3a6b2a9400d3fe5ccb627ae248aa7243e7d9f5df85a8cb256169c40bfdb5e181c82de09

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 .idea/
 .vagrant/
+.vagrant-butcher/

data/Gemfile

@@ -7,5 +7,5 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+  gem "vagrant", :github => 'mitchellh/vagrant'
 end

data/README.md

@@ -10,7 +10,7 @@ This plugin will automatically get rid of that cruft for you when you destroy th
 
 ## <a id="install"></a>Installation
 
-Starting with version 1.0.0, installation is made via Vagrant plugins only:
+Install this plugin using the Vagrant command line:
 
     $ vagrant plugin install vagrant-butcher
 
@@ -18,43 +18,45 @@ Starting with version 1.0.0, installation is made via Vagrant plugins only:
 
 The plugin is loaded automatically once installed.
 
-By default, the gem looks for the Chef server settings on `$HOME/.chef/knife.rb`. This can be overridden by setting:
+## <a id='configuration'></a>Configuration
+
+For most cases, the plugin shouldn't need any configuration. However, there are a few options that can be set. The options are all set in the `Vagrantfile` in the format:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.butcher.knife_config_file = '/path/to/knife.rb'
-  config.vm.provision :chef_client do |chef|
-    # Chef Client provisioner configuration
-  end
+  ...
+  config.butcher.<option> = <value>
+  ...
 end
 ```
 
-_Note that beginning with 1.0, the configuration is done outside of the `chef_client` provisioner._
-
-This is the output of the plugin when it runs successfully:
-
-    $ vagrant destroy -f
-    [Butcher] knife.rb location set to '/path/to/knife.rb'
-    [Butcher] Chef node 'node_name' successfully butchered from the server...
-    [Butcher] Chef client 'node_name' successfully butchered from the server...
-    [default] Forcing shutdown of VM...
-    [default] Destroying VM and associated drives...
-
-### <a id='auto_knife'></a>Auto Knife
-
-Starting with version 1.1.0 you can set the knife_config_file to `:auto` if you'd like it to automatically create a knife.rb for that instance from the chef provisioner values.
-
-This option has the following two limitations:
-- It doesn't work with windows guests.
-- The default `.` -> `/vagrant` shared folder should be mounted.
+Option | Default Value | Purpose
+-------|---------|--------
+`enabled` | `true` | Defines whether `node` and `client` should be deleted
+`guest_key_path` | `'/etc/chef/client.pem'` | Location of the client key in the guest VM
+`verify_ssl` | `true` | If set to false, does not verify Chef's host key
+`proxy` | `nil` | Inform the URL of a proxy server between your host and the Chef Server
+`client_name` | Guest's node name | Inform a client name to override the plugin's default behaviour
+`client_key` | Guest's client key | Point to a local `.pem` key file that matches the `client_name`
 
 ## <a id='caveats'></a>Caveats
 
-* Version 1.0 has only been tested with Vagrant 1.1+. If you're using an older version, it's probably best to stick to 0.0.3
 * So far this has only been tested and confirmed to run with the VirtualBox and Rackspace provisioners. It should work with others, but if you run into issues please file a bug.
+* It doesn't work with windows guests. If this is your case, either stick to version 1.x or (better) file bug reports with the errors you get.
+* The default `.` -> `/vagrant` shared folder should be mounted.
+* `verify_ssl` is enabled by default. You might want to disable that if, for example, you run your own Chef server with a self-signed cert. Check [here](#configuration) to see how.
 
 ## Changelog
 
+### 2.0.0
+
+* No more option to point to `knife.rb`. Data is retrieved from the `Vagrantfile`'s `chef_client` provisioner
+* `chef` is no longer a requirement (no more `json` conflicts)
+* [Configuration](#configuration) items were added to point to custom client name and key
+* It's possible to disable the plugin by setting the `enabled` flag to `false` in the Vagrantfile.
+
+See [Configuration](#configuration) for all possible customisations.
+
 ### 1.1.0
 
 * :auto was added as an optional value for knife_config_file
@@ -74,6 +76,11 @@ This option has the following two limitations:
 
 * Uses chef.node_name if set. Otherwise, fall back to vm.host_name (as before), or vm.box. -- _Kudos to [pikesley](https://github.com/pikesley)_.
 
+# Authors
+
+* Cassiano Leal (<cassianoleal@gmail.com>)
+* Daniel Searles ([https://github.com/squaresurf]())
+
 ## Contributing
 
 1. Fork it

data/Vagrantfile

@@ -0,0 +1,25 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.require_plugin "vagrant-butcher"
+
+orgname = ENV['CHEF_ORGNAME']
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "precise64"
+  # config.vm.network :private_network, ip: "192.168.33.10"
+  # config.vm.network :public_network
+
+  config.butcher.verify_ssl = true
+
+  config.vm.provision :chef_client do |chef|
+    chef.node_name = 'vagrant_butcher_test_vm'
+    chef.chef_server_url = "https://api.opscode.com/organizations/#{orgname}"
+    chef.validation_key_path = "~/.chef/#{orgname}-validator.pem"
+    chef.validation_client_name = "#{orgname}-validator"
+    # chef.run_list = [ 'recipe[dummy::fail]' ]
+  end
+end

data/lib/vagrant-butcher/action/cleanup.rb

@@ -1,7 +1,3 @@
-require 'chef/config'
-require 'chef/rest'
-require 'chef/api_client'
-
 module Vagrant
   module Butcher
     module Action
@@ -15,39 +11,37 @@ module Vagrant
 
         def delete_resource(resource, env)
           begin
-            chef_api(env).delete_rest("#{resource}s/#{victim(env)}")
+            @conn.send(resource.to_sym).delete(victim(env))
             env[:butcher].ui.success "Chef #{resource} '#{victim(env)}' successfully butchered from the server..."
           rescue Exception => e
-            env[:butcher].ui.warn "Could not remove #{resource} #{victim(env)}: #{e.message}"
+            env[:butcher].ui.warn "Could not butcher #{resource} #{victim(env)}: #{e.message}"
             @delete_all_success = false
           end
         end
 
-        def delete_auto_knife(env)
+        def cleanup_cache_dir(env)
           if @delete_all_success
-            File.delete(auto_knife_config_file(env))
-            File.delete(auto_knife_key_path(env))
+            File.delete(host_key_path(env))
             begin
               Dir.delete(cache_dir(env))
             rescue
               # The dir wasn't empty.
             end
+          else
+            env[:butcher].ui.warn "Client and/or node not butchered from the Chef Server. Client key was left at #{host_key_path(env)}"
           end
         end
 
         def call(env)
-          if chef_client?(env) && knife_config_file(env)
-            begin
-              ::Chef::Config.from_file knife_config_file(env)
-            rescue Errno::ENOENT => e
-              raise ::Vagrant::Butcher::VagrantWrapperError.new(e)
-            end
-
-            %w(node client).each { |resource| delete_resource(resource, env) }
+          setup_connection(env)
 
-            if auto_knife?(env)
-              delete_auto_knife(env)
+          if butcher_config(env).enabled
+            if chef_client?(env)
+              %w(node client).each { |resource| delete_resource(resource, env) }
+              cleanup_cache_dir(env)
             end
+          else
+            env[:butcher].ui.warn "Vagrant::Butcher disabled, not cleaning up Chef server!"
           end
 
           @app.call(env)

data/lib/vagrant-butcher/action/copy_guest_key.rb

@@ -0,0 +1,47 @@
+module Vagrant
+  module Butcher
+    module Action
+      class CopyGuestKey
+        include ::Vagrant::Butcher::EnvHelpers
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def create_cache_dir(env)
+          unless File.exists?(cache_dir(env))
+            env[:butcher].ui.info "Creating #{cache_dir(env)}"
+            Dir.mkdir(cache_dir(env))
+          end
+        end
+
+        def copy_key_from_guest(env)
+          create_cache_dir(env)
+
+          begin
+            env[:machine].communicate.execute "cp #{guest_key_path(env)} #{guest_cache_key_path(env)}", :sudo => true
+            env[:butcher].ui.info "Copied #{guest_key_path(env)} to #{guest_cache_key_path(env)}"
+          rescue Exception => e
+            env[:butcher].ui.error "Failed to copy #{guest_key_path(env)} to #{guest_cache_key_path(env)}"
+            env[:butcher].ui.error e
+            return false
+          end
+
+          return true
+        end
+
+        def call(env)
+          begin
+            @app.call(env)
+          ensure
+            if chef_client?(env)
+              unless guest_cache_dir(env) && copy_key_from_guest(env)
+                env[:butcher].ui.error "Failed to copy Chef client key from the guest."
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-butcher/action.rb

@@ -2,8 +2,8 @@ module Vagrant
   module Butcher
     module Action
       autoload :Cleanup, 'vagrant-butcher/action/cleanup'
-      autoload :AutoKnife, 'vagrant-butcher/action/auto_knife'
-      
+      autoload :CopyGuestKey, 'vagrant-butcher/action/copy_guest_key'
+
       def self.cleanup
         ::Vagrant::Action::Builder.new.tap do |b|
           b.use setup
@@ -11,10 +11,10 @@ module Vagrant
         end
       end
 
-      def self.auto_knife
+      def self.copy_guest_key
         ::Vagrant::Action::Builder.new.tap do |b|
           b.use setup
-          b.use Vagrant::Butcher::Action::AutoKnife
+          b.use Vagrant::Butcher::Action::CopyGuestKey
         end
       end
 

data/lib/vagrant-butcher/config.rb

@@ -1,46 +1,43 @@
 module Vagrant
   module Butcher
     class Config < ::Vagrant.plugin('2', :config)
+      attr_accessor :enabled
       attr_accessor :guest_key_path
       attr_accessor :cache_dir
-      attr_accessor :guest_cache_dir
-      attr_accessor :knife_config_file
-      
+      attr_accessor :verify_ssl
+      attr_accessor :retries
+      attr_accessor :retry_interval
+      attr_accessor :proxy
+      attr_accessor :client_name
+      attr_accessor :client_key
+
       def initialize
         super
+        @enabled = UNSET_VALUE
         @guest_key_path = UNSET_VALUE
         @cache_dir = UNSET_VALUE
-        @guest_cache_dir = UNSET_VALUE
-        @knife_config_file = UNSET_VALUE
+        @verify_ssl = UNSET_VALUE
+        @retries = UNSET_VALUE
+        @retry_interval = UNSET_VALUE
+        @proxy = UNSET_VALUE
+        @client_name = UNSET_VALUE
+        @client_key = UNSET_VALUE
       end
 
       def cache_dir=(value)
         @cache_dir = File.expand_path(value)
       end
 
-      def knife_config_file=(value)
-        unless value == :auto
-          value = File.expand_path(value)
-        end
-
-        @knife_config_file = value
-      end
-      
-      def validate(machine)
-        errors = []
-
-        if @knife_config_file != :auto && !File.exists?(@knife_config_file)
-          errors << "Knife configuration not found at #{@knife_config_file}."
-        end
-        
-        { "butcher configuration" => errors }
-      end
-      
       def finalize!
+        @enabled = true if @enabled == UNSET_VALUE
         @guest_key_path = '/etc/chef/client.pem' if @guest_key_path == UNSET_VALUE
-        @cache_dir = File.expand_path ".vagrant-butcher" if @cache_dir == UNSET_VALUE
-        @guest_cache_dir = "/vagrant/" + File.basename(@cache_dir) if @guest_cache_dir == UNSET_VALUE
-        @knife_config_file = File.expand_path "#{ENV['HOME']}/.chef/knife.rb" if @knife_config_file == UNSET_VALUE
+        @cache_dir = File.expand_path ".vagrant/butcher" if @cache_dir == UNSET_VALUE
+        @verify_ssl = true if @verify_ssl == UNSET_VALUE
+        @retries = 0 if @retries == UNSET_VALUE
+        @retry_interval = 0 if @retry_interval == UNSET_VALUE
+        @proxy = nil if @proxy == UNSET_VALUE
+        @client_name = nil if @client_name == UNSET_VALUE
+        @client_key = nil if @client_key == UNSET_VALUE
       end
     end
   end

data/lib/vagrant-butcher/env.rb

@@ -2,7 +2,7 @@ module Vagrant
   module Butcher
     class Env
       attr_accessor :ui
-      
+
       def initialize
         if Gem::Version.new(::Vagrant::VERSION) >= Gem::Version.new("1.2")
           @ui = ::Vagrant::UI::Colored.new.scope('Butcher')

data/lib/vagrant-butcher/env_helpers.rb

@@ -1,3 +1,8 @@
+require 'ridley'
+
+# Silence celluloid warnings and errors: https://github.com/RiotGames/ridley/issues/220
+::Ridley::Logging.logger.level = Logger.const_get 'FATAL'
+
 module Vagrant
   module Butcher
     module EnvHelpers
@@ -5,8 +10,27 @@ module Vagrant
         @vm_config ||= env[:machine].config.vm
       end
 
-      def chef_api(env)
-        ::Chef::REST.new(chef_provisioner(env).chef_server_url)
+      def setup_connection(env)
+        unless @conn
+          begin
+            @conn = ::Ridley.new(
+              server_url: chef_provisioner(env).chef_server_url,
+              client_name: client_name(env),
+              client_key: client_key(env),
+              ssl: {
+                verify: butcher_config(env).verify_ssl
+              },
+              retries: butcher_config(env).retries,
+              retry_interval: butcher_config(env).retry_interval,
+              proxy: butcher_config(env).proxy
+            )
+          rescue Ridley::Errors::ClientKeyFileNotFoundOrInvalid
+            env[:butcher].ui.error "Chef client key not found at #{host_key_path(env)}"
+          rescue Exception => e
+            env[:butcher].ui.error "Could not connect to Chef Server: #{e}"
+          end
+        end
+        @conn
       end
 
       def chef_provisioner(env)
@@ -19,88 +43,66 @@ module Vagrant
         vm_config(env).provisioners.select { |p| p.name == :chef_client }.any?
       end
 
-      def auto_knife?(env)
-        butcher_config(env).knife_config_file == :auto
-      end
-
       def butcher_config(env)
         @butcher_config ||= env[:machine].config.butcher
       end
 
       def cache_dir(env)
-        unless @cache_dir
-          env[:butcher].ui.info "cache dir is set to '#{butcher_config(env).cache_dir}'"
-        end
-
         @cache_dir ||= butcher_config(env).cache_dir
       end
 
-      def guest_cache_dir(env)
-        unless @guest_cache_dir
-          @guest_cache_dir = butcher_config(env).guest_cache_dir
-          env[:butcher].ui.info "guest cache dir is set to '#{@guest_cache_dir}'"
-        end
+      def cache_dir_mapping(env)
+        unless @cache_dir_mapping
+          # Grab all enabled synced_folders
+          synced_folders = vm_config(env).synced_folders.values.find_all { |f| !f[:disabled] }
 
-        @guest_cache_dir
-      end
+          # Expand the hostpath of each folder
+          synced_folders.each { |f| f[:hostpath] = File.expand_path(f[:hostpath]) }
 
-      def guest_key_path(env)
-        unless @guest_key_path
-          @guest_key_path = butcher_config(env).guest_key_path
-          env[:butcher].ui.info "guest key path is set to '#{@guest_key_path}'"
+          # Select the folder wherein the cache_dir is contained
+          cache_dir_mappings = synced_folders.select { |f| cache_dir(env) =~ /^#{f[:hostpath]}/ }
+          @cache_dir_mapping = cache_dir_mappings.first if cache_dir_mappings.any?
         end
-
-        @guest_key_path
+        @cache_dir_mapping
       end
 
-      def auto_knife_config_file(env)
-        @auto_knife_config_file ||= "#{cache_dir(env)}/#{env[:machine].name}-knife.rb"
-      end
-
-      def knife_config_file(env)
-        unless @knife_config_file
-          if auto_knife?(env)
-            file = "#{cache_dir(env)}/#{env[:machine].name}-knife.rb"
-            unless File.exists?(file)
-              file = false
-            end
+      def guest_cache_dir(env)
+        unless @guest_cache_dir
+          if cache_dir_mapping(env)
+            # Return the path to the cache dir inside the VM
+            @guest_cache_dir = cache_dir(env).gsub(cache_dir_mapping(env)[:hostpath], cache_dir_mapping(env)[:guestpath])
+            env[:butcher].ui.info "Guest cache dir at #{@guest_cache_dir}"
           else
-            file = butcher_config(env).knife_config_file
+            @guest_cache_dir = false
+            env[:butcher].ui.error "We couldn't find a synced folder to access the cache dir on the guest."
+            env[:butcher].ui.error "Did you disable the /vagrant folder or set a butcher.cache_path that isn't shared with the guest?"
           end
-
-          env[:butcher].ui.info "knife.rb location set to '#{file}'"
-
-          @knife_config_file = file
         end
-
-        @knife_config_file
+        @guest_cache_dir
       end
 
-      def auto_knife_key(env)
-        unless @auto_knife_key
-          @auto_knife_key = "#{env[:machine].name}-client.pem"
-          env[:butcher].ui.info "auto client key name is #{@auto_knife_key}"
-        end
+      def guest_key_path(env)
+        @guest_key_path ||= butcher_config(env).guest_key_path
+      end
 
-        @auto_knife_key
+      def guest_key_filename(env)
+        @guest_key ||= "#{env[:machine].name}-client.pem"
       end
 
-      def auto_knife_key_path(env)
-        unless @auto_knife_key_path
-          @auto_knife_key_path = "#{cache_dir(env)}/#{auto_knife_key(env)}"
-          env[:butcher].ui.info "auto client key path is #{@auto_knife_key_path}"
-        end
+      def host_key_path(env)
+        @host_key_path ||= "#{cache_dir(env)}/#{guest_key_filename(env)}"
+      end
 
-        @auto_knife_key_path
+      def guest_cache_key_path(env)
+        @guest_cache_key_path ||= "#{guest_cache_dir(env)}/#{guest_key_filename(env)}"
       end
 
-      def auto_knife_guest_key_path(env)
-        unless @auto_knife_guest_key_path
-          @auto_knife_guest_key_path = "#{guest_cache_dir(env)}/#{auto_knife_key(env)}"
-          env[:butcher].ui.info "auto client guest key path is #{@auto_knife_guest_key_path}"
-        end
+      def client_key(env)
+        @client_key ||= butcher_config(env).client_key || host_key_path(env)
+      end
 
-        @auto_knife_guest_key_path
+      def client_name(env)
+        @client_name ||= butcher_config(env).client_name || victim(env)
       end
 
       def victim(env)

data/lib/vagrant-butcher/errors.rb

@@ -4,7 +4,7 @@ module Vagrant
   module Butcher
     # This is a copy/adaptation of the VagrantWrapperError class of berkshelf-vagrant
     # The original can be found on https://github.com/RiotGames/berkshelf-vagrant
-    
+
     # @author Jamie Winsor <reset@riotgames.com>
     #
     # A wrapper for a BerkshelfError for Vagrant. All Berkshelf exceptions should be

data/lib/vagrant-butcher/plugin.rb

@@ -9,13 +9,13 @@ module Vagrant
       class << self
         def provision(hook)
           # This should be at the end so that it can copy the chef client pem.
-          hook.append(::Vagrant::Butcher::Action.auto_knife)
+          hook.before(::Vagrant::Action::Builtin::Provision, Vagrant::Butcher::Action.copy_guest_key)
         end
       end
 
-      action_hook(:vagrant_butcher_auto_knife, :machine_action_up, &method(:provision))
-      action_hook(:vagrant_butcher_auto_knife, :machine_action_reload, &method(:provision))
-      action_hook(:vagrant_butcher_auto_knife, :machine_action_provision, &method(:provision))
+      action_hook(:vagrant_butcher_copy_guest_key, :machine_action_up, &method(:provision))
+      action_hook(:vagrant_butcher_copy_guest_key, :machine_action_reload, &method(:provision))
+      action_hook(:vagrant_butcher_copy_guest_key, :machine_action_provision, &method(:provision))
 
       action_hook(:vagrant_butcher_cleanup, :machine_action_destroy) do |hook|
         hook.after(::Vagrant::Action::Builtin::ConfigValidate, Vagrant::Butcher::Action.cleanup)

data/lib/vagrant-butcher/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Butcher
-    VERSION = "1.1.1"
+    VERSION = "2.0.0"
   end
 end

data/lib/vagrant-butcher.rb

@@ -1,4 +1,8 @@
-require 'vagrant'
+begin
+  require "vagrant"
+rescue LoadError
+  raise "This plugin must run within Vagrant."
+end
 require 'vagrant-butcher/version'
 require 'vagrant-butcher/errors'
 

data/spec/unit/vagrant_butcher/config_spec.rb

@@ -2,68 +2,26 @@ require 'spec_helper.rb'
 
 describe Vagrant::Butcher::Config do
   subject { described_class.new }
-  
-  it "has the option to set knife.rb path" do
-    subject.should respond_to(:knife_config_file)
+
+  it "does not have the option to set knife.rb path" do
+    subject.should_not respond_to(:knife_config_file)
   end
-  
+
   it "has the option to set guest chef client pem path" do
     subject.should respond_to(:guest_key_path)
   end
-  
+
   it "has the option to set cache dir path" do
     subject.should respond_to(:cache_dir)
   end
-  
-  it "has the option to set guest cache dir path" do
-    subject.should respond_to(:guest_cache_dir)
-  end
-  
-  it "sets knife.rb default path" do
-    subject.finalize!.should eql(File.expand_path("#{ENV['HOME']}/.chef/knife.rb"))
-  end
-  
+
   it "sets guest chef client pem default path" do
     subject.finalize!
     subject.guest_key_path.should eql('/etc/chef/client.pem')
   end
-  
+
   it "sets cache dir default path" do
     subject.finalize!
-    subject.cache_dir.should eql(File.expand_path(".vagrant-butcher"))
-  end
-  
-  it "sets guest cache dir default path" do
-    subject.finalize!
-    subject.guest_cache_dir.should eql("/vagrant/" + File.basename(subject.cache_dir))
-  end
-  
-  describe "#validate" do
-    let(:env)     { double('env') }
-    let(:config)  { double('config', butcher: subject) }
-    let(:machine) { double('machine', config: config, env: env) }
-    let(:result)  { subject.validate(machine) }
-    
-    context "when validations pass" do
-      before(:each) do
-        File.should_receive(:exists?).with(subject.knife_config_file).and_return(true)
-      end
-
-      it "contains an empty Array for the 'butcher configuration' key" do
-        result["butcher configuration"].should be_a(Array)
-        result["butcher configuration"].should be_empty
-      end
-    end
-    
-    context "when validations fail" do
-      before(:each) do
-        File.should_receive(:exists?).with(subject.knife_config_file).and_return(false)
-      end
-
-      it "contains an empty Array for the 'butcher configuration' key" do
-        result["butcher configuration"].should be_a(Array)
-        result["butcher configuration"].should_not be_empty
-      end
-    end
+    subject.cache_dir.should eql(File.expand_path(".vagrant/butcher"))
   end
 end

data/vagrant-butcher.gemspec

@@ -11,15 +11,16 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Delete Chef client and node when destroying Vagrant VM}
   gem.summary       = %q{When a Vagrant VM that was spun up using Chef-Client is destroyed, it leaves behind a client and a node on the Chef server. What butcher does is to clean up those during the destroy operation.}
   gem.homepage      = "https://github.com/cassianoleal/vagrant-butcher"
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  
-  gem.add_dependency "chef", ">= 11.2.0"
-  
+
+  gem.add_dependency "ridley", ">= 1.5.3"
+
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "pry-debugger"
-  gem.add_development_dependency "bundler", "~> 1.3"
+  gem.add_development_dependency "bundler", ">= 1.3"
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-butcher
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Cassiano Leal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: ridley
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 11.2.0
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 11.2.0
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.3'
 description: Delete Chef client and node when destroying Vagrant VM
@@ -79,10 +79,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Vagrantfile
 - lib/vagrant-butcher.rb
 - lib/vagrant-butcher/action.rb
-- lib/vagrant-butcher/action/auto_knife.rb
 - lib/vagrant-butcher/action/cleanup.rb
+- lib/vagrant-butcher/action/copy_guest_key.rb
 - lib/vagrant-butcher/config.rb
 - lib/vagrant-butcher/env.rb
 - lib/vagrant-butcher/env_helpers.rb
@@ -95,7 +96,8 @@ files:
 - spec/unit/vagrant_butcher_spec.rb
 - vagrant-butcher.gemspec
 homepage: https://github.com/cassianoleal/vagrant-butcher
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -103,17 +105,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: When a Vagrant VM that was spun up using Chef-Client is destroyed, it leaves

data/lib/vagrant-butcher/action/auto_knife.rb

@@ -1,66 +0,0 @@
-require 'chef/config'
-require 'chef/rest'
-require 'chef/api_client'
-
-module Vagrant
-  module Butcher
-    module Action
-      class AutoKnife
-        include ::Vagrant::Butcher::EnvHelpers
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def victim(env)
-          @victim ||= chef_provisioner(env).node_name || vm_config(env).hostname || vm_config(env).box
-        end
-
-        def auto_create_knife(env)
-          folders = vm_config(env).synced_folders
-          if !folders.has_key?("/vagrant") || folders["/vagrant"][:disabled] == TRUE
-            env[:butcher].ui.warn "/vagrant folder not set to be mounted."
-          end
-
-          unless File.exists?(cache_dir(env))
-            env[:butcher].ui.info "Creating #{cache_dir(env)}"
-            Dir.mkdir(cache_dir(env))
-          end
-
-          begin
-            env[:machine].communicate.execute "cp #{guest_key_path(env)} #{auto_knife_guest_key_path(env)}", :sudo => true
-          rescue Exception => e
-            env[:butcher].ui.error "Failed to copy  #{guest_key_path(env)} to #{auto_knife_key_path(env)}"
-            env[:butcher].ui.error e
-            return false
-          end
-
-          env[:butcher].ui.info "Copied #{guest_key_path(env)} to #{auto_knife_key_path(env)}"
-
-          env[:butcher].ui.info "Creating #{auto_knife_config_file(env)}"
-
-          knife_rb = <<-END.gsub(/^ */, '')
-            log_level                :info
-            log_location             STDOUT
-            client_key               '#{auto_knife_key_path(env)}'
-            node_name                '#{victim(env)}'
-          END
-
-          File.new(auto_knife_config_file(env), 'w+').write(knife_rb)
-
-          return true
-        end
-
-        def call(env)
-          if chef_client?(env) && auto_knife?(env) && !File.exists?(auto_knife_config_file(env))
-            unless auto_create_knife(env)
-              env[:butcher].ui.error "Failed to auto create knife.rb."
-            end
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end