geminabox 0.9.0 → 0.10.0

data/lib/geminabox.rb

@@ -4,6 +4,7 @@ require 'builder'
 require 'sinatra/base'
 require 'rubygems/builder'
 require 'rubygems/indexer'
+require 'rubygems/package'
 require 'hostess'
 require 'geminabox/version'
 require 'rss/atom'
@@ -36,6 +37,7 @@ class Geminabox < Sinatra::Base
   autoload :GemVersionCollection, "geminabox/gem_version_collection"
   autoload :GemVersion, "geminabox/gem_version"
   autoload :DiskCache, "geminabox/disk_cache"
+  autoload :IncomingGem, "geminabox/incoming_gem"
 
   before do
     headers 'X-Powered-By' => "geminabox #{GeminaboxVersion}"
@@ -96,58 +98,40 @@ class Geminabox < Sinatra::Base
   end
 
   post '/upload' do
-    if File.exists? Geminabox.data
-      error_response( 500, "Please ensure #{File.expand_path(Geminabox.data)} is a directory." ) unless File.directory? Geminabox.data
-      error_response( 500, "Please ensure #{File.expand_path(Geminabox.data)} is writable by the geminabox web server." ) unless File.writable? Geminabox.data
-    else
-      begin
-        FileUtils.mkdir_p(settings.data)
-      rescue Errno::EACCES, Errno::ENOENT, RuntimeError => e
-        error_response( 500, "Could not create #{File.expand_path(Geminabox.data)}.\n#{e}\n#{e.message}" )
-      end
-    end
-
-    unless params[:file] && (tmpfile = params[:file][:tempfile]) && (name = params[:file][:filename])
+    unless params[:file] && params[:file][:filename] && (tmpfile = params[:file][:tempfile])
       @error = "No file selected"
       halt [400, erb(:upload)]
     end
+    handle_incoming_gem(IncomingGem.new(tmpfile))
+  end
 
-    FileUtils.mkdir_p(File.join(settings.data, "gems"))
-
-    tmpfile.binmode
-
-    gem_name = File.basename(name)
-    dest_filename = File.join(settings.data, "gems", gem_name)
-
-    if Geminabox.disallow_replace? and File.exist?(dest_filename)
-      existing_file_digest = Digest::SHA1.file(dest_filename).hexdigest
-      tmpfile_digest = Digest::SHA1.file(tmpfile.path).hexdigest
-
-      if existing_file_digest != tmpfile_digest
-        error_response(409, "Updating an existing gem is not permitted.\nYou should either delete the existing version, or change your version number.")
-      else
-        error_response(200, "Ignoring upload, you uploaded the same thing previously.")
+  post '/api/v1/gems' do
+    begin
+      handle_incoming_gem(IncomingGem.new(request.body))
+    rescue Object => o
+      File.open "/tmp/debug.txt", "a" do |io|
+        io.puts o, o.backtrace
       end
     end
+  end
 
-    atomic_write(dest_filename) do |f|
-      while blk = tmpfile.read(65536)
-        f << blk
-      end
-    end
-    reindex
+private
+
+  def handle_incoming_gem(gem)
+    prepare_data_folders
+    error_response(400, "Cannot process gem") unless gem.valid?
+    handle_replacement(gem)
+    write_and_index(gem)
 
     if api_request?
-      "Gem #{gem_name} received and indexed."
+      "Gem #{gem.name} received and indexed."
     else
       redirect url("/")
     end
   end
 
-private
-
   def api_request?
-    request.accept.first == "text/plain"
+    request.accept.first != "text/html"
   end
 
   def error_response(code, message)
@@ -164,6 +148,43 @@ HTML
     halt [code, html]
   end
 
