geminabox 0.4.0 → 0.5.0

data/README.markdown

@@ -22,6 +22,11 @@ Create a config.ru as follows:
 
 And finally, hook up the config.ru as you normally would ([passenger][passenger], [thin][thin], [unicorn][unicorn], whatever floats your boat).
 
+## Legacy RubyGems index
+
+RubyGems supports generating indexes for the so called legacy verions (< 1.2), and since it is very rare to use such versions nowadays, it can be disabled, thus improving indexing times for large repositories. If it's safe for your application, you can disable support for these legacy versions by adding the following configuration to yout config.ru file:
+
+    Geminabox.build_legacy = false
 
 ## Client Usage
 

data/lib/geminabox.rb

@@ -12,8 +12,9 @@ require 'hostess'
 class Geminabox < Sinatra::Base
   enable :static, :methodoverride
 
-  set :public, File.join(File.dirname(__FILE__), *%w[.. public])
+  set :public_folder, File.join(File.dirname(__FILE__), *%w[.. public])
   set :data, File.join(File.dirname(__FILE__), *%w[.. data])
+  set :build_legacy, false
   set :views, File.join(File.dirname(__FILE__), *%w[.. views])
   set :allow_replace, false
   use Hostess
@@ -48,13 +49,13 @@ class Geminabox < Sinatra::Base
   end
 
   get '/reindex' do
-    reindex
+    reindex(:force_rebuild)
     redirect url("/")
   end
 
   delete '/gems/*.gem' do
     File.delete file_path if File.exists? file_path
-    reindex
+    reindex(:force_rebuild)
     redirect url("/")
   end
 
@@ -67,9 +68,9 @@ class Geminabox < Sinatra::Base
 
     tmpfile.binmode
 
-    Dir.mkdir(File.join(options.data, "gems")) unless File.directory? File.join(options.data, "gems")
+    Dir.mkdir(File.join(settings.data, "gems")) unless File.directory? File.join(settings.data, "gems")
 
-    dest_filename = File.join(options.data, "gems", File.basename(name))
+    dest_filename = File.join(settings.data, "gems", File.basename(name))
 
 
     if Geminabox.disallow_replace? and File.exist?(dest_filename)
@@ -107,18 +108,27 @@ HTML
     [code, html]
   end
 
-  def reindex
+  def reindex(force_rebuild = false)
     Geminabox.fixup_bundler_rubygems!
-    Gem::Indexer.new(options.data).generate_index
+    force_rebuild = true if settings.build_legacy
+    if force_rebuild
+      indexer.generate_index
+    else
+      indexer.update_index
+    end
+  end
+
+  def indexer
+    Gem::Indexer.new(settings.data, :build_legacy => settings.build_legacy)
   end
 
   def file_path
-    File.expand_path(File.join(options.data, *request.path_info))
+    File.expand_path(File.join(settings.data, *request.path_info))
   end
 
   def load_gems
     %w(specs prerelease_specs).inject(GemVersionCollection.new){|gems, specs_file_type|
-      specs_file_path = File.join(options.data, "#{specs_file_type}.#{Gem.marshal_version}.gz")
+      specs_file_path = File.join(settings.data, "#{specs_file_type}.#{Gem.marshal_version}.gz")
       if File.exists?(specs_file_path)
         gems |= Geminabox::GemVersionCollection.new(Marshal.load(Gem.gunzip(Gem.read_binary(specs_file_path))))
       end
@@ -132,7 +142,7 @@ HTML
 
   helpers do
     def spec_for(gem_name, version)
-      spec_file = File.join(options.data, "quick", "Marshal.#{Gem.marshal_version}", "#{gem_name}-#{version}.gemspec.rz")
+      spec_file = File.join(settings.data, "quick", "Marshal.#{Gem.marshal_version}", "#{gem_name}-#{version}.gemspec.rz")
       Marshal.load(Gem.inflate(File.read(spec_file))) if File.exists? spec_file
     end
   end

data/lib/geminabox/gem_version.rb

@@ -11,9 +11,13 @@ class Geminabox::GemVersion
     !!(platform =~ /ruby/i)
   end
 
+  def version
+    Gem::Version.create(number)
+  end
+
   def <=>(other)
     sort = other.name <=> name
-    sort = other.number <=> number          if sort.zero?
+    sort = version <=>  other.version       if sort.zero?
     sort = (other.ruby? && !ruby?) ? 1 : -1 if sort.zero? && ruby? != other.ruby?
     sort = other.platform <=> platform      if sort.zero?
 

data/lib/geminabox/gem_version_collection.rb

@@ -21,6 +21,14 @@ class Geminabox::GemVersionCollection
     @gems.sort!
   end
 
+  def oldest
+    @gems.first
+  end
+
+  def newest
+    @gems.last
+  end
+
   def |(other)
     self.class.new(self.gems | other.gems)
   end

data/public/master.css

@@ -2,7 +2,7 @@
 
 
 body {
-  background: #a00;
+  background: #ddd;
   color: #444;
   font-size: 1.2em;
   font-family: "helvetica neue",  sans-serif;
@@ -35,6 +35,7 @@ code {
 
 #content {
   background: #fff;
+  border: 1px solid #ccc;
   width: 600px;
   margin: 0 auto;
   overflow: hidden;

data/views/atom.erb

@@ -2,14 +2,14 @@
 
 <feed xmlns="http://www.w3.org/2005/Atom">
   <title>Gem in a Box</title>
-  <link href="<%= url_for '/atom.xml' %>" rel="self" />
-  <link href="<%= url_for '/' %>" />
+  <link href="<%= url '/atom.xml' %>" rel="self" />
+  <link href="<%= url '/' %>" />
 
   <% @gems.each do |name, versions| %>
     <entry>
       <title><%= name %> (<%= versions.size == 1 ? versions.first : "#{versions.first} - #{versions.last}" %>)</title>
       <% versions.each do |version| %>
-        <link href="<%= url_for "/gems/#{name}-#{version}.gem" %>" />
+        <link href="<%= url "/gems/#{name}-#{version}.gem" %>" />
       <% end %>
     </entry>
   <% end %>

data/views/index.erb

@@ -7,7 +7,7 @@
 
     <% @gems.by_name do |name, versions| %>
       <li <%= %{id="jump_#{name[0..0]}"} if @index_gems.delete(name[0..0]) %> class="gem-version">
-        <h2><%= name %> (<%= versions.count == 1 ? versions.first.number : "#{versions.first.number} - #{versions.first.number}" %>)</h2>
+        <h2><%= name %> (<%= versions.count == 1 ? versions.first.number : "#{versions.oldest.number} - #{versions.newest.number}" %>)</h2>
         <% versions.each do |version| %>
           <p>
             <code>gem install <%= version.name %> <%= "--prerelease" if version.number.to_s.match(/[a-z]/i) %> -v "<%= version.number %>"</code>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geminabox
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Tom Lea
@@ -15,12 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 Z
+date: 2012-01-13 00:00:00 +00:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +31,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,8 +45,21 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
 description: A sinatra based gem hosting app, with client side gem push style functionality.
 email: contrib@tomlea.co.uk
 executables: []
@@ -69,6 +84,7 @@ files:
 - views/index.erb
 - views/layout.erb
 - views/upload.erb
+has_rdoc: true
 homepage: http://tomlea.co.uk/p/gem-in-a-box
 licenses: []
 
@@ -99,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Really simple rubygem hosting