vagrant-chef-zero 0.2.10 → 0.3.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.0
+
+* Add support for `chef_repo_path`, graciously provided by @tduffield via pull request, as I was taking too long.
+
 ## 0.2.10
 
 * Fix bug where we could find multiple gem paths with 'vagrant' in them, causing the construction of an erroneous Chef Zero binary path.  Fixes [#10](https://github.com/andrewgross/vagrant-chef-zero/issues/10)

data/README.md

@@ -36,6 +36,21 @@ config.chef_zero.roles = "../foobar/roles/*.json"
 config.chef_zero.cookbooks = "spec/fixtures/cookbooks"
 ```
 
+Alternatively, you can use `chef_repo_path` and it will attempt to intelligently find the appropriate sub directories:
+
+```ruby
+config.chef_zero.chef_repo_path = "../foobar/my_repo/"
+# This implies
+# config.chef_zero.nodes = "../foobar/nodes"
+# config.chef_zero.environments = "../foobar/environments"
+# config.chef_zero.data_bags = "../foobar/data_bags"
+# config.chef_zero.roles = "../foobar/roles"
+# config.chef_zero.cookbooks = "../foobar/coobooks"
+
+# Failure to find any of these is ok, it will just be ignored.
+```
+
+
 As Vagrant is booting up, `vagrant-chef-zero` will search each specified location for files to upload to Chef-Zero.  The upload will be done via Ridley APIs.
 
 Check out the included [Vagrantfile](https://github.com/andrewgross/vagrant-chef-zero/blob/master/Vagrantfile) for example usage.

data/Vagrantfile

@@ -3,11 +3,12 @@ Vagrant.require_plugin "vagrant-berkshelf"
 
 Vagrant.configure("2") do |config|
   config.berkshelf.enabled = true
-  config.chef_zero.nodes =        "spec/vagrant-chef-zero/fixtures/nodes"
-  config.chef_zero.environments = "spec/vagrant-chef-zero/fixtures/environments"
-  config.chef_zero.data_bags =    "spec/vagrant-chef-zero/fixtures/data_bags"
-  config.chef_zero.cookbooks =    "spec/vagrant-chef-zero/fixtures/cookbooks"
-  config.chef_zero.roles = "foobar"
+  config.chef_zero.chef_repo_path = "spec/vagrant-chef-zero/fixtures/"
+  #config.chef_zero.nodes =        "spec/vagrant-chef-zero/fixtures/nodes"
+  #config.chef_zero.environments = "spec/vagrant-chef-zero/fixtures/environments"
+  #config.chef_zero.data_bags =    "spec/vagrant-chef-zero/fixtures/data_bags"
+  #config.chef_zero.cookbooks =    "spec/vagrant-chef-zero/fixtures/cookbooks"
+  #config.chef_zero.roles = "foobar"
 
   config.vm.box = ENV['YIPIT_VAGRANT_BOX']
   config.vm.provision :chef_client do |chef|

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

@@ -3,6 +3,7 @@ require "vagrant"
 module VagrantPlugins
   module ChefZero
     class Config < Vagrant.plugin("2", :config)
+
       # Path to role fixtures
       #
       # @return [String]
@@ -33,7 +34,23 @@ module VagrantPlugins
       # @return [TrueClass, FalseClass]
       attr_accessor :enabled
 
+      # Path to a chef repo
+      #
+      # @return [String]
+      attr_reader :chef_repo_path
+
+      def chef_repo_path=(path)
+        @chef_repo_path = path
+        @roles = path_exists?("#{path}/roles") ? "#{path}/roles" : nil
+        @environments = path_exists?("#{path}/environments") ? "#{path}/environments" : nil
+        @nodes = path_exists?("#{path}/nodes") ? "#{path}/nodes" : nil
+        @cookbooks = path_exists?("#{path}/cookbooks") ? "#{path}/cookbooks" : nil
+        @data_bags = path_exists?("#{path}/data_bags") ? "#{path}/data_bags" : nil
+      end
+
+
       def initialize
+        @chef_repo_path = UNSET_VALUE
         @roles        = UNSET_VALUE
         @environments = UNSET_VALUE
         @nodes        = UNSET_VALUE
@@ -46,6 +63,10 @@ module VagrantPlugins
         { "Chef Zero" => [] }
       end
 
+      def path_exists?(path)
+        File.directory? path
+      end
+
       def finalize!
         @enabled = true if @enabled == UNSET_VALUE
         @roles = nil if @roles == UNSET_VALUE
@@ -53,9 +74,10 @@ module VagrantPlugins
         @nodes = nil if @nodes == UNSET_VALUE
         @cookbooks = nil if @cookbooks == UNSET_VALUE
         @data_bags = nil if @data_bags == UNSET_VALUE
+        @chef_repo_path = nil if @chef_repo_path == UNSET_VALUE
         {}
       end
 
     end
   end
-end
+end

data/lib/vagrant-chef-zero/env.rb

@@ -12,4 +12,4 @@ module VagrantPlugins
       end
     end
   end
-end
+end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ChefZero
-    VERSION = "0.2.10"
+    VERSION = "0.3.0"
   end
 end

data/spec/lib/config_spec.rb

@@ -0,0 +1,84 @@
+require_relative '../spec_helper'
+
+describe "VagrantPlugins::ChefZero::Config" do
+
+  before do
+    class DummyClass < VagrantPlugins::ChefZero::Config
+    end
+  end
+
+  describe "config object is created" do
+
+    it "should set all paths to nil" do 
+      d = DummyClass.new
+      d.finalize!
+      d.chef_repo_path.must_equal nil
+      d.roles.must_equal nil
+      d.environments.must_equal nil
+      d.nodes.must_equal nil
+      d.cookbooks.must_equal nil
+      d.data_bags.must_equal nil
+    end
+
+  end
+
+  describe "chef_repo_path is the only defined path" do 
+    
+    it "chef_repo_path should be set" do
+      d = DummyClass.new
+      d.chef_repo_path = "/foo"
+      d.finalize!
+      d.chef_repo_path.must_equal "/foo"
+    end
+    
+
+    it "should use sane defaults and prefix all fixture paths with the chef_repo_path" do
+      d = DummyClass.new
+      d.stubs(:path_exists?).returns(true)
+      d.chef_repo_path = "/foo"
+      d.finalize!
+
+      d.roles.must_equal "/foo/roles"
+      d.environments.must_equal "/foo/environments"
+      d.nodes.must_equal "/foo/nodes"
+      d.cookbooks.must_equal "/foo/cookbooks"
+      d.data_bags.must_equal "/foo/data_bags"
+    end
+
+
+    it "should keep nil value if sane default path does not exist" do
+      d = DummyClass.new
+      d.stubs(:path_exists?).returns(true)
+      d.stubs(:path_exists?).with("/foo/roles").returns(false)
+      d.unstubs(:path_exists?)
+      d.chef_repo_path = "/foo"
+      d.finalize!
+
+      d.roles.must_equal nil
+    end
+  end
+
+  describe "chef_repo_path is defined" do 
+
+    describe "specific fixture path is also defined" do
+
+      it "should use sane defaults for all fixture paths except the overloaded path" do
+        DummyClass.any_instance.stubs(:path_exists?).returns(true)
+        d = DummyClass.new
+        d.chef_repo_path = "/foo"
+        d.roles = "/bar/roles"
+        d.finalize!
+
+        d.roles.must_equal "/bar/roles"
+        d.environments.must_equal "/foo/environments"
+        d.nodes.must_equal "/foo/nodes"
+        d.cookbooks.must_equal "/foo/cookbooks"
+        d.data_bags.must_equal "/foo/data_bags"
+      end
+
+    end
+  end
+  
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-chef-zero
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -234,6 +234,7 @@ files:
 - Makefile
 - Rakefile
 - README.md
+- spec/lib/config_spec.rb
 - spec/lib/server_helpers_spec.rb
 - spec/spec_helper.rb
 - spec/vagrant-chef-zero/fixtures/cookbooks/blah/metadata.rb
@@ -276,7 +277,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1858234695228214747
+      hash: -1290762954162071308
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: