vlad-git 2.0.0 → 2.1.0

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 2.1.0 / 2009-10-14
+
+* Added git submodule support. [Balazs Nagy]
+
 === 2.0.0 / 2009-08-19
 
 * Birthday!

data/lib/vlad/git.rb

@@ -1,8 +1,9 @@
 class Vlad::Git
 
-  VERSION = "2.0.0"
+  # Duh.
+  VERSION = "2.1.0"
 
-  set :source, Vlad::Git.new
+  set :source,  Vlad::Git.new
   set :git_cmd, "git"
 
   ##
@@ -17,6 +18,7 @@ class Vlad::Git
     [ "rm -rf #{destination}",
       "#{git_cmd} clone #{repository} #{destination}",
       "cd #{destination}",
+      "#{git_cmd} submodule update --init",
       "#{git_cmd} checkout -f -b deployed-#{revision} #{revision}",
       "cd -"
     ].join(" && ")
@@ -34,6 +36,7 @@ class Vlad::Git
     [ "mkdir -p #{destination}",
       "cd repo",
       "#{git_cmd} archive --format=tar #{revision} | (cd #{destination} && tar xf -)",
+      "#{git_cmd} submodule foreach '#{git_cmd} archive --format=tar $sha1 | (cd #{destination}/$path && tar xf -)'",
       "cd -",
       "cd .."
     ].join(" && ")

data/test/test_vlad_git.rb

@@ -12,23 +12,24 @@ class TestVladGit < VladTestCase
   # Checkout the way the default :update task invokes the method
   def test_checkout
     cmd = @scm.checkout 'head', '/the/scm/path'
-    assert_equal 'rm -rf /the/scm/path/repo && git clone git@myhost:/home/john/project1 /the/scm/path/repo && cd /the/scm/path/repo && git checkout -f -b deployed-HEAD HEAD && cd -', cmd
+    assert_equal 'rm -rf /the/scm/path/repo && git clone git@myhost:/home/john/project1 /the/scm/path/repo && cd /the/scm/path/repo && git submodule update --init && git checkout -f -b deployed-HEAD HEAD && cd -', cmd
   end
 
   # This is not how the :update task invokes the method
   def test_checkout_revision
     # Checkout to the current directory
     cmd = @scm.checkout 'master', '.'
-    assert_equal 'rm -rf ./repo && git clone git@myhost:/home/john/project1 ./repo && cd ./repo && git checkout -f -b deployed-master master && cd -', cmd
+    assert_equal "rm -rf ./repo && git clone git@myhost:/home/john/project1 ./repo && cd ./repo && git submodule update --init && git checkout -f -b deployed-master master && cd -", cmd
 
     # Checkout to a relative path
     cmd = @scm.checkout 'master', 'some/relative/path'
-    assert_equal 'rm -rf some/relative/path/repo && git clone git@myhost:/home/john/project1 some/relative/path/repo && cd some/relative/path/repo && git checkout -f -b deployed-master master && cd -', cmd
+    assert_equal 'rm -rf some/relative/path/repo && git clone git@myhost:/home/john/project1 some/relative/path/repo && cd some/relative/path/repo && git submodule update --init && git checkout -f -b deployed-master master && cd -', cmd
+
   end
 
   def test_export
     cmd = @scm.export 'master', 'the/release/path'
-    assert_equal 'mkdir -p the/release/path && cd repo && git archive --format=tar deployed-master | (cd the/release/path && tar xf -) && cd - && cd ..', cmd
+    assert_equal "mkdir -p the/release/path && cd repo && git archive --format=tar deployed-master | (cd the/release/path && tar xf -) && git submodule foreach 'git archive --format=tar \$sha1 | (cd the/release/path/\$path && tar xf -)' && cd - && cd ..", cmd
   end
 
   def test_revision

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vlad-git
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - John Barnette
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 -07:00
+date: 2009-10-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.3
     version: 
 description: |-
   Vlad plugin for Git support. This was previously part of Vlad, but all