vagrant-berkshelf 3.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6756cdfdfc203a867d17dbca91420bb5f360b36c
-  data.tar.gz: 9da918a274b2556339f341e39d41c2d803c397d9
+  metadata.gz: 3f21f3e8d10fc7c1d2205c55b0ae8bca1221777a
+  data.tar.gz: fcd4acefc3f607775f97873bc04206b9bf2fcb08
 SHA512:
-  metadata.gz: 5376cfd45dd23245082bdcbf6088ab4625f8aa4090ce89c1b49471d4a3934c4ca9111db2b80688371771e796aba50b8ab00ae6d0e7d74006504874abca3955d9
-  data.tar.gz: 9eed85ed2561b146977d0d4b037281f6d34919e896bdf5fe1d2254ca75836ed6ab727a5c69202c9040ecc88f987a7d677a9b5c60d01eac50d446a357dc9563e9
+  metadata.gz: b4308dafc20d438f3c2a1524ed5076258c4b93e7f2291ca63c696fd116ec9aa7d81630c8a19bcda17d1a48fac25c87bcfa28caf6e343bfc66379a803dea72d61
+  data.tar.gz: fe57bc6dc166bf013d2eff69316d3ac0490ae79b6fafc3666052bc5cdadc07b434c0a91b13df7f7dbaf6c70a36bc1f697394b1488a0309258577eac4b7187a3e

data/.gitignore

@@ -1,20 +1,39 @@
+### Ruby ###
 *.gem
 *.rbc
-.bundle
-.config
-.yardoc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/test/tmp/
+/test/version_tmp/
+/tmp/
+/bin/
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalisation:
+/.bundle/
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
 Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.rspec
-.vagrant
-integration/Berksfile.lock
+.ruby-version
+.ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+### Vagrant ###
+.vagrant/

data/.travis.yml

@@ -1,14 +1,16 @@
 language: ruby
+
 rvm:
   - 2.0.0
-  - 2.1.0
+  - 2.1
+
 notifications:
   irc:
     channels:
       - "irc.freenode.org#berkshelf"
     skip_join: true
     use_notice: true
+
 bundler_args: --without doc guard --jobs 7
-before_install:
-  - sudo apt-get install -qq libgecode-dev
-script: 'bundle exec thor spec:ci'
+
+script: bundle exec rake

data/CONTRIBUTING.md

@@ -23,7 +23,7 @@ Install the latest version of [Bundler](http://gembundler.com)
 
 Clone the project
 
-    $ git clone git://github.com/berkshelf/vagrant-berkshelf.git
+    $ git clone https://github.com/berkshelf/vagrant-berkshelf.git
 
 and run:
 
@@ -32,11 +32,11 @@ and run:
 
 Bundler will install all gems and their dependencies required for testing and developing.
 
-### Running unit (RSpec) tests
+### Running tests
 
-One-time run with Thor
+One-time run with Rake
 
-    $ bundle exec thor spec
+    $ bundle exec rake spec
 
 Or you can setup a quick feedback loop with Guard
 

data/Gemfile

@@ -3,11 +3,11 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'vagrant', github: 'mitchellh/vagrant', tag: 'v1.6.3'
+  gem 'vagrant', github: 'mitchellh/vagrant'
 end
 
 group :plugins do
-  gem "vagrant-berkshelf", path: "."
+  gem 'vagrant-berkshelf', path: '.'
 end
 
 group :guard do

data/{LICENSE.txt → LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2013 Riot Games
+Copyright (c) 2012-2014 Riot Games
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -1,42 +1,85 @@
-# vagrant-berkshelf
+Vagrant Berkshelf Plugin
+========================
+[![Gem Version](http://img.shields.io/gem/v/vagrant-berkshelf.svg)][gem]
+[![Build Status](http://img.shields.io/travis/berkshelf/vagrant-berkshelf.svg)][travis]
 
-[![Gem Version](https://badge.fury.io/rb/vagrant-berkshelf.png)](http://badge.fury.io/rb/vagrant-berkshelf)
-[![Build Status](https://travis-ci.org/berkshelf/vagrant-berkshelf.png?branch=master)](https://travis-ci.org/berkshelf/vagrant-berkshelf)
+[gem]: https://rubygems.org/gems/vagrant-berkshelf
+[travis]: http://travis-ci.org/berkshelf/vagrant-berkshelf
 
-A Vagrant plugin to add Berkshelf integration to the Chef provisioners
+Vagrant Berkshelf is a Vagrant plugin that adds Berkshelf integration to the
+Chef provisioners. Vagrant Berkshelf will automatically download and install
+cookbooks onto the Vagrant Virtual Machine.
 
-## Installation
 
-1. Install [Vagrant](http://www.vagrantup.com/downloads.html) ">= 1.5.2"
-2. Install [ChefDK](http://getchef.com/downloads/chef-dk) ">= 0.2.0"
-3. Install the Vagrant Berkshelf plugin
+Installation
+------------
+1. Install the latest version of [Vagrant](http://www.vagrantup.com/downloads.html)
+2. Install the latest version of [ChefDK](http://getchef.com/downloads/chef-dk)
+3. Install the Vagrant Berkshelf plugin:
 
-    $ vagrant plugin install vagrant-berkshelf
+        $ vagrant plugin install vagrant-berkshelf
 
-## Usage
 
-Once the Vagrant Berkshelf plugin is installed it can be enabled in your Vagrantfile
+Usage
+-----
+If the Vagrant Berkshelf plugin is installed, it will intelligent detect when a
+Berksfile is present in the same working directory as the Vagrantfile.
 
-    Vagrant.configure("2") do |config|
-      ...
-      config.berkshelf.enabled = true
-      ...
-    end
+Here is an example Vagrantfile configuration section for Vagrant Berkshelf:
 
-The plugin will look in your current working directory for your `Berksfile` by default. Just ensure that your Berksfile exists and when you run `vagrant up`, `vagrant provision`, or `vagrant destroy` the Berkshelf integration will automatically kick in!
+```ruby
+Vagrant.configure("2") do |config|
+  # The path to the Berksfile to use. The default value is "Berksfile" if one
+  # exists, or nil if it does not.
+  config.berkshelf.berksfile_path = "custom.Berksfile"
 
-> The Vagrant Berkshelf plugin does not support multi-machine Vagrantfiles.
+  # Enable Berkshelf. If a Berksfile exists or a berksfile_path is given, this
+  # value is automatically set to true. If not, the value is false
+  config.berkshelf.enabled = true
 
-## Getting Help
+  # A list of Berkshelf groups to only install and sync to the Vagrant Virtual
+  # Machine. The default value is an empty array.
+  config.berkshelf.only = ["group_a", "group_b"]
 
-* If you have an issue: report it on the [issue tracker](https://github.com/berkshelf/berkshelf/issues)
-* If you have a question: visit the #chef or #berkshelf channel on irc.freenode.net
+  # A list of Berkshelf groups to not install and sync to the Vagrant Virtual
+  # Machine. The default value is an empty array.
+  config.berkshelf.except = ["group_c", "group_d"]
 
-# Authors
+  # A list of extra values to pass to the `berks` executable. The default value
+  # is an empty array.
+  config.berkshelf.args = ["--format json"]
+end
+```
 
-- Jamie Winsor (<jamie@vialstudios.com>)
-- Michael Ivey (<michael.ivey@riotgames.com>)
 
+Contributing
+------------
 Thank you to all of our [Contributors](https://github.com/berkshelf/vagrant-berkshelf/graphs/contributors), testers, and users.
 
+- Please report issues [on the GitHub issue tracker](https://github.com/berkshelf/berkshelf/issues)
+- Hangout with us in #chef or #berkshelf on freenode
+
 If you'd like to contribute, please see our [contribution guidelines](https://github.com/berkshelf/vagrant-berkshelf/blob/master/CONTRIBUTING.md) first.
+
+
+License & Authors
+-----------------
+- Jamie Winsor (jamie@vialstudios.com)
+- Michael Ivey (michael.ivey@riotgames.com)
+- Seth Vargo (sethvargo@gmail.com)
+
+```text
+Copyright (c) 2012-2014 Riot Games
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+```

data/Rakefile

@@ -0,0 +1,14 @@
+require 'bundler/gem_tasks'
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = [].tap do |a|
+    a.push('--color')
+    a.push('--format progress')
+  end.join(' ')
+end
+
+desc 'Run all tests'
+task :test => [:spec]
+
+task :default => [:test]

data/lib/vagrant-berkshelf.rb

@@ -1 +1,17 @@
-require 'berkshelf/vagrant'
+require 'vagrant'
+
+require_relative 'vagrant-berkshelf/config'
+require_relative 'vagrant-berkshelf/plugin'
+require_relative 'vagrant-berkshelf/version'
+
+module VagrantPlugins
+  module Berkshelf
+    def self.berkshelf_path
+      ENV['BERKSHELF_PATH'] || File.expand_path('~/.berkshelf')
+    end
+
+    def self.shelves_path
+      File.join(berkshelf_path, 'vagrant-berkshelf', 'shelves')
+    end
+  end
+end

data/lib/vagrant-berkshelf/action/base.rb

@@ -0,0 +1,48 @@
+require 'vagrant/action'
+
+require_relative '../helpers'
+
+module VagrantPlugins
+  module Berkshelf
+    module Action
+      class Base
+        # Cleanup any shared folders before destroying the VM.
+        def self.clean
+          Vagrant::Action::Builder.new.tap do |b|
+            b.use setup
+            b.use Action::Clean
+          end
+        end
+
+        # Provision the VM, calling setup, install, and upload.
+        def self.provision
+          Vagrant::Action::Builder.new.tap do |b|
+            b.use Action::Install
+            b.use Action::Upload
+          end
+        end
+
+        # Setup all the required middlemare, including checking for the presence
+        # of Berkshelf, checking for the proper version of Berkshelf, and
+        # loading the datafile from disk.
+        def self.setup
+          Vagrant::Action::Builder.new.tap do |b|
+            b.use Action::Check
+            b.use Vagrant::Action::Builtin::EnvSet, berkshelf: Env.new
+            b.use Action::Load
+            b.use Action::Share
+          end
+        end
+
+        include VagrantPlugins::Berkshelf::Helpers
+
+        def initialize(app, env)
+          @app = app
+
+          klass = self.class.name.downcase.split('::').last
+          @logger = Log4r::Logger.new("vagrant::berkshelf::#{klass}")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-berkshelf/action/check.rb

@@ -0,0 +1,44 @@
+require_relative 'base'
+
+module VagrantPlugins
+  module Berkshelf
+    module Action
+      class Check < Base
+        BERKS_REQUIREMENT = "~> 3.2"
+
+        def call(env)
+          check_berks_bin!(env)
+          berkshelf_version_check!(env)
+
+          @app.call(env)
+        end
+
+        # Check that the Berkshelf `berks` bin is in the PATH.
+        # @raise [BerkshelfNotFound]
+        def check_berks_bin!(env)
+          if berks_bin.nil?
+            raise BerkshelfNotFound
+          end
+        end
+
+        # Check that the installed version of Berkshelf is valid for this
+        # version of Vagrant Berkshelf.
+        # @raise [InvalidBerkshelfVersionError]
+        def berkshelf_version_check!(env)
+          result = berks("--version", "--format", "json")
+
+          begin
+            json = JSON.parse(result.stdout, symbolize_names: true)
+            version = Gem::Version.new(json[:version])
+
+            unless Gem::Requirement.new(BERKS_REQUIREMENT).satisfied_by?(version)
+              raise InvalidBerkshelfVersionError.new(berks_bin, BERKS_REQUIREMENT, version)
+            end
+          rescue JSON::ParserError
+            raise InvalidBerkshelfVersionError.new(berks_bin, BERKS_REQUIREMENT, version)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+require_relative 'base'
+
+module VagrantPlugins
+  module Berkshelf
+    module Action
+      class Clean < Base
+        def call(env)
+          if !berkshelf_enabled?(env)
+            @logger.info "Berkshelf disabled, skipping"
+            return @app.call(env)
+          end
+
+          env[:machine].ui.info "Running cleanup tasks for 'berkshelf'..."
+
+          if env[:berkshelf].shelf
+            if File.exist?(env[:berkshelf].shelf)
+              FileUtils.rm_rf(env[:berkshelf].shelf)
+              env[:berkshelf].shelf = nil
+            else
+              @logger.warn "The Berkshelf shelf did not exist for cleanup!"
+            end
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+require_relative 'base'
+
+module VagrantPlugins
+  module Berkshelf
+    module Action
+      class Install < Base
+        def call(env)
+          if !berkshelf_enabled?(env)
+            @logger.info "Berkshelf disabled, skipping"
+            return @app.call(env)
+          end
+
+          if !provision_enabled?(env)
+            @logger.info "Provisioning disabled, skipping"
+            return @app.call(env)
+          end
+
+          vendor(env)
+          @app.call(env)
+        end
+
+        # Vendor the cookbooks in the Berkshelf shelf.
+        def vendor(env)
+          shelf = env[:berkshelf].shelf
+          env[:machine].ui.info "Updating Vagrant's Berkshelf..."
+
+          options = env[:machine].config.berkshelf.to_hash
+
+          result = berks('vendor', shelf, options)
+          env[:machine].ui.output(result.stdout)
+        end
+      end
+    end
+  end
+end