geminabox 3.1.1 → 4.0.0

data/views/gem.erb

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

data/views/index.erb

@@ -1,55 +1,52 @@
-<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>
-<% if @allow_upload %>
-<small>and then ...</small>
-  <pre><code>gem install geminabox<br />gem inabox [gemfile]</code></pre>
-<% end %>
-</p>
+<div class="intro">
+  <p class="hint">Add this server to your Gemfile, then paste gem lines from below into the block</p>
+  <code class="command snippet">source "<%= h(url("/")) %>" do
+  gem "..."
+end</code>
+  <p class="hint">If you needed credentials to get to this page</p>
+  <code class="command">bundle config set --global <%= h(URI(url("/")).host) %> username:password</code>
+  <p class="hint">Without Bundler</p>
+  <code class="command">gem install GEMNAME --source <%= h(url("/")) %></code>
+  <% if @allow_upload %>
+  <p class="hint">and then ...</p>
+  <code class="command">gem install geminabox<br />gem inabox [gemfile]</code>
+  <% end %>
+</div>
 
 <% if @gems.any? %>
-  <% if @allow_upload %><a href="<%= url("/upload") %>">Upload Another Gem</a><% end %>
+  <% if @allow_upload %><p class="upload-link"><a href="<%= url("/upload") %>">Upload Another Gem</a></p><% end %>
 
-  <div id="alpha_index"><%= ("a".."z").map{|i| @index_gems.include?(i) ? "<a href='#jump_#{i}'>#{i}</a>" : i }.join(" - ") %></div>
+  <nav id="alpha_index">
+    <% ("a".."z").each do |i| %>
+      <% if @index_gems.include?(i) %><a href="#jump_<%= i %>"><%= i %></a><% else %><span><%= i %></span><% end %>
+    <% end %>
+  </nav>
 
   <ul class="gemlist">
 
     <% @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><%= 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 <%= 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"><%= h(version.platform) %></small>
-            <% end %>
-          </p>
-          <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>
-            <% end %>
-          </form>
-        <% end %>
-
-        <% if versions.count > 5 %>
-          <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) %>
-              <%= h(spec.description) %>
-              <br/>
-              <span class="author">– <%= spec.authors.map do |author|
-                "<a href='#{href(spec.homepage)}'>#{h(author)}</a>"
-              end.join(', ') %></span>
-            <% end %>
-          </p>
+      <li <%= %{id="jump_#{name[0..0].downcase}"} if @index_gems.delete(name[0..0].downcase) %> class="gem-card">
+        <div class="card-header" id="gem_<%= h(name) %>">
+          <h2><%= h(name) %> (<%= h(versions.count == 1 ? versions.first.number : "#{versions.oldest.number} - #{versions.newest.number}") %>)<a class="permalink" href="#gem_<%= h(name) %>" title="Permalink to <%= h(name) %>" aria-label="Permalink to <%= h(name) %>"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M9 17H7A5 5 0 0 1 7 7h2"></path><path d="M15 7h2a5 5 0 1 1 0 10h-2"></path><line x1="8" y1="12" x2="16" y2="12"></line></svg></a></h2>
+        </div>
+        <div class="card-body">
+          <% versions.each.reverse_each.first(5).each do |version| %>
+            <%= erb :_version_row, layout: false, locals: { version: version } %>
+          <% end %>
+
+          <% if versions.count > 5 %>
+            <div class="more-link"><a href="<%= h(url("/gems/#{name}")) %>">Older versions...</a></div>
+          <% end %>
+        </div>
+
+        <div class="card-footer">
+          <% newest_gem = versions.newest %>
+          <% if spec = spec_for(name, newest_gem.number, newest_gem.platform) %>
+            <p><%= h(spec.description) %></p>
+            <p class="author">– <%= spec.authors.map do |author|
+              "<a href='#{href(spec.homepage)}'>#{h(author)}</a>"
+            end.join(', ') %></p>
+          <% end %>
         </div>
 
       </li>
@@ -57,6 +54,4 @@
   </ul>
 <% end %>
 
