gemfury 0.1.1 → 0.2.0.beta1

data/bin/fury

@@ -7,4 +7,4 @@ require 'rubygems'
 require 'gemfury'
 require 'gemfury/command'
 
-Gemfury::Command.start
+Gemfury::Command::App.start

data/lib/faraday/request/multipart_with_file.rb

@@ -0,0 +1,34 @@
+require 'faraday'
+
+# @private
+module Faraday
+  # @private
+  class Request::MultipartWithFile < Faraday::Middleware
+    def call(env)
+      if env[:body].is_a?(Hash)
+        env[:body].each do |key, value|
+          if value.is_a?(File)
+            env[:body][key] = Faraday::UploadIO.new(value, mime_type(value), value.path)
+          end
+        end
+      end
+
+      @app.call(env)
+    end
+
+    private
+
+    def mime_type(file)
+      case file.path
+      when /\.jpe?g/i
+        'image/jpeg'
+      when /\.gif$/i
+        'image/gif'
+      when /\.png$/i
+        'image/png'
+      else
+        'application/octet-stream'
+      end
+    end
+  end
+end

data/lib/gemfury.rb

@@ -1,3 +1,33 @@
+require 'multi_json'
+require 'faraday_middleware'
+require 'faraday/request/multipart_with_file'
+
+require 'gemfury/version'
 require 'gemfury/const'
+require 'gemfury/error'
 require 'gemfury/platform'
-require 'gemfury/client'
+require 'gemfury/auth'
+require 'gemfury/configuration'
+require 'gemfury/client'
+
+module Gemfury
+  extend Configuration
+  class << self
+    # Alias for Gemfury::Client.new
+    #
+    # @return [Gemfury::Client]
+    def new(options={})
+      Gemfury::Client.new(options)
+    end
+
+    # Delegate to Twitter::Client
+    def method_missing(method, *args, &block)
+      return super unless new.respond_to?(method)
+      new.send(method, *args, &block)
+    end
+
+    def respond_to?(method, include_private = false)
+      new.respond_to?(method, include_private) || super(method, include_private)
+    end
+  end
+end

data/lib/gemfury/auth.rb

@@ -0,0 +1,13 @@
+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

data/lib/gemfury/client.rb

@@ -1,27 +1,81 @@
-require 'multi_json'
-require 'faraday_middleware'
-
 module Gemfury
-  module Client
-    ::Faraday::Request::JSON.adapter = ::MultiJson
+  class Client
+    include Gemfury::Auth
+    attr_accessor *Configuration::VALID_OPTIONS_KEYS
+
+    # Creates a new API
+    def initialize(options={})
+      options = Gemfury.options.merge(options)
+      Configuration::VALID_OPTIONS_KEYS.each do |key|
+        send("#{key}=", options[key])
+      end
+    end
+
+    # Verify gem version
+    def check_version
+      response = connection.get('status/version')
+      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
+    end
+
+    # Uploading a gem file
+    def push_gem(gem_file, options = {})
+      ensure_authorization!
+      response = connection.post('gems', options.merge(
+        :gem_file => gem_file
+      ))
+
+      ensure_successful_response!(response)
+    end
+
+    # Get Authentication token via email/password
+    def get_access_token(email, password, options = {})
+      response = connection.post('access_token', options.merge(
+        :email => email, :password => password
+      ))
+
+      ensure_successful_response!(response)
+      response.body['access_token']
+    end
 
   private
-    def client(raw = false)
+    def connection(options = {})
       options = {
-        :url => "http://#{Const.host}",
+        :url => self.endpoint,
         :ssl => { :verify => false },
         :headers => {
-          'Accept' => 'application/json',
-          'Content-Type' => 'application/json; charset=utf-8'
+          :accept => 'application/json',
+          :user_agent => user_agent
         }
-      }
+      }.merge(options)
+
+      if self.user_api_key
+        options[:headers][:authorization] = self.user_api_key
+      end
 
       Faraday.new(options) do |builder|
