geminabox 0.12.3 → 0.12.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWI3ZTAwOTg3NjFmZTcwN2RmNDNhZTYwM2MzMjM4YWE5OWI4NzUyNg==
+    MTBmZWQxYjM3NjFlODM4NmQ0N2ViMjY1MjU0ZjRiMWE4ODcyMjFmYw==
   data.tar.gz: !binary |-
-    YThlZTE0MWJkYTI5YzNlMTkxNjkyMjQ2ZTEzNGUzOTU4NDQ5NmZlYw==
+    NTcwNGQ5YjkxMDNkMGMzOWNmMThjNTJlNmVlNDg0MjE0MGEzNTdkMg==
 SHA512:
   metadata.gz: !binary |-
-    MDYyOTRiMDA0ZDhkOTY4YTQ1MzQxMTQ1YzYzZGVkNzlhOWNjMzU5ZDQwNTBk
-    YTUwYTJlZDg1N2ZlOWE5MjNmMWRjYjE2MTY3ZmRhNTBiYTVlODMxYzg2NWU5
-    ZDUzYjg3Y2FmMTdjNGQxMzRiZmM3YmE4YWRiZmJhZTI2YmRmYmM=
+    YWQyZjU1NWM4M2FmY2U1NDgzMzU5MTgzYWI1ZTVjYzc0ZWVjNTM4MTkyMzRk
+    NTc3NjM4N2VkNTljODAwZjk5MDQ5MTdiZjU1ZGMyNTg0ZjMzNTQ3Y2FkMjJk
+    YjE2NTI2Y2NiNzY5NWUyNzdlNGJiMTBlOWU1MDBiYzJjZDg3MzU=
   data.tar.gz: !binary |-
-    M2Q3NmZmZDk2MzE1N2E3YzdjNDVmMzJlNDkzOTU4YzBlZWU0YTA1MDAyZjUy
-    N2VmZTE4YTkyMjkyOTA5NTRmMWU2ZWViNmUzZTQ4M2FkYjVlYmEyOTdkZTc3
-    NWJlMGU1MzlhNDY5OWI3YWE5YzVkYWIxZDEzYjZkNDU4MDkwYjE=
+    NTUwM2EwZGVjYzc2ZTI3YjExMjI2ODI3ODZlMjc2YzIzOWUyM2IxMmIyYmMy
+    MDdkMTNmY2E5ZmRkYzNiM2YyMjliMWViYjM2NWFlMWFmMzY5NWFmOTFiY2Uz
+    ZDc1ZmU4NWY3MjM1NTY3MDg1MTcyYWM5NDY5YjgzOWM3MmZkODA=

data/README.markdown

@@ -48,6 +48,26 @@ Or in config.ru (before the run command), set:
 
     Geminabox.rubygems_proxy = true
 
+## HTTP adapter
+
+Geminabox uses the HTTPClient gem to manage its connections to remote resources.
+The relationship is managed via Geminabox::HttpClientAdapter.
+
+If you would like to use an alternative HTTP gem, create your own adapter
+and specify it in config.ru:
+
+    Geminabox.http_adapter = YourHttpAdapter.new
+
+It is recommend (but not essential) that your adapter inherits from HttpAdapter.
+The adapter will need to replace HttpAdapter's methods with those specific to
+the alternative HTTP gem. It should also be able to handle HTTP proxy
+settings. 
+
+Defining your own adapter also allows you to configure Geminabox to use the
+local systems SSL certificates.
+
+TemplateFaradayAdapter is provided as an example of an alternative HTTPAdapter.
+
 ## Client Usage
 
 Since version 0.10, Geminabox supports the standard gemcutter push API:

data/lib/geminabox.rb

@@ -13,21 +13,22 @@ module Geminabox
 
   require_relative 'geminabox/version'
   require_relative 'geminabox/proxy'
+  require_relative 'geminabox/http_adapter'
 
   def self.geminabox_path(file)
     File.join File.dirname(__FILE__), 'geminabox', file
   end
 
-  autoload :Hostess,              geminabox_path('hostess')
-  autoload :GemStore,             geminabox_path('gem_store')
-  autoload :GemStoreError,        geminabox_path('gem_store_error')
-  autoload :RubygemsDependency,   geminabox_path('rubygems_dependency')
-  autoload :GemListMerge,         geminabox_path('gem_list_merge')
-  autoload :GemVersion,           geminabox_path('gem_version')
-  autoload :GemVersionCollection, geminabox_path('gem_version_collection')
-  autoload :Server,               geminabox_path('server')
-  autoload :DiskCache,            geminabox_path('disk_cache')
-  autoload :IncomingGem,          geminabox_path('incoming_gem')
+  autoload :Hostess,                geminabox_path('hostess')
+  autoload :GemStore,               geminabox_path('gem_store')
+  autoload :GemStoreError,          geminabox_path('gem_store_error')
+  autoload :RubygemsDependency,     geminabox_path('rubygems_dependency')
+  autoload :GemListMerge,           geminabox_path('gem_list_merge')
+  autoload :GemVersion,             geminabox_path('gem_version')
+  autoload :GemVersionCollection,   geminabox_path('gem_version_collection')
+  autoload :Server,                 geminabox_path('server')
+  autoload :DiskCache,              geminabox_path('disk_cache')
+  autoload :IncomingGem,            geminabox_path('incoming_gem')
 
   class << self
 
@@ -40,7 +41,9 @@ module Geminabox
       :allow_replace,
       :gem_permissions,
       :allow_delete,
-      :rubygems_proxy
+      :rubygems_proxy,
+      :http_adapter,
+      :allow_remote_failure
     )
 
     def set_defaults(defaults)
@@ -60,17 +63,17 @@ module Geminabox
   end
 
   set_defaults(
-
-    data:                File.join(File.dirname(__FILE__), *%w[.. data]),
-    public_folder:       File.join(File.dirname(__FILE__), *%w[.. public]),
-    build_legacy:        false,
-    incremental_updates: true,
-    views:               File.join(File.dirname(__FILE__), *%w[.. views]),
-    allow_replace:       false,
-    gem_permissions:     0644,
-    rubygems_proxy:      (ENV['RUBYGEMS_PROXY'] == 'true'),
-    allow_delete:        true
-
+    data:                 File.join(File.dirname(__FILE__), *%w[.. data]),
+    public_folder:        File.join(File.dirname(__FILE__), *%w[.. public]),
+    build_legacy:         false,
+    incremental_updates:  true,
+    views:                File.join(File.dirname(__FILE__), *%w[.. views]),
+    allow_replace:        false,
+    gem_permissions:      0644,
+    rubygems_proxy:       (ENV['RUBYGEMS_PROXY'] == 'true'),
+    allow_delete:         true,
+    http_adapter:         HttpClientAdapter.new,
+    allow_remote_failure: false
   )
     
 end

data/lib/geminabox/http_adapter.rb

@@ -0,0 +1,27 @@
+require_relative 'http_adapter_config_error'
+
+module Geminabox
+  class HttpAdapter
+
+    def get_content(*args)
+      raise HttpAdapterConfigError.new(:get_content, 'the response body')
+    end
+
+    def get(*args)
+      raise HttpAdapterConfigError.new(:get, 'a response object')
+    end
+
+    def post(*args)
+      raise HttpAdapterConfigError.new(:post, 'a response object')
+    end
+
+    def set_auth(*args)
+      raise HttpAdapterConfigError.new(:set_auth, 'true')
+    end
+
+  end
+end
+
+Dir[File.expand_path('http_adapter/*.rb', File.dirname(__FILE__))].each do |file|
+  require file
+end

data/lib/geminabox/http_adapter/http_client_adapter.rb

@@ -0,0 +1,32 @@
+require 'httpclient'
+
+module Geminabox
+
+  class HttpClientAdapter < HttpAdapter
+
+    def get(*args)
+      http_client.get(*args)
+    end
+
+    def get_content(*args)
+      http_client.get_content(*args)
+    end
+
+    def post(*args)
+      http_client.post(*args)
+    end
+
+    def set_auth(url, username = nil, password = nil)
+      http_client.set_auth(url, username, password) if username or password
+      http_client.www_auth.basic_auth.challenge(url) # Workaround: https://github.com/nahi/httpclient/issues/63
+      http_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      http_client.send_timeout = 0
+      http_client.receive_timeout = 0
+    end
+
+    def http_client
+      @http_client ||= HTTPClient.new(ENV['http_proxy'])
+    end
+
+  end
+end

data/lib/geminabox/http_adapter/template_faraday_adapter.rb

