vagrant-cachier 0.5.1 → 0.6.0

data/lib/vagrant-cachier/bucket/apt_cacher.rb

@@ -9,22 +9,10 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:apt_cacher_dir)
             if guest_path = guest.capability(:apt_cacher_dir)
               if machine.config.cache.enable_nfs
-                @env[:cache_dirs] << guest_path
-
-                machine.communicate.tap do |comm|
-                  comm.execute("mkdir -p /tmp/vagrant-cache/#{@name}")
-                  unless comm.test("test -L #{guest_path}")
-                    comm.sudo("rm -rf #{guest_path}")
-                    comm.sudo("mkdir -p `dirname #{guest_path}`")
-                    comm.sudo("ln -s /tmp/vagrant-cache/#{@name} #{guest_path}")
-                  end
-                end
+                symlink(guest_path)
               else
                 @env[:ui].info I18n.t('vagrant_cachier.nfs_required', bucket: 'apt-cacher')
               end

data/lib/vagrant-cachier/bucket/apt_lists.rb

@@ -0,0 +1,24 @@
+module VagrantPlugins
+  module Cachier
+    class Bucket
+      class AptLists < Bucket
+        def self.capability
+          :apt_lists_dir
+        end
+
+        def install
+          if guest.capability?(:apt_lists_dir)
+            guest_path = guest.capability(:apt_lists_dir)
+
+            return if @env[:cache_dirs].include?(guest_path)
+
+            symlink(guest_path)
+            comm.execute("mkdir -p /tmp/vagrant-cache/#{@name}/partial")
+          else
+            @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'apt-lists')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cachier/bucket/chef.rb

@@ -7,22 +7,9 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:chef_file_cache_path)
             guest_path = guest.capability(:chef_file_cache_path)
-
-            @env[:cache_dirs] << guest_path
-
-            machine.communicate.tap do |comm|
-              comm.execute("mkdir -p /tmp/vagrant-cache/#{@name}")
-              unless comm.test("test -L #{guest_path}")
-                comm.sudo("rm -rf #{guest_path}")
-                comm.sudo("mkdir -p `dirname #{guest_path}`")
-                comm.sudo("ln -s /tmp/vagrant-cache/#{@name} #{guest_path}")
-              end
-            end
+            symlink(guest_path) if guest_path
           else
             @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Chef')
           end

data/lib/vagrant-cachier/bucket/composer.rb

@@ -7,22 +7,9 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:composer_path)
             if composer_path = guest.capability(:composer_path)
-              bucket_path = "/tmp/vagrant-cache/#{@name}"
-              @env[:cache_dirs] << composer_path
-
-              machine.communicate.tap do |comm|
-                comm.execute("mkdir -p #{bucket_path}")
-
-                unless comm.test("test -L #{composer_path}")
-                  comm.sudo("rm -rf #{composer_path}")
-                  comm.sudo("ln -s #{bucket_path} #{composer_path}")
-               end
-              end
+              symlink(composer_path, create_parent: false)
             end
           else
             @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Composer')

data/lib/vagrant-cachier/bucket/gem.rb

@@ -7,26 +7,13 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:gemdir)
             if gemdir_path = guest.capability(:gemdir)
-              prefix      = gemdir_path.split('/').last
-              bucket_path = "/tmp/vagrant-cache/#{@name}/#{prefix}"
-              machine.communicate.tap do |comm|
-                comm.execute("mkdir -p #{bucket_path}")
-
-                gem_cache_path = "#{gemdir_path}/cache"
-
-                @env[:cache_dirs] << gem_cache_path
+              prefix         = gemdir_path.split('/').last
+              bucket_path    = "/tmp/vagrant-cache/#{@name}/#{prefix}"
+              gem_cache_path = "#{gemdir_path}/cache"
 