-<% if @allow_upload %><a href="<%= url("/upload") %>">Upload Another Gem</a><% end %>
-
-<script type="text/javascript" src="<%= url "/master.js", false %>"></script>
+<% if @allow_upload %><p class="upload-link"><a href="<%= url("/upload") %>">Upload Another Gem</a></p><% end %>

data/views/layout.erb

@@ -10,5 +10,21 @@
       <h1>Gem in a Box</h1>
       <%= yield %>
     </div>
+    <% if @allow_delete %>
+    <dialog id="delete-confirm">
+      <div class="delete-confirm-body">
+        <div class="accent"></div>
+        <div>
+          <h3></h3>
+          <p></p>
+        </div>
+      </div>
+      <div class="delete-confirm-actions">
+        <button type="button" class="cancel">Cancel</button>
+        <button type="button" class="danger">Delete this version</button>
+      </div>
+    </dialog>
+    <% end %>
+    <script type="text/javascript" src="<%= url "/master.js", false %>"></script>
   </body>
 </html>

data/views/upload.erb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Tom Lea
@@ -103,6 +103,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: compact_index
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: rubygems-generate_index
   requirement: !ruby/object:Gem::Requirement
@@ -117,8 +131,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-description: A private gem hosting and/or caching app, with client side gem push style
-  functionality. Web UI is provided.
+- !ruby/object:Gem::Dependency
+  name: rss
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+description: A private gem hosting app, with client side gem push style functionality.
+  Web UI is provided.
 email:
 - contrib@tomlea.co.uk
 - jack@foys.net
@@ -133,8 +161,9 @@ files:
 - MIT-LICENSE
 - README.md
 - lib/geminabox.rb
+- lib/geminabox/compact_index_api.rb
+- lib/geminabox/compact_indexer.rb
 - lib/geminabox/disk_cache.rb
-- lib/geminabox/gem_list_merge.rb
 - lib/geminabox/gem_store.rb
 - lib/geminabox/gem_store_error.rb
 - lib/geminabox/gem_version.rb
@@ -146,12 +175,6 @@ files:
 - lib/geminabox/http_adapter_config_error.rb
 - lib/geminabox/incoming_gem.rb
 - lib/geminabox/indexer.rb
-- lib/geminabox/proxy.rb
-- lib/geminabox/proxy/copier.rb
-- lib/geminabox/proxy/file_handler.rb
-- lib/geminabox/proxy/hostess.rb
-- lib/geminabox/proxy/splicer.rb
-- lib/geminabox/rubygems_dependency.rb
 - lib/geminabox/server.rb
 - lib/geminabox/version.rb
 - lib/geminabox_client.rb
@@ -160,6 +183,7 @@ files:
 - public/favicon.ico
 - public/master.css
 - public/master.js
+- views/_version_row.erb
 - views/atom.erb
 - views/gem.erb
 - views/index.erb
@@ -170,7 +194,6 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/geminabox/geminabox
-  source_code_uri: https://github.com/geminabox/geminabox
   changelog_uri: https://github.com/geminabox/geminabox/releases
 rdoc_options:
 - "--main"

data/lib/geminabox/gem_list_merge.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require "set"
-
-module Geminabox
-  module GemListMerge
-    def self.merge(local_gem_list, remote_gem_list, strategy:)
-      strategy_for(strategy).merge(local_gem_list, remote_gem_list)
-    end
-
-    def self.strategy_for(strategy)
-      case strategy
-      when :local_gems_take_precedence_over_remote_gems
-        LocalGemsTakePrecedenceOverRemoteGems
-      when :combine_local_and_remote_gem_versions
-        CombineLocalAndRemoteGemVersions
-      else
-        raise ArgumentError, "Merge strategy must be :local_gems_take_precedence_over_remote_gems (default) or :combine_local_and_remote_gem_versions"
-      end
-    end
-
-    module LocalGemsTakePrecedenceOverRemoteGems
-      def self.merge(local_gem_list, remote_gem_list)
-        names = Set.new(local_gem_list.map { |gem| gem[:name] })
-        local_gem_list + remote_gem_list.reject { |gem| names.include? gem[:name] }
-      end
-    end
-
-    module CombineLocalAndRemoteGemVersions
-      IGNORE_DEPENDENCIES = 0..-2
-
-      def self.merge(local_gem_list, remote_gem_list)
-        merged = local_gem_list + remote_gem_list
-        merged.uniq! {|val| val.values[IGNORE_DEPENDENCIES] }
-        merged.sort_by! {|x| x.values[IGNORE_DEPENDENCIES] }
-        merged
-      end
-    end
-  end
-end