-        builder.use Faraday::Request::JSON
+        builder.use Faraday::Request::MultipartWithFile
+        builder.use Faraday::Request::Multipart
+        builder.use Faraday::Request::UrlEncoded
         #builder.use Faraday::Response::Logger
         builder.use Faraday::Response::ParseJson
         builder.adapter :net_http
       end
     end
+
+    def ensure_successful_response!(response)
+      unless response.success?
+        raise(case response.status
+          when 401 then Gemfury::Unauthorized
+          else          Gemfury::Error
+        end)
+      end
+    end
   end
 end

data/lib/gemfury/command.rb

@@ -1,39 +1,10 @@
 require 'thor'
+require 'yaml'
 require 'launchy'
 require 'highline'
 
-module Gemfury
-  class Command < Thor
-    include Gemfury::Client
+module Gemfury::Command; end
 
-    desc "push GEM" ,"upload a new version of a gem"
-    def push(*gems)
-      if gems.empty?
-        shell.say "Problem: No gems specified", :red
-        help(:push)
-        return
-      end
+require 'gemfury/command/authorization'
+require 'gemfury/command/app'
 
-      # Collect registration info
-      term = HighLine.new
-      term.say(Const.welcome)
-      email = term.ask("Email: ") do |q|
-        q.responses[:not_valid] = Const.email_error
-        q.validate = Const.email_regex
-      end
-
-      # Send the registration request
-      conn = client # From Gemfury::Client
-      resp = conn.post('/invites.json', :invite => { :email => email })
-
-      # Handle the registration
-      if resp.success?
-        body = resp.body
-        term.say "Thanks! Gemfury is almost ready. Please stay tuned."
-        Launchy.open("http://#{Const.host}/invites/#{body['slug']}")
-      else
-        term.say "Oops! Something went wrong. Please try again", :red
-      end
-    end
-  end
-end

data/lib/gemfury/command/app.rb

@@ -0,0 +1,36 @@
+class Gemfury::Command::App < Thor
+  include Gemfury::Command::Authorization
+
+  desc "version" ,"Check whether the gem is up-to-date"
+  def version
+    client.check_version
+  end
+
+  desc "push GEM" ,"upload a new version of a gem"
+  def push(*gems)
+    with_authorization do
+      gem_files = gems.map do |g|
+        File.exists?(g) ? File.new(g) : nil
+      end.compact
+
+      if gem_files.empty?
+        shell.say "Problem: No valid gems specified", :red
+        help(:push)
+        return
+      end
+
+      # Let's get uploading
+      gem_files.each do |gem_file|
+        shell.say "Uploading #{File.basename(gem_file)}"
+        client.push_gem(gem_file)
+      end
+    end
+  end
+
+private
+  def client
+    options = {}
+    options[:user_api_key] = @user_api_key if @user_api_key
+    Gemfury::Client.new(options)
+  end
+end

data/lib/gemfury/command/authorization.rb

@@ -0,0 +1,48 @@
+module Gemfury::Command::Authorization
+  include Gemfury::Platform
+
+private
+  def with_authorization(&block)
+    # Load up the credentials
+    load_credentials!
+
+    # Attempt the operation and prompt user in case of
+    # lack of authorization or a 401 response from the server
+    begin
+      prompt_credentials! if @user_api_key.nil?
+      block.call
+    rescue Gemfury::Unauthorized
+      shell.say "Oops! Authentication failure.", :red
+      @user_api_key = nil
+      retry
+    end
+  end
+
+  def prompt_credentials!
+    # Prompt credentials
+    highline = HighLine.new
+    highline.say 'Please enter your Gemfury credentials.'
+    email = highline.ask('Email: ')
+    passw = highline.ask('Password: ') { |q| q.echo = false }
+
+    # Request and save the API access token
+    if !email.empty? && !passw.empty?
+      @user_api_key = client.get_access_token(email, passw)
+      write_credentials!
+    end
+  end
+
+  def load_credentials!
+    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)
+    File.open(config_path, 'w') { |f| f.write(YAML.dump(config)) }
+  end
+
+  def read_config_file
+    File.exist?(config_path) ? YAML.load_file(config_path) : {}
+  end
+end