-                unless comm.test("test -L #{gem_cache_path}")
-                  comm.sudo("rm -rf #{gem_cache_path}")
-                  comm.sudo("mkdir -p `dirname #{gem_cache_path}`")
-                  comm.sudo("ln -s #{bucket_path} #{gem_cache_path}")
-                end
-              end
+              symlink(gem_cache_path, bucket_path)
             end
           else
             @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'RubyGems')

data/lib/vagrant-cachier/bucket/npm.rb

@@ -7,22 +7,9 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:npm_cache_dir)
             guest_path = guest.capability(:npm_cache_dir)
-
-            @env[:cache_dirs] << guest_path
-
-            machine.communicate.tap do |comm|
-              comm.execute("mkdir -p /tmp/vagrant-cache/#{@name}")
-              unless comm.test("test -L #{guest_path}")
-                comm.execute("rm -rf #{guest_path}")
-                comm.execute("mkdir -p `dirname #{guest_path}`")
-                comm.execute("ln -s /tmp/vagrant-cache/#{@name} #{guest_path}")
-              end
-            end
+            user_symlink(guest_path) if guest_path
           else
             @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'npm')
           end

data/lib/vagrant-cachier/bucket/pacman.rb

@@ -7,22 +7,9 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:pacman_cache_dir)
             guest_path = guest.capability(:pacman_cache_dir)
-
-            @env[:cache_dirs] << guest_path
-
-            machine.communicate.tap do |comm|
-              comm.execute("mkdir -p /tmp/vagrant-cache/#{@name}")
-              unless comm.test("test -L #{guest_path}")
-                comm.sudo("rm -rf #{guest_path}")
-                comm.sudo("mkdir -p `dirname #{guest_path}`")
-                comm.sudo("ln -s /tmp/vagrant-cache/#{@name} #{guest_path}")
-              end
-            end
+            symlink(guest_path)
           else
             @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Pacman')
           end

data/lib/vagrant-cachier/bucket/rvm.rb

@@ -7,26 +7,13 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:rvm_path)
             if rvm_path = guest.capability(:rvm_path)
-              prefix      = rvm_path.split('/').last
-              bucket_path = "/tmp/vagrant-cache/#{@name}/#{prefix}"
-              machine.communicate.tap do |comm|
-                comm.execute("mkdir -p #{bucket_path}")
-
-                rvm_cache_path = "#{rvm_path}/archives"
-
-                @env[:cache_dirs] << rvm_cache_path
+              prefix         = rvm_path.split('/').last
+              bucket_path    = "/tmp/vagrant-cache/#{@name}/#{prefix}"
+              rvm_cache_path = "#{rvm_path}/archives"
 
-                unless comm.test("test -L #{rvm_cache_path}")
-                  comm.sudo("rm -rf #{rvm_cache_path}")
-                  comm.sudo("mkdir -p `dirname #{rvm_cache_path}`")
-                  comm.sudo("ln -s #{bucket_path} #{rvm_cache_path}")
-                end
-              end
+              symlink(rvm_cache_path, bucket_path)
             end
           else
             @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'RVM')

data/lib/vagrant-cachier/bucket/yum.rb

@@ -7,25 +7,14 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:yum_cache_dir)
             guest_path = guest.capability(:yum_cache_dir)
+            return if @env[:cache_dirs].include?(guest_path)
 
-            @env[:cache_dirs] << guest_path
-
-            machine.communicate.tap do |comm|
-              # Ensure caching is enabled
-              comm.sudo("sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf")
+            # Ensure caching is enabled
+            comm.sudo("sed -i 's/keepcache=0/keepcache=1/g' /etc/yum.conf")
 
-              comm.execute("mkdir -p /tmp/vagrant-cache/#{@name}")
-              unless comm.test("test -L #{guest_path}")
-                comm.sudo("rm -rf #{guest_path}")
-                comm.sudo("mkdir -p `dirname #{guest_path}`")
-                comm.sudo("ln -s /tmp/vagrant-cache/#{@name} #{guest_path}")
-              end
-            end
+            symlink(guest_path)
           else
             @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Yum')
           end

