vagrant-librarian-chef-nochef 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 412ed8f95f8e9612db5cddbafed543ae7dfc1f93
-  data.tar.gz: 2063e27793a4cd42e6011d5862dc351ff9491a23
+  metadata.gz: 1ac9971af2c3bf39a8e3af7ccfb6d1cef6dc3dc9
+  data.tar.gz: 8c48311b40c19c9ab847c35758089cc4c4d1cec7
 SHA512:
-  metadata.gz: b451f308082db0f91db8ca85b7a0fa8efea5faeeb3feb5dcc444f8ff1361498ada2edcd255741146a68dcdb6e62db77a5f8610f3fae3fa349985d26689488cee
-  data.tar.gz: 329d65e274c88b47c1efb2dcfb723551d3c4cad92309011e4776bbdc3b32ba497922c2aa0c4bbc414ab7e66fb602d84d41c8436a6653c3b8dfc2513e7f9f89f2
+  metadata.gz: 6a1b149f9d59c4df79ac0b2ed5f5b753cd10144a05332f8147020e86cd28e109583f21ba845b40575e4ca759ae9ac0ae108d1331456ed34a870c29e694de22ac
+  data.tar.gz: c7cfb55dfb579f6ca37ba202d3a8aa374712d50ff4f76966e603a4c52b05c4c192938363e30418197c7c33d9baf4932477eca8b1a4d300fad5c81652443ff76e

data/Gemfile

@@ -4,5 +4,8 @@ gemspec
 
 group :development do
   gem "vagrant", github: "mitchellh/vagrant"
-  gem "vagrant-vmware-fusion"
+end
+
+group :plugins do
+  gem "vagrant-omnibus"
 end

data/README.md

@@ -51,8 +51,18 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+Librarian-Chef can be configured normally via configuration file at `.librarian/chef/config`. Again, if you change the path where cookbooks are installed by Librarian-Chef, make sure your Vagrantfile is updated to tell Vagrant's Chef provisioner where to look for them via the `cookbooks_path` attribute.
+
+If you want to programmtically disable the plugin without uninstalling it, set the `enabled` attribute to false:
+
+``` ruby
+config.librarian_chef.enabled = false
+```
+
 ## Development
 
+Vagrant 1.5.0 or greater is required.
+
 ``` bash
 bundle
 bundle exec vagrant up
@@ -60,7 +70,7 @@ bundle exec vagrant up
 
 ## Acknowledgements
 
-Thank you to @thegcat and other contributors for their work on
+Thank you to [@thegcat](https://github.com/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/Vagrantfile

@@ -2,20 +2,12 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-require "vagrant-vmware-fusion"
+require "vagrant-librarian-chef"
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "precise64"
-  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+  config.vm.box = "chef/ubuntu-14.04"
 
-  # To develop against the VMware Fusion provider, you must set an environment variable
-  # pointing to the officially installed Vagrant. You must also be running the same version
-  # of Ruby.
-  #
-  # $ VAGRANT_INSTALLER_EMBEDDED_DIR=/Applications/Vagrant/embedded bundle exec vagrant
-  config.vm.provider :vmware_fusion do |v, override|
-    override.vm.box_url = "http://files.vagrantup.com/precise64_vmware.box"
-  end
+  config.omnibus.chef_version = :latest
 
   config.vm.provision :chef_solo do |chef|
     chef.cookbooks_path = "cookbooks"

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

@@ -12,8 +12,36 @@ module VagrantPlugins
         end
 
         def call(env)
-          config = env[:machine].config.librarian_chef
+          if librarian_chef_enabled?(env)
+            resolve_and_install_cookbooks(env)
+          else
+            env[:ui].info "Librarian-Chef is disabled for this machine."
+          end
+          @app.call(env)
+        end
+
+        def get_project_path(env, config)
+          # look for a Cheffile in the configured cheffile_dir
+          if FileTest.exist? File.join(env[:root_path], config.cheffile_path)
+            return File.join(env[:root_path], config.cheffile_dir)
+          elsif FileTest.exist? File.expand_path(config.cheffile_path)
+            return File.expand_path(config.cheffile_dir)
+          end
+        end
 
+        # Determine if the Librarian-chef plugin should be run for the given environment
+        #
+        # @param [Vagrant::Environment] env
+        #
+        # @return [Boolean]
+        def librarian_chef_enabled?(env)
+          env[:machine].config.librarian_chef.enabled
+        end
+
+        private
+
+        def resolve_and_install_cookbooks(env)
+          config = env[:machine].config.librarian_chef
           project_path = get_project_path(env, config)
           if project_path
             env[:ui].info "Installing Chef cookbooks with Librarian-Chef..."
@@ -26,16 +54,6 @@ module VagrantPlugins
           else
             env[:ui].info "Couldn't find Cheffile at #{config.cheffile_path}."
           end
-          @app.call(env)
-        end
-
-        def get_project_path(env, config)
-          # look for a Cheffile in the configured cheffile_dir
-          if FileTest.exist? File.join(env[:root_path], config.cheffile_path)
-            return File.join(env[:root_path], config.cheffile_dir)
-          elsif FileTest.exist? File.expand_path(config.cheffile_path)
-            return File.expand_path(config.cheffile_dir)
-          end
         end
       end
     end

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

@@ -1,14 +1,22 @@
 module VagrantPlugins
   module LibrarianChef
     class Config < Vagrant.plugin(2, :config)
+      # The path to the directory containing the Cheffile.
+      # @return [String] The path.
       attr_accessor :cheffile_dir
 
+      # Whether or not the plugin is enabled. If disabled, it will have no effect.
+      # @return [Boolean] The value of the enabled flag.
+      attr_accessor :enabled
+
       def initialize
         @cheffile_dir = UNSET_VALUE
+        @enabled      = UNSET_VALUE
       end
 
       def finalize!
         @cheffile_dir = "." if @cheffile_dir == UNSET_VALUE
+        @enabled = true if @enabled == UNSET_VALUE
       end
 
       def cheffile_path

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

@@ -10,9 +10,9 @@ module VagrantPlugins
   module LibrarianChef
     class Plugin < Vagrant.plugin("2")
       name "vagrant-librarian-chef"
-      description <<-DESC
-A Vagrant plugin to install Chef cookbooks using Librarian-Chef.
-DESC
+
+      description "A Vagrant plugin to install Chef cookbooks using Librarian-Chef."
+
       action_hook "librarian_chef" do |hook|
         hook.before Vagrant::Action::Builtin::Provision, Action::Install
       end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module LibrarianChef
-    VERSION = "0.1.5"
+    VERSION = "0.2.0"
   end
 end

data/vagrant-librarian-chef-nochef.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "vagrant-librarian-chef-nochef"
-  spec.version       = "0.1.2"
+  spec.version       = "0.2.0"
   spec.authors       = ["Emiliano Ticci", "Jimmy Cuadra"]
   spec.email         = ["emiticci@gmail.com" "jimmy@jimmycuadra.com"]
   spec.description   = %q{A Vagrant plugin to install Chef cookbooks using librarian-chef-nochef.}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-librarian-chef-nochef
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Emiliano Ticci
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian-chef-nochef