3 files changed, 93 insertions, 130 deletions

diff --git a/spec/support/resource_helpers.rb b/spec/support/resource_helpers.rb
index 8327ec0..00bf259 100644
--- a/spec/support/resource_helpers.rb
+++ b/spec/support/resource_helpers.rb
@@ -17,6 +17,34 @@ class ProviderExampleGroup < Spec::Example::ExampleGroup
     resource.value(name)
   end
 
+  class << self
+
+    def field(field, &block)
+      ResourceField.new(self, field, &block)
+    end
+
+    # call-seq:
+    #
+    #   given(:ensure)
+    #   given(:ensure => :present)
+    def context_with(*args, &block)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      if args.empty?
+        text = options.map { |k, v| "#{k} => #{v.inspect}" }.join(' and with ')
+        context("and with #{text}", {:resource => options}, &block)
+      else
+        text = args.join(', ')
+        placeholders = args.inject({}) { |memo, key| memo.merge(key => 'an-unimportant-value') }
+        context("and with a #{text}", {:resource => placeholders}, &block)
+      end
+    end
+
+    def context_without(field, &block)
+      context("and without a #{field}", &block)
+    end
+      
+  end
+
 end
 
 Spec::Example::ExampleGroupFactory.register(:provider, ProviderExampleGroup)
diff --git a/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb b/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
index d39b858..67f9913 100644
--- a/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/bzr_spec.rb
@@ -1,135 +1,89 @@
 require 'pathname'; Pathname.new(__FILE__).realpath.ascend { |x| begin; require (x + 'spec_helper.rb'); break; rescue LoadError; end }
 
-provider_class = Puppet::Type.type(:vcsrepo).provider(:bzr)
+describe_provider :vcsrepo, :bzr, :resource => {:path => '/tmp/vcsrepo'} do
 
-describe provider_class do
-
-  before :each do
-    @resource = stub("resource")
-    @provider = provider_class.new(@resource)
-    @path = '/tmp/vcsrepo'
-  end
-
-  describe 'when creating' do
-    before do
-      @resource.expects(:value).with(:path).returns(@path).at_least_once
-    end
-    context "when a source is given" do
-      before do
-        @source = 'http://example.com/bzr/repo'
-        @resource.expects(:value).with(:source).returns(@source).at_least_once
-      end
-      context "and when a revision is given" do
-        before do
-          @revision = 'somerev'
-          @resource.expects(:value).with(:revision).returns(@revision).at_least_once
-        end
+  describe 'creating' do
+    context_with :source do
+      context_with :revision do
         it "should execute 'bzr clone -r' with the revision" do
-          @provider.expects(:bzr).with('branch', '-r', @revision, @source, @path)
-          @provider.create
+          provider.expects(:bzr).with('branch', '-r', resource.value(:revision), resource.value(:source), resource.value(:path))
+          provider.create
         end
       end
-      context "and when a revision is not given" do
-        before do
-          @resource.expects(:value).with(:revision).returns(nil).at_least_once
-        end
+      context_without :revision do
         it "should just execute 'bzr clone' without a revision" do
-          @provider.expects(:bzr).with('branch', @source, @path)
-          @provider.create
+          provider.expects(:bzr).with('branch', resource.value(:source), resource.value(:path))
+          provider.create
         end
       end
     end
-    context "when a source is not given" do
-      before do
-        @resource.expects(:value).with(:source).returns(nil).at_least_once
-      end
+    context_without :source do
       it "should execute 'bzr init'" do
-        @provider.expects(:bzr).with('init', @path)
-        @provider.create
+        provider.expects(:bzr).with('init', resource.value(:path))
+        provider.create
       end
     end
   end
 
-  describe 'when destroying' do
+  describe 'destroying' do
     it "it should remove the directory" do
-      @resource.expects(:value).with(:path).returns(@path).at_least_once
-      FileUtils.expects(:rm_rf).with(@path)
-      @provider.destroy
+      FileUtils.expects(:rm_rf).with(resource.value(:path))
+      provider.destroy
     end
   end
 
-  describe "when checking existence" do
-    before do
-      @resource.expects(:value).with(:path).returns(@path)
-    end
+  describe "checking existence" do
     it "should check for the directory" do
-      File.expects(:directory?).with(File.join(@path, '.bzr'))
-      @provider.exists?
+      File.expects(:directory?).with(File.join(resource.value(:path), '.bzr'))
+      provider.exists?
     end
   end
 
-  describe "when checking the revision property" do
+  describe "checking the revision property" do
     before do
-      @resource.expects(:value).with(:path).returns(@path).at_least_once
-      Dir.expects(:chdir).with(@path).yields
-      @provider.expects(:bzr).with('version-info').returns(fixture(:bzr_version_info))
+      expects_chdir
+      provider.expects(:bzr).with('version-info').returns(fixture(:bzr_version_info))
       @current_revid = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x'
-      @current_revno = '2634'
     end
-    context "when given a non-revid as the resource revision" do
+    context "when given a non-revid as the resource revision", :resource => {:revision => '2634'} do
       context "when its revid is not different than the current revid" do
         before do
-          @revision = @current_revno
-          @resource.expects(:value).with(:revision).returns(@revision).at_least_once
+          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("#{resource.value(:revision)} menesis@pov.lt-20100309191856-4wmfqzc803fj300x\n")
         end
         it "should return the ref" do
-          @provider.expects(:bzr).with('revision-info', @revision).returns("#{@current_revno} #{@current_revid}\n")
-          @provider.revision.should == @revision
+          provider.revision.should == resource.value(:revision)
         end
       end
-      context "when its revid is different than the current revid" do
-        before do
-          @revision = '2636'
-          @resource.expects(:value).with(:revision).returns(@revision).at_least_once
-        end
+      context "when its revid is different than the current revid", :resource => {:revision => '2636'} do
         it "should return the current revid" do
-          @provider.expects(:bzr).with('revision-info', @revision).returns("#{@revision} menesis@pov.lt-20100309191856-4wmfqzc803fj300y\n")
-          @provider.revision.should == @current_revid
-        end          
+          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("2635 foo\n")
+          provider.revision.should == @current_revid
+        end
       end
     end
     context "when given a revid as the resource revision" do
-      context "when it is the same as the current revid" do
+      context "when it is the same as the current revid", :resource => {:revision => 'menesis@pov.lt-20100309191856-4wmfqzc803fj300x'} do
         before do
-          @revision = @current_revid
-          @resource.expects(:value).with(:revision).returns(@revision).at_least_once
+          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("1234 #{resource.value(:revision)}\n")
         end
         it "should return it" do
-          @provider.expects(:bzr).with('revision-info', @revision).returns("#{@current_revno} #{@current_revid}\n")
-          @provider.revision.should == @revision
+          provider.revision.should == resource.value(:revision)
         end
       end
-      context "when it is not the same as the current revid" do
-        before do
-          @revision = 'menesis@pov.lt-20100309191856-4wmfqzc803fj300y'
-          @resource.expects(:value).with(:revision).returns(@revision).at_least_once
-        end
+      context "when it is not the same as the current revid", :resource => {:revision => 'menesis@pov.lt-20100309191856-4wmfqzc803fj300y'} do
         it "should return the current revid" do
-          @provider.expects(:bzr).with('revision-info', @revision).returns("2636 #{@revision}\n")
-          @provider.revision.should == @current_revid
+          provider.expects(:bzr).with('revision-info', resource.value(:revision)).returns("2636 foo\n")
+          provider.revision.should == @current_revid
         end
       end
     end
   end
   
-  describe "when setting the revision property" do
-    before do
-      @resource.expects(:value).with(:path).returns(@path).at_least_once
-      @revision = 'somerev'
-    end
+  describe "setting the revision property" do
     it "should use 'bzr update -r' with the revision" do
-      @provider.expects('bzr').with('update', '-r', @revision, @path)
-      @provider.revision = @revision
+      revision = 'somerev'
+      provider.expects('bzr').with('update', '-r', revision, resource.value(:path))
+      provider.revision = revision
     end
   end
 
diff --git a/spec/unit/puppet/provider/vcsrepo/git_spec.rb b/spec/unit/puppet/provider/vcsrepo/git_spec.rb
index c18490f..2d55451 100644
--- a/spec/unit/puppet/provider/vcsrepo/git_spec.rb
+++ b/spec/unit/puppet/provider/vcsrepo/git_spec.rb
@@ -2,37 +2,37 @@ require 'pathname'; Pathname.new(__FILE__).realpath.ascend { |x| begin; require
 
 describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
   
-  context 'when creating' do
-    context "when a source is given", :resource => {:source => 'git://example.com/repo.git'} do
-      context "when ensure => present", :resource => {:ensure => :present} do
-        context "when a revision is given", :resource => {:revision => 'abcdef'} do
+  context 'creating' do
+    context_with :source do
+      context_with :ensure => :present do
+        context_with :revision do
           it "should execute 'git clone' and 'git reset --hard'" do
             provider.expects('git').with('clone', resource.value(:source), resource.value(:path))
             expects_chdir
-            provider.expects('git').with('reset', '--hard', 'abcdef')
+            provider.expects('git').with('reset', '--hard', resource.value(:revision))
             provider.create
           end
         end
         
-        context "when a revision is not given" do
+        context_without :revision do
           it "should just execute 'git clone'" do
-            provider.expects(:git).with('clone', 'git://example.com/repo.git', resource.value(:path))
+            provider.expects(:git).with('clone', resource.value(:source), resource.value(:path))
             provider.create
           end
         end
       end
       
-      context "when ensure => bare", :resource => {:ensure => :bare} do
-        context "when a revision is given", :resource => {:revision => 'abcdef'} do
+      context_with :ensure => :bare do
+        context_with :revision do
           it "should just execute 'git clone --bare'" do
-            subject.expects(:git).with('clone', '--bare', 'git://example.com/repo.git', resource.value(:path))
+            subject.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path))
             subject.create
           end
         end
         
-        context "when a revision is not given" do
+        context_without :revision do
           it "should just execute 'git clone --bare'" do
-            subject.expects(:git).with('clone', '--bare', 'git://example.com/repo.git', resource.value(:path))
+            subject.expects(:git).with('clone', '--bare', resource.value(:source), resource.value(:path))
             subject.create
           end
         end
@@ -40,7 +40,7 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
     end
     
     context "when a source is not given" do
-      context "when ensure => present", :resource => {:ensure => :present} do
+      context_with :ensure => :present do
         context "when the path does not exist" do
           it "should execute 'git init'" do
             expects_mkdir
@@ -69,7 +69,7 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
         end
       end
       
-      context "when ensure = bare", :resource => {:ensure => :bare} do
+      context_with :ensure => :bare do
         context "when the path does not exist" do
           it "should execute 'git init --bare'" do
             expects_chdir
@@ -99,56 +99,37 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
       end
     end
     
-    context 'when destroying' do
+    context 'destroying' do
       it "it should remove the directory" do
         FileUtils.expects(:rm_rf).with(resource.value(:path))
         provider.destroy
       end
     end
     
-    context "when checking the revision property" do
-      context "when given a non-SHA ref as the resource revision", :resource => {:revision => 'a-tag'} do
+    context "checking the revision property" do
+      context_with :revision do
+        before do
+          expects_chdir
+          provider.expects(:git).with('rev-parse', 'HEAD').returns('currentsha')
+        end
+        
         context "when its SHA is not different than the current SHA" do
           it "should return the ref" do
-            expects_chdir
-            provider.expects(:git).with('rev-parse', 'HEAD').returns('currentsha')
-            provider.expects(:git).with('rev-parse', 'a-tag').returns('currentsha')
-            provider.revision.should == 'a-tag'
+            provider.expects(:git).with('rev-parse', resource.value(:revision)).returns('currentsha')
+            provider.revision.should == resource.value(:revision)
           end
         end
         
         context "when its SHA is different than the current SHA" do
           it "should return the current SHA" do
-            expects_chdir
-            provider.expects(:git).with('rev-parse', 'HEAD').returns('currentsha')
-            provider.expects(:git).with('rev-parse', 'a-tag').returns('othersha')
-            provider.revision.should == 'currentsha'
-          end
-        end
-      end
-      
-      context "when given a SHA ref as the resource revision" do
-        context "when it is the same as the current SHA", :resource => {:revision => 'currentsha'} do
-          it "should return it" do
-            expects_chdir
-            provider.expects(:git).with('rev-parse', 'HEAD').returns('currentsha')
-            provider.expects(:git).with('rev-parse', 'currentsha').returns('currentsha')
-            provider.revision.should == 'currentsha'
-          end
-        end
-        
-        context "when it is not the same as the current SHA", :resource => {:revision => 'othersha'} do
-          it "should return the current SHA" do
-            expects_chdir
-            provider.expects(:git).with('rev-parse', 'HEAD').returns('currentsha')
-            provider.expects(:git).with('rev-parse', 'othersha').returns('othersha')
+            provider.expects(:git).with('rev-parse', resource.value(:revision)).returns('othersha')
             provider.revision.should == 'currentsha'
           end
         end
       end
     end
     
-    context "when setting the revision property" do
+    context "setting the revision property" do
       it "should use 'git fetch' and 'git reset'" do
         expects_chdir
         provider.expects('git').with('fetch', 'origin')
@@ -157,7 +138,7 @@ describe_provider :vcsrepo, :git, :resource => {:path => '/tmp/vcsrepo'} do
       end
     end
     
-    context "when updating references" do
+    context "updating references" do
       it "should use 'git fetch --tags'" do
         expects_chdir
         provider.expects('git').with('fetch', '--tags', 'origin')