@@ -0,0 +1,51 @@
+require 'faraday'
+
+module Geminabox
+
+  class TemplateFaradayAdapter < HttpAdapter
+
+    def get(*args)
+      adapter.get(*args)
+    end
+
+    def get_content(*args)
+      response = adapter.get(*args)
+      response.body
+    end
+
+    def post(*args)
+      adapter.post(*args)
+    end
+
+    # Note that this configuration turns SSL certificate verification off.
+    # To set up the adapter for your environment see:
+    # https://github.com/lostisland/faraday/wiki/Setting-up-SSL-certificates
+    def set_auth(uri, username = nil, password = nil)
+      connection = Faraday.new url: uri, ssl: {verify: false} do |faraday|
+        faraday.adapter http_engine
+        faraday.proxy(ENV['http_proxy']) if ENV['http_proxy']
+      end
+      connection.basic_auth username, password if username
+      connection
+    end
+
+    def adapter
+      @adapter ||= Faraday.new do |faraday|
+        faraday.adapter http_engine
+        faraday.proxy(ENV['http_proxy']) if ENV['http_proxy']
+      end
+    end
+
+    def http_engine
+      :net_http  # make requests with Net::HTTP
+    end
+
+    def options
+      lambda {|faraday|
+        faraday.adapter http_engine
+        faraday.proxy(ENV['http_proxy']) if ENV['http_proxy']
+      }
+    end
+
+  end
+end

data/lib/geminabox/http_adapter_config_error.rb

@@ -0,0 +1,7 @@
+module Geminabox
+  class HttpAdapterConfigError < StandardError
+    def initialize(method_name, returns)
+      super("#{method_name} must be defined, and return #{returns}")
+    end
+  end
+end

data/lib/geminabox/incoming_gem.rb

@@ -10,7 +10,7 @@ module Geminabox
       if RbConfig::CONFIG["MAJOR"].to_i <= 1 and RbConfig::CONFIG["MINOR"].to_i <= 8
         @tempfile = Tempfile.new("gem")
       else
-        @tempfile = Tempfile.new("gem", :encoding => 'binary')
+        @tempfile = Tempfile.new("gem", :encoding => 'binary', :binmode => true)
       end
 
       while data = gem_data.read(1024**2)

data/lib/geminabox/proxy/file_handler.rb

@@ -1,4 +1,4 @@
-require 'httpclient'
+
 module Geminabox
   module Proxy
     class FileHandler
@@ -43,7 +43,7 @@ module Geminabox
       end
 
       def remote_content
-        HTTPClient.get_content(remote_url).force_encoding(encoding)
+        Geminabox.http_adapter.get_content(remote_url).force_encoding(encoding)
       rescue
         raise GemStoreError.new(500, "Unable to get content from #{remote_url}")
       end

data/lib/geminabox/proxy/hostess.rb

@@ -59,21 +59,14 @@ module Geminabox
         file = File.expand_path(File.join(Server.data, *request.path_info))
 
         unless File.exists?(file)
-          net_http_class.start("production.cf.rubygems.org") do |http|
-            path = File.join(*request.path_info)
-            response = http.get(path)
-            GemStore.create(IncomingGem.new(StringIO.new(response.body)))
-          end
+          ruby_gems_url = 'http://production.cf.rubygems.org'
+          path = File.join(ruby_gems_url, *request.path_info)
+          content = Geminabox.http_adapter.get_content(path)
+          GemStore.create(IncomingGem.new(StringIO.new(content)))
         end
 
       end
 
-      def net_http_class
-        return ::Net::HTTP unless ENV['http_proxy']
-        proxy_uri = URI.parse(ENV['http_proxy'])
-        ::Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
-      end
-
       def splice_file(file_name)
         self.file_handler = Splicer.make(file_name)
       end

data/lib/geminabox/rubygems_dependency.rb

@@ -1,4 +1,3 @@
-require 'httpclient'
 require 'json'
 
 module Geminabox
@@ -13,8 +12,11 @@ module Geminabox
           '?gems=',
           gems.map(&:to_s).join(',')
         ].join
-        body = HTTPClient.get_content(url)
+        body = Geminabox.http_adapter.get_content(url)
         JSON.parse(body)
+      rescue Exception => e
+        return [] if Geminabox.allow_remote_failure
+        raise e
       end
 
       def rubygems_uri

data/lib/geminabox/server.rb

@@ -241,7 +241,10 @@ HTML
         filename = [gem_name, version]
         filename.push(platform) if platform != default_platform
         spec_file = File.join(settings.data, "quick", "Marshal.#{Gem.marshal_version}", "#{filename.join("-")}.gemspec.rz")
