vagrant-berkshelf 1.2.0 → 1.3.2

data/CONTRIBUTING.md

@@ -28,7 +28,7 @@ Clone the project
 and run:
 
     $ cd vagrant-berkshelf
-    $ bundle-vagrant install
+    $ bundle install
 
 Bundler will install all gems and their dependencies required for testing and developing.
 

data/README.md

@@ -1,4 +1,4 @@
-# Berkshelf::Vagrant
+# vagrant-berkshelf
 [![Gem Version](https://badge.fury.io/rb/vagrant-berkshelf.png)](http://badge.fury.io/rb/vagrant-berkshelf)
 [![Build Status](https://travis-ci.org/RiotGames/vagrant-berkshelf.png?branch=master)](https://travis-ci.org/RiotGames/vagrant-berkshelf)
 [![Dependency Status](https://gemnasium.com/RiotGames/vagrant-berkshelf.png)](https://gemnasium.com/RiotGames/vagrant-berkshelf)
@@ -8,16 +8,15 @@ A Vagrant plugin to add Berkshelf integration to the Chef provisioners
 
 ## Installation
 
-Install Vagrant 1.1.x from the [Vagrant downloads page](http://downloads.vagrantup.com/)
+Install Vagrant 1.2.x from the [Vagrant downloads page](http://downloads.vagrantup.com/)
 
-Install the Berkshelf Vagrant plugin
+Install the Vagrant Berkshelf plugin
 
     $ vagrant plugin install vagrant-berkshelf
 
 ## Usage
 
-Once the Berkshelf Vagrant plugin is installed it can be enabled in your Vagrantfile
-
+Once the Vagrant Berkshelf plugin is installed it can be enabled in your Vagrantfile
 
     Vagrant.configure("2") do |config|
       ...
@@ -29,6 +28,7 @@ The plugin will look in your current working directory for your `Berksfile` by d
 
 # Authors
 - Jamie Winsor (<reset@riotgames.com>)
+- Michael Ivey (<michael.ivey@riotgames.com>)
 
 Thank you to all of our [Contributors](https://github.com/RiotGames/vagrant-berkshelf/graphs/contributors), testers, and users.
 

data/Thorfile

@@ -8,26 +8,22 @@ require 'thor/rake_compat'
 require 'berkshelf/vagrant'
 
 class Default < Thor
-  class Gem < Thor
-    include Thor::RakeCompat
-    Bundler::GemHelper.install_tasks
+  include Thor::RakeCompat
+  Bundler::GemHelper.install_tasks
 
-    namespace :gem
-
-    desc "build", "Build vagrant-berkshelf-#{Berkshelf::Vagrant::VERSION}.gem into the pkg directory"
-    def build
-      Rake::Task["build"].execute
-    end
+  desc "build", "Build vagrant-berkshelf-#{Berkshelf::Vagrant::VERSION}.gem into the pkg directory"
+  def build
+    Rake::Task["build"].execute
+  end
 
-    desc "release", "Create tag v#{Berkshelf::Vagrant::VERSION} and build and push vagrant-berkshelf-#{Berkshelf::Vagrant::VERSION}.gem to Rubygems"
-    def release
-      Rake::Task["release"].execute
-    end
+  desc "release", "Create tag v#{Berkshelf::Vagrant::VERSION} and build and push vagrant-berkshelf-#{Berkshelf::Vagrant::VERSION}.gem to Rubygems"
+  def release
+    Rake::Task["release"].execute
+  end
 
-    desc "install", "Build and install vagrant-berkshelf-#{Berkshelf::Vagrant::VERSION}.gem into system gems"
-    def install
-      Rake::Task["install"].execute
-    end
+  desc "install", "Build and install vagrant-berkshelf-#{Berkshelf::Vagrant::VERSION}.gem into system gems"
+  def install
+    Rake::Task["install"].execute
   end
 
   class Spec < Thor

data/lib/berkshelf/vagrant.rb

@@ -1,14 +1,16 @@
 begin
-  require "vagrant"
+  require 'vagrant'
 rescue LoadError
-  raise "The Vagrant Berkshelf plugin must be run within Vagrant."
+  raise 'The Vagrant Berkshelf plugin must be run within Vagrant.'
 end
 
+require 'fileutils'
+require 'json'
+require 'tmpdir'
+
 require 'berkshelf'
 require 'berkshelf/vagrant/version'
 require 'berkshelf/vagrant/errors'
-require 'tmpdir'
-require 'fileutils'
 
 module Berkshelf
   # @author Jamie Winsor <reset@riotgames.com>
@@ -31,12 +33,19 @@ module Berkshelf
       #
       # @return [String]
       #   path to the generated shelf
-      def mkshelf
+      def mkshelf(machine_name = nil)
+
         unless File.exist?(shelf_path)
           FileUtils.mkdir_p(shelf_path)
         end
 
-        Dir.mktmpdir('berkshelf-', shelf_path)
+        if machine_name.nil?
+          prefix_suffix = 'berkshelf-'
+        else
+          prefix_suffix = ['berkshelf-', "-#{machine_name}"]
+        end
+
+        Dir.mktmpdir(prefix_suffix, shelf_path)
       end
     end
   end

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

@@ -14,7 +14,7 @@ module Berkshelf
             env[:berkshelf].ui.info "Cleaning Vagrant's berkshelf"
 
             FileUtils.remove_dir(env[:berkshelf].shelf, force: true)
-            FileUtils.rm_f(cache_file)
+            FileUtils.rm_f(cache_file(env))
             env[:berkshelf].shelf = nil
           end
 

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

@@ -14,10 +14,13 @@ module Berkshelf
             return @app.call(env)
           end
 
-          shelf = load_shelf
+          # Make sure that Berkshelf itself uses distinct directories for each vagrant run.
+          ENV['BERKSHELF_PATH'] = File.join(Berkshelf.berkshelf_path, env[:machine].name.to_s) unless ENV['BERKSHELF_PATH']
+
+          shelf = load_shelf env
 
           if shelf.nil?
-            shelf = cache_shelf(Berkshelf::Vagrant.mkshelf)
+            shelf = cache_shelf(Berkshelf::Vagrant.mkshelf(env[:machine].name), env)
           end
 
           env[:berkshelf].shelf = shelf
@@ -28,10 +31,10 @@ module Berkshelf
         # @param [String] path
         #
         # @return [String]
-        def cache_shelf(path)
+        def cache_shelf(path, env)
           FileUtils.mkdir_p(File.dirname(path))
 
-          File.open(cache_file, 'w+') do |f|
+          File.open((cache_file(env)), 'w+') do |f|
             f.write(path)
           end
 
@@ -39,10 +42,10 @@ module Berkshelf
         end
 
         # @return [String, nil]
-        def load_shelf
-          return nil unless File.exist?(cache_file)
+        def load_shelf(env)
+          return nil unless File.exist?(cache_file(env))
 
-          File.read(cache_file).chomp
+          File.read(cache_file(env)).chomp
         end
       end
     end

data/lib/berkshelf/vagrant/env_helpers.rb

@@ -8,8 +8,8 @@ module Berkshelf
       # Vagrant runs.
       #
       # @return [String]
-      def cache_file
-        File.join('.vagrant', 'berkshelf')
+      def cache_file(env)
+        File.join('.vagrant', 'machines', env[:machine].name.to_s, 'berkshelf')
       end
 
       # Filter all of the provisioners of the given vagrant environment with the given name

data/lib/berkshelf/vagrant/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module Vagrant
-    VERSION = "1.2.0"
+    VERSION = "1.3.2"
   end
 end

data/spec/unit/berkshelf/vagrant_spec.rb

@@ -13,13 +13,21 @@ describe Berkshelf::Vagrant do
     end
 
     describe "::mkshelf" do
+
       it "returns a String" do
-        subject.mkshelf.should be_a(String)
+        subject.mkshelf().should be_a(String)
       end
 
       it "is a pathname including the shelf_path" do
-        subject.mkshelf.should include(subject.shelf_path)
+        subject.mkshelf().should include(subject.shelf_path)
       end
+
+      it "is a pathname including machine name" do
+
+        machine_name = 'fantastic_machine'
+        subject.mkshelf(machine_name).should include(machine_name)
+      end
+
     end
   end
 end

data/vagrant-berkshelf.gemspec

@@ -4,30 +4,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'berkshelf/vagrant/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "vagrant-berkshelf"
+  spec.name          = 'vagrant-berkshelf'
   spec.version       = Berkshelf::Vagrant::VERSION
-  spec.authors       = [ "Jamie Winsor" ]
-  spec.email         = [ "reset@riotgames.com" ]
+  spec.authors       = [ 'Jamie Winsor', 'Michael Ivey' ]
+  spec.email         = [ 'reset@riotgames.com', 'michael.ivey@riotgames.com' ]
   spec.description   = %q{A Vagrant plugin to add Berkshelf integration to the Chef provisioners}
   spec.summary       = spec.description
-  spec.homepage      = "http://berkshelf.com"
-  spec.license       = "Apache 2.0"
+  spec.homepage      = 'http://berkshelf.com'
+  spec.license       = 'Apache 2.0'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 1.9.1"
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 1.9.1'
 
-  spec.add_dependency 'berkshelf', '~> 1.4.0'
+  spec.add_dependency 'berkshelf', '~> 2.0.4'
   # activesupport 3.2.13 contains an incompatible hard lock on i18n (= 0.6.1)
   spec.add_dependency 'activesupport', '>= 3.2.0', '< 3.2.13'
 
   # Explicit locks to ensure we activate the proper gem versions for Vagrant
-  spec.add_dependency "i18n", "~> 0.6.0"
-  spec.add_dependency "json", ">= 1.5.1", "< 1.8.0"
-  spec.add_dependency "net-ssh", "~> 2.6.6"
-  spec.add_dependency "net-scp", "~> 1.1.0"
+  spec.add_dependency 'i18n', '~> 0.6.0'
+  spec.add_dependency 'net-ssh', '~> 2.6.6'
+  spec.add_dependency 'net-scp', '~> 1.1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'spork'

metadata

@@ -1,32 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-berkshelf
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.2
+  prerelease: 
 platform: ruby
 authors:
 - Jamie Winsor
+- Michael Ivey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -37,6 +42,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -47,6 +53,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,33 +61,15 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -88,6 +77,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -95,6 +85,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,6 +93,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -109,6 +101,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -116,6 +109,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -123,6 +117,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: spork
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -130,6 +125,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -137,6 +133,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -144,6 +141,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -151,6 +149,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,6 +157,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -165,6 +165,7 @@ dependencies:
 description: A Vagrant plugin to add Berkshelf integration to the Chef provisioners
 email:
 - reset@riotgames.com
+- michael.ivey@riotgames.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -201,26 +202,30 @@ files:
 homepage: http://berkshelf.com
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2561841672745040153
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A Vagrant plugin to add Berkshelf integration to the Chef provisioners
 test_files:
 - spec/spec_helper.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzE0MzU1NWI1YjNlNTFiNGEwYjFlNGI4YzM3YTcyYWEyZmYzZTc1Yg==
-  data.tar.gz: !binary |-
-    YjBhYTE3OTU0OTc2NzZiNzhkMjJlZjJjMGE4ZGRmNzNiMjhkZTM2OA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZjBlMzI2YTQzMDljZjhkOTNlMWU3YzY5ZWNlNzYyZTdjZTk3MDkxNzM0Njll
-    ODQzNzdmZjYyYjU2OGE2NjQ0ODgyZTA2NTljZTk1OTU5MzUwMDVjODkyYjc1
-    YjJlNjRkZDgyZjk0MDE3MGQ4ODY4ZmNkMzdiYzkwN2M1ZDBkMDg=
-  data.tar.gz: !binary |-
-    YTgxZmYwMGI3ZGM4NWNlYmE3OTkwMjc5OGZkYzZhN2Y0MmFhMmZmYTEzOWU2
-    YTlhOGUyNDEwODk4NDYzNjFlMGI5M2RiNjc4MjNlMmNhYTkzNjJlMmQwZDc1
-    ZmMzNWEzNGQxYWE3ZDJjYmMxNGVkZTQ4ZGZlMDdhNmM4MTJiODE=