vagrant-berkshelf 3.0.1 → 4.0.0

data/integration/Berksfile

@@ -1,3 +0,0 @@
-source "https://supermarket.getchef.com"
-
-cookbook "apt"

data/integration/Gemfile

@@ -1,10 +0,0 @@
-source "https://rubygems.org"
-
-group :development do
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"
-end
-
-group :plugins do
-  gem "vagrant-berkshelf", path: "../"
-  gem "vagrant-omnibus"
-end

data/integration/Vagrantfile

@@ -1,19 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-Vagrant.require_version ">= 1.5.0"
-
-Vagrant.configure("2") do |config|
-  config.vm.hostname = "vagrant-builder-int"
-  config.vm.box      = "opscode-ubuntu-14.04"
-  config.vm.box_url  = "https://vagrantcloud.com/chef/ubuntu-14.04/version/1/provider/virtualbox.box"
-
-  config.vm.network :private_network, type: "dhcp"
-
-  config.omnibus.chef_version = :latest
-
-  config.vm.provision :chef_client do |chef|
-    chef.chef_server_url     = "https://api.opscode.com/organizations/undeadlabs"
-    chef.validation_key_path = File.expand_path("~/.chef/undeadlabs-validator.pem")
-    chef.run_list            = ["apt::default"]
-  end
-end

data/lib/berkshelf/vagrant.rb

@@ -1,68 +0,0 @@
-begin
-  require 'vagrant'
-rescue LoadError
-  raise 'The Vagrant Berkshelf plugin must be run within Vagrant.'
-end
-
-require 'fileutils'
-require 'json'
-require 'tmpdir'
-
-require_relative 'vagrant/errors'
-require_relative 'vagrant/version'
-
-module Berkshelf
-  class << self
-    # Returns the filepath to the location Berkshelf will use for
-    # storage; temp files will go here, Cookbooks will be downloaded
-    # to or uploaded from here. By default this is '~/.berkshelf' but
-    # can be overridden by specifying a value for the ENV variable
-    # 'BERKSHELF_PATH'.
-    #
-    # @return [String]
-    def berkshelf_path
-      ENV['BERKSHELF_PATH'] || File.expand_path('~/.berkshelf')
-    end
-  end
-
-  module Vagrant
-    require_relative 'vagrant/chef_config'
-    require_relative 'vagrant/berks_config'
-    require_relative 'vagrant/action'
-    require_relative 'vagrant/config'
-    require_relative 'vagrant/env'
-    require_relative 'vagrant/env_helpers'
-
-    TESTED_REQUIREMENTS = [">= 1.1", "< 1.5.0"]
-
-    class << self
-      # The path to where shelfs are created on the host machine to be mounted in
-      # Vagrant guests
-      #
-      # @return [String]
-      def shelf_path
-        File.join(Berkshelf.berkshelf_path, 'vagrant')
-      end
-
-      # Generate a new shelf to be mounted in a Vagrant guest
-      #
-      # @return [String]
-      #   path to the generated shelf
-      def mkshelf(machine_name = nil)
-        unless File.exist?(shelf_path)
-          FileUtils.mkdir_p(shelf_path)
-        end
-
-        if machine_name.nil?
-          prefix_suffix = 'berkshelf-'
-        else
-          prefix_suffix = ['berkshelf-', "-#{machine_name}"]
-        end
-
-        Dir.mktmpdir(prefix_suffix, shelf_path)
-      end
-    end
-  end
-end
-
-require_relative 'vagrant/plugin'

data/lib/berkshelf/vagrant/action.rb