data/lib/vagrant-cachier/bucket/zypper.rb

@@ -7,25 +7,14 @@ module VagrantPlugins
         end
 
         def install
-          machine = @env[:machine]
-          guest   = machine.guest
-
           if guest.capability?(:zypper_cache_dir)
             guest_path = guest.capability(:zypper_cache_dir)
+            return if @env[:cache_dirs].include?(guest_path)
 
-            @env[:cache_dirs] << guest_path
-
-            machine.communicate.tap do |comm|
-              # Ensure caching is enabled
-              comm.sudo("zypper modifyrepo --keep-packages --all")
+            # Ensure caching is enabled
+            comm.sudo("zypper modifyrepo --keep-packages --all")
 
-              comm.execute("mkdir -p /tmp/vagrant-cache/#{@name}")
-              unless comm.test("test -L #{guest_path}")
-                comm.sudo("rm -rf #{guest_path}")
-                comm.sudo("mkdir -p `dirname #{guest_path}`")
-                comm.sudo("ln -s /tmp/vagrant-cache/#{@name} #{guest_path}")
-              end
-            end
+            symlink(guest_path)
           else
             @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Zypper')
           end

data/lib/vagrant-cachier/cap/debian/apt_lists_dir.rb

@@ -0,0 +1,13 @@
+module VagrantPlugins
+  module Cachier
+    module Cap
+      module Debian
+        module AptListsDir
+          def self.apt_lists_dir(machine)
+            '/var/lib/apt/lists'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cachier/capabilities.rb

@@ -0,0 +1,64 @@
+module VagrantPlugins
+  module Cachier
+    class Plugin < Vagrant.plugin('2')
+      guest_capability 'linux', 'gemdir' do
+        require_relative 'cap/linux/gemdir'
+        Cap::Linux::Gemdir
+      end
+
+      guest_capability 'linux', 'rvm_path' do
+        require_relative 'cap/linux/rvm_path'
+        Cap::Linux::RvmPath
+      end
+
+      guest_capability 'linux', 'composer_path' do
+        require_relative 'cap/linux/composer_path'
+        Cap::Linux::ComposerPath
+      end
+
+      guest_capability 'linux', 'chef_file_cache_path' do
+        require_relative 'cap/linux/chef_file_cache_path'
+        Cap::Linux::ChefFileCachePath
+      end
+
+      guest_capability 'linux', 'npm_cache_dir' do
+        require_relative 'cap/linux/npm_cache_dir'
+        Cap::Linux::NpmCacheDir
+      end
+
+      guest_capability 'debian', 'apt_cache_dir' do
+        require_relative 'cap/debian/apt_cache_dir'
+        Cap::Debian::AptCacheDir
+      end
+
+      guest_capability 'debian', 'apt_cacher_dir' do
+        require_relative 'cap/debian/apt_cacher_dir'
+        Cap::Debian::AptCacherDir
+      end
+
+      guest_capability 'debian', 'apt_lists_dir' do
+        require_relative 'cap/debian/apt_lists_dir'
+        Cap::Debian::AptListsDir
+      end
+
+      guest_capability 'redhat', 'yum_cache_dir' do
+        require_relative 'cap/redhat/yum_cache_dir'
+        Cap::RedHat::YumCacheDir
+      end
+
+      guest_capability 'suse', 'yum_cache_dir' do
+        # Disable Yum on suse guests
+      end
+
+      guest_capability 'arch', 'pacman_cache_dir' do
+        require_relative 'cap/arch/pacman_cache_dir'
+        Cap::Arch::PacmanCacheDir
+      end
+
+      guest_capability 'suse', 'zypper_cache_dir' do
+        require_relative 'cap/suse/zypper_cache_dir'
+        Cap::SuSE::ZypperCacheDir
+      end
+    end
+  end
+end

data/lib/vagrant-cachier/config.rb

@@ -1,24 +1,39 @@
 module VagrantPlugins
   module Cachier
     class Config < Vagrant.plugin(2, :config)
-      attr_accessor :scope, :auto_detect, :enable_nfs
+      attr_accessor :scope, :auto_detect, :synced_folder_opts
       attr_reader   :buckets
 
       ALLOWED_SCOPES = %w( box machine )
 
       def initialize
-        @scope       = UNSET_VALUE
+        @scope = UNSET_VALUE
         @auto_detect = UNSET_VALUE
-        @enable_nfs  = UNSET_VALUE
+        @synced_folder_opts = UNSET_VALUE
+        @ui = Vagrant::UI::Colored.new
       end
 
       def enable(bucket, opts = {})
         (@buckets ||= {})[bucket] = opts
       end
 
+      def enable_nfs=(value)
+        @ui.warn "The `enable_nfs` config for vagrant-cachier has been deprecated " \
+                "and will be removed on 0.7.0, please use " \
+                "`synced_folder_opts = { type: :nfs }` instead.\n"
+
+        @synced_folder_opts = { type: :nfs } if value
+      end
+
       def validate(machine)
         errors = _detected_errors
 
+        if enabled? && backed_by_cloud_provider?(machine)
+          machine.ui.warn(I18n.t('vagrant_cachier.backed_by_cloud_provider',
+                                 provider: machine.provider_name))
+          disable!
+        end
+
         if enabled? && ! ALLOWED_SCOPES.include?(@scope.to_s)
           errors << I18n.t('vagrant_cachier.unknown_cache_scope',
                             allowed:     ALLOWED_SCOPES.inspect,
@@ -28,18 +43,28 @@ module VagrantPlugins
         { "vagrant cachier" => errors }
       end
 
+      def enabled?
+        return @enabled unless @enabled.nil?
+
+        @enabled = @scope != UNSET_VALUE
+      end
+
+      def disable!
+        @enabled = false
+      end
+
       def finalize!
         return unless enabled?
 
-        @scope       = :box  if @scope == UNSET_VALUE
-        @auto_detect = false if @auto_detect == UNSET_VALUE
-        @enable_nfs  = false if @enable_nfs == UNSET_VALUE
-        @buckets     = @buckets ? @buckets.dup : {}
+        @auto_detect = true if @auto_detect == UNSET_VALUE
+        @synced_folder_opts = nil if @synced_folder_opts == UNSET_VALUE
+        @buckets = @buckets ? @buckets.dup : {}
       end
 
-      def enabled?
-        @enabled ||= @auto_detect != UNSET_VALUE ||
-                     @buckets != nil
+      private
+
+      def backed_by_cloud_provider?(machine)
+        CLOUD_PROVIDERS.include?(machine.provider_name.to_s)
       end
     end
   end

data/lib/vagrant-cachier/hooks.rb

@@ -0,0 +1,27 @@
+module VagrantPlugins
+  module Cachier
+    class Plugin < Vagrant.plugin('2')
+      action_hook VagrantPlugins::Cachier::Plugin::ALL_ACTIONS do |hook|
+        require_relative 'action/configure_bucket_root'
+        require_relative 'action/install_buckets'
+
+        hook.before Vagrant::Action::Builtin::Provision, Action::ConfigureBucketRoot
+        # This will do the initial buckets installation
+        hook.after Vagrant::Action::Builtin::Provision, Action::InstallBuckets, chmod: true
+      end
+
+      # This ensure buckets are reconfigured after provisioners runs
+      action_hook :provisioner_run do |hook|
+        require_relative 'action/install_buckets'
+        hook.after :run_provisioner, Action::InstallBuckets
+      end
+
+      clean_action_hook = lambda do |hook|
+        require_relative 'action/clean'
+        hook.before Vagrant::Action::Builtin::GracefulHalt, Action::Clean
+      end
+      action_hook 'remove-guest-symlinks-on-halt',    :machine_action_halt,    &clean_action_hook
+      action_hook 'remove-guest-symlinks-on-package', :machine_action_package, &clean_action_hook
+    end
+  end
+end