diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-21 23:27:30 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-21 23:27:30 +0000 |
| commit | 5307d803f5cce7b14a6afd1d51f6d53ec85ca87d (patch) | |
| tree | aac2997a9ff000fbf2f1f9f27077bb7b2403f2c9 /lib/rubygems/request_set | |
| parent | b1529a30e08040b717adef8ac1fa8be1c060e7e1 (diff) | |
| download | ruby-5307d803f5cce7b14a6afd1d51f6d53ec85ca87d.tar.gz | |
* lib/rubygems: Update to RubyGems master 50a8210. Important changes
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
Diffstat (limited to 'lib/rubygems/request_set')
| -rw-r--r-- | lib/rubygems/request_set/gem_dependency_api.rb | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/rubygems/request_set/gem_dependency_api.rb b/lib/rubygems/request_set/gem_dependency_api.rb index 8e29eb87e5..0c27b1a61a 100644 --- a/lib/rubygems/request_set/gem_dependency_api.rb +++ b/lib/rubygems/request_set/gem_dependency_api.rb @@ -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 |