diff options
| -rw-r--r-- | lib/bundler/cli.rb | 4 | ||||
| -rw-r--r-- | lib/bundler/cli/common.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/shared_helpers.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/source/git/git_proxy.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/templates/Executable.bundler | 2 | ||||
| -rw-r--r-- | lib/bundler/ui/shell.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/command.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/platform.rb | 4 | ||||
| -rw-r--r-- | lib/rubygems/source/git.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/util.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/helper.rb | 2 |
11 files changed, 13 insertions, 13 deletions
@@ -127,8 +127,8 @@ module Bundler if man_pages.include?(command) man_page = man_pages[command] - if Bundler.which("man") && man_path !~ %r{^file:/.+!/META-INF/jruby.home/.+} - Kernel.exec "man #{man_page}" else puts File.read("#{man_path}/#{File.basename(man_page)}.ronn") end @@ -54,7 +54,7 @@ module Bundler Bundler.definition.specs.each do |spec| return spec if spec.name == name - specs << spec if regexp && spec.name =~ regexp end default_spec = default_gem_spec(name) @@ -329,7 +329,7 @@ module Bundler def set_rubyopt rubyopt = [ENV["RUBYOPT"]].compact setup_require = "-r#{File.expand_path("setup", __dir__)}" - return if !rubyopt.empty? && rubyopt.first =~ /#{Regexp.escape(setup_require)}/ rubyopt.unshift setup_require Bundler::SharedHelpers.set_env "RUBYOPT", rubyopt.join(" ") end @@ -87,7 +87,7 @@ module Bundler def contains?(commit) allowed_with_path do result, status = git_null("branch", "--contains", commit, dir: path) - status.success? && result =~ /^\* (.*)$/ end end @@ -27,7 +27,7 @@ m = Module.new do bundler_version = nil update_index = nil ARGV.each_with_index do |a, i| - if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN bundler_version = a end next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ @@ -130,7 +130,7 @@ module Bundler def tell_err(message, color = nil, newline = nil) return if @shell.send(:stderr).closed? - newline ||= message.to_s !~ /( |\t)\Z/ message = word_wrap(message) if newline.is_a?(Hash) && newline[:wrap] color = nil if color && !$stderr.tty? @@ -190,7 +190,7 @@ class Gem::Command "Please specify at least one gem name (e.g. gem build GEMNAME)" end - args.select {|arg| arg !~ /^-/ } end ## @@ -89,7 +89,7 @@ class Gem::Platform when String then arch = arch.split "-" - if arch.length > 2 && arch.last !~ /\d+(\.\d+)?$/ # reassemble x86-linux-{libc} extra = arch.pop arch.last << "-#{extra}" end @@ -101,7 +101,7 @@ class Gem::Platform else cpu end - if arch.length == 2 && arch.last =~ /^\d+(\.\d+)?$/ # for command-line @os, @version = arch return end @@ -227,7 +227,7 @@ class Gem::Source::Git < Gem::Source require_relative "../openssl" normalized = - if @repository =~ %r{^\w+://(\w+@)?} uri = URI(@repository).normalize.to_s.sub %r{/$},"" uri.sub(/\A(\w+)/) { $1.downcase } else @@ -109,7 +109,7 @@ module Gem::Util # comes with a leading slash. def self.correct_for_windows_path(path) - if path[0].chr == "/" && path[1].chr =~ /[a-z]/i && path[2].chr == ":" path[1..-1] else path @@ -582,7 +582,7 @@ class Gem::TestCase < Test::Unit::TestCase end def in_path?(executable) # :nodoc: - return true if %r{\A([A-Z]:|/)} =~ executable && File.exist?(executable) ENV["PATH"].split(File::PATH_SEPARATOR).any? do |directory| File.exist? File.join directory, executable |