Skip to content

Commit

Permalink
Move requires to capistrano/all
Browse files Browse the repository at this point in the history
This removes the need to set `require: false` in your Gemfile. Should
prevent the issues described in #582 reoccurring.

(also capistrano/rails#15)
  • Loading branch information
mikejohn857 committed Sep 13, 2013
1 parent cf5b466 commit 06755ff
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion bin/cap
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env ruby
require 'capistrano'
require 'capistrano/all'
Capistrano::Application.new.run
15 changes: 0 additions & 15 deletions lib/capistrano.rb
Original file line number Diff line number Diff line change
@@ -1,15 +0,0 @@
require 'rake'
require 'sshkit'
require 'sshkit/dsl'

Rake.application.options.trace = true

require 'capistrano/version'
require 'capistrano/version_validator'
require 'capistrano/i18n'
require 'capistrano/dsl'
require 'capistrano/application'
require 'capistrano/configuration'

module Capistrano
end
16 changes: 16 additions & 0 deletions lib/capistrano/all.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
require 'rake'
require 'sshkit'
require 'sshkit/dsl'

Rake.application.options.trace = true

require 'capistrano/version'
require 'capistrano/version_validator'
require 'capistrano/i18n'
require 'capistrano/dsl'
require 'capistrano/application'
require 'capistrano/configuration'

module Capistrano

end
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
$LOAD_PATH.unshift(File.dirname(__FILE__))
require 'capistrano/all'
require 'rspec'
require 'capistrano'
require 'mocha/api'

# Requires supporting files with custom matchers and macros, etc,
Expand Down

0 comments on commit 06755ff

Please sign in to comment.