vagrant-butcher 0.0.2 → 0.0.3

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea/

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/vagrant-butcher.png)](http://badge.fury.io/rb/vagrant-butcher)
+
 # Vagrant::Butcher
 
 If you're using Vagrant with the Chef-Client provisioner, e.g. for creating cookbooks, it creates a client and a node on the Chef server. Once you destroy the VM, both the client and node will be kept on the server, which may cause problems if you fire up the same VM again.
@@ -10,7 +12,7 @@ Installation will depend on whether you're using bundler or not.
 
 ### If you're using Bundler
 
-Add this line to your application's Gemfile:
+Add this line to your cookbook's Gemfile:
 
     gem 'vagrant-butcher'
 
@@ -22,7 +24,7 @@ And then execute:
 
 You have to install this plugin via Vagrant:
 
-    $ vagrant gem 'vagrant-butcher'
+    $ vagrant gem install 'vagrant-butcher'
 
 Explanation for that is found on the [Vagrant Plugins Documentation](http://vagrantup.com/v1/docs/extending/types.html)
 

data/lib/vagrant-butcher/cleanup.rb

@@ -6,21 +6,33 @@ module Vagrant
         def knife_config; @knife_config || "#{ENV['HOME']}/.chef/knife.rb"; end
       end
 
-      def cleanup_chef_server(host_name)
+      def cleanup_chef_server(node_name)
         chef_api = ::Chef::REST.new(::Chef::Config[:chef_server_url])
         %w(node client).each do |resource|
-          env[:ui].info "Removing Chef #{resource} \"#{host_name}\"..."
+          env[:ui].info "Removing Chef #{resource} \"#{node_name}\"..."
           begin
-            chef_api.delete_rest("#{resource}s/#{host_name}")
+            chef_api.delete_rest("#{resource}s/#{node_name}")
           rescue Exception => e
-            env[:ui].warn "Could not remove #{resource} #{host_name}: #{e.message}"
+            env[:ui].warn "Could not remove #{resource} #{node_name}: #{e.message}"
           end
         end
       end
 
       def cleanup
         ::Chef::Config.from_file(config.knife_config)
-        cleanup_chef_server(env[:vm].config.vm.host_name)
+        conf = env[:vm].config.vm
+
+        # If a node_name is given to the chef-client provisioner, use it
+        chef_provisioner = conf.provisioners.find { |p| p.provisioner.name == "Vagrant::Provisioners::ChefClient" }
+        victim = chef_provisioner.config.node_name
+
+        # If no node_name, fall back to host_name or box
+        if not victim then
+          env[:ui].info "No chef.node_name set, falling back to vm.host_name or vm.box."
+          victim ||= conf.host_name || conf.box
+        end
+
+        cleanup_chef_server(victim)
       end
     end
   end

data/lib/vagrant-butcher/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Butcher
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-butcher
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-01 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
@@ -87,4 +87,3 @@ summary: When a Vagrant VM that was spun up using Chef-Client is destroyed, it l
   behind a client and a node on the Chef server. What butcher does is to clean up
   those during the destroy operation.
 test_files: []
-has_rdoc: