gemfury 0.2.0.beta1 → 0.2.0.beta2

data/lib/gemfury.rb

@@ -6,8 +6,9 @@ require 'gemfury/version'
 require 'gemfury/const'
 require 'gemfury/error'
 require 'gemfury/platform'
-require 'gemfury/auth'
 require 'gemfury/configuration'
+
+require 'gemfury/client/filters'
 require 'gemfury/client'
 
 module Gemfury
@@ -30,4 +31,13 @@ module Gemfury
       new.respond_to?(method, include_private) || super(method, include_private)
     end
   end
+end
+
+class Hash
+  # Access nested hashes as a period-separated path
+  def path(path, separator = '.')
+    path.split(separator).inject(self) do |hash, part|
+      hash.is_a?(Hash) ? hash[part] : nil
+    end
+  end
 end

data/lib/gemfury/client.rb

@@ -1,6 +1,6 @@
 module Gemfury
   class Client
-    include Gemfury::Auth
+    include Gemfury::Client::Filters
     attr_accessor *Configuration::VALID_OPTIONS_KEYS
 
     # Creates a new API
@@ -26,7 +26,7 @@ module Gemfury
 
     # Uploading a gem file
     def push_gem(gem_file, options = {})
-      ensure_authorization!
+      ensure_ready!(:authorization)
       response = connection.post('gems', options.merge(
         :gem_file => gem_file
       ))
@@ -34,8 +34,25 @@ module Gemfury
       ensure_successful_response!(response)
     end
 
+    # List available gems
+    def list(options = {})
+      ensure_ready!(:authorization)
+      response = connection.get('gems', options)
+      ensure_successful_response!(response)
+      response.body
+    end
+
+    # List versions for a gem
+    def versions(name, options = {})
+      ensure_ready!(:authorization)
+      response = connection.get("gems/#{name}/versions", options)
+      ensure_successful_response!(response)
+      response.body
+    end
+
     # Get Authentication token via email/password
     def get_access_token(email, password, options = {})
+      ensure_ready!
       response = connection.post('access_token', options.merge(
         :email => email, :password => password
       ))

data/lib/gemfury/client/filters.rb

@@ -0,0 +1,33 @@
+module Gemfury
+  class Client
+    module Filters
+
+    private
+      def ensure_ready!(*args)
+        # Ensure authorization
+        if args.include?(:authorization)
+          raise Unauthorized unless authenticated?
+        end
+
+        # Check version requirement
+        ensure_gem_compatibility! if self.check_gem_version
+      end
+
+      def authenticated?
+        self.user_api_key && !self.user_api_key.empty?
+      end
+
+      def ensure_gem_compatibility!
+        response = connection.get('status/version')
+        ensure_successful_response!(response)
+
+        current = Gem::Version.new(Gemfury::VERSION)
+        version = Gem::Requirement.new(response.body['version'])
+
+        unless version.satisfied_by?(current)
+          raise InvalidGemVersion.new('Please update your gem')
+        end
+      end
+    end
+  end
+end

data/lib/gemfury/command/app.rb

@@ -1,14 +1,15 @@
 class Gemfury::Command::App < Thor
   include Gemfury::Command::Authorization
 
-  desc "version" ,"Check whether the gem is up-to-date"
+  map "-v" => :version
+  desc "version" ,"Show Gemfury version", :hide => true
   def version
-    client.check_version
+    shell.say Gemfury::VERSION
   end
 
-  desc "push GEM" ,"upload a new version of a gem"
+  desc "push GEM" ,"Upload a new version of a gem"
   def push(*gems)
-    with_authorization do
+    with_checks_and_rescues do
       gem_files = gems.map do |g|
         File.exists?(g) ? File.new(g) : nil
       end.compact
@@ -27,10 +28,45 @@ class Gemfury::Command::App < Thor
     end
   end
 
+  desc "list" ,"List your gems on Gemfury"
+  def list
+    with_checks_and_rescues do
+      gems = client.list
+      shell.say "\n*** GEMFURY GEMS ***\n\n"
+      gems.each do |g|
+        desc, version = g['name'], g.path('latest_version.version')
+        desc << " (#{version})" if version
+        shell.say desc
+      end
+    end
+  end
+
+  desc "versions GEM" ,"List all the available gem versions"
+  def versions(gem_name)
+    with_checks_and_rescues do
+      versions = client.versions(gem_name)
+      shell.say "\n*** #{gem_name.capitalize} Versions ***\n\n"
+      versions.each do |v|
+        shell.say v['version']
+      end
+    end
+  end
+
 private
   def client
-    options = {}
+    options = { :check_gem_version => true }
     options[:user_api_key] = @user_api_key if @user_api_key
     Gemfury::Client.new(options)
   end
+
+  def with_checks_and_rescues(&block)
+    with_authorization(&block)
+  rescue Gemfury::InvalidGemVersion => e
+    shell.say "You have a deprecated Gemfury gem", :red
+    if shell.yes? "Would you like to update this gem now? [yN]"
+      exec("gem update gemfury")
+    else
+      shell.say %q(No problem. You can also run "gem update gemfury")
+    end
+  end
 end

data/lib/gemfury/configuration.rb

@@ -6,7 +6,8 @@ module Gemfury
       :user_api_key,
       :adapter,
       :endpoint,
-      :user_agent].freeze
+      :user_agent,
+      :check_gem_version].freeze
 
     # The adapter that will be used to connect if none is set
     DEFAULT_ADAPTER = :net_http
@@ -21,6 +22,9 @@ module Gemfury
     # Default user API key
     DEFAULT_API_KEY = nil
 
+    # Default to skip the gem version check on API calls
+    DEFAULT_VERSION_CHECK = false
+
     # @private
     attr_accessor *VALID_OPTIONS_KEYS
 
@@ -47,6 +51,7 @@ module Gemfury
       self.adapter            = DEFAULT_ADAPTER
       self.endpoint           = DEFAULT_ENDPOINT
       self.user_agent         = DEFAULT_USER_AGENT
+      self.check_gem_version  = DEFAULT_VERSION_CHECK
       self
     end
   end

data/lib/gemfury/version.rb

@@ -1,3 +1,3 @@
 module Gemfury
-  VERSION = '0.2.0.beta1'
+  VERSION = '0.2.0.beta2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemfury
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta1
+  version: 0.2.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000Z
+date: 2011-08-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70289577678140 !ruby/object:Gem::Requirement
+  requirement: &70150918484520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70289577678140
+  version_requirements: *70150918484520
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70289577677540 !ruby/object:Gem::Requirement
+  requirement: &70150918483840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.5
+        version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *70289577677540
+  version_requirements: *70150918483840
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70289577677000 !ruby/object:Gem::Requirement
+  requirement: &70150918483340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70289577677000
+  version_requirements: *70150918483340
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70289577676460 !ruby/object:Gem::Requirement
+  requirement: &70150918482760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,29 +54,29 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70289577676460
+  version_requirements: *70150918482760
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70289577675960 !ruby/object:Gem::Requirement
+  requirement: &70150918482180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *70289577675960
+  version_requirements: *70150918482180
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70289577675360 !ruby/object:Gem::Requirement
+  requirement: &70150918481600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70289577675360
+  version_requirements: *70150918481600
 description: ! 'Client library and command-line tool to manage your gems on http://gemfury.com
 
 '
@@ -91,7 +91,7 @@ files:
 - bin/fury
 - bin/gemfury
 - lib/faraday/request/multipart_with_file.rb
-- lib/gemfury/auth.rb
+- lib/gemfury/client/filters.rb
 - lib/gemfury/client.rb
 - lib/gemfury/command/app.rb
 - lib/gemfury/command/authorization.rb
@@ -106,7 +106,8 @@ homepage: http://gemfury.com
 licenses: []
 post_install_message: ! "************************************************************************\n\n
   \ Upload your first gem to start using Gemfury:\n  fury push my-gem-1.0.gem\n\n
-  \ Follow @gemfury on Twitter for announcements, updates, and news.\n  https://twitter.com/gemfury\n\n************************************************************************\n"
+  \ Find out what else you can do:\n  fury help\n\n  Follow @gemfury on Twitter for
+  announcements, updates, and news.\n  https://twitter.com/gemfury\n\n************************************************************************\n"
 rdoc_options: []
 require_paths:
 - lib

data/lib/gemfury/auth.rb

@@ -1,13 +0,0 @@
-module Gemfury
-  module Auth
-
-  private
-    def authenticated?
-      self.user_api_key && !self.user_api_key.empty?
-    end
-
-    def ensure_authorization!
-      raise Unauthorized unless authenticated?
-    end
-  end
-end