diff options
| author | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-01 03:45:05 +0000 |
|---|---|---|
| committer | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-01 03:45:05 +0000 |
| commit | d22130922e7842226d38d59680e4bbb48a28a5f0 () | |
| tree | 39594d3a14641dd5488a99a5e633239296fa5742 /lib/rubygems/config_file.rb | |
| parent | 4752539e3f3e563d559732c52424206bd6f12dbd (diff) | |
Import rubygems 1.8.5 (released @ 137c80f)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/rubygems/config_file.rb | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -207,11 +207,15 @@ class Gem::ConfigFile # Location of RubyGems.org credentials def credentials_path - File.join(Gem.user_home, '.gem', 'credentials') end def load_api_keys - @api_keys = File.exists?(credentials_path) ? load_file(credentials_path) : @hash if @api_keys.key? :rubygems_api_key then @rubygems_api_key = @api_keys[:rubygems_api_key] @api_keys[:rubygems] = @api_keys.delete :rubygems_api_key unless @api_keys.key? :rubygems @@ -221,8 +225,8 @@ class Gem::ConfigFile def rubygems_api_key=(api_key) config = load_file(credentials_path).merge(:rubygems_api_key => api_key) - dirname = File.dirname(credentials_path) - Dir.mkdir(dirname) unless File.exists?(dirname) Gem.load_yaml @@ -236,7 +240,7 @@ class Gem::ConfigFile def load_file(filename) Gem.load_yaml - return {} unless filename and File.exists?(filename) begin YAML.load(File.read(filename)) rescue ArgumentError @@ -360,6 +364,4 @@ class Gem::ConfigFile protected attr_reader :hash - end - |