geminabox 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 58341b99ae23a2be5f634b571d4f2d95f7c3824b
-  data.tar.gz: d5dab4aa7155ca48994f6bac27902072f3fead85
+SHA256:
+  metadata.gz: d4cd157b68695f62078fdfe0852c583684149a3df1bf12fe49c77f52786cf814
+  data.tar.gz: 81190a65a9f11776e07569922f7284a72cece2f5a39fa3a950155276b95f0ad1
 SHA512:
-  metadata.gz: 52a5d0c2190743b85fe4f588e80a0283725ca2e00f11216747cfc2f8e200eb0621789223e859804480ffe6e03b7f282e2fcfe3768d217e33fbd200ed5cb595b8
-  data.tar.gz: bf43c59a32f80f9ba739ed632a2529acf71f052f5842f4ce0fdc44210d6671a1fbb722c3a3bd1f98ec60c059c2a9c0238dbe1e4fe5d284c91fc8fbce6d7d85f1
+  metadata.gz: 48c92617e64fd7abfbe55aee1223f2fa56ee5e6c6436e470b3b491182ccf5508ff259822204c53c32503ce9eb2be38f94e817e4cd0c6e6a3df27814006014f93
+  data.tar.gz: 4baad42fcfce75ff75411481cf118cde1e991471bb9f650f6869e9ccd68b8078448debcbbd5185b3d8cbe4a5b478e7485de6e8a8e7e615ea6420ed89a45fc34e

data/lib/geminabox.rb

@@ -67,7 +67,7 @@ module Geminabox
     def settings
       Server.settings
     end
-    
+
     def call(env)
       Server.call env
     end
@@ -85,7 +85,7 @@ module Geminabox
     rubygems_proxy_merge_strategy:  ENV.fetch('RUBYGEMS_PROXY_MERGE_STRATEGY') { :local_gems_take_precedence_over_remote_gems }.to_sym,
     allow_delete:                   true,
     http_adapter:                   HttpClientAdapter.new,
-    lockfile:                       '/tmp/geminabox.lockfile',
+    lockfile:                       File.join(ENV.fetch('TMPDIR', '/tmp'), 'geminabox.lockfile'),
     retry_interval:                 60,
     allow_remote_failure:           false,
     ruby_gems_url:                  'https://rubygems.org/',
@@ -93,5 +93,5 @@ module Geminabox
     allow_upload:                   true,
     on_gem_received:                nil
   )
-    
+
 end

data/lib/geminabox/server.rb

@@ -206,7 +206,7 @@ module Geminabox
     def serialize_update(&block)
       with_rlock(&block)
     rescue ReentrantFlock::AlreadyLocked
-      halt 503, { 'Retry-After' => Geminabox.retry_interval }, 'Repository lock is held by another process'
+      halt 503, { 'Retry-After' => Geminabox.retry_interval.to_s }, 'Repository lock is held by another process'
     end
 
     def with_rlock(&block)

data/lib/geminabox/version.rb

@@ -1,3 +1,3 @@
 module Geminabox
-  VERSION = '1.3.0' unless defined? VERSION
+  VERSION = '1.4.1' unless defined? VERSION
 end

data/views/atom.erb

@@ -10,12 +10,12 @@
   <% newest_gem = versions.newest %>
     <% spec = spec_for(name, newest_gem.number, newest_gem.platform) %>
     <entry>
-      <id><%= name %></id>
+      <id><%= h(name) %></id>
       <updated><%= spec.date.w3cdtf %></updated>
-      <title><%= name %> (<%= versions.size == 1 ? versions.oldest.number : "#{versions.oldest.number} - #{versions.newest.number}" %>)</title>
-      <author><name><%= spec.authors.join(", ") %></name></author>
+      <title><%= h(name) %> (<%= h(versions.size == 1 ? versions.oldest.number : "#{versions.oldest.number} - #{versions.newest.number}") %>)</title>
+      <author><name><%= h(spec.authors.join(", ")) %></name></author>
       <% versions.each do |version| %>