data/lib/geminabox/proxy/copier.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-
-module Geminabox
-  module Proxy
-    class Copier < FileHandler
-
-      def self.copy(file_name)
-        copier = new(file_name)
-        copier.get_file
-        copier
-      end
-
-      def get_file
-        return true if proxy_file_exists?
-        return copy_local if local_file_exists?
-        get_remote
-      end
-
-      def copy_local
-        FileUtils.cp local_path, proxy_path
-      end
-
-      def get_remote
-        begin
-          if rc = remote_content
-            File.open(proxy_path, 'wb'){|f| f.write(rc) }
-          end
-        rescue
-          File.unlink(proxy_path) if File.exist?(proxy_path)
-          raise $!
-        end
-      end
-
-    end
-  end
-end

data/lib/geminabox/proxy/file_handler.rb

@@ -1,102 +0,0 @@
-# frozen_string_literal: true
-
-module Geminabox
-  module Proxy
-    class FileHandler
-
-      attr_reader :file_name
-
-      def initialize(file_name)
-        @file_name = file_name
-        # file_name comes from the request path; both paths get mkdir_p and writes.
-        root = File.expand_path(root_path) + File::SEPARATOR
-        unless local_path.start_with?(root) && proxy_path.start_with?(root)
-          raise ArgumentError, "#{file_name} resolves outside #{root_path}"
-        end
-        ensure_destination_exists
-      end
-
-      def local_path
-        File.expand_path(file_name, root_path)
-      end
-
-      def root_path
-        Geminabox.data
-      end
-
-      def local_file_exists?
-        file_exists? local_path
-      end
-
-      def proxy_file_exists?
-        file_exists? proxy_path
-      end
-
-      def proxy_path
-        File.expand_path(file_name, proxy_folder_path)
-      end
-
-      def file_exists?(path)
-        File.exist? path
-      end
-
-      def proxy_folder_path
-        File.join(root_path, proxy_folder_name)
-      end
-
-      def proxy_folder_name
-        'proxy'
-      end
-
-      def remote_content
-        Geminabox.http_adapter.get_content(remote_url)
-      rescue
-        return nil if Geminabox.allow_remote_failure
-        raise GemStoreError.new(500, "Unable to get content from #{remote_url}")
-      end
-
-      def remote_url
-        URI.join(Geminabox.ruby_gems_url, file_name)
-      end
-
-      def local_content
-        File.binread(local_path)
-      end
-
-      private
-      def encoding
-        "UTF-8"
-      end
-
-      def ensure_destination_exists
-        create_local_folder unless local_folder_exists?
-        create_proxy_folder unless proxy_folder_exists?
-      end
-
-      def proxy_file_folder
-        File.dirname proxy_path
-      end
-
-      def proxy_folder_exists?
-        Dir.exist?(proxy_file_folder)
-      end
-
-      def create_proxy_folder
-        FileUtils.mkdir_p(proxy_file_folder)
-      end
-
-      def local_file_folder
-        File.dirname local_path
-      end
-
-      def local_folder_exists?
-        Dir.exist?(local_file_folder)
-      end
-
-      def create_local_folder
-        FileUtils.mkdir_p(local_file_folder)
-      end
-
-    end
-  end
-end

data/lib/geminabox/proxy/hostess.rb

@@ -1,85 +0,0 @@
-# frozen_string_literal: true
-
-require 'sinatra/base'
-require 'net/http'
-
-module Geminabox
-  module Proxy
-    class Hostess < Sinatra::Base
-      set :host_authorization, { permitted_hosts: [] }
-
-      attr_accessor :file_handler
-      def serve
-        headers["Cache-Control"] = 'no-transform'
-        if file_handler
-          send_file file_handler.proxy_path
-        else
-          send_file(data_path, :type => response['Content-Type'])
-        end
-      end
-
-      %w[specs.4.8.gz
-         latest_specs.4.8.gz
-         prerelease_specs.4.8.gz
-      ].each do |index|
-        get "/#{index}" do
-          splice_file index
-          content_type 'application/x-gzip'
-          serve
-        end
-      end
-
-      get '/quick/Marshal.4.8/*.gemspec.rz' do
-        copy_file request.path_info[1..]
-        content_type('application/x-deflate')
-        serve
-      end
-
-      %w[specs.4.8
-         latest_specs.4.8
-         prerelease_specs.4.8
-      ].each do |index|
-        get "/#{index}" do
-          splice_file index
-          serve
-        end
-      end
-
-      get "/gems/*.gem" do
-        get_from_rubygems_if_not_local
-        serve
-      end
-
-      private
-      def get_from_rubygems_if_not_local
-
-        unless File.exist?(data_path)
-          ruby_gems_url = Geminabox.ruby_gems_url
-          path = File.join(ruby_gems_url, *request.path_info)
-          content = Geminabox.http_adapter.get_content(path)
-          GemStore.create(IncomingGem.new(StringIO.new(content)))
-        end
-
-      end
-
-      def splice_file(file_name)
-        self.file_handler = Splicer.make(file_name)
-      end
-
-      def copy_file(file_name)
-        self.file_handler = Copier.copy(file_name)
-      rescue ArgumentError
-        halt 404
-      end
-
-      # Rack::Protection normally strips ".." first; this holds without it.
-      def data_path
-        path = File.expand_path(File.join(Geminabox.data, *request.path_info))
-        halt 404 unless path.start_with?(File.expand_path(Geminabox.data) + File::SEPARATOR)
-        path
-      end
-
-
-    end
-  end
-end

data/lib/geminabox/proxy/splicer.rb

@@ -1,85 +0,0 @@
-# frozen_string_literal: true
-
-require 'tempfile'
-require 'fileutils'
-require 'rubygems/util'
-
-module Geminabox
-  module Proxy
-    class Splicer < FileHandler
-
-      def self.make(file_name)
-        splicer = new(file_name)
-        splicer.create
-        splicer
-      end
-
-      def create
-        if data = new_content
-          f = Tempfile.create('geminabox')
-          f.binmode
-          begin
-            f.write(data)
-          ensure
-            f.close rescue nil
-          end
-          FileUtils.mv f.path, splice_path
-        end
-      end
-
-      def new_content
-        if local_file_exists?
-          merge_content
-        else
-          remote_content
-        end
-      end
-
-      def splice_path
-        proxy_path
-      end
-
-      def splice_folder_path
-        proxy_folder_path
-      end
-
-      def splice_file_exists?
-        file_exists? splice_path
-      end
-
-      def merge_content
-        if gzip?
-          merge_gziped_content
-        else
-          merge_text_content
-        end
-      end
-
-      def gzip?
-        /\.gz$/ =~ file_name
-      end
-
-      private
-      def merge_gziped_content
-        if rc = remote_content
-          package(unpackage(local_content) | unpackage(rc))
-        else
-          local_content
-        end
-      end
-
-      def unpackage(content)
-        Marshal.load(Gem::Util.gunzip(content))
-      end
-
-      def package(content)
-        Gem::Util.gzip(Marshal.dump(content))
-      end
-
-      def merge_text_content
-        local_content.to_s + remote_content.to_s
-      end
-
-    end
-  end
-end

data/lib/geminabox/proxy.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Geminabox
-  module Proxy
-    def self.proxy_path(file)
-      File.join File.dirname(__FILE__), 'proxy', file
-    end
-
-    autoload :Hostess,      proxy_path('hostess')
-    autoload :FileHandler,  proxy_path('file_handler')
-    autoload :Splicer,      proxy_path('splicer')
-    autoload :Copier,       proxy_path('copier')
-  end
-end