Skip to content

Bugfixes #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexspeller wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bugfixes #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76998dd
fix namespace issue
alexspeller Jun 10, 2011
27a3589
Fix bug with private method being called
alexspeller Jun 9, 2011
1f2b6b1
Deployer shouldn't do a local query with mercurial eiter
alexspeller Jun 10, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion config/initializers/capistrano_namespace_rake_fix.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# see http://groups.google.com/group/capistrano/browse_thread/thread/b5e11c0ebf37a8be
Capistrano::Configuration::Namespaces::Namespace.class_eval { undef :symlink }
Capistrano::Configuration::Namespaces::Namespace.class_eval do
undef :symlink
undef :install
end
10 changes: 7 additions & 3 deletions lib/webistrano/deployer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def initialize(deployment)

@deployment = deployment

if(@deployment.task && !@deployment.new_record?)
if(@deployment.send(:task) && !@deployment.new_record?)
# a read deployment
@logger = Webistrano::Logger.new(deployment)
@logger.level = Webistrano::Logger::TRACE
Expand Down Expand Up @@ -63,8 +63,12 @@ def execute!
set_webistrano_logger(config)

set_up_config(config)

exchange_real_revision(config) unless (config.fetch(:scm).to_s == 'git') # git cannot do a local query by default

# git and mercurial cannot do a local query by default
unless %w(git mercurial).include? config.fetch(:scm).to_s
exchange_real_revision(config)
end

save_revision(config)
save_pid

Expand Down