gemfury 0.3.2 → 0.4.0.beta1

data/lib/gemfury/client.rb

@@ -11,17 +11,12 @@ module Gemfury
       end
     end
 
-    # Verify gem version
-    def check_version
-      response = connection.get('status/version')
+    # Get the information for the current account
+    def account_info
+      ensure_ready!(:authorization)
+      response = connection.get('users/me')
       ensure_successful_response!(response)
-
-      current = Gem::Version.new(Gemfury::VERSION)
-      latest = Gem::Version.new(response.body['version'])
-
-      unless latest.eql?(current)
-        raise InvalidGemVersion.new('Please update your gem')
-      end
+      response.body
     end
 
     # Uploading a gem file
@@ -69,6 +64,28 @@ module Gemfury
       response.body['access_token']
     end
 
+    # List collaborators for this account
+    def list_collaborators(options = {})
+      ensure_ready!(:authorization)
+      response = connection.get('collaborators', options)
+      ensure_successful_response!(response)
+      response.body
+    end
+
+    # Add a collaborator to the account
+    def add_collaborator(login, options = {})
+      ensure_ready!(:authorization)
+      response = connection.put("collaborators/#{login}", options)
+      ensure_successful_response!(response)
+    end
+
+    # Remove a collaborator to the account
+    def remove_collaborator(login, options = {})
+      ensure_ready!(:authorization)
+      response = connection.delete("collaborators/#{login}", options)
+      ensure_successful_response!(response)
+    end
+
   private
     def connection(options = {})
       options = {
@@ -85,6 +102,10 @@ module Gemfury
         options[:headers][:authorization] = self.user_api_key
       end
 
+      if self.account
+        options[:params] = { :as => self.account }
+      end
+
       Faraday.new(options) do |builder|
         builder.use Faraday::Request::MultipartWithFile
         builder.use Faraday::Request::Multipart
@@ -103,6 +124,7 @@ module Gemfury
         when 404 then Gemfury::NotFound
         when 400
           case error['type']
+          when 'Forbidden'       then Gemfury::Forbidden
           when 'GemVersionError' then Gemfury::InvalidGemVersion
           else                        Gemfury::Error
           end

data/lib/gemfury/command/app.rb

@@ -1,6 +1,9 @@
 class Gemfury::Command::App < Thor
   include Gemfury::Command::Authorization
 
+  # Impersonation
+  class_option :as, :desc => 'Access an account other than your own'
+
   map "-v" => :version
   desc "version" ,"Show Gemfury version", :hide => true
   def version
@@ -35,7 +38,7 @@ class Gemfury::Command::App < Thor
       shell.say "\n*** GEMFURY GEMS ***\n\n"
       gems.each do |g|
         desc, version = g['name'], g.path('latest_version.version')
-        desc << " (#{version})" if version
+        desc << " (#{version ? version : 'beta'})"
         shell.say desc
       end
     end
@@ -72,11 +75,48 @@ class Gemfury::Command::App < Thor
     end
   end
 
+  ### COLLABORATION MANAGEMENT ###
+  map "sharing:add" => 'sharing_add'
+  map "sharing:remove" => 'sharing_remove'
+
+  desc "sharing", "List collaborators"
+  def sharing
+    with_checks_and_rescues do
+      me = client.account_info['username']
+      collaborators = client.list_collaborators
+      if collaborators.empty?
+        shell.say "You (#{me}) are the only collaborator", :green
+      else
+        shell.say %Q(\n*** Collaborators for "#{me}" ***\n), :green
+        usernames = [me] + collaborators.map { |c| c['username'] }
+        shell.say usernames.join("\n")
+      end
+      shell.say "\n"
+    end
+  end
+
+  desc "sharing:add USERNAME", "Add a collaborator"
+  def sharing_add(username)
+    with_checks_and_rescues do
+      client.add_collaborator(username)
+      shell.say "Added #{username} as a collaborator"
+    end
+  end
+
+  desc "sharing:remove USERNAME", "Remove a collaborator"
+  def sharing_remove(username)
+    with_checks_and_rescues do
+      client.remove_collaborator(username)
+      shell.say "Removed #{username} as a collaborator"
+    end
+  end
+
 private
   def client
-    options = {}
-    options[:user_api_key] = @user_api_key if @user_api_key
-    Gemfury::Client.new(options)
+    opts = {}
+    opts[:user_api_key] = @user_api_key if @user_api_key
+    opts[:account] = options[:as] if options[:as]
+    Gemfury::Client.new(opts)
   end
 
   def with_checks_and_rescues(&block)
@@ -88,6 +128,8 @@ private
     else
       shell.say %q(No problem. You can also run "gem update gemfury")
     end
+  rescue Gemfury::Forbidden => e
+    shell.say "Oops! You're not allowed to access this", :red
   rescue Gemfury::NotFound => e
     shell.say "Oops! Doesn't look like this exists", :red
   rescue Exception => e

data/lib/gemfury/command/authorization.rb

@@ -20,9 +20,13 @@ private
       prompt_credentials! if @user_api_key.nil?
       block.call
     rescue Gemfury::Unauthorized
-      shell.say "Oops! Authentication failure.", :red
-      @user_api_key = nil
-      retry
+      if acct = client.account
+        shell.say %Q(Oops! You don't have access to "#{acct}"), :red
+      else
+        shell.say "Oops! Authentication failure.", :red
+        @user_api_key = nil
+        retry
+      end
     end
   end
 

data/lib/gemfury/configuration.rb

@@ -6,13 +6,13 @@ module Gemfury
       :user_api_key,
       :adapter,
       :endpoint,
-      :user_agent].freeze
+      :user_agent,
+      :account].freeze
 
     # The adapter that will be used to connect if none is set
     DEFAULT_ADAPTER = :net_http
 
     # The endpoint that will be used to connect if none is set
