Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Rename 'repository' to 'code_repo' and bump the version

  • Loading branch information...
commit aa070fb968fda62e7d6390206af79595980bb0dc 1 parent 22f5def
@halorgium authored
View
2  Rakefile
@@ -20,7 +20,7 @@ end
desc "quick little hack to see what the state of the nation looks like"
task :debug do
Vlad.load :config => "lib/vlad/subversion.rb"
- set :repository, "repository path"
+ set :code_repo, "code repo path"
set :deploy_to, "deploy path"
set :domain, "server domain"
View
4 doco/getting_started.txt
@@ -8,9 +8,9 @@
set :application, "project"
set :domain, "example.com"
set :deploy_to, "/path/to/install"
- set :repository, 'http://svn.example.com/project/branches/stable/'
+ set :code_repo, 'http://svn.example.com/project/branches/stable/'
-This defaults to using 'svn export' from +repository+, and a single
+This defaults to using 'svn export' from +code_repo+, and a single
server for +app+, +db+, and +www+. If you need to tweak these things,
refer to the variable documentation.
View
2  doco/migration.txt
@@ -39,5 +39,5 @@
== AFTER:
set :domain, "zenspider.textdriven.com"
- set :repository, "svn://svn.example.com/rubyholic/branches/stable"
+ set :code_repo, "svn://svn.example.com/rubyholic/branches/stable"
set :deploy_to, "/users/home/zenspider/domains/new.rubyholic.com"
View
2  doco/variables.txt
@@ -1,7 +1,7 @@
== Core Variables
-repository:: REQUIRED: Repository path: e.g. http://repo.example.com/svn
+code_repo:: REQUIRED: Repository path: e.g. http://repo.example.com/svn
deploy_to:: REQUIRED: Deploy path on target machines. e.g. /var/www/app
domain:: REQUIRED: Used for the common case of a single target
server. e.g. example.com
View
2  lib/rake_remote_task.rb
@@ -409,7 +409,7 @@ def self.set_defaults
@@default_env ||= {}
self.reset
- mandatory :repository, "repository path"
+ mandatory :code_repo, "code repo path"
mandatory :deploy_to, "deploy path"
mandatory :domain, "server domain"
View
2  lib/vlad.rb
@@ -20,7 +20,7 @@ module Vlad
##
# This is the version of Vlad you are running.
- VERSION = '1.2.0'
+ VERSION = '1.2.0.1'
##
# Base error class for all Vlad errors.
View
6 lib/vlad/git.rb
@@ -5,7 +5,7 @@ class Vlad::Git
##
# Returns the command that will check out +revision+ from the
- # repository into directory +destination+. +revision+ can be any
+ # code repo into directory +destination+. +revision+ can be any
# SHA1 or equivalent (e.g. branch, tag, etc...)
def checkout(revision, destination)
@@ -13,14 +13,14 @@ def checkout(revision, destination)
revision = 'HEAD' if revision =~ /head/i
[ "rm -rf #{destination}",
- "#{git_cmd} clone #{repository} #{destination}",
+ "#{git_cmd} clone #{code_repo} #{destination}",
"cd #{destination}",
"#{git_cmd} checkout -f -b deployed-#{revision} #{revision}"
].join(" && ")
end
##
- # Returns the command that will export +revision+ from the repository into
+ # Returns the command that will export +revision+ from the code repo into
# the directory +destination+.
def export(revision, destination)
View
10 lib/vlad/mercurial.rb
@@ -3,22 +3,22 @@ class Vlad::Mercurial
set :source, Vlad::Mercurial.new
##
- # Returns the command that will check out +revision+ from the repository
+ # Returns the command that will check out +revision+ from the code repo
# into directory +destination+
def checkout(revision, destination)
revision = 'tip' if revision =~ /^head$/i
- "hg pull -r #{revision} -R #{destination} #{repository}"
+ "hg pull -r #{revision} -R #{destination} #{code_repo}"
end
##
- # Returns the command that will export +revision+ from the repository into
+ # Returns the command that will export +revision+ from the code repo into
# the directory +destination+.
def export(revision_or_source, destination)
revision_or_source = 'tip' if revision_or_source =~ /^head$/i
if revision_or_source =~ /^(\d+|tip)$/i then
- "hg archive -r #{revision_or_source} -R #{repository} #{destination}"
+ "hg archive -r #{revision_or_source} -R #{code_repo} #{destination}"
else
"hg archive -R #{revision_or_source} #{destination}"
end
@@ -29,6 +29,6 @@ def export(revision_or_source, destination)
# into a subversion revision specification.
def revision(revision)
- "`hg identify -R #{repository} | cut -f1 -d\\ `"
+ "`hg identify -R #{code_repo} | cut -f1 -d\\ `"
end
end
View
2  lib/vlad/perforce.rb
@@ -101,7 +101,7 @@ def rev_no(revision)
Root: #{scm_path}
View:
- #{repository}/... //#{p4client}/...
+ #{code_repo}/... //#{p4client}/...
CLIENT
end
View
10 lib/vlad/subversion.rb
@@ -4,20 +4,20 @@ class Vlad::Subversion
set :svn_cmd, "svn"
##
- # Returns the command that will check out +revision+ from the repository
+ # Returns the command that will check out +revision+ from the code repo
# into directory +destination+
def checkout(revision, destination)
- "#{svn_cmd} co -r #{revision} #{repository} #{destination}"
+ "#{svn_cmd} co -r #{revision} #{code_repo} #{destination}"
end
##
- # Returns the command that will export +revision+ from the repository into
+ # Returns the command that will export +revision+ from the code repo into
# the directory +destination+.
def export(revision_or_source, destination)
if revision_or_source =~ /^(\d+|head)$/i then
- "#{svn_cmd} export -r #{revision_or_source} #{repository} #{destination}"
+ "#{svn_cmd} export -r #{revision_or_source} #{code_repo} #{destination}"
else
"#{svn_cmd} export #{revision_or_source} #{destination}"
end
@@ -28,7 +28,7 @@ def export(revision_or_source, destination)
# into a subversion revision specification.
def revision(revision)
- "`#{svn_cmd} info #{repository} | grep 'Revision:' | cut -f2 -d\\ `"
+ "`#{svn_cmd} info #{code_repo} | grep 'Revision:' | cut -f2 -d\\ `"
end
end
View
2  test/test_vlad.rb
@@ -69,7 +69,7 @@ def test_hosts_for_unique
def test_initialize
@vlad.set_defaults # ensure these three are virginal
- assert_raise(Vlad::ConfigurationError) { @vlad.repository }
+ assert_raise(Vlad::ConfigurationError) { @vlad.code_repo }
assert_raise(Vlad::ConfigurationError) { @vlad.deploy_to }
assert_raise(Vlad::ConfigurationError) { @vlad.domain }
end
View
2  test/test_vlad_git.rb
@@ -6,7 +6,7 @@ class TestVladGit < VladTestCase
def setup
super
@scm = Vlad::Git.new
- set :repository, "git@myhost:/home/john/project1"
+ set :code_repo, "git@myhost:/home/john/project1"
end
def test_checkout
View
2  test/test_vlad_mercurial.rb
@@ -5,7 +5,7 @@
class TestVladMercurial < Test::Unit::TestCase
def setup
@scm = Vlad::Mercurial.new
- set :repository, "http://repo/project"
+ set :code_repo, "http://repo/project"
end
def test_checkout
View
2  test/test_vlad_subversion.rb
@@ -6,7 +6,7 @@ class TestVladSubversion < VladTestCase
def setup
super
@scm = Vlad::Subversion.new
- set :repository, "svn+ssh://repo/myproject"
+ set :code_repo, "svn+ssh://repo/myproject"
end
def test_checkout
View
4 vlad.gemspec
@@ -1,7 +1,7 @@
Gem::Specification.new do |s|
s.name = %q{vlad}
- s.version = "1.2.0"
- s.date = %q{2008-05-25}
+ s.version = "1.2.0.1"
+ s.date = %q{2008-10-03}
s.summary = %q{Vlad the Deployer is pragmatic application deployment automation, without mercy. Much like Capistrano, but with 1/10th the complexity. Vlad integrates seamlessly with Rake, and uses familiar and standard tools like ssh and rsync.}
s.email = %q{ryand-ruby@zenspider.com}
s.homepage = %q{http://rubyhitsquad.com/}
View
4 vladdemo.sh
@@ -13,7 +13,7 @@ pause() {
}
echo "Starting demo from scratch"
-echo " This step creates a subversion repository and imports a new rails app"
+echo " This step creates a subversion code repo and imports a new rails app"
echo " It modifies the Rakefile to load Vlad and creates config/deploy.rb"
echo
pause
@@ -31,7 +31,7 @@ echo "require 'rubygems'
require 'vlad'
Vlad.load" >> Rakefile
-echo "set :repository, 'svn://localhost/blah'
+echo "set :code_repo, 'svn://localhost/blah'
set :domain, 'localhost'
set :deploy_to, '/Users/ryan/demo/website'
set :web_command, 'sudo apachectl'" > config/deploy.rb

1 comment on commit aa070fb

@zenspider

I can’t and won’t pull this back into vlad.

Please sign in to comment.
Something went wrong with that request. Please try again.