geminabox 0.6.1 → 0.7.0

data/README.markdown

@@ -1,12 +1,13 @@
 # Gem in a Box – Really simple rubygem hosting
-## 
+##
 
-Geminabox let's you host your own gems, and push new gems to it just like with rubygems.org.
+Geminabox lets you host your own gems, and push new gems to it just like with rubygems.org.
 The bundler dependencies API is supported out of the box.
-Authentication it left up to either the web server, or the Rack stack.
+Authentication is left up to either the web server, or the Rack stack.
 For basic auth, try [Rack::Auth](http://rack.rubyforge.org/doc/Rack/Auth/Basic.html).
 
 
+[![Build Status](https://secure.travis-ci.org/cwninja/geminabox.png)](http://travis-ci.org/cwninja/geminabox)
 
 
 ![screen shot](http://pics.tomlea.co.uk/bbbba6/geminabox.png)
@@ -30,7 +31,7 @@ And finally, hook up the config.ru as you normally would ([passenger][passenger]
 
 ## 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:
+RubyGems supports generating indexes for the so called legacy versions (< 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 your config.ru file:
 
     Geminabox.build_legacy = false
 

data/lib/geminabox/version.rb

@@ -1 +1 @@
-GeminaboxVersion = '0.6.1' unless defined? GeminaboxVersion
+GeminaboxVersion = '0.7.0' unless defined? GeminaboxVersion

data/lib/geminabox.rb

@@ -7,6 +7,7 @@ require 'rubygems/indexer'
 require 'hostess'
 require 'geminabox/version'
 require 'rss/atom'
+require 'tempfile'
 
 class Geminabox < Sinatra::Base
   enable :static, :methodoverride
@@ -50,8 +51,9 @@ class Geminabox < Sinatra::Base
   end
 
   get '/api/v1/dependencies' do
-    disk_cache.cache(params[:gems]) do
-      query_gems = params[:gems].split(',')
+    query_gems = params[:gems].split(',').sort
+    cache_key = query_gems.join(',')
+    disk_cache.cache(cache_key) do
       deps = load_gems.gems.select {|gem| query_gems.include?(gem.name) }.map do |gem|
         spec = spec_for(gem.name, gem.number)
         {
@@ -74,6 +76,13 @@ class Geminabox < Sinatra::Base
     redirect url("/")
   end
 
+  get '/gems/:gemname' do
+    gems = Hash[load_gems.by_name]
+    @gem = gems[params[:gemname]]
+    halt 404 unless @gem
+    erb :gem
+  end
+
   delete '/gems/*.gem' do
     File.delete file_path if File.exists? file_path
     reindex(:force_rebuild)
@@ -82,8 +91,8 @@ class Geminabox < Sinatra::Base
 
   post '/upload' do
     if File.exists? Geminabox.data
-      error_response( 500, "Please ensure #{File.expand_path(Geminabox.data)} is writable by the geminabox web server." ) unless File.writable? 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)
@@ -114,14 +123,14 @@ class Geminabox < Sinatra::Base
         error_response(200, "Ignoring upload, you uploaded the same thing previously.")
       end
     end
-
-    File.open(dest_filename, "wb") do |f|
+    
+    atomic_write(dest_filename) do |f|
       while blk = tmpfile.read(65536)
         f << blk
       end
     end
     reindex
-
+    
     if api_request?
       "Gem #{gem_name} received and indexed."
     else
@@ -193,6 +202,16 @@ HTML
     Set.new(gems.map{|gem| gem.name[0..0].downcase})
   end
 
+  # based on http://as.rubyonrails.org/classes/File.html
+  def atomic_write(file_name)
+    temp_dir = File.join(settings.data, "_temp")
+    FileUtils.mkdir_p(temp_dir)
+    temp_file = Tempfile.new("." + File.basename(file_name), temp_dir)
+    yield temp_file
+    temp_file.close
+    File.rename(temp_file.path, file_name)
+  end
+  
   helpers do
     def spec_for(gem_name, version)
       spec_file = File.join(settings.data, "quick", "Marshal.#{Gem.marshal_version}", "#{gem_name}-#{version}.gemspec.rz")

data/lib/geminabox_client.rb

@@ -10,6 +10,7 @@ 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
   end
 
   def extract_username_and_password_from_url!(url)
@@ -27,7 +28,7 @@ class GeminaboxClient
   def push(gemfile)
     response = http_client.post(url_for(:upload), {'file' => File.open(gemfile, "rb")}, {'Accept' => 'text/plain'})
 
-    if response.status < 400
+    if response.status < 300
       response.body
     else
       raise GeminaboxClient::Error, "Error (#{response.code} received)\n\n#{response.body}"

data/public/master.css

@@ -1,4 +1,4 @@
-@import "http://fonts.googleapis.com/css?family=Droid+Sans+Mono";
+@import "https://fonts.googleapis.com/css?family=Droid+Sans+Mono";
 
 
 body {
@@ -24,6 +24,12 @@ a:hover {
   color: #00f;
 }
 
+a#more_link {
+  font-size: 0.7em;
+  line-height: 1.2;
+  vertical-align: bottom;
+}
+
 form {
   margin: 0;
 }
@@ -146,4 +152,4 @@ ul.gemlist li:hover a.download {
 
 .gem-version small.platform {
   padding: 0 0 0 15px;
-}
+}

data/views/gem.erb

@@ -0,0 +1,37 @@
+<p>
+<a href="/">Back to Gem Index</a>
+</p>
+
+<ul class="gemlist">
+  <% @gem.by_name do |name, versions| %>
+    <li class="gem-version">
+      <h2><%= name %> (<%= versions.count == 1 ? versions.first.number : "#{versions.oldest.number} - #{versions.newest.number}" %>)</h2>
+      <% versions.each.reverse_each do |version| %>
+        <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>
+        <form class="delete-form" method="post" action="<%= url("/gems/#{version.gemfile_name}.gem") %>">
+          <a class="download" href="<%= url("/gems/#{version.gemfile_name}.gem") %>">download</a>
+          <input type="hidden" name="_method" value="DELETE" />
+          <button type="submit">delete</button>
+        </form>
+      <% end %>
+
+      <div class="details">
+        <p>
+        <% if spec = spec_for(name, versions.newest.number) %>
+          <%= spec.description %>
+          <br/>
+          <span class="author">– <%= spec.authors.map do |author|
+            "<a href='#{spec.homepage}'>#{author}</a>"
+          end.join(', ') %></span>
+        <% end %>
+        </p>
+      </div>
+
+    </li>
+  <% end %>
+</ul>

data/views/index.erb

@@ -1,3 +1,12 @@
+<p>
+<small>If you did not need any credentials to get to this page</small>
+  <pre><code>gem sources -a <%= url "/" %></code></pre>
+<small>If you needed some credentials to get to this page</small>
+  <pre><code>gem sources -a <%= url.to_s.gsub('://','://username:password@') %></code></pre>
+<small>and then ...</small>
+  <pre><code>gem install geminabox<br />gem inabox [gemfile]</code></pre>
+</p>
+
 <% if @gems.any? %>
   <a href="<%= url("/upload") %>">Upload Another Gem</a>
 
@@ -8,7 +17,7 @@
     <% @gems.by_name do |name, versions| %>
       <li <%= %{id="jump_#{name[0..0].downcase}"} if @index_gems.delete(name[0..0].downcase) %> class="gem-version">
         <h2><%= name %> (<%= versions.count == 1 ? versions.first.number : "#{versions.oldest.number} - #{versions.newest.number}" %>)</h2>
-        <% versions.each do |version| %>
+        <% versions.each.reverse_each.first(5).each do |version| %>
           <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 %>
@@ -22,6 +31,10 @@
           </form>
         <% end %>
 
+        <% if versions.count > 5 %>
+          <a href="<%= url("/gems/#{name}") %>" id="more_link">Older versions...</a>
+        <% end %>
+
         <div class="details">
           <p>
             <% if spec = spec_for(name, versions.newest.number) %>

data/views/layout.erb

@@ -8,14 +8,6 @@
   <body>
     <div id="content">
       <h1>Gem in a Box</h1>
-      <p>
-      <small>If you did not need any credentials to get to this page</small>
-        <pre><code>gem sources -a <%= url "/" %></code></pre>
-      <small>If you needed some credentials to get to this page</small>
-        <pre><code>gem sources -a <%= url.to_s.gsub('://','://username:password@') %></code></pre>
-      <small>and then ...</small>
-        <pre><code>gem install geminabox<br />gem inabox [gemfile]</code></pre>
-      </p>
       <%= yield %>
     </div>
     <script type="text/javascript" src="<%= url "/jquery.js" %>"></script>

data/views/upload.erb

@@ -1,3 +1,6 @@
+<p>
+<small>Choose a gem file to upload ...</small>
+</p>
 <%= @error %>
 <form method="POST" enctype="multipart/form-data"> 
   <input type="file" name="file">

metadata

@@ -1,115 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: geminabox
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 0.7.0
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 1
-  version: 0.6.1
 platform: ruby
-authors: 
+authors:
 - Tom Lea
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+date: 2012-08-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70182476864760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
-  name: builder
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70182476864760
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &70182476863120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70182476863120
+- !ruby/object:Gem::Dependency
   name: httpclient
-- !ruby/object:Gem::Dependency 
+  requirement: &70182476861740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: *70182476861740
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70182476861160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70182476861160
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70182476859960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
-  name: rake
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *70182476859960
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70182476858640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70182476858640
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: &70182480431960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id005
-  name: rack-test
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *70182480431960
+- !ruby/object:Gem::Dependency
+  name: capybara-mechanize
+  requirement: &70182480428020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70182480428020
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70182480424560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
-  name: minitest
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70182480424560
 description: A sinatra based gem hosting app, with client side gem push style functionality.
 email: contrib@tomlea.co.uk
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - README.markdown
 - lib/geminabox/disk_cache.rb
 - lib/geminabox/gem_version.rb
@@ -125,42 +132,40 @@ files:
 - public/master.css
 - public/master.js
 - views/atom.erb
+- views/gem.erb
 - views/index.erb
 - views/layout.erb
 - views/upload.erb
 homepage: http://tomlea.co.uk/p/gem-in-a-box
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.markdown
-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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4127424449105456213
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 4127424449105456213
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Really simple rubygem hosting
 test_files: []
-