vagrant-librarian-chef 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3497ada011a5d5276259eaf6f14a21798da85618
-  data.tar.gz: 9fe602c0e7e23abad49fe0195274434afbef8cdd
+  metadata.gz: 0e9f3cbc24c33ba05d2e6d81dff49c9a64f30129
+  data.tar.gz: 2bd72d43a4a3722139ddd5aae8c7e940b1cd68db
 SHA512:
-  metadata.gz: cf61da57ea8822c5111d45030b2738c4cda6c31c8c969ab654d4c18df42e5db8df7c13d8f20d810b7ee8a561c2ae478652c15c1e57657f215cf4a83a3dc43d2e
-  data.tar.gz: da19c2e14e8693701e763eebadcbe6628aea27d8b8eb01995658d497b8d1b22bdeeed61873a832c01c7758cbee9279c605bb3220f5b84a053eccfe990d1f630b
+  metadata.gz: 66875978a48398ade12d140bf6b0868847a2856e6606835323e57b9da57b72a92f155a282528ce2719febbae0772ee32ec10c048049ce4292de9af8384ac00bd
+  data.tar.gz: 1975f3c8a5e62edab974a2388f840d6957f61799e9b10bbe7f20eeb182c22186b6f142b8bbf505dd6e2ab800b96bcfa4fff59886a64b9857511f70bc3d369991

data/README.md

@@ -1,6 +1,8 @@
 # vagrant-librarian-chef
 
-A [Vagrant](http://www.vagrantup.com/) plugin to install [Chef](http://www.opscode.com/chef/) cookbooks using [Librarian-Chef](https://github.com/applicationsonline/librarian-chef).
+A [Vagrant](http://www.vagrantup.com/) plugin to install
+[Chef](http://www.opscode.com/chef/) cookbooks using
+[Librarian-Chef](https://github.com/applicationsonline/librarian-chef).
 
 ## Requirements
 
@@ -14,7 +16,27 @@ vagrant plugin install vagrant-librarian-chef
 
 ## Usage
 
-Vagrant will automatically run Librarian-Chef before any provisioning step, so simply set up your Cheffile as you normally would.
+Vagrant will automatically run Librarian-Chef before any provisioning step, so
+simply set up your Cheffile as you normally would.
+
+You may specify the subdirectory within which to run `librarian-chef`
+using the `librarian_chef.cheffile_dir` config key.  Please keep in mind
+that you will need to explicitly set the `cookbooks_path` in the
+`:chef_solo` provisioner:
+
+```ruby
+Vagrant.configure("2") do |config|
+
+  config.librarian_chef.cheffile_dir = "chef"
+
+  config.vm.provision :chef_solo do |chef|
+    chef.cookbooks_path = "chef/cookbooks"
+
+    ...
+
+  end
+end
+```
 
 ## Development
 
@@ -25,4 +47,7 @@ bundle exec vagrant up
 
 ## Acknowledgements
 
-Thank you to @thegcat and other contributors for their work on [vagrant-librarian](https://github.com/thegcat/vagrant-librarian), an earlier version of this functionality for Vagrant 1.0.x and the original Librarian gem with integrated Librarian-Chef.
+Thank you to @thegcat and other contributors for their work on
+[vagrant-librarian](https://github.com/thegcat/vagrant-librarian), an earlier
+version of this functionality for Vagrant 1.0.x and the original Librarian gem
+with integrated Librarian-Chef.

data/lib/vagrant-librarian-chef/action/librarian_chef.rb

@@ -7,13 +7,18 @@ module VagrantPlugins
       class Install
         def initialize(app, env)
           @app = app
+          # Config#finalize! SHOULD be called automatically
+          env[:global_config].librarian_chef.finalize!
         end
 
         def call(env)
-          # look for a Cheffile in the Vagrant root_path
-          if FileTest.exist?(env[:root_path] + "Cheffile")
+          config = env[:global_config].librarian_chef
+          # look for a Cheffile in the configured cheffile_dir
+          if FileTest.exist? File.join(env[:root_path], config.cheffile_path)
             env[:ui].info "Installing Chef cookbooks with Librarian-Chef..."
-            environment = Librarian::Chef::Environment.new
+            environment = Librarian::Chef::Environment.new({
+              :project_path => config.cheffile_dir
+            })
             Librarian::Action::Ensure.new(environment).run
             Librarian::Action::Resolve.new(environment).run
             Librarian::Action::Install.new(environment).run

data/lib/vagrant-librarian-chef/config.rb

@@ -0,0 +1,19 @@
+module VagrantPlugins
+  module LibrarianChef
+    class Config < Vagrant.plugin(2, :config)
+      attr_accessor :cheffile_dir
+
+      def initialize
+        @cheffile_dir = UNSET_VALUE
+      end
+
+      def finalize!
+        @cheffile_dir = nil if @cheffile_dir == UNSET_VALUE
+      end
+
+      def cheffile_path
+        @cheffile_path ||= @cheffile_dir ? File.join(@cheffile_dir, 'Cheffile') : 'Cheffile'
+      end
+    end
+  end
+end

data/lib/vagrant-librarian-chef/plugin.rb

@@ -16,6 +16,11 @@ DESC
       action_hook "librarian_chef" do |hook|
         hook.before Vagrant::Action::Builtin::Provision, Action::Install
       end
+
+      config "librarian_chef" do
+        require_relative "config"
+        Config
+      end
     end
   end
 end

data/lib/vagrant-librarian-chef/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module LibrarianChef
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-librarian-chef
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian-chef
@@ -82,6 +82,7 @@ files:
 - Vagrantfile
 - lib/vagrant-librarian-chef.rb
 - lib/vagrant-librarian-chef/action/librarian_chef.rb
+- lib/vagrant-librarian-chef/config.rb
 - lib/vagrant-librarian-chef/plugin.rb
 - lib/vagrant-librarian-chef/version.rb
 - vagrant-librarian-chef.gemspec