berkshelf-vagrant 1.0.4 → 1.0.6

data/lib/berkshelf/vagrant/action.rb

@@ -1,59 +1,61 @@
-module Berkshelf::Vagrant
-  module Action
-    autoload :Clean, 'berkshelf/vagrant/action/clean'
-    autoload :ConfigureChef, 'berkshelf/vagrant/action/configure_chef'
-    autoload :Install, 'berkshelf/vagrant/action/install'
-    autoload :LoadShelf, 'berkshelf/vagrant/action/load_shelf'
-    autoload :SetUI, 'berkshelf/vagrant/action/set_ui'
-    autoload :Upload, 'berkshelf/vagrant/action/upload'
+module Berkshelf
+  module Vagrant
+    module Action
+      autoload :Clean, 'berkshelf/vagrant/action/clean'
+      autoload :ConfigureChef, 'berkshelf/vagrant/action/configure_chef'
+      autoload :Install, 'berkshelf/vagrant/action/install'
+      autoload :LoadShelf, 'berkshelf/vagrant/action/load_shelf'
+      autoload :SetUI, 'berkshelf/vagrant/action/set_ui'
+      autoload :Upload, 'berkshelf/vagrant/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 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.tap do |b|
-          b.use Berkshelf::Vagrant::Action::Install
+      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.tap do |b|
+            b.use Berkshelf::Vagrant::Action::Install
+          end
         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
+        # 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
-      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
+        # 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
-      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::SetUI
-          b.use Berkshelf::Vagrant::Action::LoadShelf
-          b.use Berkshelf::Vagrant::Action::ConfigureChef
+        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::SetUI
+            b.use Berkshelf::Vagrant::Action::LoadShelf
+            b.use Berkshelf::Vagrant::Action::ConfigureChef
+          end
         end
       end
     end

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

@@ -1,25 +1,27 @@
-module Berkshelf::Vagrant
-  module Action
-    # @author Jamie Winsor <reset@riotgames.com>
-    class Clean
-      include Berkshelf::Vagrant::EnvHelpers
+module Berkshelf
+  module Vagrant
+    module Action
+      # @author Jamie Winsor <reset@riotgames.com>
+      class Clean
+        include Berkshelf::Vagrant::EnvHelpers
 
-      def initialize(app, env)
-        @app = app
-      end
+        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"
+        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[:berkshelf].shelf = nil
-        end
+            FileUtils.remove_dir(env[:berkshelf].shelf, force: true)
+            FileUtils.rm_f(cache_file)
+            env[:berkshelf].shelf = nil
+          end
 
-        @app.call(env)
-      rescue Berkshelf::BerkshelfError => e
-        raise VagrantWrapperError.new(e)
+          @app.call(env)
+        rescue Berkshelf::BerkshelfError => e
+          raise Berkshelf::VagrantWrapperError.new(e)
+        end
       end
     end
   end

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

@@ -1,21 +1,23 @@
-module Berkshelf::Vagrant
-  module Action
-    # @author Jamie Winsor <reset@riotgames.com>
-    class ConfigureChef
-      include Berkshelf::Vagrant::EnvHelpers
+module Berkshelf
+  module Vagrant
+    module Action
+      # @author Jamie Winsor <reset@riotgames.com>
+      class ConfigureChef
+        include Berkshelf::Vagrant::EnvHelpers
 
-      def initialize(app, env)
-        @app = app
-      end
+        def initialize(app, env)
+          @app = app
+        end
 
-      def call(env)
-        if chef_solo?(env) && env[:berkshelf].shelf
-          provisioners(:chef_solo, env).each do |provisioner|
-            provisioner.config.cookbooks_path = provisioner.config.send(:prepare_folders_config, env[:berkshelf].shelf)
+        def call(env)
+          if chef_solo?(env) && env[:berkshelf].shelf
+            provisioners(:chef_solo, env).each do |provisioner|
+              provisioner.config.cookbooks_path = provisioner.config.send(:prepare_folders_config, env[:berkshelf].shelf)
+            end
           end
-        end
 
-        @app.call(env)
+          @app.call(env)
+        end
       end
     end
   end

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

@@ -1,34 +1,36 @@
-module Berkshelf::Vagrant
-  module Action
-    # @author Jamie Winsor <reset@riotgames.com>
-    class Install
-      include Berkshelf::Vagrant::EnvHelpers
+module Berkshelf
+  module Vagrant
+    module Action
+      # @author Jamie Winsor <reset@riotgames.com>
+      class Install
+        include Berkshelf::Vagrant::EnvHelpers
 
-      def initialize(app, env)
-        @app = app
-      end
-
-      def call(env)
-        env[:berkshelf].berksfile = Berkshelf::Berksfile.from_file(env[:global_config].berkshelf.berksfile_path)
-
-        if chef_solo?(env)
-          install(env)
+        def initialize(app, env)
+          @app = app
         end
 
-        @app.call(env)
-      rescue Berkshelf::BerkshelfError => e
-        raise VagrantWrapperError.new(e)
-      end
+        def call(env)
+          env[:berkshelf].berksfile = Berkshelf::Berksfile.from_file(env[:global_config].berkshelf.berksfile_path)
 
-      private
+          if chef_solo?(env)
+            install(env)
+          end
 
-        def install(env)
-          env[:berkshelf].ui.info "Updating Vagrant's berkshelf: '#{env[:berkshelf].shelf}'"
-          opts = {
-            path: env[:berkshelf].shelf
-          }.merge(env[:global_config].berkshelf.to_hash).symbolize_keys!
-          env[:berkshelf].berksfile.install(opts)
+          @app.call(env)
+        rescue Berkshelf::BerkshelfError => e
+          raise Berkshelf::VagrantWrapperError.new(e)
         end
+
+        private
+
+          def install(env)
+            env[:berkshelf].ui.info "Updating Vagrant's berkshelf: '#{env[:berkshelf].shelf}'"
+            opts = {
+              path: env[:berkshelf].shelf
+            }.merge(env[:global_config].berkshelf.to_hash).symbolize_keys!
+            env[:berkshelf].berksfile.install(opts)
+          end
+      end
     end
   end
 end

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

@@ -1,43 +1,45 @@
-module Berkshelf::Vagrant
-  module Action
-    # @author Jamie Winsor <reset@riotgames.com>
-    class LoadShelf
-      include Berkshelf::Vagrant::EnvHelpers
-
-      def initialize(app, env)
-        @app = app
-      end
-
-      def call(env)
-        shelf = load_shelf
-
-        if shelf.nil?
-          shelf = cache_shelf(Berkshelf::Vagrant.mkshelf)
+module Berkshelf
+  module Vagrant
+    module Action
+      # @author Jamie Winsor <reset@riotgames.com>
+      class LoadShelf
+        include Berkshelf::Vagrant::EnvHelpers
+
+        def initialize(app, env)
+          @app = app
         end
 
-        env[:berkshelf].shelf = shelf
+        def call(env)
+          shelf = load_shelf
 
-        @app.call(env)
-      end
+          if shelf.nil?
+            shelf = cache_shelf(Berkshelf::Vagrant.mkshelf)
+          end
 
-      # @param [String] path
-      #
-      # @return [String]
-      def cache_shelf(path)
-        FileUtils.mkdir_p(File.dirname(path))
+          env[:berkshelf].shelf = shelf
 
-        File.open(cache_file, 'w+') do |f|
-          f.write(path)
+          @app.call(env)
         end
 
-        path
-      end
+        # @param [String] path
+        #
+        # @return [String]
+        def cache_shelf(path)
+          FileUtils.mkdir_p(File.dirname(path))
 
-      # @return [String, nil]
-      def load_shelf
-        return nil unless File.exist?(cache_file)
+          File.open(cache_file, 'w+') do |f|
+            f.write(path)
+          end
 
-        File.read(cache_file).chomp
+          path
+        end
+
+        # @return [String, nil]
+        def load_shelf
+          return nil unless File.exist?(cache_file)
+
+          File.read(cache_file).chomp
+        end
       end
     end
   end

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

@@ -1,14 +1,16 @@
-module Berkshelf::Vagrant
-  module Action
-    # @author Jamie Winsor <reset@riotgames.com>
-    class SetUI
-      def initialize(app, env)
-        @app = app
-      end
+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 = env[:berkshelf].ui
-        @app.call(env)
+        def call(env)
+          Berkshelf.ui = env[:berkshelf].ui
+          @app.call(env)
+        end
       end
     end
   end

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

@@ -1,38 +1,40 @@
-module Berkshelf::Vagrant
-  module Action
-    # @author Jamie Winsor <reset@riotgames.com>
-    class Upload
-      include Berkshelf::Vagrant::EnvHelpers
+module Berkshelf
+  module Vagrant
+    module Action
+      # @author Jamie Winsor <reset@riotgames.com>
+      class Upload
+        include Berkshelf::Vagrant::EnvHelpers
 
-      def initialize(app, env)
-        @app = app
-      end
-
-      def call(env)
-        if chef_client?(env)
-          upload(env)
+        def initialize(app, env)
+          @app = app
         end
 
-        @app.call(env)
-      rescue Berkshelf::BerkshelfError => e
-        raise VagrantWrapperError.new(e)
-      end
+        def call(env)
+          if chef_client?(env)
+            upload(env)
+          end
 
-      private
+          @app.call(env)
+        rescue Berkshelf::BerkshelfError => e
+          raise Berkshelf::VagrantWrapperError.new(e)
+        end
+
+        private
 
-        def upload(env)
-          provisioners(:chef_client, env).each do |provisioner|
-            env[:berkshelf].ui.info "Uploading cookbooks to '#{provisioner.config.chef_server_url}'"
-            env[:berkshelf].berksfile.upload(
-              server_url: provisioner.config.chef_server_url,
-              client_name: env[:berkshelf].config.chef.node_name,
-              client_key: env[:berkshelf].config.chef.client_key,
-              ssl: {
-                verify: env[:berkshelf].config.ssl.verify
-              }
-            )
+          def upload(env)
+            provisioners(:chef_client, env).each do |provisioner|
+              env[:berkshelf].ui.info "Uploading cookbooks to '#{provisioner.config.chef_server_url}'"
+              env[:berkshelf].berksfile.upload(
+                server_url: provisioner.config.chef_server_url,
+                client_name: env[:berkshelf].config.chef.node_name,
+                client_key: env[:berkshelf].config.chef.client_key,
+                ssl: {
+                  verify: env[:berkshelf].config.ssl.verify
+                }
+              )
+            end
           end
-        end
+      end
     end
   end
 end

data/lib/berkshelf/vagrant/env.rb

@@ -1,20 +1,22 @@
-module Berkshelf::Vagrant
-  # @author Jamie Winsor <reset@riotgames.com>
-  #
-  # Environment data to build up and persist through the middleware chain
-  class Env
-    # @return [Vagrant::UI::Colored]
-    attr_accessor :ui
-    # @return [Berkshelf::Berksfile]
-    attr_accessor :berksfile
-    # @return [String]
-    attr_accessor :shelf
-    # @return [Berkshelf::Config]
-    attr_accessor :config
+module Berkshelf
+  module Vagrant
+    # @author Jamie Winsor <reset@riotgames.com>
+    #
+    # Environment data to build up and persist through the middleware chain
+    class Env
+      # @return [Vagrant::UI::Colored]
+      attr_accessor :ui
+      # @return [Berkshelf::Berksfile]
+      attr_accessor :berksfile
+      # @return [String]
+      attr_accessor :shelf
+      # @return [Berkshelf::Config]
+      attr_accessor :config
 
-    def initialize
-      @ui     = ::Vagrant::UI::Colored.new('Berkshelf')
-      @config = Berkshelf::Config.instance
+      def initialize
+        @ui     = ::Vagrant::UI::Colored.new('Berkshelf')
+        @config = Berkshelf::Config.instance
+      end
     end
   end
 end

data/lib/berkshelf/vagrant/env_helpers.rb

@@ -1,46 +1,48 @@
-module Berkshelf::Vagrant
-  # @author Jamie Winsor <reset@riotgames.com>
-  #
-  # A module of common helper functions that can be mixed into Berkshelf::Vagrant actions
-  module EnvHelpers
-    # A file to persist berkshelf-vagrant specific information in between
-    # Vagrant runs.
+module Berkshelf
+  module Vagrant
+    # @author Jamie Winsor <reset@riotgames.com>
     #
-    # @return [String]
-    def cache_file
-      File.join('.vagrant', 'berkshelf')
-    end
+    # A module of common helper functions that can be mixed into Berkshelf::Vagrant actions
+    module EnvHelpers
+      # A file to persist berkshelf-vagrant specific information in between
+      # Vagrant runs.
+      #
+      # @return [String]
+      def cache_file
+        File.join('.vagrant', 'berkshelf')
+      end
 
-    # Filter all of the provisioners of the given vagrant environment with the given name
-    #
-    # @param [Symbol] name
-    #   name of provisioner to filter
-    # @param [Vagrant::Environment, Hash] env
-    #   environment to inspect
-    #
-    # @return [Array]
-    def provisioners(name, env)
-      config_global = env.respond_to?(:config_global) ? env.config_global : env[:global_config]
-      
-      config_global.vm.provisioners.select { |prov| prov.name == name }
-    end
+      # Filter all of the provisioners of the given vagrant environment with the given name
+      #
+      # @param [Symbol] name
+      #   name of provisioner to filter
+      # @param [Vagrant::Environment, Hash] env
+      #   environment to inspect
+      #
+      # @return [Array]
+      def provisioners(name, env)
+        config_global = env.respond_to?(:config_global) ? env.config_global : env[:global_config]
+        
+        config_global.vm.provisioners.select { |prov| prov.name == name }
+      end
 