-        Marshal.load(Gem.inflate(File.read(spec_file))) if File.exists? spec_file
+        File::open(spec_file, 'r') do |unzipped_spec_file|
+          unzipped_spec_file.binmode
+          Marshal.load(Gem.inflate(unzipped_spec_file.read))
+        end if File.exists? spec_file
       end
 
       def default_platform

data/lib/geminabox/version.rb

@@ -1,3 +1,3 @@
 module Geminabox
-  VERSION = '0.12.3' unless defined? VERSION
+  VERSION = '0.12.4' unless defined? VERSION
 end

data/lib/geminabox_client.rb

@@ -1,17 +1,13 @@
 require 'uri'
-require 'httpclient'
+require 'geminabox'
 
 class GeminaboxClient
   attr_reader :url, :http_client
 
   def initialize(url)
     extract_username_and_password_from_url!(url)
-    @http_client = HTTPClient.new
-    @http_client.set_auth(url_for(:upload), @username, @password) if @username or @password
-    @http_client.www_auth.basic_auth.challenge(url_for(:upload)) # Workaround: https://github.com/nahi/httpclient/issues/63
-    @http_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    @http_client.send_timeout = 0
-    @http_client.receive_timeout = 0
+    @http_client = Geminabox.http_adapter
+    @http_client.set_auth(url_for(:upload), @username, @password) 
   end
 
   def extract_username_and_password_from_url!(url)
@@ -32,7 +28,7 @@ class GeminaboxClient
     if response.status < 300
       response.body
     else
-      raise GeminaboxClient::Error, "Error (#{response.code} received)\n\n#{response.body}"
+      raise GeminaboxClient::Error, "Error (#{response.status} received)\n\n#{response.body}"
     end
   end
 

data/lib/rubygems/commands/inabox_command.rb

@@ -27,6 +27,10 @@ class Gem::Commands::InaboxCommand < Gem::Command
     add_option('-o', '--overwrite', "Overwrite Gem.") do |value, options|
       options[:overwrite] = true
     end
+
+    add_option('-p', '--port', "Sets port") do |value, options|
+      options[:port] = value
+    end
   end
 
   def last_minute_requires!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Tom Lea
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -68,6 +68,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,36 +122,40 @@ extra_rdoc_files:
 files:
 - MIT-LICENSE
 - README.markdown
-- lib/geminabox_client.rb
 - lib/rubygems_plugin.rb
+- lib/geminabox/version.rb
 - lib/geminabox/gem_store_error.rb
-- lib/geminabox/server.rb
-- lib/geminabox/gem_version_collection.rb
-- lib/geminabox/disk_cache.rb
+- lib/geminabox/incoming_gem.rb
+- lib/geminabox/gem_version.rb
+- lib/geminabox/hostess.rb
+- lib/geminabox/indexer.rb
+- lib/geminabox/gem_list_merge.rb
 - lib/geminabox/rubygems_dependency.rb
-- lib/geminabox/proxy/copier.rb
+- lib/geminabox/proxy.rb
 - lib/geminabox/proxy/file_handler.rb
 - lib/geminabox/proxy/hostess.rb
+- lib/geminabox/proxy/copier.rb
 - lib/geminabox/proxy/splicer.rb
-- lib/geminabox/proxy.rb
-- lib/geminabox/hostess.rb
+- lib/geminabox/gem_version_collection.rb
+- lib/geminabox/http_adapter/http_client_adapter.rb
+- lib/geminabox/http_adapter/template_faraday_adapter.rb
+- lib/geminabox/server.rb
+- lib/geminabox/disk_cache.rb
+- lib/geminabox/http_adapter.rb
+- lib/geminabox/http_adapter_config_error.rb
 - lib/geminabox/gem_store.rb
-- lib/geminabox/version.rb
-- lib/geminabox/gem_list_merge.rb
-- lib/geminabox/incoming_gem.rb
-- lib/geminabox/indexer.rb
-- lib/geminabox/gem_version.rb
-- lib/geminabox.rb
 - lib/rubygems/commands/inabox_command.rb
+- lib/geminabox_client.rb
+- lib/geminabox.rb
+- public/master.js
 - public/master.css
 - public/jquery.js
 - public/favicon.ico
-- public/master.js
+- views/atom.erb
+- views/gem.erb
 - views/upload.erb
-- views/index.erb
 - views/layout.erb
-- views/gem.erb
-- views/atom.erb
+- views/index.erb
 homepage: http://tomlea.co.uk/p/gem-in-a-box
 licenses:
 - MIT-LICENSE
@@ -160,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Really simple rubygem hosting