diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-21 10:20:47 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-21 10:20:47 +0000 |
| commit | 5335ce0e060c7a2a0b01c57f8f8a64254f2658e1 (patch) | |
| tree | c63321cb7c7c5c15454a79d81123c7188be2c51e /lib/rubygems/exceptions.rb | |
| parent | 2f023c5dbaadede9ceac3eb9ac0e73f3050e5ada (diff) | |
| download | ruby-5335ce0e060c7a2a0b01c57f8f8a64254f2658e1.tar.gz | |
Merge master branch from rubygems/rubygems upstream.
* Enable Style/MethodDefParentheses in Rubocop
https://github.com/rubygems/rubygems/pull/2478
* Enable Style/MultilineIfThen in Rubocop
https://github.com/rubygems/rubygems/pull/2479
* Fix required_ruby_version with prereleases and improve error message
https://github.com/rubygems/rubygems/pull/2344
* Fix bundler rubygems binstub not properly looking for bundler
https://github.com/rubygems/rubygems/pull/2426
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/exceptions.rb')
| -rw-r--r-- | lib/rubygems/exceptions.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rubygems/exceptions.rb b/lib/rubygems/exceptions.rb index 5999bc2a0d..a387cd390f 100644 --- a/lib/rubygems/exceptions.rb +++ b/lib/rubygems/exceptions.rb @@ -36,7 +36,7 @@ class Gem::DependencyResolutionError < Gem::DependencyError attr_reader :conflict - def initialize conflict + def initialize(conflict) @conflict = conflict a, b = conflicting_dependencies @@ -77,7 +77,7 @@ class Gem::FilePermissionError < Gem::Exception attr_reader :directory - def initialize directory + def initialize(directory) @directory = directory super "You don't have write permissions for the #{directory} directory." @@ -137,7 +137,7 @@ class Gem::ImpossibleDependenciesError < Gem::Exception attr_reader :conflicts attr_reader :request - def initialize request, conflicts + def initialize(request, conflicts) @request = request @conflicts = conflicts @@ -249,7 +249,7 @@ class Gem::UnsatisfiableDependencyError < Gem::DependencyError # Creates a new UnsatisfiableDependencyError for the unsatisfiable # Gem::Resolver::DependencyRequest +dep+ - def initialize dep, platform_mismatch=nil + def initialize(dep, platform_mismatch=nil) if platform_mismatch and !platform_mismatch.empty? plats = platform_mismatch.map { |x| x.platform.to_s }.sort.uniq super "Unable to resolve dependency: No match for '#{dep}' on this platform. Found: #{plats.join(', ')}" |