vlad-hg 2.1.2 → 2.1.3

data/History.txt

@@ -1,3 +1,14 @@
+=== 2.1.3 / 2010-11-22
+
+* 2 bugfixes
+
+  * Honor the setting of +deploy_via+. Thanks to McClain Looney.
+
+  * Use 'default' as the actual default value of +revision+. This will break
+    your configuration if you were manually doing something silly like <tt>set
+    :revision, 'head'</tt> in your deploy.rb. But you wouldn't do that, would
+    you?
+
 === 2.1.2 / 2010-09-15
 
 * 1 bug fix

data/Manifest.txt

@@ -6,4 +6,3 @@ lib/vlad/mercurial.rb
 lib/vlad/mercurial_queue.rb
 test/test_vlad_mercurial.rb
 test/test_vlad_mercurial_queue.rb
-test/vlad_test_case.rb

data/lib/vlad/mercurial.rb

@@ -3,10 +3,11 @@ require 'vlad'
 module Vlad
   class Mercurial
 
-    VERSION = '2.1.2'.freeze
+    VERSION = '2.1.3'.freeze
 
-    set :source, Vlad::Mercurial.new
-    set :hg_cmd, "hg"
+    set :source,   Vlad::Mercurial.new
+    set :hg_cmd,   'hg'
+    set :revision, 'default'
 
     ##
     # Returns the command that will check out +revision+ from the
@@ -14,8 +15,6 @@ module Vlad
     # changeset ID or equivalent (e.g. branch, tag, etc...)
 
     def checkout(revision, destination)
-      revision = 'default' if revision =~ /^head$/i
-
       # These all get executed after a "cd #{scm_path}"
       [ "if [ ! -d .hg ]; then #{hg_cmd} init; fi",
         "#{hg_cmd} pull #{repository}",
@@ -29,9 +28,12 @@ module Vlad
     # Expects to be run from +scm_path+ after Vlad::Mercurial#checkout
 
     def export(revision, destination)
-      revision = 'default' if revision =~ /^head$/i
-
-      "#{hg_cmd} archive -r #{revision} #{destination}"
+      case deploy_via.to_sym
+      when :checkout, :clone
+        "#{hg_cmd} clone #{scm_path} -r #{revision} #{destination}"
+      else # :archive, :export (or whatever)
+        "#{hg_cmd} archive -r #{revision} #{destination}"
+      end
     end
 
     ##

data/lib/vlad/mercurial_queue.rb

@@ -4,11 +4,12 @@ module Vlad
   class MercurialQueue
 
     set :source, Vlad::MercurialQueue.new
-    set :hg_cmd, "hg"
+    set :hg_cmd, 'hg'
+    set :revision, 'default'
     set :queue_repo do
       "#{repository}/.hg/patches"
     end
-    set :queue_revision, "tip"
+    set :queue_revision, 'default'
 
     ##
     # Returns the command that will check out +revision+ from the
@@ -16,8 +17,6 @@ module Vlad
     # changeset ID or equivalent (e.g. branch, tag, etc...)
 
     def checkout(revision, destination)
-      revision = 'default' if revision =~ /^head$/i
-
       commands = []
       commands << "if [ ! -d .hg ]; then #{hg_cmd} init; fi"
       commands << "if [ ! -d .hg/patches/.hg ]; then #{hg_cmd} qinit -c; fi"
@@ -36,8 +35,6 @@ module Vlad
     # Expects to be run from +scm_path+ after Vlad::Mercurial#checkout
 
     def export(revision, destination)
-      revision = 'default' if revision =~ /^head$/i
-
       "#{hg_cmd} archive -r qtip #{destination}"
     end
 

data/test/test_vlad_mercurial.rb

@@ -1,16 +1,17 @@
-require 'test/vlad_test_case'
+require 'rake/test_case' # from rake_remote_task
 require 'vlad'
 require 'vlad/mercurial'
 
-class TestVladMercurial < MiniTest::Unit::TestCase
+class TestVladMercurial < Rake::TestCase
   def setup
+    Rake::RemoteTask.set_defaults
     @scm = Vlad::Mercurial.new
     set :repository, "http://repo/project"
     set :deploy_to, "/path/to"
   end
 
   def test_checkout
-    cmd = @scm.checkout 'head', '/path/to/scm'
+    cmd = @scm.checkout 'default', '/path/to/scm'
 
     expected = "if [ ! -d .hg ]; then hg init; fi " \
                "&& hg pull http://repo/project " \
@@ -20,7 +21,8 @@ class TestVladMercurial < MiniTest::Unit::TestCase
   end
 
   def test_export
-    cmd = @scm.export 'head', '/path/to/release'
+    cmd = @scm.export 'default', '/path/to/release'
+    assert_equal :export, deploy_via.to_sym
     assert_equal 'hg archive -r default /path/to/release', cmd
   end
 
@@ -30,5 +32,15 @@ class TestVladMercurial < MiniTest::Unit::TestCase
     expected = "`hg identify -r 000000000000 | cut -f1 -d\\ `"
     assert_equal expected, cmd
   end
+
+  def test_deploy_via
+    set :deploy_via, :clone
+    cmd = @scm.export 'default', '/path/to/release'
+    assert_equal 'hg clone /path/to/scm -r default /path/to/release', cmd
+
+    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
 
+end

data/test/test_vlad_mercurial_queue.rb

@@ -1,4 +1,4 @@
-require 'test/vlad_test_case'
+require 'rake/test_case' # from rake_remote_task
 require 'vlad'
 require 'vlad/mercurial_queue'
 
@@ -13,7 +13,7 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
   end
 
   def test_checkout
-    cmd = @scm.checkout 'head', '/path/to/scm'
+    cmd = @scm.checkout 'default', '/path/to/scm'
 
     expected = "if [ ! -d .hg ]; then hg init; fi " \
                "&& if [ ! -d .hg/patches/.hg ]; then hg qinit -c; fi " \
@@ -28,7 +28,7 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
   end
 
   def test_export
-    cmd = @scm.export 'head', '/path/to/release'
+    cmd = @scm.export 'default', '/path/to/release'
     assert_equal 'hg archive -r qtip /path/to/release', cmd
   end
 
@@ -42,7 +42,7 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
     set :queue_repo, 'http://repo/project-patched'
 
     # only need to test #checkout
-    cmd = @scm.checkout 'head', '/path/to/scm'
+    cmd = @scm.checkout 'default', '/path/to/scm'
 
     expected = "if [ ! -d .hg ]; then hg init; fi " \
                "&& if [ ! -d .hg/patches/.hg ]; then hg qinit -c; fi " \
@@ -60,7 +60,7 @@ class TestVladMercurialQueue < MiniTest::Unit::TestCase
     set :queue_revision, "deadbeefd00d"
 
     # only need to test #checkout
-    cmd = @scm.checkout 'head', '/path/to/scm'
+    cmd = @scm.checkout 'default', '/path/to/scm'
 
     expected = "if [ ! -d .hg ]; then hg init; fi " \
                "&& if [ ! -d .hg/patches/.hg ]; then hg qinit -c; fi " \

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vlad-hg
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 2
   - 1
-  - 2
-  version: 2.1.2
+  - 3
+  version: 2.1.3
 platform: ruby
 authors: 
 - Kevin R. Bullock
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 -05:00
+date: 2010-11-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,7 +87,6 @@ files:
 - lib/vlad/mercurial_queue.rb
 - test/test_vlad_mercurial.rb
 - test/test_vlad_mercurial_queue.rb
-- test/vlad_test_case.rb
 has_rdoc: true
 homepage: http://hitsquad.rubyforge.org/vlad-hg/
 licenses: []

data/test/vlad_test_case.rb

@@ -1,72 +0,0 @@
-require 'minitest/autorun'
-require 'stringio'
-require 'vlad'
-
-class StringIO
-  def readpartial(size) read end # suck!
-end
-
-module Process
-  def self.expected status
-    @@expected ||= []
-    @@expected << status
-  end
-
-  class << self
-    alias :waitpid2_old :waitpid2
-
-    def waitpid2(pid)
-      [ @@expected.shift ]
-    end
-  end
-end
-
-class Rake::RemoteTask
-  attr_accessor :commands, :action, :input, :output, :error
-
-  Status = Struct.new :exitstatus
-
-  class Status
-    def success?() exitstatus == 0 end
-  end
-
-  def system *command
-    @commands << command
-    self.action ? self.action[command.join(' ')] : true
-  end
-
-  def popen4 *command
-    @commands << command
-
-    @input = StringIO.new
-    out = StringIO.new @output.shift.to_s
-    err = StringIO.new @error.shift.to_s
-
-    raise if block_given?
-
-    status = self.action ? self.action[command.join(' ')] : 0
-    Process.expected Status.new(status)
-
-    return 42, @input, out, err
-  end
-
-  def select reads, writes, errs, timeout
-    [reads, writes, errs]
-  end
-
-end
-
-class VladTestCase < MiniTest::Unit::TestCase
-  def setup
-    @vlad = Rake::RemoteTask
-    @vlad.reset
-    Rake.application.clear
-    @task_count = Rake.application.tasks.size
-    @vlad.set :domain, "example.com"
-  end
-
-  def util_set_hosts
-    @vlad.host "app.example.com", :app
-    @vlad.host "db.example.com", :db
-  end
-end