vagrant-cachier 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 307983515bc00363631b1742d531e79f2fb24e8e
-  data.tar.gz: 6bebf0f7c9e887566d4f1161506d461ae43f3b06
+  metadata.gz: 845908f7aaf2e34bc7a2fdf9b8a6f8ccef0081f3
+  data.tar.gz: b4fc6095061bd704172251999bfe8a8e2637e145
 SHA512:
-  metadata.gz: 6677e3fcb6ebb9c699fd3c774250fba801a50c914c32022d53367ad2a2b1fe029f03f8853f84858fe8bf554e982c5763bab24d1f2ed70a140847f587287ad01e
-  data.tar.gz: 20574de968aac25e1d2295739a2f97d2876be801f1d966841c631d7524b3186aef29e522952ce7b2c5c3ed2d53cac244826d171db505eab9265e4ab8f4efe583
+  metadata.gz: 212c652010365cccde66327bb8bfb13b60ce98a1bfc9373c3201bcbec9913c6cf0ad9ff014aeda2f22ec3870f915d7fcda083dbf3bf47ddce76a36b9d261be4d
+  data.tar.gz: 140ac7f80cc15d00cb3ef08548f40e97ce3746bd81715652929904c29260ed9784e7223ffadba53ef0fe1847f8927abcccb8032e335558111263bc87fc7b7ae8

data/.gitignore

@@ -15,4 +15,3 @@ test/tmp
 test/version_tmp
 tmp
 .vagrant
-development/cookbooks

data/CHANGELOG.md

@@ -1,6 +1,20 @@
+## [0.7.0](https://github.com/fgrehm/vagrant-cachier/compare/v0.6.0...v0.7.0) (Apr 06, 2014)
+
+FEATURES:
+
+  - ["Generic" cache bucket](http://fgrehm.viewdocs.io/vagrant-cachier/buckets/generic) [[GH-94]] / [[GH-4]].
+
+BUG FIXES:
+
+  - Fix apt-cacher bucket undefined method error [[GH-96]]
+
+[GH-94]: https://github.com/fgrehm/vagrant-cachier/pull/94
+[GH-4]: https://github.com/fgrehm/vagrant-cachier/issues/4
+[GH-96]: https://github.com/fgrehm/vagrant-cachier/issues/96
+
 ## [0.6.0](https://github.com/fgrehm/vagrant-cachier/compare/v0.5.1...v0.6.0) (Feb 26, 2014)
 
-BACKWARDS INCOMPATIBILITY:
+BACKWARDS INCOMPATIBILITIES:
 
   - Plugin activation is now triggered by the `cache.scope` config and that config
     is now required. Previous versions of the plugin had it set to `:box` but

data/Gemfile

@@ -1,14 +1,14 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in vagrant-cachier.gemspec
-gemspec
-
 group :development do
-  gem 'vagrant',               github: 'mitchellh/vagrant', tag: 'v1.4.3'
+  gem 'vagrant',               github: 'mitchellh/vagrant', tag: 'v1.5.2'
+  gem 'rake'
+end
+
+group :plugins do
+  gemspec
   gem 'vagrant-lxc',           github: 'fgrehm/vagrant-lxc'
   gem 'vagrant-pristine',      github: 'fgrehm/vagrant-pristine'
   gem 'vagrant-global-status', github: 'fgrehm/vagrant-global-status'
-  gem 'vagrant-librarian-chef'
   gem 'vagrant-omnibus'
-  gem 'rake'
 end

data/Gemfile.lock

@@ -1,14 +1,14 @@
 GIT
   remote: git://github.com/fgrehm/vagrant-global-status.git
-  revision: 8ae82e2c57b085a030137a40e9b3d232f42e5117
+  revision: 6a93c79c7595b76392a2b559674985eabc004aa8
   specs:
     vagrant-global-status (0.1.5.dev)
 
 GIT
   remote: git://github.com/fgrehm/vagrant-lxc.git
-  revision: 1083f100adc4cf1bd20e7eb794ecfda94ef8b365
+  revision: 47cf361b983d71108619ce5f379ef0fe3358a6a8
   specs:
-    vagrant-lxc (0.7.1.dev)
+    vagrant-lxc (1.0.0.alpha.2.dev)
 
 GIT
   remote: git://github.com/fgrehm/vagrant-pristine.git
@@ -18,112 +18,53 @@ GIT
 
 GIT
   remote: git://github.com/mitchellh/vagrant.git
-  revision: 4f0eb9504cc786d5a57a43814427e8eb35407a4c
-  tag: v1.4.3
+  revision: 5b360d0990f0f6fb286dadf65581c345c55d3b32
+  tag: v1.5.2
   specs:
-    vagrant (1.4.3)
-      childprocess (~> 0.3.7)
+    vagrant (1.5.2)
+      bundler (~> 1.5.2)
+      childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
-      log4r (~> 1.1.9)
+      listen (~> 2.4.0)
+      log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.1.0)
       net-ssh (>= 2.6.6, < 2.8.0)
