geminabox 0.3.2 → 0.3.3

data/lib/geminabox.rb

@@ -1,7 +1,9 @@
+require 'rubygems'
+require 'bundler/setup'
+
 require "digest/md5"
 require "builder"
 require 'sinatra/base'
-require 'rubygems'
 require 'rubygems/builder'
 require "rubygems/indexer"
 
@@ -45,6 +47,11 @@ class Geminabox < Sinatra::Base
     erb :upload
   end
 
+  get '/reindex' do
+    reindex
+    redirect "/"
+  end
+
   delete '/gems/*.gem' do
     File.delete file_path if File.exists? file_path
     reindex
@@ -113,15 +120,14 @@ HTML
     %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")
       if File.exists?(specs_file_path)
-        gems + Marshal.load(Gem.gunzip(Gem.read_binary(specs_file_path)))
-      else
-        gems
+        gems |= Geminabox::GemVersionCollection.new(Marshal.load(Gem.gunzip(Gem.read_binary(specs_file_path))))
       end
+      gems
     }
   end
 
   def index_gems(gems)
-    Set.new(gems.map{|name, _| name[0..0]})
+    Set.new(gems.map{|gem| gem.name[0..0]})
   end
 
   helpers do

data/lib/geminabox/gem_version.rb

@@ -0,0 +1,27 @@
+class Geminabox::GemVersion
+  attr_accessor :name, :number, :platform
+
+  def initialize(name, number, platform)
+    @name = name
+    @number = number
+    @platform = platform
+  end
+
+  def ruby?
+    !!(platform =~ /ruby/i)
+  end
+
+  def <=>(other)
+    sort = other.name <=> name
+    sort = other.number <=> number          if sort.zero?
+    sort = (other.ruby? && !ruby?) ? 1 : -1 if sort.zero? && ruby? != other.ruby?
+    sort = other.platform <=> platform      if sort.zero?
+
+    sort
+  end
+
+  def gemfile_name
+    included_platform = ruby? ? nil : platform
+    [name, number, included_platform].compact.join('-')
+  end
+end

data/lib/geminabox/gem_version_collection.rb

@@ -1,26 +1,49 @@
+require 'geminabox/gem_version'
+
 class Geminabox::GemVersionCollection
   include Enumerable
 
-  def initialize(initial_gems = [])
-    @gems = Hash.new{|h,k| h[k] = [] }
-    initial_gems.each{|g| self << g }
+  attr_reader :gems
+
+  def initialize(initial_gems=[])
+    @gems = []
+    initial_gems.each { |gemdef| self << gemdef }
   end
 
-  def <<(gemdef)
-    name,version,_ = gemdef
-    return self if name.nil?
-    @gems[name] += [version].flatten
-    @gems[name].sort!
-    self
+  def <<(version_or_def)
+    version = if version_or_def.is_a?(Geminabox::GemVersion)
+                version_or_def
+              else
+                Geminabox::GemVersion.new(*version_or_def)
+              end
+
+    @gems << version
+    @gems.sort!
   end
 
-  def + other
-    other.inject(self.class.new(self)){|new_set, gemdef|
-      new_set << gemdef
-    }
+  def |(other)
+    self.class.new(self.gems | other.gems)
   end
 
   def each(&block)
-    @gems.sort_by{|name, versions| name }.each(&block)
+    @gems.each(&block)
+  end
+
+  def by_name
+    grouped = @gems.inject(hash_of_collections) do |grouped, gem|
+      grouped[gem.name] << gem
+      grouped
+    end
+
+    if block_given?
+      grouped.each(&Proc.new)
+    else
+      grouped
+    end
+  end
+
+  private
+  def hash_of_collections
+    Hash.new { |h,k| h[k] = self.class.new }
   end
 end

data/public/master.css

@@ -9,6 +9,12 @@ body {
   margin: 0;
 }
 
+small {
+  color: #999;
+  font-size: 60%;
+}
+
+
 a {
   text-decoration: none;
   color: #00a;
@@ -110,3 +116,19 @@ ul.gemlist li .delete-form:hover button {
   margin-top: 1.0em;
   color: #aaa;
 }
+
+
+.gem-version form p {
+  margin: 0;
+  padding: 1px 0;
+  border: 0;
+  font-weight: normal;
+  font-style: normal;
+  font-size: 100%;
+  line-height: 1;
+  font-family: inherit;
+}
+
+.gem-version small.platform {
+  padding: 0 0 0 15px;
+}

data/views/index.erb

@@ -5,12 +5,17 @@
 
   <ul class="gemlist">
 
-    <% @gems.each do |name, versions| %>
-      <li <%= %{id="jump_#{name[0..0]}"} if @index_gems.delete(name[0..0]) %>>
-        <h2><%= name %> (<%= versions.size == 1 ? versions.first : "#{versions.first} - #{versions.last}" %>)</h2>
+    <% @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>
         <% versions.each do |version| %>
-          <form class="delete-form" method="post" action="/gems/<%= name %>-<%= version %>.gem">
-            <code>gem install <%= name %> <%= "--prerelease" if version.to_s.match(/[a-z]/i) %> -v "<%= version %>"</code>
+          <form class="delete-form" method="post" action="/gems/<%= version.gemfile_name %>.gem">
+            <p>
+              <code>gem install <%= version.name %> <%= "--prerelease" if version.number.to_s.match(/[a-z]/i) %> -v "<%= version.number %>"</code>
+              <% unless version.platform =~ /^ruby/i %>
+                <small class="platform"><%= version.platform %></small>
+              <% end %>
+            </p>
             <input type="hidden" name="_method" value="DELETE" />
             <button type="submit">delete</button>
           </form>
@@ -18,7 +23,7 @@
 
         <div class="details">
           <p>
-            <% if spec = spec_for(name, versions.last) %>
+            <% if spec = spec_for(name, versions.first.number) %>
               <%= spec.description %>
               <br/>
               <span class="author">– <%= spec.authors.map do |author|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geminabox
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Tom Lea
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 +01:00
-default_executable: 
+date: 2011-12-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -56,6 +55,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - README.markdown
+- lib/geminabox/gem_version.rb
 - lib/geminabox/gem_version_collection.rb
 - lib/geminabox.rb
 - lib/hostess.rb
@@ -69,7 +69,6 @@ files:
 - views/index.erb
 - views/layout.erb
 - views/upload.erb
-has_rdoc: true
 homepage: http://tomlea.co.uk/p/gem-in-a-box
 licenses: []
 
@@ -100,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Really simple rubygem hosting