vagrant-berkshelf 3.0.1 → 4.0.0

data/lib/vagrant-berkshelf/plugin.rb

@@ -0,0 +1,40 @@
+require 'vagrant/action'
+
+require_relative 'action/check'
+require_relative 'action/clean'
+require_relative 'action/install'
+require_relative 'action/load'
+require_relative 'action/share'
+require_relative 'action/upload'
+require_relative 'env'
+
+module VagrantPlugins
+  module Berkshelf
+    class Plugin < Vagrant.plugin("2")
+      # Require a particular version of Vagrant
+      Vagrant.require_version("~> 1.5")
+
+      name "berkshelf"
+      description <<-DESC
+      Automatically synchronize cookbooks in the Berksfile to virtual machines
+      provisioned by Chef using Berkshelf.
+      DESC
+
+      [:machine_action_up, :machine_action_reload, :machine_action_provision].each do |action|
+        action_hook(:berkshelf_provision, action) do |hook|
+          hook.before(Vagrant::Action::Builtin::ConfigValidate, Action::Base.setup)
+          hook.before(Vagrant::Action::Builtin::Provision, Action::Base.provision)
+        end
+      end
+
+      action_hook(:berkshelf_cleanup, :machine_action_destroy) do |hook|
+        hook.before(Vagrant::Action::Builtin::DestroyConfirm, Action::Base.clean)
+      end
+
+      config(:berkshelf) do
+        require_relative "config"
+        Config
+      end
+    end
+  end
+end

data/lib/vagrant-berkshelf/version.rb

@@ -0,0 +1,5 @@
+module VagrantPlugins
+  module Berkshelf
+    VERSION = "4.0.0"
+  end
+end

data/spec/spec_helper.rb

@@ -3,9 +3,6 @@ require 'bundler/setup'
 require 'spork'
 
 Spork.prefork do
-  APP_ROOT = File.expand_path('../../', __FILE__)
-  ENV["BERKSHELF_PATH"] = File.join(APP_ROOT, 'spec', 'tmp', 'berkshelf')
-
   require 'rspec'
 
   RSpec.configure do |config|
@@ -18,5 +15,5 @@ Spork.prefork do
 end
 
 Spork.each_run do
-  require 'berkshelf/vagrant'
+  require 'vagrant-berkshelf'
 end

data/spec/unit/vagrant-berkshelf/config_spec.rb

@@ -0,0 +1,119 @@
+require "spec_helper"
+
+describe VagrantPlugins::Berkshelf::Config do
+  subject { described_class.new }
+
+  let(:machine) { double("machine") }
+
+  describe "#berksfile_path" do
+    it "defaults to nil" do
+      subject.finalize!
+      expect(subject.berksfile_path).to be(nil)
+    end
+
+    it "sets the value if it exists" do
+      allow(File).to receive(:exist?)
+        .with("Berksfile")
+        .and_return(true)
+      subject.finalize!
+      expect(subject.berksfile_path).to eq("Berksfile")
+    end
+  end
+
+  describe "#enabled" do
+    it "is true when there is a Berksfile present" do
+      allow(File).to receive(:exist?)
+        .with("Berksfile")
+        .and_return(true)
+      subject.finalize!
+      expect(subject.enabled).to be(true)
+    end
+
+    it "is false when there is a Berksfile present but it is disabled" do
+      allow(File).to receive(:exist?)
+        .with("Berksfile")
+        .and_return(true)
+        subject.enabled = false
+      subject.finalize!
+      expect(subject.enabled).to be(false)
+    end
+
+    it "is true when a berksfile_path is given" do
+      subject.berksfile_path = "Berksfile"
+      subject.finalize!
+      expect(subject.enabled).to be(true)
+    end
+
+    it "is false when the berksfile_path is given but it is disabled" do
+      subject.berksfile_path = "Berksfile"
+      subject.enabled = false
+      subject.finalize!
+      expect(subject.enabled).to be(false)
+    end
+
+    it "defaults to false" do
+      allow(File).to receive(:exist?)
+        .with("Berksfile")
+        .and_return(false)
+      subject.finalize!
+      expect(subject.enabled).to be(false)
+    end
+  end
+
+  describe "#only" do
+    it "defaults to an empty array" do
+      subject.finalize!
+      expect(subject.only).to be_a(Array)
+      expect(subject.only).to be_empty
+    end
+  end
+
+  describe "#except" do
+    it "defaults to an empty array" do
+      subject.finalize!
+      expect(subject.except).to be_a(Array)
+      expect(subject.except).to be_empty
+    end
+  end
+
+  describe "#args" do
+    it "defaults to an empty array" do
+      subject.finalize!
+      expect(subject.args).to be_a(Array)
+      expect(subject.args).to be_empty
+    end
+  end
+
+  describe "#validate" do
+    before do
+      allow(machine).to receive(:env)
+        .and_return(double("env",
+          root_path: "",
+        ))
+
+      subject.berksfile_path = "Berksfile"
+      subject.enabled = true
+      subject.only = []
+      subject.except = []
+      subject.args = []
+    end
+
+    let(:result) { subject.validate(machine) }
+    let(:errors) { result["Berkshelf"] }
+
+    context "when the berksfile_path is nil" do
+      it "returns an error if enabled" do
+        subject.berksfile_path = ""
+        subject.finalize!
+        expect(errors).to include("berksfile_path must be set")
+      end
+
+      it "does not returns an error if disabled" do
+        subject.berksfile_path = ""
+        subject.enabled = false
+        subject.finalize!
+        expect(errors).to eq([])
+      end
+    end
+  end
+end