+      rb-kqueue (~> 0.2.0)
+      wdm (~> 0.1.0)
 
 PATH
   remote: .
   specs:
-    vagrant-cachier (0.6.0)
+    vagrant-cachier (0.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    archive-tar-minitar (0.5.2)
-    chef (11.8.2)
-      chef-zero (~> 1.6, >= 1.6.2)
-      diff-lcs (~> 1.2, >= 1.2.4)
-      erubis (~> 2.7)
-      highline (~> 1.6, >= 1.6.9)
-      json (>= 1.4.4, <= 1.7.7)
-      mime-types (~> 1.16)
-      mixlib-authentication (~> 1.3)
-      mixlib-cli (~> 1.3)
-      mixlib-config (~> 2.0)
-      mixlib-log (~> 1.3)
-      mixlib-shellout (~> 1.2)
-      net-ssh (~> 2.6)
-      net-ssh-multi (~> 1.1.0)
-      ohai (~> 6.0)
-      pry (~> 0.9)
-      puma (~> 1.6)
-      rest-client (>= 1.0.4, < 1.7.0)
-      yajl-ruby (~> 1.1)
-    chef-zero (1.7.2)
-      hashie (~> 2.0)
-      json
-      mixlib-log (~> 1.3)
-      moneta (< 0.7.0)
-      rack
-    childprocess (0.3.9)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    childprocess (0.5.2)
       ffi (~> 1.0, >= 1.0.11)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
     erubis (2.7.0)
     ffi (1.9.3)
-    hashie (2.0.5)
-    highline (1.6.20)
     i18n (0.6.9)
-    ipaddress (0.8.0)
-    json (1.7.7)
-    librarian (0.1.1)
-      highline
-      thor (~> 0.15)
-    librarian-chef (0.0.2)
-      archive-tar-minitar (>= 0.5.2)
-      chef (>= 0.10)
-      librarian (~> 0.1.0)
+    listen (2.4.1)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
     log4r (1.1.10)
-    method_source (0.8.2)
-    mime-types (1.25.1)
-    mixlib-authentication (1.3.0)
-      mixlib-log
-    mixlib-cli (1.4.0)
-    mixlib-config (2.1.0)
-    mixlib-log (1.6.0)
-    mixlib-shellout (1.3.0)
-    moneta (0.6.0)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.7.0)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
-    net-ssh-multi (1.1)
-      net-ssh (>= 2.1.4)
-      net-ssh-gateway (>= 0.99.0)
-    ohai (6.20.0)
-      ipaddress
-      mixlib-cli
-      mixlib-config
-      mixlib-log
-      mixlib-shellout
-      systemu (~> 2.5.2)
-      yajl-ruby
-    pry (0.9.12.4)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    puma (1.6.3)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.1.1)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    slop (3.4.7)
-    systemu (2.5.2)
-    thor (0.18.1)
-    vagrant-librarian-chef (0.1.4)
-      librarian-chef
-    vagrant-omnibus (1.2.1)
-    yajl-ruby (1.2.0)
+    rake (10.2.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.2)
+      ffi (>= 0.5.0)
+    timers (1.1.0)
+    vagrant-omnibus (1.3.1)
+    wdm (0.1.0)
 
 PLATFORMS
   ruby
@@ -133,7 +74,6 @@ DEPENDENCIES
   vagrant!
   vagrant-cachier!
   vagrant-global-status!
-  vagrant-librarian-chef
   vagrant-lxc!
   vagrant-omnibus
   vagrant-pristine!

data/development/Vagrantfile

@@ -1,12 +1,6 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-Vagrant.require_plugin 'vagrant-cachier'
-Vagrant.require_plugin 'vagrant-librarian-chef'
-Vagrant.require_plugin 'vagrant-lxc'
-Vagrant.require_plugin 'vagrant-omnibus'
-Vagrant.require_plugin 'vagrant-pristine'
-
 Vagrant.configure("2") do |config|
   config.vm.synced_folder "../", "/vagrant", id: 'vagrant-root'
 
@@ -18,6 +12,10 @@ Vagrant.configure("2") do |config|
     vb.customize [ "modifyvm", :id, "--memory", 256, "--cpus", "1" ]
   end
 
+  config.vm.provider :lxc do |lxc|
+    lxc.customize 'aa_profile', 'unconfined'
+  end
+
   configure_private_network = lambda do |node, suffix|
     node.vm.network :private_network, ip: "192.168.50.#{suffix}"
   end
@@ -61,7 +59,11 @@ Vagrant.configure("2") do |config|
   end
 
   config.vm.define :ubuntu do |ubuntu|
-    ubuntu.vm.box = "quantal64"
+    ubuntu.vm.box = "raring64"
+    ubuntu.vm.provider :lxc do |_, override|
+      override.vm.box = 'fgrehm/raring64-lxc'
+    end
+
     configure_private_network.call ubuntu, 10
 
     initial_debian_setup.call(ubuntu)
@@ -69,14 +71,7 @@ Vagrant.configure("2") do |config|
 
     ubuntu.omnibus.chef_version = :latest
     ubuntu.vm.provision :chef_solo do |chef|
-      chef.add_recipe "java::oracle"
-      chef.json = {
-        :java => {
-          :oracle => {
-            :accept_oracle_download_terms => true
-          }
-        }
-      }
+      chef.add_recipe "cachier::default"
     end
   end
 

data/development/cookbooks/cachier/recipes/default.rb

@@ -0,0 +1,4 @@
+zip_filepath = "#{Chef::Config['file_cache_path']}/vagrant-cachier.tar.gz"
+zip_url      = "https://github.com/fgrehm/vagrant-cachier/archive/v0.6.0.tar.gz"
+
+remote_file(zip_filepath) { source zip_url }

data/docs/buckets/generic.md