data/lib/gemfury/configuration.rb

@@ -0,0 +1,54 @@
+module Gemfury
+  # Defines constants and methods related to configuration
+  module Configuration
+    # An array of valid keys in the options hash when configuring
+    VALID_OPTIONS_KEYS = [
+      :user_api_key,
+      :adapter,
+      :endpoint,
+      :user_agent].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
+    DEFAULT_USER_AGENT = "Gemfury RubyGem #{Gemfury::VERSION}".freeze
+
+    # Default user API key
+    DEFAULT_API_KEY = nil
+
+    # @private
+    attr_accessor *VALID_OPTIONS_KEYS
+
+    # When this module is extended, set all configuration options to their default values
+    def self.extended(base)
+      base.reset
+    end
+
+    # Convenience method to allow configuration options to be set in a block
+    def configure
+      yield self
+    end
+
+    # Create a hash of options and their values
+    def options
+      options = {}
+      VALID_OPTIONS_KEYS.each{|k| options[k] = send(k)}
+      options
+    end
+
+    # Reset all configuration options to defaults
+    def reset
+      self.user_api_key       = DEFAULT_API_KEY
+      self.adapter            = DEFAULT_ADAPTER
+      self.endpoint           = DEFAULT_ENDPOINT
+      self.user_agent         = DEFAULT_USER_AGENT
+      self
+    end
+  end
+end
+

data/lib/gemfury/error.rb

@@ -0,0 +1,10 @@
+module Gemfury
+  # Base Error class
+  class Error < StandardError; end
+
+  # The Gemfury gem version doesn't match the one on the server
+  class InvalidGemVersion < Error; end
+
+  # Client#user_api_key is not defined or Gemfury returns 401
+  class Unauthorized < Error; end
+end

data/lib/gemfury/platform.rb

@@ -4,6 +4,10 @@ module Gemfury
       on_windows? ? ENV['USERPROFILE'] : ENV['HOME']
     end
 
+    def config_path
+      File.expand_path('.gem/gemfury', home_directory)
+    end
+
     def on_windows?
       RUBY_PLATFORM =~ /mswin32|mingw32/
     end

data/lib/gemfury/version.rb

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

metadata

@@ -1,182 +1,131 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gemfury
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.2.0.beta1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Michael Rykov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-17 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: highline
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70289577678140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70289577678140
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &70289577677540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 0
-        - 14
-        - 5
+      - !ruby/object:Gem::Version
         version: 0.14.5
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70289577677540
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &70289577677000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70289577677000
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70289577676460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: faraday
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70289577676460
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: &70289577675960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: faraday_middleware
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70289577675960
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: &70289577675360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 6
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.6.3
   type: :runtime
-  version_requirements: *id006
-description: |
-  Client library and command-line tool to manage your gems on http://gemfury.com
+  prerelease: false
+  version_requirements: *70289577675360
+description: ! 'Client library and command-line tool to manage your gems on http://gemfury.com
 
+'
 email: mrykov@gmail.com
-executables: 
+executables:
 - gemfury
 - fury
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - bin/fury
 - bin/gemfury
+- lib/faraday/request/multipart_with_file.rb
+- lib/gemfury/auth.rb
 - lib/gemfury/client.rb
+- lib/gemfury/command/app.rb
+- lib/gemfury/command/authorization.rb
 - lib/gemfury/command.rb
+- lib/gemfury/configuration.rb
 - lib/gemfury/const.rb
+- lib/gemfury/error.rb
 - lib/gemfury/platform.rb
+- lib/gemfury/version.rb
 - lib/gemfury.rb
-has_rdoc: false
 homepage: http://gemfury.com
 licenses: []
-
-post_install_message: |
-  ************************************************************************
-  
-    Upload your first gem to start using Gemfury:
-    fury push my-gem-1.0.gem
-  
-    Follow @gemfury on Twitter for announcements, updates, and news.
-    https://twitter.com/gemfury
-  
-  ************************************************************************
-
+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"
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Client library and command-line tool to manage your gems on Gemfury
 test_files: []
-