vlad-hg 2.2.1 → 2.2.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.2.2 / 2011-07-18
+
+* 1 bug fix
+
+  * Respect +deploy_via+ and +hg_subrepos+ when using MQ
+
 === 2.2.1 / 2011-07-18
 
 * 1 bug fix

data/lib/vlad/mercurial.rb

@@ -3,7 +3,7 @@ require 'vlad'
 module Vlad
   class Mercurial
 
-    VERSION = '2.2.1'.freeze
+    VERSION = '2.2.2'.freeze
 
     set :source,        Vlad::Mercurial.new
     set :hg_cmd,        'hg'

data/lib/vlad/mercurial_queue.rb

@@ -35,7 +35,12 @@ module Vlad
     # Expects to be run from +scm_path+ after Vlad::Mercurial#checkout
 
     def export(revision, destination)
-      "#{hg_cmd} archive -r qtip #{destination}"
+      case deploy_via.to_sym
+      when :checkout, :clone
+        "#{hg_cmd} clone #{scm_path} -r qtip #{destination}"
+      else # :archive, :export (or whatever)
+        "#{hg_cmd} archive#{' -S' if hg_subrepos} -r qtip #{destination}"
+      end
     end
 
     ##

data/test/test_vlad_mercurial.rb

@@ -27,10 +27,17 @@ class TestVladMercurial < Rake::TestCase
     assert_equal 'hg archive -r default /path/to/release', cmd
   end
 
+  def test_export_via
+    set :deploy_via, :checkout
+    cmd = @scm.export 'default', '/path/to/release'
+    assert_equal 'hg clone /path/to/scm -r default /path/to/release', cmd
+  end
+
   def test_export_subrepos
     set :hg_subrepos, true
     cmd = @scm.export 'default', '/path/to/release'
     assert_equal 'hg archive -S -r default /path/to/release', cmd
+    set :hg_subrepos, false
   end
 
   def test_revision

data/test/test_vlad_mercurial_queue.rb

@@ -5,6 +5,7 @@ require 'vlad/mercurial_queue'
 class TestVladMercurialQueue < MiniTest::Unit::TestCase
 
   def setup
+    Rake::RemoteTask.set_defaults
     @scm = Vlad::MercurialQueue.new
     set :repository,      "http://repo/project"
     set :deploy_to,       "/path/to"
@@ -32,6 +33,19 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
     assert_equal 'hg archive -r qtip /path/to/release', cmd
   end
 
+  def test_export_via
+    set :deploy_via, :checkout
+    cmd = @scm.export 'default', '/path/to/release'
+    assert_equal 'hg clone /path/to/scm -r qtip /path/to/release', cmd
+  end
+
+  def test_export_subrepos
+    set :hg_subrepos, true
+    cmd = @scm.export 'default', '/path/to/release'
+    assert_equal 'hg archive -S -r qtip /path/to/release', cmd
+    set :hg_subrepos, false
+  end
+
   def test_revision
     cmd = @scm.revision('default')
     expected = "`hg identify -r default | cut -f1 -d\\ `"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vlad-hg
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 2
   - 2
-  - 1
-  version: 2.2.1
+  - 2
+  version: 2.2.2
 platform: ruby
 authors: 
 - Kevin R. Bullock