@@ -1,64 +0,0 @@
-module Berkshelf
-  module Vagrant
-    module Action
-      require_relative 'env'
-      require_relative 'env_helpers'
-
-      require_relative 'action/clean'
-      require_relative 'action/configure_chef'
-      require_relative 'action/install'
-      require_relative 'action/load_shelf'
-      require_relative 'action/upload'
-
-      class << self
-        # Return the Berkshelf install middleware stack. When placed in the action chain
-        # this stack will find retrieve and resolve the cookbook dependencies describe
-        # in your configured Berksfile.
-        #
-        # Cookbooks will install into a temporary directory, called a Shelf, and be mounted
-        # into the VM. This mounted path will be appended to the chef_solo.cookbooks_path value.
-        #
-        # @return [::Vagrant::Action::Builder]
-        def install
-          @install ||= ::Vagrant::Action::Builder.new.tap do |b|
-            b.use Berkshelf::Vagrant::Action::Install
-          end
-        end
-
-        # Return the Berkshelf upload middleware stack. When placed in the action chain
-        # this stack will upload cookbooks to a Chef Server if the Chef-Client provisioner
-        # is used. The Chef Server where the cookbooks will be uploaded to is the same Chef
-        # Server used in the Chef-Client provisioner.
-        #
-        # Nothing will be done if the Chef-Solo provisioner is used.
-        #
-        # @return [::Vagrant::Action::Builder]
-        def upload
-          @upload ||= ::Vagrant::Action::Builder.new.tap do |b|
-            b.use Berkshelf::Vagrant::Action::Upload
-          end
-        end
-
-        # Return the Berkshelf clean middleware stack. When placed in the action chain
-        # this stack will clean up any temporary directories or files created by the other
-        # middleware stacks.
-        #
-        # @return [::Vagrant::Action::Builder]
-        def clean
-          @clean ||= ::Vagrant::Action::Builder.new.tap do |b|
-            b.use setup
-            b.use Berkshelf::Vagrant::Action::Clean
-          end
-        end
-
-        def setup
-          @setup ||= ::Vagrant::Action::Builder.new.tap do |b|
-            b.use ::Vagrant::Action::Builtin::EnvSet, berkshelf: Berkshelf::Vagrant::Env.new
-            b.use Berkshelf::Vagrant::Action::LoadShelf
-            b.use Berkshelf::Vagrant::Action::ConfigureChef
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-module Berkshelf
-  module Vagrant
-    module Action
-      class Clean
-        include Berkshelf::Vagrant::EnvHelpers
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          if env[:berkshelf].shelf && File.exist?(env[:berkshelf].shelf)
-            env[:berkshelf].ui.info "Cleaning Vagrant's berkshelf"
-
-            FileUtils.remove_dir(env[:berkshelf].shelf, force: true)
-            FileUtils.rm_f(cache_file(env))
-            env[:berkshelf].shelf = nil
-          end
-
-          @app.call(env)
-        rescue Berkshelf::BerkshelfError => e
-          raise Berkshelf::VagrantWrapperError.new(e)
-        end
-      end
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-module Berkshelf
-  module Vagrant
-    module Action
-      class ConfigureChef
-        include Berkshelf::Vagrant::EnvHelpers
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          unless berkshelf_enabled?(env)
-            return @app.call(env)
-          end
-
-          if chef_solo?(env) && shelf = env[:berkshelf].shelf
-            provisioners(:chef_solo, env).each do |provisioner|
-              provisioner.config.cookbooks_path = provisioner.config.send(:prepare_folders_config, shelf)
-            end
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,69 +0,0 @@
-module Berkshelf
-  module Vagrant
-    module Action
-      class Install
-        include Berkshelf::Vagrant::EnvHelpers
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          if provision_disabled?(env)
-            env[:berkshelf].ui.info "Skipping Berkshelf with --no-provision"
-
-            return @app.call(env)
-          end
-
-          unless berkshelf_enabled?(env)
-            if File.exist?(berksfile_path(env))
-              warn_disabled_but_berksfile_exists(env)
-            end
-
-            return @app.call(env)
-          end
-
-          if chef_solo?(env)
-            vendor(env)
-          end
-
-          @app.call(env)
-        rescue => ex
-          raise Berkshelf::VagrantWrapperError.new(ex)
-        end
-
-        private
-
-          def vendor(env)
-            check_vagrant_version(env)
-            env[:berkshelf].ui.info "Updating Vagrant's berkshelf: '#{env[:berkshelf].shelf}'"
-            FileUtils.rm_rf(env[:berkshelf].shelf)
-
-            opts                = env[:machine].config.berkshelf.to_hash
-            berks_opts          = { berksfile: opts[:berksfile_path] }
-            berks_opts[:except] = opts[:except] if opts.has_key?(:except) && !opts[:except].empty?
-            berks_opts[:only]   = opts[:only] if opts.has_key?(:only) && !opts[:only].empty?
-
-            env[:berkshelf].ui.info berks("vendor", env[:berkshelf].shelf, berks_opts)
-          end
-
-          def warn_disabled_but_berksfile_exists(env)
-            env[:berkshelf].ui.warn "Berkshelf plugin is disabled but a Berksfile was found at" +
-              " your configured path: #{berksfile_path(env)}"
-            env[:berkshelf].ui.warn "Enable the Berkshelf plugin by setting 'config.berkshelf.enabled = true'" +
-              " in your vagrant config"
-          end
-
-          def check_vagrant_version(env)
-            unless vagrant_version_satisfies?(">= 1.5")
-              raise UnsupportedVagrantVersion.new(">= 1.5")
-            end
-          end
-
-          def vagrant_version_satisfies?(requirements)
-            Gem::Requirement.new(requirements).satisfied_by? Gem::Version.new(::Vagrant::VERSION)
-          end
-      end
-    end
-  end
-end

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

@@ -1,52 +0,0 @@
-module Berkshelf
-  module Vagrant
-    module Action
-      class LoadShelf
-        include Berkshelf::Vagrant::EnvHelpers
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          unless berkshelf_enabled?(env)
-            return @app.call(env)
-          end
-
-          # 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)
-
-          shelf = load_shelf(env)
-
-          if shelf.nil?
-            shelf = cache_shelf(Berkshelf::Vagrant.mkshelf(env[:machine].name), env)
-          end
-
-          env[:berkshelf].shelf = shelf
-
-          @app.call(env)
-        end
-
-        # @param [String] path
-        #
-        # @return [String]
-        def cache_shelf(path, env)
-          FileUtils.mkdir_p(File.dirname(path))
-
-          File.open((cache_file(env)), 'w+') do |f|
-            f.write(path)
-          end
-
-          path
-        end
-
-        # @return [String, nil]
-        def load_shelf(env)
-          return nil unless File.exist?(cache_file(env))
-
-          File.read(cache_file(env)).chomp
-        end
-      end
-    end
-  end
-end

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

@@ -1,53 +0,0 @@
-require 'tempfile'
-
-module Berkshelf
-  module Vagrant
-    module Action
-      class Upload
-        include Berkshelf::Vagrant::EnvHelpers
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          if provision_disabled?(env)
-            return @app.call(env)
-          end
-
-          unless berkshelf_enabled?(env)
-            return @app.call(env)
-          end
-
-          if chef_client?(env)
-            upload(env)
-          end
-
-          @app.call(env)
-        end
-
-        private
-
-          def upload(env)
-            provisioners(:chef_client, env).each do |provisioner|
-              begin
-                # Temporarily generate a berkshelf configuration to pass to the CLI since not all versions
-                # of the CLI allow overriding all options needed for upload.
-                tmp_config = Tempfile.new("berks-config")
-                config     = BerksConfig.instance.dup
-                config[:chef][:chef_server_url] = provisioner.config.chef_server_url
-                tmp_config.write(config.to_json)
-                tmp_config.flush
-
-                env[:berkshelf].ui.info "Uploading cookbooks to '#{provisioner.config.chef_server_url}'"
-                berks("upload", config: tmp_config.path, berksfile: berksfile_path(env), force: true,
-                  freeze: false)
-              ensure
-                tmp_config.close! unless tmp_config.nil?
-              end
-            end
-          end
-      end
-    end
-  end
-end

data/lib/berkshelf/vagrant/berks_config.rb

@@ -1,48 +0,0 @@
-require 'vagrant/util/hash_with_indifferent_access'
-
-module Berkshelf::Vagrant
-  class BerksConfig < ::Vagrant::Util::HashWithIndifferentAccess
-    class << self
-      # @return [String]
-      def store_location
-        File.join(Berkshelf.berkshelf_path, 'config.json')
-      end
-
-      # @return [String]
-      def local_location
-        ENV['BERKSHELF_CONFIG'] || File.join('.', '.berkshelf', 'config.json')
-      end
-
-      # @return [String]
-      def path
-        path = File.exists?(local_location) ? local_location : store_location
-        File.expand_path(path)
-      end
-
-      # Instantiate and return or just return the currently instantiated Berkshelf
-      # configuration
-      #
-      # @return [Config]
-      def instance
-        @instance ||= if File.exists?(path) && File.readable?(path)
-          new(JSON.parse(File.read(path)))
-        else
-          new
-        end
-      end
-    end
-
-    def initialize(attributes = {})
-      attributes.merge!(chef: ChefConfig.instance, ssl: ::Vagrant::Util::HashWithIndifferentAccess.new(verify: false))
-      super(attributes)
-    end
-
-    def chef
-      self[:chef]
-    end
-
-    def ssl
-      self[:ssl]
-    end
-  end
-end