vagrant-cachier 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 128c2d9a31cfd5c225379939860bbde167859725
-  data.tar.gz: e91ef742421e41a52a8ad6e5dfad8e725b96fbe2
+  metadata.gz: f6e6cd454dcf842045a953db7d04ebb1cf674a46
+  data.tar.gz: 519e500d6cbc8dffdf954f68c73131eaf9627cc9
 SHA512:
-  metadata.gz: 1f74a3a07f0846be9980cef819a1fb128a32301536f6625860f9cfc5016324115a0a4aa110cf264da99cb04deecb56171ce328e3adb974ea2afa5cd86e75819a
-  data.tar.gz: 1eb97fd445b5981a67b6bad2f4675b4d18f59f6ba823576fbd73f5a1acd1fb8be06d18eb163e59d3a8d00af3d97a2d1bada2027e38b04a134015e770e7fd58a3
+  metadata.gz: a1e782dc85ae462c0e2500d3ecd79d7096b5f9e84f7bf17f7d9303da4569f1fc58e87c6c35936856ae13e809786a8f66d965b988454b5c6e75319544e50de036
+  data.tar.gz: 094c5f3588d29b434139b45b2308ef11900226b7d6cf6fde8f8291e680069b31346f969d693f2da4c6e975255c6502e61acc1ec27ace50cf850941526d6f47a1

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [1.2.0](https://github.com/fgrehm/vagrant-cachier/compare/v1.1.0...v1.2.0) (Jan 14, 2015)
+
+FEATURES:
+
+  - [Chef Gems bucket](http://fgrehm.viewdocs.io/vagrant-cachier/buckets/chef_rubygems) [[GH-129]]
+
+[GH-129]: https://github.com/fgrehm/vagrant-cachier/pull/129
+
+BUG FIXES:
+
+  - Fix provisioner resolution on Vagrant 1.7+ [[GH-133]] / [[GH-134]]
+  - Do not modify Vagrant core object, preventing unpredictable behavior [[GH-135]]
+
+[GH-133]: https://github.com/fgrehm/vagrant-cachier/issues/133
+[GH-134]: https://github.com/fgrehm/vagrant-cachier/pull/134
+[GH-135]: https://github.com/fgrehm/vagrant-cachier/pull/135
+
+
 ## [1.1.0](https://github.com/fgrehm/vagrant-cachier/compare/v1.0.0...v1.1.0) (Oct 15, 2014)
 
 FEATURES:

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'vagrant', github: 'mitchellh/vagrant', tag: 'v1.6.5'
+  gem 'vagrant', github: 'mitchellh/vagrant', tag: 'v1.7.2'
   gem 'rake'
 end
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/fgrehm/vagrant-lxc.git
-  revision: 622366bd64e570478fad56908d2869a7dc2f6c3a
+  revision: c9cd671a32f730fff4b6e4fdd3687a531af0663c
   specs:
-    vagrant-lxc (1.0.1)
+    vagrant-lxc (1.1.0)
 
 GIT
   remote: git://github.com/fgrehm/vagrant-pristine.git
@@ -12,28 +12,30 @@ GIT
 
 GIT
   remote: git://github.com/mitchellh/vagrant.git
-  revision: c38e17cc29f69aaea1610451333396494181a481
-  tag: v1.6.5
+  revision: 1cd667b243f4a263cd5322b6455165cc676b6f7f
+  tag: v1.7.2
   specs:
-    vagrant (1.6.5)
-      bundler (>= 1.5.2, < 1.7.0)
+    vagrant (1.7.2)
+      bundler (>= 1.5.2, < 1.8.0)
       childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.1)
       i18n (~> 0.6.0)
-      listen (~> 2.7.1)
+      listen (~> 2.8.0)
       log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.1.0)
+      net-sftp (~> 2.1)
       net-ssh (>= 2.6.6, < 2.10.0)
       nokogiri (= 1.6.3.1)
       rb-kqueue (~> 0.2.0)
+      rest-client (>= 1.6.0, < 2.0)
       wdm (~> 0.1.0)
       winrm (~> 1.1.3)
 
 PATH
   remote: .
   specs:
-    vagrant-cachier (1.1.0)
+    vagrant-cachier (1.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -54,11 +56,11 @@ GEM
       builder (>= 2.1.2)
     hashicorp-checkpoint (0.1.4)
     hitimes (1.2.2)
-    httpclient (2.4.0)
+    httpclient (2.6.0.1)
     httpi (0.9.7)
       rack
     i18n (0.6.11)
-    listen (2.7.11)
+    listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -67,21 +69,28 @@ GEM
     logging (1.8.2)
       little-plugger (>= 1.1.3)
       multi_json (>= 1.8.4)
+    mime-types (2.4.3)
     mini_portile (0.6.0)
     multi_json (1.10.1)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    netrc (0.10.2)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     nori (1.1.5)
-    rack (1.5.2)
-    rake (10.3.2)
+    rack (1.6.0)
+    rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.3)
       ffi (>= 0.5.0)
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rubyntlm (0.1.1)
     savon (0.9.5)
       akami (~> 1.0)

data/docs/buckets/chef_rubygems.md

