berkshelf 1.2.1 → 1.3.0.rc1

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.9.3-p327@berkshelf --create

data/lib/berkshelf/vagrant.rb

@@ -1,74 +0,0 @@
-require 'vagrant'
-require 'berkshelf'
-require 'berkshelf/vagrant/errors'
-
-module Berkshelf
-  # @author Jamie Winsor <reset@riotgames.com>
-  # @author Andrew Garson <andrew.garson@gmail.com>
-  module Vagrant
-    module Action
-      autoload :Install, 'berkshelf/vagrant/action/install'
-      autoload :Upload, 'berkshelf/vagrant/action/upload'
-      autoload :Clean, 'berkshelf/vagrant/action/clean'
-      autoload :SetUI, 'berkshelf/vagrant/action/set_ui'
-      autoload :Validate, 'berkshelf/vagrant/action/validate'
-    end
-
-    autoload :Config, 'berkshelf/vagrant/config'
-    autoload :Middleware, 'berkshelf/vagrant/middleware'
-
-    class << self
-      # @param [Vagrant::Action::Environment] env
-      #
-      # @return [String, nil]
-      def shelf_for(env)
-        return nil if env[:vm].uuid.nil?
-
-        File.join(Berkshelf.berkshelf_path, "vagrant", env[:vm].uuid)
-      end
-
-      # @param [Symbol] shortcut
-      # @param [Vagrant::Config::Top] config
-      #
-      # @return [Array]
-      def provisioners(shortcut, config)
-        config.vm.provisioners.select { |prov| prov.shortcut == shortcut }
-      end
-
-      # Determine if the given instance of Vagrant::Config::Top contains a
-      # chef_solo provisioner
-      #
-      # @param [Vagrant::Config::Top] config
-      #
-      # @return [Boolean]
-      def chef_solo?(config)
-        !provisioners(:chef_solo, config).empty?
-      end
-
-      # Determine if the given instance of Vagrant::Config::Top contains a
-      # chef_client provisioner
-      #
-      # @param [Vagrant::Config::Top] config
-      #
-      # @return [Boolean]
-      def chef_client?(config)
-        !provisioners(:chef_client, config).empty?
-      end
-
-      # Initialize the Berkshelf Vagrant middleware stack
-      def init!
-        ::Vagrant.config_keys.register(:berkshelf) { Berkshelf::Vagrant::Config }
-
-        [ :provision, :start ].each do |action|
-          ::Vagrant.actions[action].insert(::Vagrant::Action::General::Validate, Berkshelf::Vagrant::Action::Validate)
-          ::Vagrant.actions[action].insert(::Vagrant::Action::VM::Provision, Berkshelf::Vagrant::Middleware.install)
-          ::Vagrant.actions[action].insert(::Vagrant::Action::VM::Provision, Berkshelf::Vagrant::Middleware.upload)
-        end
-
-        ::Vagrant.actions[:destroy].insert(::Vagrant::Action::VM::ProvisionerCleanup, Berkshelf::Vagrant::Middleware.clean)
-      end
-    end
-  end
-end
-
-Berkshelf::Vagrant.init!

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

@@ -1,26 +0,0 @@
-module Berkshelf
-  module Vagrant
-    module Action
-      # @author Jamie Winsor <reset@riotgames.com>
-      class Clean
-        attr_reader :shelf
-
-        def initialize(app, env)
-          @app = app
-          @shelf = Berkshelf::Vagrant.shelf_for(env)
-        end
-
-        def call(env)
-          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
-
-          @app.call(env)
-        rescue BerkshelfError => e
-          raise VagrantWrapperError.new(e)
-        end
-      end
-    end
-  end
-end

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

@@ -1,49 +0,0 @@
-module Berkshelf
-  module Vagrant
-    module Action
-      # @author Jamie Winsor <reset@riotgames.com>
-      # @author Andrew Garson <andrew.garson@gmail.com>
-      class Install
-        attr_reader :shelf
-        attr_reader :berksfile
-
-        def initialize(app, env)
-          @app       = app
-          @shelf     = Berkshelf::Vagrant.shelf_for(env)
-          @berksfile = Berksfile.from_file(env[:vm].config.berkshelf.berksfile_path)
-        end
-
-        def call(env)
-          if Berkshelf::Vagrant.chef_solo?(env[:vm].config)
-            configure_cookbooks_path(env)
-            install(env)
-          end
-
-          @app.call(env)
-        rescue BerkshelfError => e
-          raise VagrantWrapperError.new(e)
-        end
-
-        private
-
-          def install(env)
-            Berkshelf.formatter.msg "installing cookbooks..."
-            opts = {
-              path: self.shelf
-            }.merge(env[:vm].config.berkshelf.to_hash).symbolize_keys!
-            berksfile.install(opts)
-          end
-
-          def configure_cookbooks_path(env)
-            Berkshelf::Vagrant.provisioners(:chef_solo, env[:vm].config).each do |provisioner|
-              unless provisioner.config.cookbooks_path.is_a?(Array)
-                provisioner.config.cookbooks_path = Array(provisioner.config.cookbooks_path)
-              end
-
-              provisioner.config.cookbooks_path.unshift(self.shelf)
-            end
-          end
-      end
-    end
-  end
-end

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

@@ -1,17 +0,0 @@
-module Berkshelf
-  module Vagrant
-    module Action
-      # @author Jamie Winsor <reset@riotgames.com>
-      class SetUI
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          Berkshelf.ui = ::Vagrant::UI::Colored.new('Berkshelf')
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,41 +0,0 @@
-module Berkshelf
-  module Vagrant
-    module Action
-      # @author Jamie Winsor <reset@riotgames.com>
-      class Upload
-        attr_reader :berksfile
-
-        def initialize(app, env)
-          @app       = app
-          @berksfile = Berksfile.from_file(env[:vm].config.berkshelf.berksfile_path)
-        end
-
-        def call(env)
-          if Berkshelf::Vagrant.chef_client?(env[:vm].config)
-            upload(env)
-          end
-
-          @app.call(env)
-        rescue BerkshelfError => e
-          raise VagrantWrapperError.new(e)
-        end
-
-        private
-
-          def upload(env)
-            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,
-                client_name: Berkshelf::Config.instance.chef.node_name,
-                client_key: Berkshelf::Config.instance.chef.client_key,
-                ssl: {
-                  verify: Berkshelf::Config.instance.ssl.verify
-                }
-              )
-            end
-          end
-      end
-    end
-  end
-end

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

@@ -1,30 +0,0 @@
-module Berkshelf
-  module Vagrant
-    module Action
-      # @author Jamie Winsor <reset@riotgames.com>
-      #
-      # As of Vagrant 1.0.5 it is not possible to validate configuration values of
-      # a configuraiton that was not explicitly described in a Vagrant::Config.run block.
-      #
-      # In our case we want some values set for our middleware stacks even if the user does
-      # not explicitly set values for settings in `config.berkshelf`.
-      class Validate
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          recorder = ::Vagrant::Config::ErrorRecorder.new
-          env[:vm].config.berkshelf.validate(env[:vm].env, recorder)
-
-          unless recorder.errors.empty?
-            raise ::Vagrant::Errors::ConfigValidationFailed,
-              messages: ::Vagrant::Util::TemplateRenderer.render("config/validation_failed", errors: { berkshelf: recorder })
-          end
-
-          @app.call(env)
-        end
-      end
-    end
-  end
-end

data/lib/berkshelf/vagrant/config.rb

@@ -1,53 +0,0 @@
-module Berkshelf
-  module Vagrant
-    # @author Jamie Winsor <reset@riotgames.com>
-    # @author Andrew Garson <andrew.garson@gmail.com>
-    class Config < ::Vagrant::Config::Base
-      # @return [String]
-      #   path to the Berksfile to use with Vagrant
-      attr_reader :berksfile_path
-
-      # @return [Array<Symbol>]
-      #   only cookbooks in these groups will be installed and copied to
-      #   Vagrant's shelf
-      attr_accessor :only
-
-      # @return [Array<Symbol>]
-      #   cookbooks in all other groups except for these will be installed
-      #   and copied to Vagrant's shelf
-      attr_accessor :except
-
-      def initialize
-        @berksfile_path = File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME)
-        @except         = Array.new
-        @only           = Array.new
-      end
-
-      # @param [String] value
-      def berksfile_path=(value)
-        @berksfile_path = File.expand_path(value)
-      end
-
-      # @param [String] value
-      def client_key=(value)
-        @client_key = File.expand_path(value)
-      end
-
-      def validate(env, errors)
-        if !except.empty? && !only.empty?
-          errors.add("A value for berkshelf.empty and berkshelf.only cannot both be defined.")
-        end
-
-        if Berkshelf::Vagrant.chef_client?(env.config.global)
-          if Berkshelf::Config.instance.chef.node_name.nil?
-            errors.add("A configuration must be set for chef.node_name when using the chef_client provisioner. Run 'berks configure' or edit your configuration.")
-          end
-
-          if Berkshelf::Config.instance.chef.client_key.nil?
-            errors.add("A configuration must be set for chef.client_key when using the chef_client provisioner. Run 'berks configure' or edit your configuration.")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/berkshelf/vagrant/errors.rb

@@ -1,31 +0,0 @@
-require 'vagrant/errors'
-
-module Berkshelf
-  # A wrapper for a BerkshelfError for Vagrant. All Berkshelf exceptions should be
-  # wrapped in this proxy object so they are properly handled when Vagrant encounters
-  # an exception.
-  #
-  # @example wrapping an error encountered within the Vagrant plugin
-  #   rescue BerkshelfError => e
-  #     VagrantWrapperError.new(e)
-  #   end
-  class VagrantWrapperError < Vagrant::Errors::VagrantError
-    # @param [BerkshelfError]
-    attr_reader :original
-
-    # @param [BerkshelfError] original
-    def initialize(original)
-      @original = original
-    end
-
-    def to_s
-      "#{original.class}: #{original.to_s}"
-    end
-
-    private
-
-      def method_missing(fun, *args, &block)
-        original.send(fun, *args, &block)
-      end
-  end
-end

data/lib/berkshelf/vagrant/middleware.rb

@@ -1,52 +0,0 @@
-module Berkshelf
-  module Vagrant
-    # @author Jamie Winsor <reset@riotgames.com>
-    #
-    # Middleware stacks for use with Vagrant
-    module Middleware
-      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 installed into a temporary directory, called a Shelf, and 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 do
-            use Berkshelf::Vagrant::Action::SetUI
-            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 do
-            use Berkshelf::Vagrant::Action::SetUI
-            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 do
-            use Berkshelf::Vagrant::Action::SetUI
-            use Berkshelf::Vagrant::Action::Clean
-          end
-        end
-      end
-    end
-  end
-end