chef-metal-vagrant 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42ba70f08cd9d773f590362eb5834a4661733b7d
-  data.tar.gz: 0d503d578e1b39a64e8153fa922a0fd5a41768bf
+  metadata.gz: 9a8d69c824684a912af6c8f37ab60465dffe4fee
+  data.tar.gz: ab15a76ad01d484b0503f8920a4d788682d8676d
 SHA512:
-  metadata.gz: a39044b884a5133eaae765dd1c15203395f39fbaffadeb99a19bb46a704b68cd109d44a4e203def878ff8cea60b115049b48e745bd51ba52487b78078d3922a3
-  data.tar.gz: e4803282d13b3e6119a825e2ed3d6483e023b269365464eeb03e1b46748a447a25a9e83af5be1afd9c56f0c2dc9ca06292fac497f606c499919bfec7b212fa35
+  metadata.gz: 810fa6b256bc05420dc7d409f1b582e5d433914bc519cbec3b64d2e95d5ed1c2742d0d46ba89d1dc38cc0e7c87f4d4d1cd86643569316ec47712c2f634df98df
+  data.tar.gz: 507562488443ae27ca942210faba3383eb40c2dce8e8617c8ce8d1b82f70672184dc8d3531df7449417601dc61e49d8e668370a39597d400af9297a56652deec

data/lib/chef/provisioning/driver_init/vagrant.rb

@@ -0,0 +1,3 @@
+require 'chef/provisioning/vagrant_driver/driver'
+
+ChefMetal.register_driver_class("vagrant", Chef::Provisioning::VagrantDriver::Driver)

data/lib/chef/provisioning/vagrant_driver.rb

@@ -0,0 +1,35 @@
+require 'chef_metal'
+require 'chef/resource/vagrant_cluster'
+require 'chef/provider/vagrant_cluster'
+require 'chef/resource/vagrant_box'
+require 'chef/provider/vagrant_box'
+require 'chef/provisioning/vagrant_driver/driver'
+
+class Chef
+  module Provisioning
+    module VagrantDriver
+      def self.with_vagrant_box(run_context, box_name, vagrant_options = {}, &block)
+        if box_name.is_a?(Chef::Resource::VagrantBox)
+          new_options = { :vagrant_options => { 'vm.box' => box_name.name } }
+          new_options[:vagrant_options]['vm.box_url'] = box_name.url if box_name.url
+        else
+          new_options = { :vagrant_options => { 'vm.box' => box_name } }
+        end
+
+        run_context.chef_metal.add_machine_options(new_options, &block)
+      end
+    end
+  end
+
+  module DSL
+    module Recipe
+      def with_vagrant_cluster(cluster_path, &block)
+        with_driver("vagrant:#{cluster_path}", &block)
+      end
+
+      def with_vagrant_box(box_name, vagrant_options = {}, &block)
+        Chef::Provisioning::VagrantDriver.with_vagrant_box(run_context, box_name, vagrant_options, &block)
+      end
+    end
+  end
+end

data/lib/{chef_metal_vagrant/vagrant_driver.rb → chef/provisioning/vagrant_driver/driver.rb}

@@ -6,13 +6,15 @@ require 'chef_metal/convergence_strategy/install_msi'
 require 'chef_metal/convergence_strategy/install_cached'
 require 'chef_metal/transport/winrm'
 require 'chef_metal/transport/ssh'
-require 'chef_metal_vagrant/version'
+require 'chef/provisioning/vagrant_driver/version'
 require 'chef/resource/vagrant_cluster'
 require 'chef/provider/vagrant_cluster'
 
-module ChefMetalVagrant
+class Chef
+module Provisioning
+module VagrantDriver
   # Provisions machines in vagrant.
-  class VagrantDriver < ChefMetal::Driver
+  class Driver < ChefMetal::Driver
 
     include Chef::Mixin::ShellOut
 
@@ -30,7 +32,7 @@ module ChefMetalVagrant
     attr_reader :cluster_path
 
     def self.from_url(driver_url, config)
-      VagrantDriver.new(driver_url, config)
+      Driver.new(driver_url, config)
     end
 
     def self.canonicalize_url(driver_url, config)
@@ -51,7 +53,7 @@ module ChefMetalVagrant
         old_location = machine_spec.location
         machine_spec.location = {
           'driver_url' => driver_url,
-          'driver_version' => ChefMetalVagrant::VERSION,
+          'driver_version' => Chef::Provisioning::VagrantDriver::VERSION,
           'vm_name' => vm_name,
           'vm_file_path' => vm_file_path,
           'allocated_at' => Time.now.utc.to_s,
@@ -465,3 +467,5 @@ module ChefMetalVagrant
     end
   end
 end
+end
+end

data/lib/chef/provisioning/vagrant_driver/version.rb

@@ -0,0 +1,7 @@
+class Chef
+module Provisioning
+module VagrantDriver
+  VERSION = '0.7'
+end
+end
+end

data/lib/chef/resource/vagrant_box.rb

@@ -1,5 +1,5 @@
 require 'chef/resource/lwrp_base'
-require 'chef_metal_vagrant'
+require 'chef/provisioning/vagrant_driver'
 
 class Chef::Resource::VagrantBox < Chef::Resource::LWRPBase
   self.resource_name = 'vagrant_box'
@@ -13,6 +13,11 @@ class Chef::Resource::VagrantBox < Chef::Resource::LWRPBase
 
   def after_created
     super
-    ChefMetalVagrant.with_vagrant_box run_context, self
+    Chef::Provisioning::VagrantDriver.with_vagrant_box run_context, self
+  end
+
+  # We are not interested in Chef's cloning behavior here.
+  def load_prior_resource
+    Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
   end
 end

data/lib/chef/resource/vagrant_cluster.rb

@@ -1,5 +1,5 @@
 require 'chef/resource/lwrp_base'
-require 'chef_metal_vagrant'
+require 'chef/provisioning/vagrant_driver'
 
 class Chef::Resource::VagrantCluster < Chef::Resource::LWRPBase
   self.resource_name = 'vagrant_cluster'
@@ -13,4 +13,9 @@ class Chef::Resource::VagrantCluster < Chef::Resource::LWRPBase
     super
     run_context.chef_metal.with_driver "vagrant:#{path}"
   end
+
+  # We are not interested in Chef's cloning behavior here.
+  def load_prior_resource
+    Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-vagrant
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -79,12 +79,12 @@ files:
 - Rakefile
 - lib/chef/provider/vagrant_box.rb
 - lib/chef/provider/vagrant_cluster.rb
+- lib/chef/provisioning/driver_init/vagrant.rb
+- lib/chef/provisioning/vagrant_driver.rb
+- lib/chef/provisioning/vagrant_driver/driver.rb
+- lib/chef/provisioning/vagrant_driver/version.rb
 - lib/chef/resource/vagrant_box.rb
 - lib/chef/resource/vagrant_cluster.rb
-- lib/chef_metal/driver_init/vagrant.rb
-- lib/chef_metal_vagrant.rb
-- lib/chef_metal_vagrant/vagrant_driver.rb
-- lib/chef_metal_vagrant/version.rb
 homepage: https://github.com/opscode/chef-metal-fog
 licenses: []
 metadata: {}

data/lib/chef_metal/driver_init/vagrant.rb

@@ -1,3 +0,0 @@
-require 'chef_metal_vagrant/vagrant_driver'
-
-ChefMetal.register_driver_class("vagrant", ChefMetalVagrant::VagrantDriver)

data/lib/chef_metal_vagrant.rb

@@ -1,33 +0,0 @@
-require 'chef_metal'
-require 'chef/resource/vagrant_cluster'
-require 'chef/provider/vagrant_cluster'
-require 'chef/resource/vagrant_box'
-require 'chef/provider/vagrant_box'
-require 'chef_metal_vagrant/vagrant_driver'
-
-module ChefMetalVagrant
-  def self.with_vagrant_box(run_context, box_name, vagrant_options = {}, &block)
-    if box_name.is_a?(Chef::Resource::VagrantBox)
-      new_options = { :vagrant_options => { 'vm.box' => box_name.name } }
-      new_options[:vagrant_options]['vm.box_url'] = box_name.url if box_name.url
-    else
-      new_options = { :vagrant_options => { 'vm.box' => box_name } }
-    end
-
-    run_context.chef_metal.add_machine_options(new_options, &block)
-  end
-end
-
-class Chef
-  module DSL
-    module Recipe
-      def with_vagrant_cluster(cluster_path, &block)
-        with_driver("vagrant:#{cluster_path}", &block)
-      end
-
-      def with_vagrant_box(box_name, vagrant_options = {}, &block)
-        ChefMetalVagrant.with_vagrant_box(run_context, box_name, vagrant_options, &block)
-      end
-    end
-  end
-end

data/lib/chef_metal_vagrant/version.rb

@@ -1,3 +0,0 @@
-module ChefMetalVagrant
-  VERSION = '0.6'
-end