data/vagrant-berkshelf.gemspec

@@ -1,30 +1,42 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'berkshelf/vagrant/version'
+require 'vagrant-berkshelf/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'vagrant-berkshelf'
-  spec.version       = Berkshelf::Vagrant::VERSION
-  spec.authors       = [ 'Jamie Winsor', 'Michael Ivey' ]
-  spec.email         = [ 'jamie@vialstudios.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.name    = 'vagrant-berkshelf'
+  spec.version = VagrantPlugins::Berkshelf::VERSION
+  spec.authors = [
+    'Jamie Winsor',
+    'Michael Ivey',
+    'Seth Vargo',
+  ]
+  spec.email = [
+    'jamie@vialstudios.com',
+    'michael.ivey@riotgames.com',
+    'sethvargo@gmail.com',
+  ]
+  spec.description = %q{A Vagrant plugin to add Berkshelf integration to the Chef provisioners}
+  spec.summary     = spec.description
+  spec.homepage    = 'https://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.required_ruby_version = '>= 1.9.3'
 
-  spec.post_install_message = "In order to use the Vagrant-Berkshelf plugin, you must have ChefDK installed.\n" +
-                              "To download the latest ChefDK visit http://getchef.com/downloads/chef-dk."
+  spec.post_install_message = <<-EOH
+The Vagrant Berkshelf plugin requires Berkshelf from the Chef Development Kit.
+You can download the latest version of the Chef Development Kit from:
 
-  spec.add_dependency "buff-shell_out"
+    https://downloads.getchef.com/chef-dk
+
+Installing Berkshelf via other methods is not officially supported.
+EOH
 
   spec.add_development_dependency 'spork', '~> 0.9'
   spec.add_development_dependency 'rspec', '~> 2.13'
-  spec.add_development_dependency 'thor',  '~> 0.18'
+  spec.add_development_dependency 'rake'
 end

metadata

@@ -1,30 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-berkshelf
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Jamie Winsor
 - Michael Ivey
+- Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: buff-shell_out
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: spork
   requirement: !ruby/object:Gem::Requirement
@@ -54,23 +41,24 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
 description: A Vagrant plugin to add Berkshelf integration to the Chef provisioners
 email:
 - jamie@vialstudios.com
 - michael.ivey@riotgames.com
+- sethvargo@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -81,40 +69,37 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
-- LICENSE.txt
+- LICENSE
 - README.md
-- Thorfile
-- integration/Berksfile
-- integration/Gemfile
-- integration/Vagrantfile
-- lib/berkshelf/vagrant.rb
-- lib/berkshelf/vagrant/action.rb
-- lib/berkshelf/vagrant/action/clean.rb
-- lib/berkshelf/vagrant/action/configure_chef.rb
-- lib/berkshelf/vagrant/action/install.rb
-- lib/berkshelf/vagrant/action/load_shelf.rb
-- lib/berkshelf/vagrant/action/upload.rb
-- lib/berkshelf/vagrant/berks_config.rb
-- lib/berkshelf/vagrant/chef_config.rb
-- lib/berkshelf/vagrant/config.rb
-- lib/berkshelf/vagrant/env.rb
-- lib/berkshelf/vagrant/env_helpers.rb
-- lib/berkshelf/vagrant/errors.rb
-- lib/berkshelf/vagrant/plugin.rb
-- lib/berkshelf/vagrant/version.rb
+- Rakefile
 - lib/vagrant-berkshelf.rb
+- lib/vagrant-berkshelf/action/base.rb
+- lib/vagrant-berkshelf/action/check.rb
+- lib/vagrant-berkshelf/action/clean.rb
+- lib/vagrant-berkshelf/action/install.rb
+- lib/vagrant-berkshelf/action/load.rb
+- lib/vagrant-berkshelf/action/share.rb
+- lib/vagrant-berkshelf/action/upload.rb
+- lib/vagrant-berkshelf/config.rb
+- lib/vagrant-berkshelf/env.rb
+- lib/vagrant-berkshelf/errors.rb
+- lib/vagrant-berkshelf/helpers.rb
+- lib/vagrant-berkshelf/plugin.rb
+- lib/vagrant-berkshelf/version.rb
 - spec/spec_helper.rb
-- spec/unit/berkshelf/vagrant/config_spec.rb
-- spec/unit/berkshelf/vagrant/errors_spec.rb
-- spec/unit/berkshelf/vagrant_spec.rb
+- spec/unit/vagrant-berkshelf/config_spec.rb
 - vagrant-berkshelf.gemspec
-homepage: http://berkshelf.com
+homepage: https://berkshelf.com
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: |-
-  In order to use the Vagrant-Berkshelf plugin, you must have ChefDK installed.
-  To download the latest ChefDK visit http://getchef.com/downloads/chef-dk.
+post_install_message: |
+  The Vagrant Berkshelf plugin requires Berkshelf from the Chef Development Kit.
+  You can download the latest version of the Chef Development Kit from:
+
+      https://downloads.getchef.com/chef-dk
+
+  Installing Berkshelf via other methods is not officially supported.
 rdoc_options: []
 require_paths:
 - lib
@@ -122,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -136,7 +121,5 @@ specification_version: 4
 summary: A Vagrant plugin to add Berkshelf integration to the Chef provisioners
 test_files:
 - spec/spec_helper.rb
-- spec/unit/berkshelf/vagrant/config_spec.rb
-- spec/unit/berkshelf/vagrant/errors_spec.rb
-- spec/unit/berkshelf/vagrant_spec.rb
+- spec/unit/vagrant-berkshelf/config_spec.rb
 has_rdoc: 

data/Thorfile

@@ -1,59 +0,0 @@
-# encoding: utf-8
-$:.push File.expand_path("../lib", __FILE__)
-
-require 'bundler'
-require 'bundler/setup'
-require 'thor/rake_compat'
-require 'berkshelf/vagrant'
-
-GEM_PKG = "vagrant-berkshelf-#{Berkshelf::Vagrant::VERSION}.gem".freeze
-
-class Gem < Thor
-  include Thor::RakeCompat
-  Bundler::GemHelper.install_tasks
-
-  desc "build", "Build #{GEM_PKG} into the pkg directory"
-  def build
-    Rake::Task["build"].execute
-  end
-
-  desc "release", "Create tag v#{Berkshelf::Vagrant::VERSION} and build and push #{GEM_PKG} to Rubygems"
-  def release
-    Rake::Task["release"].execute
-  end
-
-  desc "install", "Build and install #{GEM_PKG} into system gems"
-  def install
-    Rake::Task["install"].execute
-  end
-end
-
-class Spec < Thor
-  include Thor::Actions
-  default_task :unit
-
-  desc "plug", "Install #{GEM_PKG} into vagrant"
-  def plug
-    build
-    run "vagrant plugin install pkg/#{GEM_PKG}"
-  end
-
-  desc "ci", "Run all possible tests on Travis-CI"
-  def ci
-    ENV['CI'] = 'true' # Travis-CI also sets this, but set it here for local testing
-    invoke(:unit)
-  end
-
-  desc "unit", "Run unit tests"
-  def unit
-    unless run_unit
-      exit 1
-    end
-  end
-
-  no_tasks do
-    def run_unit(*flags)
-      run "rspec --color --format=documentation #{flags.join(' ')} spec"
-    end
-  end
-end