gemfury 0.4.20.beta3 → 0.4.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3abb2ed8257af5fc8e89726130003604cc57330b
-  data.tar.gz: 6f8e7c740deb2457cb7ec9afa801599115511b79
+  metadata.gz: c694aba98d65385ee9ff199b2224633dbea7f805
+  data.tar.gz: 66378125693c7382a484fbe03ace6258ae6dcf1d
 SHA512:
-  metadata.gz: 0c3b16e21dd5b5b14cb77e9a4385106b093685cf19a4453369d5f4f0355bacf2a1c663e9e90ac783f90e1f4dcd6f127d808edf035632ae9ce679a79403bcf5f0
-  data.tar.gz: 23365a7eb73c33902e2371f75dd5154491580abc1d194f6c46c2bc2b13e4afff6fd9a5b5b9ff15326c5572f2cdb48eb4f79d2cafe127cded142a69f4eb5b6d6f
+  metadata.gz: de6a50353915de51c282f5109a2435b2b4c4fc09df9a5624813f5885743477f5fa70391ac456bc19deca1088e16f0fe7aeb34ada1d98a35ca9c5b09e248c4338
+  data.tar.gz: da3c807d72fde4f8020da870bc400c5d304d8d8d12fd94cc97bdc24db95816810f72432677611560e604481a28c774304100f48f4b4a50400472f6cfc305801f

data/lib/gemfury.rb

@@ -1,8 +1,10 @@
+gem "netrc",              "~> 0.7.7"
 gem "multi_json",         "~> 1.0"
 gem "faraday",            ">= 0.7.4", "< 0.9.0.pre"
 gem "faraday_middleware", ">= 0.7",   "< 0.10.0.pre"
 
 require 'cgi'
+require 'netrc'
 require 'multi_json'
 require 'faraday_middleware'
 require 'faraday/request/multipart_with_file'

data/lib/gemfury/command/authorization.rb

@@ -3,9 +3,12 @@ module Gemfury::Command::Authorization
 
   def wipe_credentials!
     FileUtils.rm(config_path, :force => true) # never raises exception
+    netrc_conf.delete(netrc_host)
+    netrc_conf.save
   end
 
   def has_credentials?
+    !!netrc_conf[netrc_host] ||
     read_config_file.key?(:gemfury_api_key)
   end
 
@@ -40,22 +43,32 @@ private
     # Request and save the API access token
     if !email.empty? && !passw.empty?
       @user_api_key = client.get_access_token(email, passw)
-      write_credentials!
+      write_credentials!(email)
     end
   end
 
   def load_credentials!
+    # Get credentials from ~/.netrc
+    email, @user_api_key = netrc_conf[netrc_host]
+    # Legacy loading from ~/.gem/gemfury
     conf = read_config_file
     @user_api_key = conf[:gemfury_api_key] if conf[:gemfury_api_key]
   end
 
-  def write_credentials!
-    config = read_config_file.merge(:gemfury_api_key => @user_api_key)
-    FileUtils.mkdir_p(File.dirname(config_path))
-    File.open(config_path, 'w') { |f| f.write(YAML.dump(config)) }
+  def write_credentials!(email)
+    netrc_conf[netrc_host] = email, @user_api_key
+    netrc_conf.save
   end
 
   def read_config_file
     File.exist?(config_path) ? YAML.load_file(config_path) : {}
   end
+
+  def netrc_conf
+    @netrc ||= Netrc.read
+  end
+
+  def netrc_host
+    URI.parse(client.endpoint).host
+  end
 end

data/lib/gemfury/version.rb

@@ -1,3 +1,3 @@
 module Gemfury
-  VERSION = '0.4.20.beta3'
+  VERSION = '0.4.20'
 end

data/lib/rubygems_plugin.rb

@@ -1,8 +1,2 @@
 require 'rubygems/command_manager'
 Gem::CommandManager.instance.register_command :fury
-
-# Step 1. Check whether ~/.gem/gemfury exists
-
-# Step 2. Check whether api_token is present
-
-# Step 3. Override Gem.sources to include source path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemfury
 version: !ruby/object:Gem::Version
-  version: 0.4.20.beta3
+  version: 0.4.20
 platform: ruby
 authors:
 - Michael Rykov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -44,6 +44,20 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -156,9 +170,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14