archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 21:14:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* lib/rubygems: Update to RubyGems master 50a8210. Important changes

Browse source 
in this commit:

  RubyGems now automatically checks for gem.deps.rb or Gemfile when
  running ruby executables.  This behavior is similar to `bundle exec
  rake`.  This change may be reverted before Ruby 2.1.0 if too many bugs
  are found.

* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43767 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2013-11-21 23:27:30 +00:00
parent b1529a30e0
commit 5307d803f5
30 changed files with 714 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/rubygems/request_set/gem_dependency_api.rb
View file

@ -115,7 +115,7 @@ class Gem::RequestSet::GemDependencyAPI
##
# A Hash containing gem names and files to require from those gems.
attr_reader :requires
attr_reader :requires # :nodoc:
##
# A set of gems that are loaded via the +:path+ option to #gem
@ -125,7 +125,7 @@ class Gem::RequestSet::GemDependencyAPI
##
# The groups of gems to exclude from installation
attr_accessor :without_groups
attr_accessor :without_groups # :nodoc:
##
# Creates a new GemDependencyAPI that will add dependencies to the
@ -282,6 +282,8 @@ class Gem::RequestSet::GemDependencyAPI
true
end
private :gem_github
##
# Handles the :group and :groups +options+ for the gem with the given
# +name+.
@ -361,7 +363,7 @@ class Gem::RequestSet::GemDependencyAPI
def gem_requires name, options # :nodoc:
if options.include? :require then
if requires = options.delete(:require) then
@requires[name].concat requires
@requires[name].concat Array requires
end
else
@requires[name] << name
@ -370,6 +372,11 @@ class Gem::RequestSet::GemDependencyAPI
private :gem_requires
##
# :category: Gem Dependencies DSL
#
# Block form for specifying gems from a git +repository+.
def git repository
@current_repository = repository
@ -424,6 +431,8 @@ class Gem::RequestSet::GemDependencyAPI
##
# :category: Gem Dependencies DSL
#
# Block form for restricting gems to a particular platform.
def platform what
@current_platform = what
@ -436,6 +445,8 @@ class Gem::RequestSet::GemDependencyAPI
##
# :category: Gem Dependencies DSL
#
# Block form for restricting gems to a particular platform.
alias :platforms :platform