-    #
     DEFAULT_ENDPOINT = 'https://www.gemfury.com/1/'.freeze
 
     # The value sent in the 'User-Agent' header if none is set
@@ -21,6 +21,9 @@ module Gemfury
     # Default user API key
     DEFAULT_API_KEY = nil
 
+    # Use the current account (no impersonation)
+    DEFAULT_ACCOUNT = nil
+
     # @private
     attr_accessor *VALID_OPTIONS_KEYS
 
@@ -47,6 +50,7 @@ module Gemfury
       self.adapter            = DEFAULT_ADAPTER
       self.endpoint           = DEFAULT_ENDPOINT
       self.user_agent         = DEFAULT_USER_AGENT
+      self.account            = DEFAULT_ACCOUNT
       self
     end
   end

data/lib/gemfury/error.rb

@@ -1,13 +1,16 @@
 module Gemfury
   # Base Error class
-  class Error < StandardError; end
+  Error = Class.new(StandardError)
 
   # The Gemfury gem version doesn't match the one on the server
-  class InvalidGemVersion < Error; end
+  InvalidGemVersion = Class.new(Error)
 
   # Client#user_api_key is not defined or Gemfury returns 401
-  class Unauthorized < Error; end
+  Unauthorized = Class.new(Error)
+
+  # Client is not allowed to perform this operation
+  Forbidden = Class.new(Error)
 
   # Returned if something is not found
-  class NotFound < Error; end
+  NotFound = Class.new(Error)
 end

data/lib/gemfury/version.rb

@@ -1,3 +1,3 @@
 module Gemfury
-  VERSION = '0.3.2'
+  VERSION = '0.4.0.beta1'
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: gemfury
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.4.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Michael Rykov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-29 00:00:00.000000000Z
+date: 2011-10-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70204899099800 !ruby/object:Gem::Requirement
+  requirement: &70192202900480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70204899099800
+  version_requirements: *70192202900480
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70204899099160 !ruby/object:Gem::Requirement
+  requirement: &70192202899980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *70204899099160
+  version_requirements: *70192202899980
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70204899098700 !ruby/object:Gem::Requirement
+  requirement: &70192202899520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70204899098700
+  version_requirements: *70192202899520
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70204899029120 !ruby/object:Gem::Requirement
+  requirement: &70192202899060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70204899029120
+  version_requirements: *70192202899060
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70204899028440 !ruby/object:Gem::Requirement
+  requirement: &70192202898600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *70204899028440
+  version_requirements: *70192202898600
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70204899027600 !ruby/object:Gem::Requirement
+  requirement: &70192202898140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70204899027600
+  version_requirements: *70192202898140
 description: ! 'Client library and command-line tool to manage your gems on http://gemfury.com
 
 '
@@ -120,12 +120,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Client library and command-line tool to manage your gems on Gemfury