vagrant-cachier 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e3d1a6bde8fed89429d000fe1cb4ad3d966873c
-  data.tar.gz: da33a199d777158597f0aa29df079eb63f7909b8
+  metadata.gz: 79be67fe8e7e56705fd0cfd49d71c1e72f87a704
+  data.tar.gz: 928f3031d27f68421a37743f14720540e540091f
 SHA512:
-  metadata.gz: 91ff3706421615c7f68d1fafa796ee0e9fa58ae2eee63aa35a4e02f49b73be7a8c7266e72b467af91e2d98b323b6faafb87e9c5436e4710bc4a0ea641b4ed6da
-  data.tar.gz: 8f1533ddbe6be87b8fa7beacf54d3d3627abcf2d6b797a09fbcf2cee722e23a82d6a7f5c745adc29ec0f17ef8adcb2324bcaccef70d38cebd0028b817bf7e45a
+  metadata.gz: 40753db496aef5ba65bfff06fbe17cc6bcdd19249bbe4268a7938f883769364a8bca878fa2437dca4280e0f49979f6c040a7c8910d5e63c129c49ce0ffd9c341
+  data.tar.gz: b142bd61c5819f9f7de5255103c1ebe48ef3693e3f5e52192970a765d798f0db50d0bcf981cb65bb960617224e6b04ba30650c28987639c7aeaf67b7a4b87274

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.4.1](https://github.com/fgrehm/vagrant-cachier/compare/v0.4.0...v0.4.1) (Oct 27, 2013)
+
+BUG FIXES:
+
+  - Do not attempt to configure apt-cacher-ng bucket if it is not installed on guest
+    machine.
+
+
 ## [0.4.0](https://github.com/fgrehm/vagrant-cachier/compare/v0.3.3...v0.4.0) (Oct 23, 2013)
 
 FEATURES:

data/Gemfile.lock

@@ -31,7 +31,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-cachier (0.4.0)
+    vagrant-cachier (0.4.1)
 
 GEM
   remote: https://rubygems.org/

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

@@ -13,21 +13,21 @@ module VagrantPlugins
           guest   = machine.guest
 
           if guest.capability?(:apt_cacher_dir)
-            if machine.config.cache.enable_nfs
-              guest_path = guest.capability(:apt_cacher_dir)
+            if guest_path = guest.capability(:apt_cacher_dir)
+              if machine.config.cache.enable_nfs
+                @env[:cache_dirs] << guest_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}")
+                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
+              else
+                @env[:ui].info I18n.t('vagrant_cachier.nfs_required', bucket: 'apt-cacher')
               end
-            else
-              @env[:ui].info I18n.t('vagrant_cachier.nfs_required', bucket: 'apt-cacher')
             end
           else
             @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'apt-cacher')

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

@@ -3,9 +3,18 @@ module VagrantPlugins
     module Cap
       module Debian
         module AptCacherDir
+          CACHER_CONF      = '/etc/apt-cacher-ng/acng.conf'
+          CACHER_CACHE_DIR = "$(cat #{CACHER_CONF} | grep CacheDir | cut -d' ' -f 2)"
+
           def self.apt_cacher_dir(machine)
-            # cat /etc/apt-cacher-ng/acng.conf |grep CacheDir
-            '/var/cache/apt-cacher-ng'
+            cache_dir = nil
+            machine.communicate.tap do |comm|
+              return unless comm.test("test -f #{CACHER_CONF}")
+              comm.execute "echo #{CACHER_CACHE_DIR}" do |buffer, output|
+                cache_dir = output.chomp if buffer == :stdout
+              end
+            end
+            return cache_dir
           end
         end
       end

data/lib/vagrant-cachier/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Cachier
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cachier
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies: []
 description: Speed up vagrant boxes provisioning
 email: