gemfury 0.5.0.beta1 → 0.5.0.beta3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGE5MzY5NTE3MGFhMjRiMzhjNDk3MzY2MmFiZTZiMTM4OGEzZDkzZA==
+    Mzg2MzBkYmE1NzI0OGIwMjY1NWZhNTMzYjk2MDIxNDk2NWI5Nzc3MA==
   data.tar.gz: !binary |-
-    ZDg3MWFmZTA2MTViOGYwNTllZjRhZmY5YWViNWVjMTcwOThlNTdmZA==
+    YTllNGYyM2EzMDFiMjg0OGU4YzI5ZjU0YzFhNDFjMDY2MjJmYjkwOQ==
 SHA512:
   metadata.gz: !binary |-
-    NjU4NTU0ZDExMjgyZjllY2FjZGViNmUzM2FiMzc4N2NlODQ4MGY4YzYwMGEy
-    OGM2NGRkMDQyZWNhNzY3ZTFiYzJiZmZjZDAzYzE5Y2Q5MTNmNTIxNGNmOTJm
-    MWNkMWVjYTQ3Y2RiZGQzMjFkMTNmOGNhYTZjNWU2YmVlYmUxMDA=
+    NjY2Mzc1OTc0ZjQ1MWIzYjJhMGQ2ZDkxMmE2ODkyYjQyMmIwZjc0ZjZiMDMz
+    NzdlNzQ1OGE3M2E1ZjJiYjJmNTJkN2E4ODM2NTlmNjdlYjRiMDQ2ZDgyYzdk
+    MWU1ODY1OTdiMTM0YTIzMTdhOGI4YWMxM2RlNmI1ZGNhNTMxMTY=
   data.tar.gz: !binary |-
-    MWM2OTk4M2I2YjE3Y2QxNjNjMzJlMzA5OTE4NTc0Y2RiODNhYWRkMmZiYmM4
-    YmQzMzUxMzRhM2ZjZjcyMGY1NmQ2N2Q0MDBjNTQ3MTA1MzhiNTA3ODRlNWE2
-    OTRhODA0NWNiZjdhMDJiYjg2ZDk0NTZjYzRlNzU5MGE2OTI3N2Y=
+    YjUwNDQyMjA1ZTVlZjcwNjc4NzY0NGY4NzEzM2UwYmM4ODY0MTE0MzIzYjZh
+    MzdhMWFiZjVhY2Q5YTc1MDM2ZDg3ZjE4NTBhZWRmYWM4YWM5ZmJmZWUxNWU2
+    YjUyMjc3YTA5M2U0ZDQ1ZDgwOWM5ZTA5N2M0OWM2ZjliN2RkZmQ=

data/lib/gemfury.rb

@@ -1,6 +1,6 @@
-gem "netrc",              "~> 0.7.7"
-gem "multi_json",         "~> 1.0"
+gem "multi_json",         "~> 1.10"
 gem "faraday",            ">= 0.9.0", "< 0.10.0.pre"
+gem "netrc",              "~> 0.10.0"
 
 require 'cgi'
 require 'uri'
@@ -29,7 +29,7 @@ module Gemfury
       Gemfury::Client.new(options)
     end
 
-    # Delegate to Twitter::Client
+    # Delegate to Gemfury::Client
     def method_missing(method, *args, &block)
       return super unless new.respond_to?(method)
       new.send(method, *args, &block)

data/lib/gemfury/client.rb

@@ -23,8 +23,7 @@ module Gemfury
       ensure_ready!(:authorization)
 
       # Generate upload link
-      headers = { :accept => "application/vnd.fury.v2+json" }
-      api2 = connection(:headers => headers)
+      api2 = connection(:api_version => 2)
       response = api2.post('uploads')
       checked_response_body(response)
 
@@ -123,14 +122,20 @@ module Gemfury
     end
 
     def connection(options = {})
+      # The 'Accept' HTTP header for API versioning
+      http_accept = begin
+        v = options.delete(:api_version) || self.api_version
+        "application/vnd.fury.v#{v.to_i}+json"
+      end
+
+      # Faraday client options
       options = {
         :url => self.endpoint,
-        :ssl => { :verify => false },
         :params => {},
         :headers => {
-          :user_agent => user_agent,
+          :accept => http_accept,
+          :user_agent => self.user_agent,
           :x_gem_version => Gemfury::VERSION,
-          :accept => self.http_accept || 'application/json',
         }.merge(options.delete(:headers) || {})
       }.merge(options)
 
@@ -161,6 +166,7 @@ module Gemfury
         when 401 then Gemfury::Unauthorized
         when 403 then Gemfury::Forbidden
         when 404 then Gemfury::NotFound
+        when 409 then Gemfury::Conflict
         when 503 then Gemfury::TimeoutError
         when 400
           case error['type']

data/lib/gemfury/command/app.rb

@@ -4,6 +4,7 @@ class Gemfury::Command::App < Thor
 
   # Impersonation
   class_option :as, :desc => 'Access an account other than your own'
+  class_option :api_token, :desc => 'API token to use for commands'
 
   map "-v" => :version
   desc "version", "Show Gemfury version", :hide => true
@@ -11,18 +12,7 @@ class Gemfury::Command::App < Thor
     shell.say Gemfury::VERSION
   end
 
-  desc "whoami", "Show current user"
-  def whoami
-    if !has_credentials?
-      shell.say %Q(You are not logged in), :green
-    else
-      with_checks_and_rescues do
-        me = client.account_info['username']
-        shell.say %Q(You are logged in as "#{me}"), :green
-      end
-    end
-  end
-
+  ### PACKAGE MANAGEMENT ###
   desc "push FILE", "Upload a new version of a package"
   def push(*gems)
     with_checks_and_rescues do