-        <link href="<%= url "/gems/#{version.gemfile_name}.gem" %>" />
+        <link href="<%= h(url "/gems/#{version.gemfile_name}.gem") %>" />
       <% end %>
     </entry>
   <% end %>

data/views/gem.erb

@@ -5,18 +5,18 @@
 <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>
+      <h2><%= h(name) %> (<%= h(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>
+        <code>gem install <%= h(version.name) %> <%= "--prerelease" if version.number.to_s.match(/[a-z]/i) %> -v "<%= h(version.number) %>"</code>
         <% unless version.platform =~ /^ruby/i %>
-          <small class="platform"><%= version.platform %></small>
+          <small class="platform"><%= h(version.platform) %></small>
         <% end %>
         </p>
         <div class="delete-form">
-          <a class="download" href="<%= url("/gems/#{version.gemfile_name}.gem") %>">download</a>
+          <a class="download" href="<%= h(url("/gems/#{version.gemfile_name}.gem")) %>">download</a>
           <% if @allow_delete %>
-          <form method="post" action="<%= url("/gems/#{version.gemfile_name}.gem") %>">
+          <form method="post" action="<%= h(url("/gems/#{version.gemfile_name}.gem")) %>">
             <input type="hidden" name="_method" value="DELETE" />
             <button type="submit">delete</button>
           </form>
@@ -28,10 +28,10 @@
         <p>
         <% newest_gem = versions.newest %>
         <% if spec = spec_for(name, newest_gem.number, newest_gem.platform) %>
-          <%= spec.description %>
+          <%= h(spec.description) %>
           <br/>
           <span class="author">– <%= spec.authors.map do |author|
-            "<a href='#{href(spec.homepage)}'>#{author}</a>"
+            "<a href='#{href(spec.homepage)}'>#{h(author)}</a>"
           end.join(', ') %></span>
         <% end %>
         </p>

data/views/index.erb

@@ -18,16 +18,16 @@
 
     <% @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>
+        <h2><%= h(name) %> (<%= h(versions.count == 1 ? versions.first.number : "#{versions.oldest.number} - #{versions.newest.number}") %>)</h2>
         <% 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>
+            <code>gem install <%= h(version.name) %> <%= "--prerelease" if version.number.to_s.match(/[a-z]/i) %> -v "<%= h(version.number) %>"</code>
             <% unless version.platform =~ /^ruby/i %>
-              <small class="platform"><%= version.platform %></small>
+              <small class="platform"><%= h(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>
+          <form class="delete-form" method="post" action="<%= h(url("/gems/#{version.gemfile_name}.gem")) %>">
+            <a class="download" href="<%= h(url("/gems/#{version.gemfile_name}.gem")) %>">download</a>
             <% if @allow_delete %>
             <input type="hidden" name="_method" value="DELETE" />
             <button type="submit">delete</button>
@@ -36,17 +36,17 @@
         <% end %>
 
         <% if versions.count > 5 %>
-          <a href="<%= url("/gems/#{name}") %>" id="more_link">Older versions...</a>
+          <a href="<%= h(url("/gems/#{name}")) %>" id="more_link">Older versions...</a>
         <% end %>
 
         <div class="details">
           <p>
             <% newest_gem = versions.newest %>
             <% if spec = spec_for(name, newest_gem.number, newest_gem.platform) %>
-              <%= spec.description %>
+              <%= h(spec.description) %>
               <br/>
               <span class="author">– <%= spec.authors.map do |author|
-                "<a href='#{href(spec.homepage)}'>#{author}</a>"
+                "<a href='#{href(spec.homepage)}'>#{h(author)}</a>"
               end.join(', ') %></span>
             <% end %>
           </p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Tom Lea
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -97,6 +97,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rss
+  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'
 description: A sinatra based gem hosting app, with client side gem push style functionality.
 email:
 - contrib@tomlea.co.uk
@@ -166,8 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Really simple rubygem hosting