vlad-git 2.1.0 → 2.2.0

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+=== 2.2.0 / 2010-08-22
+
+* New maintainer, Aaron Suggs!
+* Expanded README
+* Compatible with Vlad 2.1.
+* Fixed git submodule initialization for older git versions (< 1.5.6).
+* Add a fast checkout/update mode. [fisons]
+
 === 2.1.0 / 2009-10-14
 
 * Added git submodule support. [Balazs Nagy]

data/README.rdoc

@@ -1,24 +1,53 @@
 = Git for Vlad
 
 * http://github.com/jbarnette/vlad-git
-* http://rubyforge.org/projects/hitsquad
+* http://rubyhitsquad.com/Vlad_the_Deployer.html
 
 == Description
 
 Vlad plugin for Git support. This was previously part of Vlad, but all
 modules outside the core recipe have been extracted.
 
-== Examples
+== Installation
 
-    Vlad.load :scm => :git
+ $ gem install vlad-git
 
-== Installation
+== Usage
+
+(Adapted from Vlad's getting started guide:
+http://hitsquad.rubyforge.org/vlad/doco/getting_started_txt.html)
+
+In your Rakefile, load Vlad with the :scm => :git:
+
+ begin
+   require 'vlad'
+   Vlad.load :scm => :git
+ rescue
+   # do nothing
+ end
+
+In config/deploy.rb, set the repository:
+
+ set :application, "project"
+ set :domain, "example.com"
+ set :deploy_to, "/path/to/install"
+ set :repository, 'git@example.com:project'
+
+By default, vlad-git will deploy origin/master. To deploy an arbitrary
+rev-spec, set the :revision in config/deploy.rb:
+
+ set :revision, "origin/my_branch" # Deploy a branch
+ set :revision, "v2.0"             # Deploy a tag
+ set :revision, "a3539b3f3e9edba1" # Deploy a commit
+
+== Contributors
 
-    $ gem install vlad-git
+* John Barnette http://github.com/jbarnette
+* Aaron Suggs http://github.com/ktheory
 
 == License
 
-Copyright 2009 Vlad contributors, John Barnette (jbarnette@rubyforge.org)
+Copyright 2009 Vlad contributors, John Barnette (code@jbarnette.com)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,14 +1,16 @@
 require "rubygems"
 require "hoe"
 
+Hoe.plugins.delete :rubyforge
 Hoe.plugin :doofus, :git
 
 Hoe.spec "vlad-git" do
-  developer "John Barnette", "jbarnette@rubyforge.org"
+  developer "John Barnette", "code@jbarnette.com"
+  developer "Aaron Suggs", "aaron@ktheory.com"
 
   self.extra_rdoc_files = FileList["*.rdoc"]
   self.history_file     = "CHANGELOG.rdoc"
   self.readme_file      = "README.rdoc"
-  self.rubyforge_name   = "hitsquad"
   self.testlib          = :minitest
+  self.extra_deps       << ["vlad", ">= 2.1.0"]
 end

data/lib/vlad/git.rb

@@ -1,12 +1,11 @@
 class Vlad::Git
 
   # Duh.
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 
   set :source,  Vlad::Git.new
   set :git_cmd, "git"
 
-  ##
   # Returns the command that will check out +revision+ from the
   # repository into directory +destination+.  +revision+ can be any
   # SHA1 or equivalent (e.g. branch, tag, etc...)
@@ -14,20 +13,34 @@ class Vlad::Git
   def checkout(revision, destination)
     destination = File.join(destination, 'repo')
     revision = 'HEAD' if revision =~ /head/i
+    new_revision = ('HEAD' == revision) ? "origin" : revision
 
-    [ "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(" && ")
+    if fast_checkout_applicable?(revision, destination)
+      [ "cd #{destination}",
+        "#{git_cmd} checkout -q origin",
+        "#{git_cmd} fetch",
+        "#{git_cmd} reset --hard #{new_revision}",
+        "#{git_cmd} submodule init",
+        "#{git_cmd} submodule update",
+        "#{git_cmd} branch -f deployed-#{revision} #{revision}",
+        "#{git_cmd} checkout deployed-#{revision}",
+        "cd -"
+      ].join(" && ")
+    else
+      [ "rm -rf #{destination}",
+        "#{git_cmd} clone #{repository} #{destination}",
+        "cd #{destination}",
+        "#{git_cmd} submodule init",
+        "#{git_cmd} submodule update",
+        "#{git_cmd} checkout -f -b deployed-#{revision} #{revision}",
+        "cd -"
+      ].join(" && ")
+    end
   end
 
-  ##
-  # Returns the command that will export +revision+ from the current directory
-  # into the directory +destination+.
-  # Expects to be run from +scm_path+ after Vlad::Git#checkout
+  # Returns the command that will export +revision+ from the current
+  # directory into the directory +destination+. Expects to be run
+  # from +scm_path+ after Vlad::Git#checkout.
 
   def export(revision, destination)
     revision = 'HEAD' if revision =~ /head/i
@@ -42,13 +55,30 @@ class Vlad::Git
     ].join(" && ")
   end
 
-  ##
-  # Returns a command that maps human-friendly revision identifier +revision+
-  # into a git SHA1.
+  # Returns a command that maps human-friendly revision identifier
+  # +revision+ into a git SHA1.
 
   def revision(revision)
     revision = 'HEAD' if revision =~ /head/i
 
     "`#{git_cmd} rev-parse #{revision}`"
   end
+
+  private
+
+  # Checks if fast-checkout is applicable
+  def fast_checkout_applicable?(revision, destination)
+    revision = 'HEAD' if revision =~ /head/i
+
+    begin
+      cmd = [ "if cd #{destination}",
+              "#{git_cmd} rev-parse #{revision}",
+              "#{git_cmd} remote -v | grep -q #{repository}",
+              "cd -; then exit 0; else exit 1; fi &>/dev/null" ].join(" && ")
+      run cmd
+      return true
+    rescue Rake::CommandFailedError
+      return false
+    end
+  end
 end

data/test/test_vlad_git.rb

@@ -1,33 +1,55 @@
-require 'vlad_test_case'
+require 'minitest/autorun'
 require 'vlad'
 require 'vlad/git'
+require 'mocha'
 
-class TestVladGit < VladTestCase
+class TestVladGit < MiniTest::Unit::TestCase
   def setup
     super
     @scm = Vlad::Git.new
+    @scm.stubs(:fast_checkout_applicable?).returns(false)
+
+    @scm_fast = Vlad::Git.new
+    @scm_fast.stubs(:fast_checkout_applicable?).returns(true)
+
     set :repository, "git@myhost:/home/john/project1"
   end
 
   # 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 submodule update --init && 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 init && git submodule update && git checkout -f -b deployed-HEAD HEAD && cd -', cmd
+  end
+
+  # (fast-mode) Checkout the way the default :update task invokes the method
+  def test_checkout_fast
+    cmd = @scm_fast.checkout 'head', '/the/scm/path'
+    assert_equal 'cd /the/scm/path/repo && git checkout -q origin && git fetch && git reset --hard origin && git submodule init && git submodule update && git branch -f deployed-HEAD HEAD && git checkout deployed-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 submodule update --init && 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 init && git submodule update && 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 submodule update --init && 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 init && git submodule update && git checkout -f -b deployed-master master && cd -', cmd
+  end
+
+    # (fast-mode) This is not how the :update task invokes the method
+  def test_checkout_revision_fast
+    # Checkout to the current directory
+    cmd = @scm_fast.checkout 'master', '.'
+    assert_equal 'cd ./repo && git checkout -q origin && git fetch && git reset --hard master && git submodule init && git submodule update && git branch -f deployed-master master && git checkout deployed-master && cd -', cmd
 
+    cmd = @scm_fast.checkout 'master', 'some/relative/path'
+    assert_equal 'cd some/relative/path/repo && git checkout -q origin && git fetch && git reset --hard master && git submodule init && git submodule update && git branch -f deployed-master master && git checkout deployed-master && cd -', cmd
   end
 
   def test_export
+    # default mode
     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 -) && git submodule foreach 'git archive --format=tar \$sha1 | (cd the/release/path/\$path && tar xf -)' && cd - && cd ..", cmd
   end
@@ -40,3 +62,4 @@ class TestVladGit < VladTestCase
     end
   end
 end
+

metadata

@@ -1,32 +1,62 @@
 --- !ruby/object:Gem::Specification 
 name: vlad-git
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  hash: 7
+  prerelease: false
+  segments: 
+  - 2
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - John Barnette
+- Aaron Suggs
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 -07:00
+date: 2010-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: vlad
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+        hash: 21
+        segments: 
+        - 2
+        - 6
+        - 1
+        version: 2.6.1
+  type: :development
+  version_requirements: *id002
 description: |-
   Vlad plugin for Git support. This was previously part of Vlad, but all
   modules outside the core recipe have been extracted.
 email: 
-- jbarnette@rubyforge.org
+- code@jbarnette.com
+- aaron@ktheory.com
 executables: []
 
 extensions: []
@@ -54,21 +84,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: hitsquad
-rubygems_version: 1.3.5
+rubyforge_project: vlad-git
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Vlad plugin for Git support