summaryrefslogtreecommitdiff
path: root/lib/bundler
diff options
context:
space:
mode:
authorAntonio Scandurra <as_cii@hotmail.it>2014-03-21 09:12:35 +0100
committerAntonio Scandurra <as_cii@hotmail.it>2014-03-21 09:35:33 +0100
commit259012d7bdf90e362122122b1f090a8af8070b32 (patch)
treee2ea3eb4177d19576a90ade5708c0fb963bc7844 /lib/bundler
parent4d29adeee6e000e309674ee38ce3c027cec3534d (diff)
downloadbundler-259012d7bdf90e362122122b1f090a8af8070b32.tar.gz
Avoid threequals operator where possible
Diffstat (limited to 'lib/bundler')
-rw-r--r--lib/bundler/definition.rb6
-rw-r--r--lib/bundler/dependency.rb4
-rw-r--r--lib/bundler/dsl.rb2
-rw-r--r--lib/bundler/graph.rb2
-rw-r--r--lib/bundler/index.rb2
-rw-r--r--lib/bundler/parallel_workers/worker.rb2
-rw-r--r--lib/bundler/retry.rb2
-rw-r--r--lib/bundler/setup.rb2
-rw-r--r--lib/bundler/source/git.rb2
-rw-r--r--lib/bundler/source/rubygems.rb2
-rw-r--r--lib/bundler/vendor/net/http/persistent.rb6
-rw-r--r--lib/bundler/vendor/thor/group.rb2
12 files changed, 17 insertions, 17 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 3dfa484593..94a4d6d507 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -438,7 +438,7 @@ module Bundler
end
locals.any? do |source, changed|
- changed || specs_changed?(source) { |o| source.class === o.class && source.uri == o.uri }
+ changed || specs_changed?(source) { |o| source.class == o.class && source.uri == o.uri }
end
end
@@ -455,10 +455,10 @@ module Bundler
changes = false
# Get the Rubygems source from the Gemfile.lock
- locked_gem = @locked_sources.find { |s| Source::Rubygems === s }
+ locked_gem = @locked_sources.find { |s| s.kind_of?(Source::Rubygems) }
# Get the Rubygems source from the Gemfile
- actual_gem = @sources.find { |s| Source::Rubygems === s }
+ actual_gem = @sources.find { |s| s.kind_of?(Source::Rubygems) }
# If there is a Rubygems source in both
if locked_gem && actual_gem
diff --git a/lib/bundler/dependency.rb b/lib/bundler/dependency.rb
index 1b09ed74c5..c0e8f8bf7b 100644
--- a/lib/bundler/dependency.rb
+++ b/lib/bundler/dependency.rb
@@ -67,9 +67,9 @@ module Bundler
def current_env?
return true unless @env
- if Hash === @env
+ if @env.is_a?(Hash)
@env.all? do |key, val|
- ENV[key.to_s] && (String === val ? ENV[key.to_s] == val : ENV[key.to_s] =~ val)
+ ENV[key.to_s] && (val.is_a?(String) ? ENV[key.to_s] == val : ENV[key.to_s] =~ val)
end
else
ENV[@env.to_s]
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index b18125a4ec..5a985a6791 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -74,7 +74,7 @@ module Bundler
raise GemfileError, %{You need to specify gem names as Strings. Use 'gem "#{name.to_s}"' instead.}
end
- options = Hash === args.last ? args.pop.dup : {}
+ options = args.last.is_a?(Hash) ? args.pop.dup : {}
version = args
normalize_options(name, version, options)
diff --git a/lib/bundler/graph.rb b/lib/bundler/graph.rb
index daf4749bef..92f538b9fd 100644
--- a/lib/bundler/graph.rb
+++ b/lib/bundler/graph.rb
@@ -91,7 +91,7 @@ module Bundler
Gem::Dependency.class_eval do
def matching_specs platform_only = false
matches = Bundler.load.specs.select { |spec|
- self.name === spec.name and # TODO: == instead of ===
+ self.name == spec.name and
requirement.satisfied_by? spec.version
}
diff --git a/lib/bundler/index.rb b/lib/bundler/index.rb
index bb35179ce1..493ac8fa52 100644
--- a/lib/bundler/index.rb
+++ b/lib/bundler/index.rb
@@ -182,7 +182,7 @@ module Bundler
end
def spec_satisfies_dependency?(spec, dep)
- return false unless dep.name === spec.name
+ return false unless dep.name == spec.name
dep.requirement.satisfied_by?(spec.version)
end
diff --git a/lib/bundler/parallel_workers/worker.rb b/lib/bundler/parallel_workers/worker.rb
index 89f17915cc..0e101d1c5f 100644
--- a/lib/bundler/parallel_workers/worker.rb
+++ b/lib/bundler/parallel_workers/worker.rb
@@ -32,7 +32,7 @@ module Bundler
# Retrieves results of job function being executed in worker pool
def deq
result = @response_queue.deq
- if WrappedException === result
+ if result.is_a?(WrappedException)
raise result.exception
end
result
diff --git a/lib/bundler/retry.rb b/lib/bundler/retry.rb
index ddcdb2b165..ea4d7577d9 100644
--- a/lib/bundler/retry.rb
+++ b/lib/bundler/retry.rb
@@ -42,7 +42,7 @@ module Bundler
def fail(e)
@failed = true
- raise e if last_attempt? || @exceptions.any?{|k| k === e }
+ raise e if last_attempt? || @exceptions.any?{ |k| e.is_a?(k) }
return true unless name
Bundler.ui.warn "Retrying#{" #{name}" if name} due to error (#{current_run.next}/#{total_runs}): #{e.class} #{e.message}"
end
diff --git a/lib/bundler/setup.rb b/lib/bundler/setup.rb
index d5770977d5..3059975d4e 100644
--- a/lib/bundler/setup.rb
+++ b/lib/bundler/setup.rb
@@ -8,7 +8,7 @@ if Bundler::SharedHelpers.in_bundle?
rescue Bundler::BundlerError => e
puts "\e[31m#{e.message}\e[0m"
puts e.backtrace.join("\n") if ENV["DEBUG"]
- if Bundler::GemNotFound === e
+ if e.is_a?(Bundler::GemNotFound)
puts "\e[33mRun `bundle install` to install missing gems.\e[0m"
end
exit e.status_code
diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb
index 209def7a7d..5919328137 100644
--- a/lib/bundler/source/git.rb
+++ b/lib/bundler/source/git.rb
@@ -47,7 +47,7 @@ module Bundler
end
def eql?(o)
- Git === o &&
+ o.is_a?(Git) &&
uri == o.uri &&
ref == o.ref &&
branch == o.branch &&
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index 5150fdc33c..ab9a5f0389 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -35,7 +35,7 @@ module Bundler
end
def eql?(o)
- Rubygems === o
+ o.is_a?(Rubygems)
end
alias == eql?
diff --git a/lib/bundler/vendor/net/http/persistent.rb b/lib/bundler/vendor/net/http/persistent.rb
index 4db9305914..e2805b1236 100644
--- a/lib/bundler/vendor/net/http/persistent.rb
+++ b/lib/bundler/vendor/net/http/persistent.rb
@@ -241,7 +241,7 @@ class Net::HTTP::Persistent
# NOTE: This may not work on ruby > 1.9.
def self.detect_idle_timeout uri, max = 10
- uri = URI uri unless URI::Generic === uri
+ uri = URI uri unless uri.is_a?(URI::Generic)
uri += '/'
req = Net::HTTP::Head.new uri.request_uri
@@ -257,7 +257,7 @@ class Net::HTTP::Persistent
$stderr.puts "HEAD #{uri} => #{response.code}" if $DEBUG
- unless Net::HTTPOK === response then
+ unless response.is_a?(Net::HTTPOK) then
raise Error, "bad response code #{response.code} detecting idle timeout"
end
@@ -1065,7 +1065,7 @@ class Net::HTTP::Persistent
# Returns the request.
def request_setup req_or_uri # :nodoc:
- req = if URI === req_or_uri then
+ req = if req_or_uri.is_a?(URI) then
Net::HTTP::Get.new req_or_uri.request_uri
else
req_or_uri
diff --git a/lib/bundler/vendor/thor/group.rb b/lib/bundler/vendor/thor/group.rb
index 00614bdd03..231f8b1a05 100644
--- a/lib/bundler/vendor/thor/group.rb
+++ b/lib/bundler/vendor/thor/group.rb
@@ -125,7 +125,7 @@ class Thor::Group # rubocop:disable ClassLength
return unless options[#{name.inspect}]
value = options[#{name.inspect}]
- value = #{name.inspect} if TrueClass === value
+ value = #{name.inspect} if value.is_a?(TrueClass)
klass, command = self.class.prepare_for_invocation(#{name.inspect}, value)
if klass