diff options
author | Aaron Stone <aaron@serendipity.cx> | 2013-07-25 09:24:51 -0700 |
---|---|---|
committer | Aaron Stone <aaron@serendipity.cx> | 2013-07-25 13:57:42 -0700 |
commit | a14da4fc175649adaa2aa2a37465e5cd3fc7fccb (patch) | |
tree | 79c3760635cf6defe29be5238f4456aa6c58c280 | |
parent | c281f10efde83847f4df822010c32e03cda809b7 (diff) | |
download | puppet-vcsrepo-a14da4fc175649adaa2aa2a37465e5cd3fc7fccb.tar.gz puppet-vcsrepo-a14da4fc175649adaa2aa2a37465e5cd3fc7fccb.tar.bz2 |
Handle revision update without source switch.
-rw-r--r-- | lib/puppet/provider/vcsrepo/svn.rb | 6 | ||||
-rw-r--r-- | spec/unit/puppet/provider/vcsrepo/svn_spec.rb | 31 |
2 files changed, 27 insertions, 10 deletions
diff --git a/lib/puppet/provider/vcsrepo/svn.rb b/lib/puppet/provider/vcsrepo/svn.rb index 9de0812..bfc9b76 100644 --- a/lib/puppet/provider/vcsrepo/svn.rb +++ b/lib/puppet/provider/vcsrepo/svn.rb @@ -85,7 +85,11 @@ Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo) end def revision=(desired) - args = buildargs.push('switch', '-r', desired, @resource.value(:source)) + args = if @resource.value(:source) + buildargs.push('switch', '-r', desired, @resource.value(:source)) + else + buildargs.push('update', '-r', desired) + end at_path do svn(*args) end diff --git a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb b/spec/unit/puppet/provider/vcsrepo/svn_spec.rb index e7e25d7..675fc0b 100644 --- a/spec/unit/puppet/provider/vcsrepo/svn_spec.rb +++ b/spec/unit/puppet/provider/vcsrepo/svn_spec.rb @@ -66,16 +66,29 @@ describe_provider :vcsrepo, :svn, :resource => {:path => '/tmp/vcsrepo'} do end describe "setting the revision property" do + before do + @revision = '30' + end + resource_without :source do + it "should use 'svn update'" do + expects_chdir + provider.expects(:svn).with('--non-interactive', 'update', '-r', @revision) + provider.revision = @revision + end + end + end + + describe "setting the revision property and repo source" do + before do + @revision = '30' + end resource_with :source do - before do - @revision = '30' - end - it "should use 'svn switch'" do - expects_chdir - provider.expects(:svn).with('--non-interactive', 'switch', '-r', @revision, 'an-unimportant-value') - provider.revision = @revision - end - end + it "should use 'svn switch'" do + expects_chdir + provider.expects(:svn).with('--non-interactive', 'switch', '-r', @revision, 'an-unimportant-value') + provider.revision = @revision + end + end end end |