vagrant-librarian-chef 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f82c78cb2f10176747923991aa039a126977137
-  data.tar.gz: 1caa6e7aa66ad97550fa8544fa18e7a4dccc9c7d
+  metadata.gz: 00f7e7254040996cf4d3b0ac0199a51d9f099d21
+  data.tar.gz: da9cf5d32d649532a5a2e5fa286c88ffbf51f4dc
 SHA512:
-  metadata.gz: fc92ee30b9a65c1635d937506152326733862285abd97f6607440c86e10ef5365a2dcafc29c2893d9c8f0c60d7405fef8e57edeee121e2aefe875aef960197b3
-  data.tar.gz: 7be1d74e3311bf624e4b335d0dbe34cd0817b649d7c355f99f9ab45559dc68f1be4cb1e3bea90da6283b0b99d8e4b12bde4f78d5b957720708f0d5ada176cff3
+  metadata.gz: 8edd1b1483d55b266713a02ea420c77050bea37cb19876fb9c7344bd5756cbd89981559f679d49a083849fc771e04a3babe3dffd3a04931b10c7e4af3f1204e8
+  data.tar.gz: 7c4a84c08da63f960b909bba6c27f56ad984050c5657e12541ae394df4d7738fa52708ff04924aa1bea3909bc513658f79571bbba6cb178d3bf63dd44cb6e1b0

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

@@ -13,18 +13,30 @@ module VagrantPlugins
 
         def call(env)
           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)
+
+          project_path = get_project_path(env, config)
+          if project_path
             env[:ui].info "Installing Chef cookbooks with Librarian-Chef..."
             environment = Librarian::Chef::Environment.new({
-              :project_path => File.join(env[:root_path], config.cheffile_dir)
+              :project_path => project_path
             })
             Librarian::Action::Ensure.new(environment).run
             Librarian::Action::Resolve.new(environment).run
             Librarian::Action::Install.new(environment).run
+          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? config.cheffile_path
+            return config.cheffile_dir
+          elsif FileTest.exist? File.join(env[:root_path], config.cheffile_path)
+            return File.join(env[:root_path], config.cheffile_dir)
+          end
+        end
       end
     end
   end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module LibrarianChef
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-librarian-chef
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian-chef
@@ -111,3 +111,4 @@ signing_key:
 specification_version: 4
 summary: A Vagrant plugin to install Chef cookbooks using Librarian-Chef.
 test_files: []
+has_rdoc: