From 15ddecef0ee3634d730ae2a6342859dbeba6d835 Mon Sep 17 00:00:00 2001 From: Bruce Williams Date: Sat, 13 Mar 2010 15:19:39 -0800 Subject: Basic Mercurial support --- examples/cvs.pp | 17 ----- examples/cvs/init.pp | 17 +++++ examples/git.pp | 15 ----- examples/git/init.pp | 15 +++++ examples/hg/init.pp | 11 ++++ examples/svn.pp | 4 -- examples/svn/init.pp | 4 ++ lib/puppet/provider/vcsrepo/cvs.rb | 2 +- lib/puppet/provider/vcsrepo/git.rb | 2 +- lib/puppet/provider/vcsrepo/hg.rb | 59 +++++++++++++++++ lib/puppet/provider/vcsrepo/svn.rb | 2 +- spec/fixtures/hg_parents.txt | 6 ++ spec/unit/puppet/provider/vcsrepo/hg_spec.rb | 96 ++++++++++++++++++++++++++++ 13 files changed, 211 insertions(+), 39 deletions(-) delete mode 100644 examples/cvs.pp create mode 100644 examples/cvs/init.pp delete mode 100644 examples/git.pp create mode 100644 examples/git/init.pp create mode 100644 examples/hg/init.pp delete mode 100644 examples/svn.pp create mode 100644 examples/svn/init.pp create mode 100644 lib/puppet/provider/vcsrepo/hg.rb create mode 100644 spec/fixtures/hg_parents.txt create mode 100644 spec/unit/puppet/provider/vcsrepo/hg_spec.rb diff --git a/examples/cvs.pp b/examples/cvs.pp deleted file mode 100644 index a3b9685..0000000 --- a/examples/cvs.pp +++ /dev/null @@ -1,17 +0,0 @@ -vcsrepo { "/tmp/vcstest-cvs-repo": - ensure => present, - provider => cvs -} - -vcsrepo { "/tmp/vcstest-cvs-workspace-local": - ensure => present, - provider => cvs, - source => "/tmp/vcstest-cvs-repo", - require => Vcsrepo["/tmp/vcstest-cvs-repo"] -} - -vcsrepo { "/tmp/vcstest-cvs-workspace-remote": - ensure => present, - provider => cvs, - source => ":pserver:anonymous@cvs.sv.gnu.org:/sources/leetcvrt" -} diff --git a/examples/cvs/init.pp b/examples/cvs/init.pp new file mode 100644 index 0000000..a3b9685 --- /dev/null +++ b/examples/cvs/init.pp @@ -0,0 +1,17 @@ +vcsrepo { "/tmp/vcstest-cvs-repo": + ensure => present, + provider => cvs +} + +vcsrepo { "/tmp/vcstest-cvs-workspace-local": + ensure => present, + provider => cvs, + source => "/tmp/vcstest-cvs-repo", + require => Vcsrepo["/tmp/vcstest-cvs-repo"] +} + +vcsrepo { "/tmp/vcstest-cvs-workspace-remote": + ensure => present, + provider => cvs, + source => ":pserver:anonymous@cvs.sv.gnu.org:/sources/leetcvrt" +} diff --git a/examples/git.pp b/examples/git.pp deleted file mode 100644 index 7763a91..0000000 --- a/examples/git.pp +++ /dev/null @@ -1,15 +0,0 @@ -vcsrepo { "/tmp/vcstest-git-bare": - ensure => bare, - provider => git -} - -vcsrepo { "/tmp/vcstest-git-wc": - ensure => present, - provider => git -} - -vcsrepo { "/tmp/vcstest-git-clone": - ensure => present, - provider => git, - source => "git://github.com/bruce/rtex.git" -} diff --git a/examples/git/init.pp b/examples/git/init.pp new file mode 100644 index 0000000..7763a91 --- /dev/null +++ b/examples/git/init.pp @@ -0,0 +1,15 @@ +vcsrepo { "/tmp/vcstest-git-bare": + ensure => bare, + provider => git +} + +vcsrepo { "/tmp/vcstest-git-wc": + ensure => present, + provider => git +} + +vcsrepo { "/tmp/vcstest-git-clone": + ensure => present, + provider => git, + source => "git://github.com/bruce/rtex.git" +} diff --git a/examples/hg/init.pp b/examples/hg/init.pp new file mode 100644 index 0000000..620806e --- /dev/null +++ b/examples/hg/init.pp @@ -0,0 +1,11 @@ +vcsrepo { "/tmp/vcstest-hg-init": + ensure => present, + provider => hg +} + +vcsrepo { "/tmp/vcstest-hg-clone": + ensure => present, + provider => hg, + source => "http://hg.basho.com/riak/", + revision => '34e6012c783a' +} diff --git a/examples/svn.pp b/examples/svn.pp deleted file mode 100644 index b48415b..0000000 --- a/examples/svn.pp +++ /dev/null @@ -1,4 +0,0 @@ -vcsrepo { "/tmp/vcstest-svn-server": - ensure => present, - provider => svn -} diff --git a/examples/svn/init.pp b/examples/svn/init.pp new file mode 100644 index 0000000..b48415b --- /dev/null +++ b/examples/svn/init.pp @@ -0,0 +1,4 @@ +vcsrepo { "/tmp/vcstest-svn-server": + ensure => present, + provider => svn +} diff --git a/lib/puppet/provider/vcsrepo/cvs.rb b/lib/puppet/provider/vcsrepo/cvs.rb index 58018d3..99faa54 100644 --- a/lib/puppet/provider/vcsrepo/cvs.rb +++ b/lib/puppet/provider/vcsrepo/cvs.rb @@ -1,4 +1,4 @@ -require 'puppet/provider/vcsrepo' +require File.join(File.dirname(__FILE__), '..', 'vcsrepo') Puppet::Type.type(:vcsrepo).provide(:cvs, :parent => Puppet::Provider::Vcsrepo) do desc "Supports CVS repositories/workspaces" diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb index 99477a0..eeecac3 100644 --- a/lib/puppet/provider/vcsrepo/git.rb +++ b/lib/puppet/provider/vcsrepo/git.rb @@ -1,4 +1,4 @@ -require 'puppet/provider/vcsrepo' +require File.join(File.dirname(__FILE__), '..', 'vcsrepo') Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) do desc "Supports Git repositories" diff --git a/lib/puppet/provider/vcsrepo/hg.rb b/lib/puppet/provider/vcsrepo/hg.rb new file mode 100644 index 0000000..7263b4f --- /dev/null +++ b/lib/puppet/provider/vcsrepo/hg.rb @@ -0,0 +1,59 @@ +require File.join(File.dirname(__FILE__), '..', 'vcsrepo') + +Puppet::Type.type(:vcsrepo).provide(:hg, :parent => Puppet::Provider::Vcsrepo) do + desc "Supports Mercurial repositories" + + commands :hg => 'hg' + defaultfor :hg => :exists + + def create + if !@resource.value(:source) + create_repository(@resource.value(:path)) + else + clone_repository(@resource.value(:revision)) + end + end + + def exists? + File.directory?(File.join(@resource.value(:path), '.hg')) + end + + def destroy + FileUtils.rm_rf(@resource.value(:path)) + end + + def revision + at_path do + hg('parents')[/^changeset:\s+(?:-?\d+):(\S+)/m, 1] + end + end + + def revision=(desired) + at_path do + hg('pull') + begin + hg('merge') + rescue Puppet::ExecutionFailure + # If there's nothing to merge, just skip + end + hg('update', '--clean', '-r', desired) + end + end + + private + + def create_repository(path) + hg('init', path) + end + + def clone_repository(revision) + args = ['clone'] + if revision + args.push('-u', revision) + end + args.push(@resource.value(:source), + @resource.value(:path)) + hg(*args) + end + +end diff --git a/lib/puppet/provider/vcsrepo/svn.rb b/lib/puppet/provider/vcsrepo/svn.rb index 97c7fcb..09fdd0e 100644 --- a/lib/puppet/provider/vcsrepo/svn.rb +++ b/lib/puppet/provider/vcsrepo/svn.rb @@ -1,4 +1,4 @@ -require 'puppet/provider/vcsrepo' +require File.join(File.dirname(__FILE__), '..', 'vcsrepo') Puppet::Type.type(:vcsrepo).provide(:svn, :parent => Puppet::Provider::Vcsrepo) do desc "Supports Subversion repositories" diff --git a/spec/fixtures/hg_parents.txt b/spec/fixtures/hg_parents.txt new file mode 100644 index 0000000..46173df --- /dev/null +++ b/spec/fixtures/hg_parents.txt @@ -0,0 +1,6 @@ +changeset: 3:34e6012c783a +parent: 2:21ea4598c962 +parent: 1:9d0ff0028458 +user: Test User +date: Fri Aug 07 13:13:02 2009 -0400 +summary: merge diff --git a/spec/unit/puppet/provider/vcsrepo/hg_spec.rb b/spec/unit/puppet/provider/vcsrepo/hg_spec.rb new file mode 100644 index 0000000..56189a3 --- /dev/null +++ b/spec/unit/puppet/provider/vcsrepo/hg_spec.rb @@ -0,0 +1,96 @@ +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(:hg) + +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/hg/repo' + @resource.expects(:value).with(:source).returns(@source).at_least_once + end + context "and when a revision is given" do + before do + @revision = '6aa99e9b3ac2' + @resource.expects(:value).with(:revision).returns(@revision).at_least_once + end + it "should execute 'hg clone -u' with the revision" do + @provider.expects(:hg).with('clone', '-u', @revision, @source, @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 + it "should just execute 'hg clone' without a revision" do + @provider.expects(:hg).with('clone', @source, @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 + it "should execute 'hg init'" do + @provider.expects(:hg).with('init', @path) + @provider.create + end + end + end + + describe 'when 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 + end + end + + describe "when checking existence" do + before do + @resource.expects(:value).with(:path).returns(@path) + end + it "should check for the directory" do + File.expects(:directory?).with(File.join(@path, '.hg')) + @provider.exists? + end + end + + describe "when checking the revision property" do + before do + @resource.expects(:value).with(:path).returns(@path) + end + it "should use 'hg tip'" do + @provider.expects('hg').with('parents').returns(fixture(:hg_parents)) + Dir.expects(:chdir).with(@path).yields + @provider.revision.should == '34e6012c783a' + end + end + + describe "when setting the revision property" do + before do + @resource.expects(:value).with(:path).returns(@path).at_least_once + @revision = '6aa99e9b3ab1' + end + it "should use 'hg update ---clean -r'" do + Dir.expects(:chdir).with(@path).yields + @provider.expects('hg').with('pull') + @provider.expects('hg').with('merge') + @provider.expects('hg').with('update', '--clean', '-r', @revision) + @provider.revision = @revision + end + end + +end -- cgit v1.2.3