oneblackbear-obbistrano 1.0.16 → 1.0.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -94,13 +94,19 @@ Capistrano::Configuration.instance(:must_exist).load do
94
94
  end
95
95
 
96
96
  task :git_deploy do
97
+ logger.level = Capistrano::Logger::IMPORTANT # least verbose
97
98
  begin
98
99
  run "ls #{deploy_to}/.git"
99
100
  rescue
100
- run "git init"
101
- run "git remote add origin #{repository}"
101
+ run "cd #{deploy_to} && git init"
102
+ run "cd #{deploy_to} && git remote add origin #{repository}"
103
+ end
104
+ run "cd #{deploy_to} && git fetch"
105
+ begin
106
+ run "cd #{deploy_to} && git checkout -b #{branch} origin/#{branch}"
107
+ rescue
108
+ "cd #{deploy_to} && git checkout #{branch}"
102
109
  end
103
- run "git pull origin #{branch}"
104
110
  end
105
111
 
106
112
  task :svn_deploy do
@@ -108,6 +114,7 @@ Capistrano::Configuration.instance(:must_exist).load do
108
114
  end
109
115
 
110
116
  task :cms_deploy do
117
+ logger.level = Capistrano::Logger::IMPORTANT # least verbose
111
118
  begin
112
119
  run "ls plugins/cms/.git"
113
120
  rescue
@@ -124,6 +131,7 @@ Capistrano::Configuration.instance(:must_exist).load do
124
131
  end
125
132
 
126
133
  task :php_wax_deploy do
134
+ logger.level = Capistrano::Logger::IMPORTANT # least verbose
127
135
  begin
128
136
  run "ls wax/.git"
129
137
  rescue
data/obbistrano.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = %q{obbistrano}
5
- s.version = "1.0.16"
5
+ s.version = "1.0.17"
6
6
  s.authors = ["Ross Riley", "One Black Bear"]
7
7
  s.date = Time.now
8
8
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oneblackbear-obbistrano
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.16
4
+ version: 1.0.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ross Riley