-    # Determine if the given vagrant environment contains a chef_solo provisioner
-    #
-    # @param [Vagrant::Environment] env
-    #
-    # @return [Boolean]
-    def chef_solo?(env)
-      provisioners(:chef_solo, env).any?
-    end
+      # Determine if the given vagrant environment contains a chef_solo provisioner
+      #
+      # @param [Vagrant::Environment] env
+      #
+      # @return [Boolean]
+      def chef_solo?(env)
+        provisioners(:chef_solo, env).any?
+      end
 
-    # Determine if the given vagrant environment contains a chef_client provisioner
-    #
-    # @param [Vagrant::Environment] env
-    #
-    # @return [Boolean]
-    def chef_client?(env)
-      provisioners(:chef_client, env).any?
+      # Determine if the given vagrant environment contains a chef_client provisioner
+      #
+      # @param [Vagrant::Environment] env
+      #
+      # @return [Boolean]
+      def chef_client?(env)
+        provisioners(:chef_client, env).any?
+      end
     end
   end
 end

data/lib/berkshelf/vagrant/plugin.rb

@@ -1,32 +1,34 @@
-module Berkshelf::Vagrant
-  # @author Jamie Winsor <reset@riotgames.com>
-  class Plugin < ::Vagrant.plugin("2")
-    class << self
-      def provision(hook)
-        hook.after(Vagrant::Action::Builtin::Provision, Berkshelf::Vagrant::Action.upload)
-        hook.after(Vagrant::Action::Builtin::Provision, Berkshelf::Vagrant::Action.install)
-        hook.before(Vagrant::Action::Builtin::ConfigValidate, Berkshelf::Vagrant::Action.setup)
+module Berkshelf
+  module Vagrant
+    # @author Jamie Winsor <reset@riotgames.com>
+    class Plugin < ::Vagrant.plugin("2")
+      class << self
+        def provision(hook)
+          hook.after(::Vagrant::Action::Builtin::Provision, Berkshelf::Vagrant::Action.upload)
+          hook.after(::Vagrant::Action::Builtin::Provision, Berkshelf::Vagrant::Action.install)
+          hook.before(::Vagrant::Action::Builtin::ConfigValidate, Berkshelf::Vagrant::Action.setup)
+        end
       end
-    end
 
-    name "berkshelf"
-    description <<-DESC
-    Automatically make available cookbooks to virtual machines provisioned by Chef Solo
-    or Chef Client using Berkshelf.
-    DESC
+      name "berkshelf"
+      description <<-DESC
+      Automatically make available cookbooks to virtual machines provisioned by Chef Solo
+      or Chef Client using Berkshelf.
+      DESC
 
-    action_hook(:berkshelf_provision, :machine_action_up, &method(:provision))
-    action_hook(:berkshelf_provision, :machine_action_provision, &method(:provision))
+      action_hook(:berkshelf_provision, :machine_action_up, &method(:provision))
+      action_hook(:berkshelf_provision, :machine_action_provision, &method(:provision))
 
-    action_hook(:berkshelf_cleanup, :machine_action_destroy) do |hook|
-      # @todo this should be appended to the middleware stack instead of hooked in after the
-      #   Virtualbox specific destroy step but there is a bug in Vagrant (1.1.0) which
-      #   causes appended middleware to run multiple times.
-      hook.after(VagrantPlugins::ProviderVirtualBox::Action::DestroyUnusedNetworkInterfaces, Berkshelf::Vagrant::Action.clean)
-    end
+      action_hook(:berkshelf_cleanup, :machine_action_destroy) do |hook|
+        # @todo this should be appended to the middleware stack instead of hooked in after the
+        #   Virtualbox specific destroy step but there is a bug in Vagrant (1.1.0) which
+        #   causes appended middleware to run multiple times.
+        hook.after(VagrantPlugins::ProviderVirtualBox::Action::DestroyUnusedNetworkInterfaces, Berkshelf::Vagrant::Action.clean)
+      end
 
-    config(:berkshelf) do
-      Berkshelf::Vagrant::Config
+      config(:berkshelf) do
+        Berkshelf::Vagrant::Config
+      end
     end
   end
 end

data/lib/berkshelf/vagrant/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module Vagrant
-    VERSION = "1.0.4"
+    VERSION = "1.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-vagrant
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3541994389694666662
+      hash: -1000128588332199351
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24