berkshelf 0.6.0.beta1 → 0.6.0.beta2

data/berkshelf.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'ridley',  '>= 0.0.5'
   s.add_runtime_dependency 'solve',   '>= 0.3.0'
-  s.add_runtime_dependency 'chef',    '~> 10.12.0'
+  s.add_runtime_dependency 'chef',    '~> 10.12'
   s.add_runtime_dependency 'minitar'
   s.add_runtime_dependency 'thor',    '~> 0.16.0'
   s.add_runtime_dependency 'vagrant', '~> 1.0.5'

data/lib/berkshelf/berksfile.rb

@@ -32,7 +32,9 @@ module Berkshelf
         
         scratch = Berkshelf.mktmpdir
         cookbooks.each do |cb|
-          FileUtils.cp_r(cb.path, File.join(scratch, cb.cookbook_name))
+          dest = File.join(scratch, cb.cookbook_name, "/")
+          FileUtils.mkdir_p(dest)
+          FileUtils.cp_r(Dir.glob(File.join(cb.path, "*")), dest)
         end
 
         FileUtils.remove_dir(path, force: true)

data/lib/berkshelf/vagrant.rb

@@ -18,12 +18,12 @@ module Berkshelf
 
     class << self
       # @param [Vagrant::Action::Environment] env
+      #
+      # @return [String, nil]
       def shelf_for(env)
-        unless env[:global_config].vm.host_name
-          return nil
-        end
+        return nil if env[:vm].uuid.nil?
 
-        File.join(Berkshelf.berkshelf_path, "vagrant", env[:global_config].vm.host_name)
+        File.join(Berkshelf.berkshelf_path, "vagrant", env[:vm].uuid)
       end
 
       # @param [Symbol] shortcut
@@ -64,7 +64,7 @@ module Berkshelf
           ::Vagrant.actions[action].insert(::Vagrant::Action::VM::Provision, Berkshelf::Vagrant::Middleware.upload)
         end
 
-        ::Vagrant.actions[:destroy].insert(::Vagrant::Action::VM::CleanMachineFolder, Berkshelf::Vagrant::Middleware.clean)
+        ::Vagrant.actions[:destroy].insert(::Vagrant::Action::VM::ProvisionerCleanup, Berkshelf::Vagrant::Middleware.clean)
       end
     end
   end

data/lib/berkshelf/vagrant/action/clean.rb

@@ -11,7 +11,7 @@ module Berkshelf
         end
 
         def call(env)
-          if Berkshelf::Vagrant.chef_solo?(env[:global_config]) && self.shelf
+          if Berkshelf::Vagrant.chef_solo?(env[:vm].config) && self.shelf
             Berkshelf.formatter.msg "cleaning Vagrant's shelf"
             FileUtils.remove_dir(self.shelf, fore: true)
           end

data/lib/berkshelf/vagrant/action/install.rb

@@ -11,14 +11,14 @@ module Berkshelf
         def initialize(app, env)
           @app                  = app
           @shelf                = Berkshelf::Vagrant.shelf_for(env)
-          @config               = env[:global_config].berkshelf
+          @config               = env[:vm].config.berkshelf
           Berkshelf.config_path = @config.config_path
           Berkshelf.load_config
           @berksfile            = Berksfile.from_file(@config.berksfile_path)
         end
 
         def call(env)
-          if Berkshelf::Vagrant.chef_solo?(env[:global_config])
+          if Berkshelf::Vagrant.chef_solo?(env[:vm].config)
             configure_cookbooks_path(env)
             install(env)
           end
@@ -37,7 +37,7 @@ module Berkshelf
           end
 
           def configure_cookbooks_path(env)
-            Berkshelf::Vagrant.provisioners(:chef_solo, env[:global_config]).each do |provisioner|
+            Berkshelf::Vagrant.provisioners(:chef_solo, env[:vm].config).each do |provisioner|
               provisioner.config.cookbooks_path.unshift(self.shelf)
             end
           end

data/lib/berkshelf/vagrant/action/upload.rb

@@ -10,14 +10,14 @@ module Berkshelf
 
         def initialize(app, env)
           @app = app
-          @node_name  = env[:global_config].berkshelf.node_name
-          @client_key = env[:global_config].berkshelf.client_key
-          @ssl_verify = env[:global_config].berkshelf.ssl_verify
-          @berksfile  = Berksfile.from_file(env[:global_config].berkshelf.berksfile_path)
+          @node_name  = env[:vm].config.berkshelf.node_name
+          @client_key = env[:vm].config.berkshelf.client_key
+          @ssl_verify = env[:vm].config.berkshelf.ssl_verify
+          @berksfile  = Berksfile.from_file(env[:vm].config.berkshelf.berksfile_path)
         end
 
         def call(env)
-          if Berkshelf::Vagrant.chef_client?(env[:global_config])
+          if Berkshelf::Vagrant.chef_client?(env[:vm].config)
             upload(env)
           end
 
@@ -27,7 +27,7 @@ module Berkshelf
         private
 
           def upload(env)
-            Berkshelf::Vagrant.provisioners(:chef_client, env[:global_config]).each do |provisioner|
+            Berkshelf::Vagrant.provisioners(:chef_client, env[:vm].config).each do |provisioner|
               Berkshelf.formatter.msg "uploading cookbooks to '#{provisioner.config.chef_server_url}'"
               berksfile.upload(
                 server_url: provisioner.config.chef_server_url,

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "0.6.0.beta1"
+  VERSION = "0.6.0.beta2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 0.6.0.beta1
+  version: 0.6.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.12.0
+        version: '10.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,7 +61,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.12.0
+        version: '10.12'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement