Permalink
Browse files

Move requires to `capistrano/all`

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...
1 parent f040f12 commit 447e4ce9506f9de32a3399ef0c78403b7d2281f0 @seenmyfate seenmyfate committed Sep 13, 2013
Showing with 18 additions and 17 deletions.
  1. +1 −1 bin/cap
  2. +0 −15 lib/capistrano.rb
  3. +16 −0 lib/capistrano/all.rb
  4. +1 −1 spec/spec_helper.rb
View
@@ -1,3 +1,3 @@
#!/usr/bin/env ruby
-require 'capistrano'
+require 'capistrano/all'
Capistrano::Application.new.run
View
@@ -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
View
@@ -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
View
@@ -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,

0 comments on commit 447e4ce

Please sign in to comment.