@@ -0,0 +1,18 @@
+# Chef RubyGems
+
+When a Chef installation is detected, this bucket caches its embedded gems.
+Most of these gems are part of the Chef omnibus package but sometimes cookbooks
+need to install extra gems to run within the context of a Chef recipe using the
+`chef_gem` resource.
+
+The embedded Chef gem location is returned by running the
+`/opt/chef/embedded/bin/gem env gemdir` command.
+
+To manually enable it:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.box = 'some-box-using-chef-provisioner'
+  config.cache.enable :chef_gem
+end
+```

data/docs/template.html

@@ -87,6 +87,7 @@
                   <li><a tabindex="-1" href="buckets/apt-lists">apt-lists</a></li>
                   <li><a tabindex="-1" href="buckets/apt-cacher">apt-cacher</a></li>
                   <li><a tabindex="-1" href="buckets/chef">Chef</a></li>
+                  <li><a tabindex="-1" href="buckets/chef_rubygems">Chef Gems</a></li>
                   <li><a tabindex="-1" href="buckets/composer">Composer</a></li>
                   <li><a tabindex="-1" href="buckets/bower">Bower</a></li>
                   <li><a tabindex="-1" href="buckets/pacman">Pacman</a></li>

data/lib/vagrant-cachier/bucket.rb

@@ -90,6 +90,7 @@ end
 require_relative "bucket/apt"
 require_relative "bucket/chef"
 require_relative "bucket/gem"
+require_relative "bucket/chef_gem"
 require_relative "bucket/pacman"
 require_relative "bucket/yum"
 require_relative "bucket/rvm"

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

@@ -0,0 +1,25 @@
+module VagrantPlugins
+  module Cachier
+    class Bucket
+      class ChefGem < Bucket
+        def self.capability
+          :chef_gemdir
+        end
+
+        def install
+          if guest.capability?(:chef_gemdir)
+            if gemdir_path = guest.capability(:chef_gemdir)
+              prefix         = gemdir_path.split('/').last
+              bucket_path    = "/tmp/vagrant-cache/#{@name}/#{prefix}"
+              gem_cache_path = "#{gemdir_path}/cache"
+
+              symlink(gem_cache_path, bucket_path)
+            end
+          else
+            @env[:ui].info I18n.t('vagrant_cachier.skipping_bucket', bucket: 'ChefRubyGems')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cachier/cap/linux/chef_file_cache_path.rb

@@ -6,7 +6,7 @@ module VagrantPlugins
           def self.chef_provisioner?(machine)
             provisioners = machine.config.vm.provisioners
             chef_provisioners = [:chef_solo, :chef_client]
-            compat_provisioners = provisioners.keep_if { |p| chef_provisioners.include? p.name }
+            compat_provisioners = provisioners.select { |p| chef_provisioners.include? p.name || p.type }
 
             if compat_provisioners.size > 1
               raise "One machine is using multiple chef provisioners, which is unsupported."

data/lib/vagrant-cachier/cap/linux/chef_gemdir.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module Cachier
+    module Cap
+      module Linux
+        module ChefGemdir
+          def self.chef_gemdir(machine)
+            gemdir = nil
+            machine.communicate.tap do |comm|
+              return unless comm.test('test -f /opt/chef/embedded/bin/gem')
+              comm.execute '/opt/chef/embedded/bin/gem env gemdir' do |buffer, output|
+                gemdir = output.chomp if buffer == :stdout
+              end
+            end
+            return gemdir
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cachier/capabilities.rb

@@ -6,6 +6,11 @@ module VagrantPlugins
         Cap::Linux::Gemdir
       end
 
+      guest_capability 'linux', 'chef_gemdir' do
+        require_relative 'cap/linux/chef_gemdir'
+        Cap::Linux::ChefGemdir
+      end
+
       guest_capability 'linux', 'rvm_path' do
         require_relative 'cap/linux/rvm_path'
         Cap::Linux::RvmPath

data/lib/vagrant-cachier/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Cachier
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-cachier
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies: []
 description: Caffeine reducer
 email:
@@ -17,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -34,6 +34,7 @@ files:
 - docs/buckets/apt.md
 - docs/buckets/bower.md
 - docs/buckets/chef.md
+- docs/buckets/chef_rubygems.md
 - docs/buckets/composer.md
 - docs/buckets/generic.md
 - docs/buckets/npm.md
@@ -57,6 +58,7 @@ files:
 - lib/vagrant-cachier/bucket/apt_lists.rb
 - lib/vagrant-cachier/bucket/bower.rb
 - lib/vagrant-cachier/bucket/chef.rb
+- lib/vagrant-cachier/bucket/chef_gem.rb
 - lib/vagrant-cachier/bucket/composer.rb
 - lib/vagrant-cachier/bucket/gem.rb
 - lib/vagrant-cachier/bucket/generic.rb
@@ -71,6 +73,7 @@ files:
 - lib/vagrant-cachier/cap/debian/apt_lists_dir.rb
 - lib/vagrant-cachier/cap/linux/bower_path.rb
 - lib/vagrant-cachier/cap/linux/chef_file_cache_path.rb
+- lib/vagrant-cachier/cap/linux/chef_gemdir.rb
 - lib/vagrant-cachier/cap/linux/composer_path.rb
 - lib/vagrant-cachier/cap/linux/gemdir.rb
 - lib/vagrant-cachier/cap/linux/npm_cache_dir.rb
@@ -100,17 +103,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Caffeine reducer