@@ -64,6 +54,7 @@ class Gemfury::Command::App < Thor
     end
   end
 
+  ### AUTHENTICATION ###
   desc "logout", "Remove Gemfury credentials"
   def logout
     if !has_credentials?
@@ -74,6 +65,21 @@ class Gemfury::Command::App < Thor
     end
   end
 
+  desc "login", "Populate Gemfury credentials"
+  def login
+    with_checks_and_rescues do
+      me = client.account_info['name']
+      shell.say %Q(You are logged in as "#{me}"), :green
+    end
+  end
+
+  desc "whoami", "Show current user"
+  def whoami
+    has_credentials? ? self.login : begin
+      shell.say %Q(You are not logged in), :green
+    end
+  end
+
   ### COLLABORATION MANAGEMENT ###
   map "sharing:add" => 'sharing_add'
   map "sharing:remove" => 'sharing_remove'
@@ -167,6 +173,7 @@ private
   end
 
   def with_checks_and_rescues(&block)
+    @user_api_key = options[:api_token] if options[:api_token]
     with_authorization(&block)
   rescue Gemfury::InvalidGemVersion => e
     shell.say "You have a deprecated Gemfury client", :red
@@ -175,6 +182,8 @@ private
     else
       shell.say %q(No problem. You can also run "gem update gemfury")
     end
+  rescue Gemfury::Conflict => e
+    die!("Oops! Locked for another user. Try again later.", e)
   rescue Gemfury::Forbidden => e
     die!("Oops! You're not allowed to access this", e)
   rescue Gemfury::NotFound => e

data/lib/gemfury/command/authorization.rb

@@ -3,19 +3,19 @@ module Gemfury::Command::Authorization
 
   def wipe_credentials!
     FileUtils.rm(config_path, :force => true) # never raises exception
-    netrc_conf.delete(netrc_host)
+    each_netrc_host { |h| netrc_conf.delete(h) }
     netrc_conf.save
   end
 
   def has_credentials?
-    !!netrc_conf[netrc_host] ||
+    !!netrc_conf[netrc_api_host] ||
     read_config_file.key?(:gemfury_api_key)
   end
 
 private
   def with_authorization(&block)
-    # Load up the credentials
-    load_credentials!
+    # Load up the credentials if user_api_key is not already set
+    load_credentials! if @user_api_key.nil?
 
     # Attempt the operation and prompt user in case of
     # lack of authorization or a 401 response from the server
@@ -49,14 +49,13 @@ private
 
   def load_credentials!
     # Get credentials from ~/.netrc
-    email, @user_api_key = netrc_conf[netrc_host]
+    email, @user_api_key = netrc_conf[netrc_api_host]
     # Legacy loading from ~/.gem/gemfury
-    conf = read_config_file
-    @user_api_key = conf[:gemfury_api_key] if conf[:gemfury_api_key]
+    @user_api_key ||= read_config_file[:gemfury_api_key]
   end
 
   def write_credentials!(email)
-    netrc_conf[netrc_host] = email, @user_api_key
+    each_netrc_host { |h| netrc_conf[h] = email, @user_api_key }
     netrc_conf.save
   end
 
@@ -68,7 +67,13 @@ private
     @netrc ||= Netrc.read
   end
 
-  def netrc_host
+  def netrc_api_host
     URI.parse(client.endpoint).host
   end
+
+  def each_netrc_host
+    [:endpoint, :gitpoint].each do |c|
+      yield(URI.parse(client.send(c)).host)
+    end
+  end
 end

data/lib/gemfury/configuration.rb

@@ -6,8 +6,9 @@ module Gemfury
       :user_api_key,
       :adapter,
       :endpoint,
+      :gitpoint,
       :user_agent,
-      :http_accept,
+      :api_version,
       :account].freeze
 
     # The adapter that will be used to connect if none is set
@@ -16,11 +17,14 @@ module Gemfury
     # The endpoint that will be used to connect if none is set
     DEFAULT_ENDPOINT  = 'https://api.fury.io/'.freeze
 
+    # The HTTP endpoint for git repo (used for .netrc credentials)
+    DEFAULT_GITPOINT  = 'https://git.fury.io/'.freeze
+
     # The value sent in the 'User-Agent' header if none is set
     DEFAULT_USER_AGENT = "Gemfury RubyGem #{Gemfury::VERSION}".freeze
 
-    # The value sent in the 'Accept' header for versioning
-    DEFAULT_HTTP_ACCEPT = "application/vnd.fury.v1+json".freeze
+    # Default API version
+    DEFAULT_API_VERSION = 1
 
     # Default user API key
     DEFAULT_API_KEY = nil
@@ -53,8 +57,9 @@ module Gemfury
       self.user_api_key       = DEFAULT_API_KEY
       self.adapter            = DEFAULT_ADAPTER
       self.endpoint           = DEFAULT_ENDPOINT
+      self.gitpoint           = DEFAULT_GITPOINT
       self.user_agent         = DEFAULT_USER_AGENT
-      self.http_accept        = DEFAULT_HTTP_ACCEPT
+      self.api_version        = DEFAULT_API_VERSION
       self.account            = DEFAULT_ACCOUNT
       self
     end

data/lib/gemfury/error.rb

@@ -11,6 +11,9 @@ module Gemfury
   # Client is not allowed to perform this operation
   Forbidden = Class.new(Error)
 
+  # Account is locked for another operation
+  Conflict = Class.new(Error)
+
   # Returned if something is not found
   NotFound = Class.new(Error)
 

data/lib/gemfury/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemfury
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta1
+  version: 0.5.0.beta3
 platform: ruby
 authors:
 - Michael Rykov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Cloud Gem Server for your private RubyGems