Skip to content

Commit

Permalink
Migrate to capistrano 3
Browse files Browse the repository at this point in the history
  • Loading branch information
zzet committed Jun 23, 2014
1 parent 2b5670f commit 052a69e
Show file tree
Hide file tree
Showing 6 changed files with 200 additions and 164 deletions.
26 changes: 7 additions & 19 deletions Capfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
# Load DSL and Setup Up Stages
require 'capistrano/version'
load 'deploy'
require 'capistrano/setup'
require 'capistrano/deploy'

require 'bundler/capistrano'
require 'capistrano/bundler'
require 'capistrano/rails/assets'
require 'capistrano/rails/migrations'
require 'airbrake/capistrano3'

require 'capistrano/ext/multistage'

require 'undev/capistrano'

# Maintance page with deploy
require 'capistrano/maintenance'

# Uncomment if you will use Airbrake notifications
require 'airbrake/capistrano'

Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }

load 'deploy' if respond_to?(:namespace) # cap2 differentiator
load 'deploy/assets'
load 'config/deploy' # remove this line to skip loading any of the default tasks
Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
27 changes: 17 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ gem "gitlab-linguist", "~> 3.0.0", require: "linguist"
# API
gem "grape", "~> 0.6.1"
# Replace with rubygems when nesteted entities get released
gem "grape-entity", "~> 0.4.1", ref: 'd904381c951e86250c3f44213b349a3dd8e83fb1', git: 'https://github.com/intridea/grape-entity.git'
gem "grape-entity", "~> 0.4.1", ref: 'd904381c951e86250c3f44213b349a3dd8e83fb1', git: 'https://github.com/intridea/grape-entity.git'
gem 'rack-cors', require: 'rack/cors'

# Email validation
Expand All @@ -81,7 +81,7 @@ gem "haml-rails"
gem "carrierwave"

# for aws storage
gem "fog", "~> 1.3.1", group: :aws
#gem "fog" #, "~> 1.3.1", group: :aws

# Authorization
gem "six"
Expand All @@ -90,8 +90,11 @@ gem "six"
gem "seed-fu"

# Markdown to HTML
gem "redcarpet", "~> 2.2.2"
gem "github-markup", "~> 0.7.4", require: 'github/markup', git: 'https://github.com/gitlabhq/markup.git', ref: '61ade389c1e1c159359338f570d18464a44ddbc4'
gem "redcarpet", "~> 2.2.2"
gem "github-markup", "~> 0.7.4",
require: 'github/markup',
github: 'gitlabhq/markup',
ref: '61ade389c1e1c159359338f570d18464a44ddbc4'

# Diffs
gem "diffy"
Expand Down Expand Up @@ -212,15 +215,19 @@ end

group :undev do
# Deploy with Capistrano
gem "capi"
gem 'capistrano'
gem 'capistrano-ext'
gem 'capistrano-maintenance'
#gem "capi"
gem 'capistrano', '~> 3.2.0'
gem 'capistrano-bundler'
gem 'capistrano-rails'

gem 'undev', '>=0.2.1'
#gem 'capistrano'
#gem 'capistrano-ext'
#gem 'capistrano-maintenance'

#gem 'undev', '>=0.2.1'
end

gem 'airbrake'
gem 'airbrake', '~> 3.1.16'
gem 'newrelic_rpm'

gem 'rb-inotify', require: linux_only('rb-inotify')
Expand Down
74 changes: 26 additions & 48 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ GIT
specs:
elasticsearch-rails (0.1.0.rc1)

GIT
remote: git://github.com/gitlabhq/markup.git
revision: 61ade389c1e1c159359338f570d18464a44ddbc4
ref: 61ade389c1e1c159359338f570d18464a44ddbc4
specs:
github-markup (0.7.6)

GIT
remote: git://github.com/libgit2/rugged.git
revision: 0ac443721f775d2402f376e9974967b147a8f44b
Expand Down Expand Up @@ -45,13 +52,6 @@ GIT
gitlab-linguist (> 2.9.0)
rugged (~> 0.19.0)

GIT
remote: https://github.com/gitlabhq/markup.git
revision: 61ade389c1e1c159359338f570d18464a44ddbc4
ref: 61ade389c1e1c159359338f570d18464a44ddbc4
specs:
github-markup (0.7.6)

GIT
remote: https://github.com/intridea/grape-entity.git
revision: d904381c951e86250c3f44213b349a3dd8e83fb1
Expand Down Expand Up @@ -122,18 +122,16 @@ GEM
bootstrap-sass (3.0.3.0)
sass (~> 3.2)
builder (3.1.4)
capi (0.1.1)
capistrano
capistrano (2.15.4)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
capistrano-ext (1.2.1)
capistrano (>= 1.0.0)
capistrano-maintenance (0.0.3)
capistrano (>= 2.0.0)
capistrano (3.2.1)
i18n
rake (>= 10.0.0)
sshkit (~> 1.3)
capistrano-bundler (1.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capistrano-rails (1.1.1)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand Down Expand Up @@ -223,7 +221,6 @@ GEM
erubis (2.7.0)
escape_utils (0.2.4)
eventmachine (1.0.3)
excon (0.13.4)
execjs (2.0.2)
factory_girl (4.3.0)
activesupport (>= 3.0.0)
Expand All @@ -247,16 +244,6 @@ GEM
websocket-driver (>= 0.3.0)
ffaker (1.22.1)
ffi (1.9.3)
fog (1.3.1)
builder
excon (~> 0.13.0)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
net-scp (~> 1.0.4)
net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0)
ruby-hmac
font-awesome-rails (3.2.1.3)
railties (>= 3.2, < 5.0)
foreman (0.63.0)
Expand Down Expand Up @@ -337,7 +324,6 @@ GEM
haml (>= 3.1, < 5.0)
railties (~> 4.0.0)
hashie (2.0.5)
highline (1.6.19)
hike (1.2.3)
hipchat (0.14.0)
httparty
Expand Down Expand Up @@ -397,13 +383,9 @@ GEM
multi_xml (0.5.5)
multipart-post (1.2.0)
net-ldap (0.3.1)
net-scp (1.0.4)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.7.0)
net-ssh-gateway (1.2.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
newrelic_rpm (3.6.6.147)
nokogiri (1.5.10)
nprogress-rails (0.1.2.3)
Expand Down Expand Up @@ -549,7 +531,6 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
ruby-hmac (0.4.0)
ruby-progressbar (1.2.0)
rubyntlm (0.1.1)
safe_yaml (0.9.7)
Expand Down Expand Up @@ -616,6 +597,10 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sshkit (1.5.1)
colorize
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
stamp (0.5.0)
state_machine (1.2.0)
stringex (1.5.1)
Expand Down Expand Up @@ -660,10 +645,6 @@ GEM
execjs (>= 0.3.0)
json (>= 1.8.0)
underscore-rails (1.4.4)
undev (0.2.2)
capistrano
rake
thor
unicorn (4.6.3)
kgio (~> 2.6)
rack
Expand Down Expand Up @@ -703,10 +684,9 @@ DEPENDENCIES
better_errors
binding_of_caller
bootstrap-sass (~> 3.0)
capi
capistrano
capistrano-ext
capistrano-maintenance
capistrano (~> 3.2.0)
capistrano-bundler
capistrano-rails
capybara
carrierwave
closure_tree
Expand All @@ -727,7 +707,6 @@ DEPENDENCIES
enumerize
factory_girl_rails
ffaker
fog (~> 1.3.1)
font-awesome-rails (~> 3.2)
foreman
gemnasium-gitlab-service (~> 0.2)
Expand Down Expand Up @@ -818,7 +797,6 @@ DEPENDENCIES
turbolinks
uglifier
underscore-rails (~> 1.4.4)
undev (>= 0.2.1)
unicorn (~> 4.6.3)
unicorn-worker-killer
version_sorter
Expand Down
Loading

0 comments on commit 052a69e

Please sign in to comment.