@@ -0,0 +1,42 @@
+# Generic
+
+This bucket is never enabled by default. You have to enable it explicitly like
+this:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.cache.enable :generic, { :cache_dir => "/var/cache/some" }
+end
+```
+
+The `:cache_dir` parameter is required. It specifies the directory on the guest
+that will be cached under the "generic" bucket.
+
+You may enable more than one generic bucket by giving them different names via
+the `:name` parameter, like this:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.cache.enable :generic, { name: "one", cache_dir: "/var/cache/one" }
+  config.cache.enable :generic, { name: "two", cache_dir: "/var/cache/two" }
+end
+```
+
+In this case you get two buckets called "generic-one" and "generic-two" under guest's
+`/tmp/vagrant-cache`.
+
+The Generic bucket is useful if you want to implement a caching mechanism by
+hand. For instance, if you want to cache your wget downloads under
+`/var/cache/wget` you can do this:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.cache.enable :generic, { name: "wget", cache_dir: "/var/cache/wget" }
+end
+```
+
+Then, you invoke wget like this:
+
+```sh
+wget -N -P /var/cache/wget URL
+```

data/docs/template.html

@@ -82,6 +82,7 @@
               <li class="dropdown">
                 <a class="dropdown-toggle" data-toggle="dropdown" href="#">Available Buckets <span class="caret"></span></a>
                 <ul class="dropdown-menu">
+                  <li><a tabindex="-1" href="buckets/generic">Generic</a></li>
                   <li><a tabindex="-1" href="buckets/apt">APT</a></li>
                   <li><a tabindex="-1" href="buckets/apt-lists">apt-lists</a></li>
                   <li><a tabindex="-1" href="buckets/apt-cacher">apt-cacher</a></li>

data/lib/vagrant-cachier/bucket.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
 
       def self.auto_detect(env)
         @buckets.each do |bucket|
-          if env[:machine].guest.capability?(bucket.capability)
+          if bucket.respond_to?(:capability) && env[:machine].guest.capability?(bucket.capability)
             env[:machine].config.cache.enable bucket.bucket_name
           end
         end
@@ -98,3 +98,4 @@ require_relative "bucket/apt_lists"
 require_relative "bucket/composer"
 require_relative "bucket/npm"
 require_relative "bucket/zypper"
+require_relative "bucket/generic"

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

@@ -11,10 +11,11 @@ module VagrantPlugins
         def install
           if guest.capability?(:apt_cacher_dir)
             if guest_path = guest.capability(:apt_cacher_dir)
-              if machine.config.cache.enable_nfs
+              synced_folder_type = (machine.config.cache.synced_folder_opts || {})[:type]
+              if synced_folder_type && synced_folder_type.to_sym == :nfs
                 symlink(guest_path)
               else
-                @env[:ui].info I18n.t('vagrant_cachier.nfs_required', bucket: 'apt-cacher')
+                @env[:ui].warn I18n.t('vagrant_cachier.nfs_required', bucket: 'apt-cacher')
               end
             end
           else

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

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module Cachier
+    class Bucket
+      class Generic < Bucket
+        def install
+          if @configs.has_key?(:cache_dir)
+            @name = @configs.has_key?(:name) ? "generic-#{@configs[:name]}" : "generic"
+            symlink(@configs[:cache_dir])
+          else
+            @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'Generic')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cachier/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Cachier
-    VERSION = "0.6.0"
+    VERSION = "0.7.0"
   end
 end

data/locales/en.yml

@@ -8,7 +8,7 @@ en:
       Unknown cache scope '%{cache_scope}' (allowed scopes: %{allowed})
     nfs_required: |-
       The '%{bucket}' cache bucket requires NFS to be enabled, please add
-      `config.cache.enable_nfs = true` to your Vagrantfile.
+      `config.cache.synced_folder_opts = {type: :nfs}` to your Vagrantfile.
     will_fix_machine_cache_dir: |-
       A vagrant-cachier provider specific cache dir was found under
       '%{current_path}' and it will be moved to

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cachier
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies: []
 description: Caffeine reducer
 email:
@@ -27,12 +27,14 @@ files:
 - development/Cheffile
 - development/Cheffile.lock
 - development/Vagrantfile
+- development/cookbooks/cachier/recipes/default.rb
 - docs/benchmarks.md
 - docs/buckets/apt-cacher.md
 - docs/buckets/apt-lists.md
 - docs/buckets/apt.md
 - docs/buckets/chef.md
 - docs/buckets/composer.md
+- docs/buckets/generic.md
 - docs/buckets/npm.md
 - docs/buckets/pacman.md
 - docs/buckets/rubygems.md
@@ -55,6 +57,7 @@ files:
 - lib/vagrant-cachier/bucket/chef.rb
 - lib/vagrant-cachier/bucket/composer.rb
 - lib/vagrant-cachier/bucket/gem.rb
+- lib/vagrant-cachier/bucket/generic.rb
 - lib/vagrant-cachier/bucket/npm.rb
 - lib/vagrant-cachier/bucket/pacman.rb
 - lib/vagrant-cachier/bucket/rvm.rb