aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler/dsl.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/bundler/dsl.rb')
-rw-r--r--lib/bundler/dsl.rb16
1 files changed, 2 insertions, 14 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index c4e59f30..e2853e08 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -152,18 +152,6 @@ module Bundler
with_source(@sources.add_git_source(normalize_hash(options).merge("github" => repo)), &blk)
end
- def svn(uri, options = {}, source_options = {}, &blk)
- unless block_given?
- msg = "You can no longer specify a svn source by itself. Instead, \n" \
- "either use the :svn option on a gem, or specify the gems that \n" \
- "bundler should find in the svn source by passing a block to \n" \
- "the svn method."
- raise DeprecatedError, msg
- end
-
- with_source(@sources.add_svn_source(normalize_hash(options).merge("uri" => uri)), &blk)
- end
-
def to_definition(lockfile, unlock)
Definition.new(lockfile, @dependencies, @sources, unlock, @ruby_version)
end
@@ -231,7 +219,7 @@ module Bundler
end
def valid_keys
- @valid_keys ||= %w(group groups git svn path name branch ref tag require submodules platform platforms type source)
+ @valid_keys ||= %w(group groups git path name branch ref tag require submodules platform platforms type source)
end
def normalize_options(name, version, opts)
@@ -284,7 +272,7 @@ module Bundler
opts["git"] = @git_sources[git_name].call(opts[git_name])
end
- ["git", "path", "svn"].each do |type|
+ ["git", "path"].each do |type|
if param = opts[type]
if version.first && version.first =~ /^\s*=?\s*(\d[^\s]*)\s*$/
options = opts.merge("name" => name, "version" => $1)