+  def prepare_data_folders
+    if File.exists? Geminabox.data
+      error_response( 500, "Please ensure #{File.expand_path(Geminabox.data)} is a directory." ) unless File.directory? Geminabox.data
+      error_response( 500, "Please ensure #{File.expand_path(Geminabox.data)} is writable by the geminabox web server." ) unless File.writable? Geminabox.data
+    else
+      begin
+        FileUtils.mkdir_p(settings.data)
+      rescue Errno::EACCES, Errno::ENOENT, RuntimeError => e
+        error_response( 500, "Could not create #{File.expand_path(Geminabox.data)}.\n#{e}\n#{e.message}" )
+      end
+    end
+
+    FileUtils.mkdir_p(File.join(settings.data, "gems"))
+  end
+
+  def handle_replacement(gem)
+    if Geminabox.disallow_replace? and File.exist?(gem.dest_filename)
+      existing_file_digest = Digest::SHA1.file(gem.dest_filename).hexdigest
+
+      if existing_file_digest != gem.hexdigest
+        error_response(409, "Updating an existing gem is not permitted.\nYou should either delete the existing version, or change your version number.")
+      else
+        error_response(200, "Ignoring upload, you uploaded the same thing previously.")
+      end
+    end
+  end
+
+  def write_and_index(gem)
+    tmpfile = gem.gem_data
+    atomic_write(gem.dest_filename) do |f|
+      while blk = tmpfile.read(65536)
+        f << blk
+      end
+    end
+    reindex
+  end
+
   def reindex(force_rebuild = false)
     Geminabox.fixup_bundler_rubygems!
     force_rebuild = true unless settings.incremental_updates

data/lib/geminabox/incoming_gem.rb

@@ -0,0 +1,49 @@
+class Geminabox::IncomingGem
+  def initialize(gem_data, root_path = Geminabox.settings.data)
+    unless gem_data.respond_to? :read
+      raise ArgumentError, "Expected an instance of IO"
+    end
+
+    digest = Digest::SHA1.new
+    @tempfile = Tempfile.new("gem", :encoding => 'binary')
+    while data = gem_data.read(1024**2)
+      @tempfile.write data
+      digest << data
+    end
+    @tempfile.close
+    @sha1 = digest.hexdigest
+
+    @root_path = root_path
+  end
+
+  def gem_data
+    File.open(@tempfile.path, "rb")
+  end
+
+  def valid?
+    spec && spec.name && spec.version
+  rescue Gem::Package::Error
+    false
+  end
+
+  def spec
+    unless @spec
+      Gem::Package.open(gem_data, "r", nil) do |pkg|
+        @spec = pkg.metadata
+      end
+    end
+    @spec
+  end
+
+  def name
+    "#{spec.name}-#{spec.version}.gem"
+  end
+
+  def dest_filename
+    File.join(@root_path, "gems", name)
+  end
+
+  def hexdigest
+    @sha1
+  end
+end

data/lib/geminabox/version.rb

@@ -1 +1 @@
-GeminaboxVersion = '0.9.0' unless defined? GeminaboxVersion
+GeminaboxVersion = '0.10.0' unless defined? GeminaboxVersion

data/lib/geminabox_client.rb

@@ -10,7 +10,8 @@ class GeminaboxClient
     @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 = 600
+    @http_client.send_timeout = 0
+    @http_client.receive_timeout = 0
   end
 
   def extract_username_and_password_from_url!(url)

metadata

@@ -2,7 +2,7 @@
 name: geminabox
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Tom Lea
@@ -166,6 +166,7 @@ files:
 - lib/geminabox/disk_cache.rb
 - lib/geminabox/gem_version.rb
 - lib/geminabox/gem_version_collection.rb
+- lib/geminabox/incoming_gem.rb
 - lib/geminabox/indexer.rb
 - lib/geminabox/version.rb
 - lib/geminabox.rb
@@ -197,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 332321015016906523
+      hash: 1008215541658349139
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
@@ -206,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 332321015016906523
+      hash: 1008215541658349139
       version: '0'
 requirements: []
 rubyforge_project: