vagrant-butcher 2.1.5 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3bcdc3aa88b5afc4dcc98716a69db4dce2a425d
-  data.tar.gz: c14fcca2095d8f8a58e65fedaddc4f61c566bcb5
+  metadata.gz: f4a8b11cb3abd8531f40c129ea3303511cca1d36
+  data.tar.gz: c59e91ee9e005b49d3fe20b185822bba24a49190
 SHA512:
-  metadata.gz: c472bb126b5787269ac34a6cf9c01f5283b5deb998a38fccf1b84171a8d43f5ed7af800b7774844e9e1e66d837495b6a52cd437eccb916260b444c37ba369e12
-  data.tar.gz: 6de1168eefd9876c2b50f85454f0ee8883101612135a7096e6e5f2fca732207eecd5c6d4055a0b03bd338f434b75a9e43783080ca16b87bc726bcffd8c785885
+  metadata.gz: 26aca93443026d75878dee07702e3007ab59a8a632ffe0cc43ada62e3eb90c9e2d92d608e26083bc2899dc0f566e1af58b5aa7924b4576e381fb258d365c4618
+  data.tar.gz: c57a78095136fa45fd6fa28b5c8b1e92bbdc9ea07baa5fd2b74da414c82799e1259652d680f07fb49657fd940b2f5ab390622392da2b6c8c2ffc51ae626336a9

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.0.0
 script: bundle exec rspec spec/

data/Gemfile

@@ -9,3 +9,7 @@ group :development do
   # Vagrant environment itself using `vagrant plugin`.
   gem "vagrant", :github => 'mitchellh/vagrant'
 end
+
+group :plugins do
+  gem "vagrant-butcher", :path => "."
+end

data/README.md

@@ -48,6 +48,13 @@ Option | Default Value | Purpose
 
 ## Changelog
 
+### 2.2.0
+
+* Removed compatibility with Vagrant < 1.5
+* Fixes an issue with recent Vagrant versions where the butcher sequence would never run
+* Sets default `guest_key_path` depending on OS
+* Tested and confirmed working on Windows and Linux
+
 ### 2.0.0
 
 * No more option to point to `knife.rb`. Data is retrieved from the `Vagrantfile`'s `chef_client` provisioner

data/Vagrantfile

@@ -4,8 +4,6 @@
 # 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|

data/lib/vagrant-butcher.rb

@@ -10,7 +10,6 @@ module Vagrant
   module Butcher
     autoload :Action,     'vagrant-butcher/action'
     autoload :Config,     'vagrant-butcher/config'
-    autoload :Env,        'vagrant-butcher/env'
     autoload :Helpers,    'vagrant-butcher/helpers'
   end
 end

data/lib/vagrant-butcher/action.rb

@@ -6,23 +6,15 @@ module Vagrant
 
       def self.cleanup
         ::Vagrant::Action::Builder.new.tap do |b|
-          b.use setup
           b.use Vagrant::Butcher::Action::Cleanup
         end
       end
 
       def self.copy_guest_key
         ::Vagrant::Action::Builder.new.tap do |b|
-          b.use setup
           b.use Vagrant::Butcher::Action::CopyGuestKey
         end
       end
-
-      def self.setup
-        @setup ||= ::Vagrant::Action::Builder.new.tap do |b|
-          b.use ::Vagrant::Action::Builtin::EnvSet, butcher: Vagrant::Butcher::Env.new
-        end
-      end
     end
   end
 end

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

@@ -13,7 +13,7 @@ module Vagrant
           if butcher_config(machine(env)).enabled
             cleanup(env)
           else
-            ui(env).warn "Vagrant::Butcher disabled, not cleaning up Chef server!"
+            env[:ui].warn "Vagrant::Butcher disabled, not cleaning up Chef server!"
           end
 
           @app.call(env)

data/lib/vagrant-butcher/config.rb

@@ -1,6 +1,8 @@
 module Vagrant
   module Butcher
     class Config < ::Vagrant.plugin('2', :config)
+      include Helpers::Guest
+
       attr_accessor :enabled
       attr_accessor :guest_key_path
       attr_reader   :cache_dir
@@ -26,7 +28,7 @@ module Vagrant
 
       def finalize!
         @enabled = true if @enabled == UNSET_VALUE
-        @guest_key_path = '/etc/chef/client.pem' if @guest_key_path == UNSET_VALUE
+        @guest_key_path = :DEFAULT if @guest_key_path == UNSET_VALUE
         @verify_ssl = true if @verify_ssl == UNSET_VALUE
         @retries = 0 if @retries == UNSET_VALUE
         @retry_interval = 0 if @retry_interval == UNSET_VALUE

data/lib/vagrant-butcher/helpers.rb

@@ -5,6 +5,7 @@ module Vagrant
       autoload :Action,     'vagrant-butcher/helpers/action'
       autoload :KeyFiles,   'vagrant-butcher/helpers/key_files'
       autoload :Connection, 'vagrant-butcher/helpers/connection'
+      autoload :Guest,      'vagrant-butcher/helpers/guest'
     end
   end
 end

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

@@ -4,10 +4,6 @@ module Vagrant
       module Action
         include Config
 
-        def ui(env)
-          @ui ||= env[:butcher].ui
-        end
-
         def machine(env)
           @machine ||= env[:machine]
         end

data/lib/vagrant-butcher/helpers/connection.rb

@@ -23,18 +23,18 @@ module Vagrant
               proxy: butcher_config(env).proxy
             )
           rescue Ridley::Errors::ClientKeyFileNotFoundOrInvalid
-            ui(env).error "Chef client key not found at #{client_key_path(env)}"
+            env[:ui].error "Chef client key not found at #{client_key_path(env)}"
           rescue Exception => e
-            ui(env).error "Could not connect to Chef Server: #{e}"
+            env[:ui].error "Could not connect to Chef Server: #{e}"
           end
         end
 
         def delete_resource(resource, env)
           begin
             @conn.send(resource.to_sym).delete(victim(env))
-            ui(env).success "Chef #{resource} '#{victim(env)}' successfully butchered from the server..."
+            env[:ui].success "Chef #{resource} '#{victim(env)}' successfully butchered from the server..."
           rescue Exception => e
-            ui(env).warn "Could not butcher #{resource} #{victim(env)}: #{e.message}"
+            env[:ui].warn "Could not butcher #{resource} #{victim(env)}: #{e.message}"
             @failed_deletions ||= []
             @failed_deletions << resource
           end

data/lib/vagrant-butcher/helpers/guest.rb

@@ -0,0 +1,19 @@
+module Vagrant
+  module Butcher
+    module Helpers
+      module Guest
+
+        def windows?(env)
+          machine(env).guest.capability_host_chain.last.first == :windows
+        end
+
+        def get_guest_key_path(env)
+          return butcher_config(env).guest_key_path unless butcher_config(env).guest_key_path == :DEFAULT
+          return 'c:\etc\chef\client.pem' if windows?(env)
+          return '/etc/chef/client.pem'
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-butcher/helpers/key_files.rb

@@ -4,13 +4,14 @@ module Vagrant
   module Butcher
     module Helpers
       module KeyFiles
+        include ::Vagrant::Butcher::Helpers::Guest
 
         def cache_dir(env)
           @cache_dir ||= File.expand_path(File.join(root_path(env), butcher_config(env).cache_dir))
         end
 
         def guest_key_path(env)
-          @guest_key_path ||= butcher_config(env).guest_key_path
+          @guest_key_path ||= get_guest_key_path(env)
         end
 
         def key_filename(env)
@@ -23,19 +24,18 @@ module Vagrant
 
         def create_cache_dir(env)
           unless File.exists?(cache_dir(env))
-            ui(env).info "Creating #{cache_dir(env)}"
+            env[:ui].info "Creating #{cache_dir(env)} ..."
             FileUtils.mkdir_p(cache_dir(env))
           end
         end
 
         def grab_key_from_guest(env)
           create_cache_dir(env)
-
-          machine(env).communicate.execute("cat #{guest_key_path(env)}", sudo: true) do |type,data|
-            File.open("#{cache_dir(env)}/#{key_filename(env)}", "w") { |f| f << data } if type == :stdout
+          unless windows?(env)
+            machine(env).communicate.execute "chmod 0644 #{guest_key_path(env)}", :sudo => true
           end
-
-          ui(env).info "Saved client key to #{cache_dir(env)}/#{key_filename(env)}"
+          machine(env).communicate.download(guest_key_path(env), "#{cache_dir(env)}/#{key_filename(env)}")
+          env[:ui].info "Saved client key to #{cache_dir(env)}/#{key_filename(env)}"
         end
 
         def cleanup_cache_dir(env)
@@ -44,7 +44,7 @@ module Vagrant
             File.delete(key_file) if File.exists?(key_file)
             Dir.delete(cache_dir(env)) if (Dir.entries(cache_dir(env)) - %w{ . .. }).empty?
           else
-            ui(env).warn "#{@failed_deletions} not butchered from the Chef Server. Client key was left at #{client_key_path(env)}"
+            env[:ui].warn "#{@failed_deletions} not butchered from the Chef Server. Client key was left at #{client_key_path(env)}"
           end
         end
 
@@ -52,7 +52,7 @@ module Vagrant
           begin
             grab_key_from_guest(env)
           rescue ::Vagrant::Errors::VagrantError => e
-            ui(env).error "Failed to create #{cache_dir(env)}/#{key_filename(env)}: #{e.class} - #{e}"
+            env[:ui].error "Failed to create #{cache_dir(env)}/#{key_filename(env)}: #{e.class} - #{e}"
           end
         end
 

data/lib/vagrant-butcher/plugin.rb

@@ -18,7 +18,7 @@ module Vagrant
       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)
+        hook.prepend(Vagrant::Butcher::Action.cleanup)
       end
 
       config("butcher") do

data/lib/vagrant-butcher/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Butcher
-    VERSION = "2.1.5"
+    VERSION = "2.2.0"
   end
 end

data/spec/unit/vagrant_butcher/config_spec.rb

@@ -37,7 +37,7 @@ describe Vagrant::Butcher::Config do
 
   it "sets guest chef client pem default path" do
     subject.finalize!
-    subject.guest_key_path.should eql('/etc/chef/client.pem')
+    subject.guest_key_path.should eql(:DEFAULT)
   end
 
   it "sets cache dir path" do

data/vagrant-butcher.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "ridley", ">= 1.5.3"
+  gem.add_dependency "ridley", ">= 4.0.0"
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "pry-debugger"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-butcher
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.0
 platform: ruby
 authors:
 - Cassiano Leal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -85,18 +85,17 @@ files:
 - 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/errors.rb
 - lib/vagrant-butcher/helpers.rb
 - lib/vagrant-butcher/helpers/action.rb
 - lib/vagrant-butcher/helpers/config.rb
 - lib/vagrant-butcher/helpers/connection.rb
+- lib/vagrant-butcher/helpers/guest.rb
 - lib/vagrant-butcher/helpers/key_files.rb
 - lib/vagrant-butcher/plugin.rb
 - 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
@@ -119,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: When a Vagrant VM that was spun up using Chef-Client is destroyed, it leaves
@@ -128,5 +127,4 @@ 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

data/lib/vagrant-butcher/env.rb

@@ -1,19 +0,0 @@
-module Vagrant
-  module Butcher
-    class Env
-      attr_accessor :ui
-
-      def initialize
-        vagrant_version = Gem::Version.new(::Vagrant::VERSION)
-        if vagrant_version >= Gem::Version.new("1.5")
-          @ui = ::Vagrant::UI::Colored.new
-          @ui.opts[:target] = 'Butcher'
-        elsif 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
-end

data/spec/unit/vagrant_butcher/env_spec.rb

@@ -1,9 +0,0 @@
-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