vagrant-butcher 1.0.0 → 1.0.1

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

@@ -10,19 +10,18 @@ module Vagrant
 
         def initialize(app, env)
           @app = app
-          @env = env
         end
 
-        def victim
-          @victim ||= chef_provisioner(@env).node_name || vm_config(@env).hostname || vm_config(@env).box
+        def victim(env)
+          @victim ||= chef_provisioner(env).node_name || vm_config(env).hostname || vm_config(env).box
         end
 
-        def delete_resource(resource)
+        def delete_resource(resource, env)
           begin
-            chef_api(@env).delete_rest("#{resource}s/#{victim}")
-            @env[:butcher].ui.success "Chef #{resource} '#{victim}' successfully butchered from the server..."
+            chef_api(env).delete_rest("#{resource}s/#{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}: #{e.message}"
+            env[:butcher].ui.warn "Could not remove #{resource} #{victim(env)}: #{e.message}"
           end
         end
 
@@ -34,7 +33,7 @@ module Vagrant
               raise ::Vagrant::Butcher::VagrantWrapperError.new(e)
             end
 
-            %w(node client).each { |resource| delete_resource(resource) }
+            %w(node client).each { |resource| delete_resource(resource, env) }
           end
 
           @app.call(env)

data/lib/vagrant-butcher/env.rb

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

data/lib/vagrant-butcher/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Butcher
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/spec/unit/vagrant_butcher/env_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper.rb'
+
+describe Vagrant::Butcher::Env do
+  subject { described_class.new }
+
+  it "is a valid Vagrant UI object" do
+    subject.ui.should be_a Vagrant::UI::BasicScope
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-butcher
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -99,6 +99,7 @@ files:
 - lib/vagrant-butcher/version.rb
 - spec/spec_helper.rb
 - spec/unit/vagrant_butcher/config_spec.rb
+- spec/unit/vagrant_butcher/env_spec.rb
 - spec/unit/vagrant_butcher_spec.rb
 - vagrant-butcher.gemspec
 homepage: https://github.com/cassianoleal/vagrant-butcher
@@ -130,4 +131,5 @@ summary: When a Vagrant VM that was spun up using Chef-Client is destroyed, it l
 test_files:
 - spec/spec_helper.rb
 - spec/unit/vagrant_butcher/config_spec.rb
+- spec/unit/vagrant_butcher/env_spec.rb
 - spec/unit/vagrant_butcher_spec.rb