geminabox 1.0.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 8afe3098cb80942ee57d596be27995cc09985c532a4f11e91652aad2794398a7
-  data.tar.gz: d40b32a8f9975304805a35369ab3a55f80e7ad820b5c9a897d6870dd94a1b24a
+SHA1:
+  metadata.gz: 58341b99ae23a2be5f634b571d4f2d95f7c3824b
+  data.tar.gz: d5dab4aa7155ca48994f6bac27902072f3fead85
 SHA512:
-  metadata.gz: b2945ea3c84217cab2f84426d345a2171d48900ddcdec2df4632c197395c93936f51fee0540743cf2980d2b9e17818525eeeb73b3ff5202fee2a3392d9f44522
-  data.tar.gz: 7636277b6475b3ddcd51e99dfe25a02ce426fdf12dd62940b9ada6639eecc1a9569e205116502faf41c0624c57b137dd92f0ad1c38a27e6f50e372ea949394aa
+  metadata.gz: 52a5d0c2190743b85fe4f588e80a0283725ca2e00f11216747cfc2f8e200eb0621789223e859804480ffe6e03b7f282e2fcfe3768d217e33fbd200ed5cb595b8
+  data.tar.gz: bf43c59a32f80f9ba739ed632a2529acf71f052f5842f4ce0fdc44210d6671a1fbb722c3a3bd1f98ec60c059c2a9c0238dbe1e4fe5d284c91fc8fbce6d7d85f1

data/README.md

@@ -92,6 +92,24 @@ local systems SSL certificates.
 
 TemplateFaradayAdapter is provided as an example of an alternative HTTPAdapter.
 
+## Hooks
+
+You can add a hook (anything callable) which will be called when a gem is
+successfully received.
+
+```ruby
+Geminabox.on_gem_received = Proc.new do |gem|
+  puts "Gem received: #{gem.spec.name} #{gem.spec.version}"
+end
+```
+
+Typically you might use this to push a notification to your team chat. Any
+exceptions which occur within the hook is silently ignored, so please ensure they
+are handled properly if this is not desirable.
+
+Also, please note that this hook blocks `POST /upload` and `POST /api/v1/gems` APIs processing.
+Hook authors are responsible to perform any action non-blocking/async to avoid HTTP timeout.
+
 ## Client Usage
 
 Since version 0.10, Geminabox supports the standard gemcutter push API:
@@ -104,6 +122,10 @@ You can also use the gem plugin:
 
     gem inabox pkg/my-awesome-gem-1.0.gem
 
+And since version 1.2.0, Geminabox supports the standard gemcutter yank API:
+
+    gem yank my-awesome-gem -v 1.0 --host HOST
+
 Configure Gem in a box (interactive prompt to specify where to upload to):
 
     gem inabox -c

data/lib/geminabox.rb

@@ -46,6 +46,7 @@ module Geminabox
       :gem_permissions,
       :allow_delete,
       :rubygems_proxy,
+      :rubygems_proxy_merge_strategy,
       :http_adapter,
       :lockfile,
       :retry_interval,
@@ -53,6 +54,7 @@ module Geminabox
       :ruby_gems_url,
       :bundler_ruby_gems_url,
       :allow_upload,
+      :on_gem_received
     )
 
     def set_defaults(defaults)
@@ -72,22 +74,24 @@ module Geminabox
   end
 
   set_defaults(
-    data:                  File.join(File.dirname(__FILE__), *%w[.. data]),
-    public_folder:         File.join(File.dirname(__FILE__), *%w[.. public]),
-    build_legacy:          false,
-    incremental_updates:   true,
-    views:                 File.join(File.dirname(__FILE__), *%w[.. views]),
-    allow_replace:         false,
-    gem_permissions:       0644,
-    rubygems_proxy:        (ENV['RUBYGEMS_PROXY'] == 'true'),
-    allow_delete:          true,
-    http_adapter:          HttpClientAdapter.new,
-    lockfile:              '/tmp/geminabox.lockfile',
-    retry_interval:        60,
-    allow_remote_failure:  false,
-    ruby_gems_url:         'https://rubygems.org/',
-    bundler_ruby_gems_url: 'https://bundler.rubygems.org/',
-    allow_upload:          true,
+    data:                           File.join(File.dirname(__FILE__), *%w[.. data]),
+    public_folder:                  File.join(File.dirname(__FILE__), *%w[.. public]),
+    build_legacy:                   false,
+    incremental_updates:            true,
+    views:                          File.join(File.dirname(__FILE__), *%w[.. views]),
+    allow_replace:                  false,
+    gem_permissions:                0644,
+    rubygems_proxy:                 (ENV['RUBYGEMS_PROXY'] == 'true'),
+    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',
+    retry_interval:                 60,
+    allow_remote_failure:           false,
+    ruby_gems_url:                  'https://rubygems.org/',
+    bundler_ruby_gems_url:          'https://bundler.rubygems.org/',
+    allow_upload:                   true,
+    on_gem_received:                nil
   )
     
 end

data/lib/geminabox/gem_list_merge.rb

@@ -1,23 +1,38 @@
-module Geminabox
-  class GemListMerge
-    attr_accessor :list
-
-    IGNORE_DEPENDENCIES = 0..-2
+require "set"
 
-    def self.from(*lists)
-      lists.map{|list| new(list)}.inject(:merge)
+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 initialize(list)
-      @list = list
+    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 :merge_local_and_remote_gem_versions"
+      end
     end
 
-    def merge(other)
-      merged = (list + other.list)
-      merged.uniq! {|val| val.values[IGNORE_DEPENDENCIES] }
-      merged.sort_by! {|x| x.values[IGNORE_DEPENDENCIES] }
-      merged
+    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/splicer.rb

@@ -1,5 +1,6 @@
 require 'tempfile'
 require 'fileutils'
+require 'rubygems/util'
 
 module Geminabox
   module Proxy
@@ -65,11 +66,11 @@ module Geminabox
       end
 
       def unpackage(content)
-        Marshal.load(Gem.gunzip(content))
+        Marshal.load(Gem::Util.gunzip(content))
       end
 
       def package(content)
-        Gem.gzip(Marshal.dump(content))
+        Gem::Util.gzip(Marshal.dump(content))
       end
 
       def merge_text_content

data/lib/geminabox/server.rb

@@ -1,4 +1,5 @@
 require 'reentrant_flock'
+require 'rubygems/util'
 
 module Geminabox
 
@@ -119,7 +120,7 @@ module Geminabox
       serialize_update do
         params[:force_rebuild] ||= 'true'
         unless %w(true false).include? params[:force_rebuild]
-          error_response(400, "force_rebuild parameter must be either of true or false, but was #{params[:force_rebuild]}")
+          error_response(400, "force_rebuild parameter must be either of true or false")
         end
         force_rebuild = params[:force_rebuild] == 'true'
         self.class.reindex(force_rebuild)
@@ -130,6 +131,7 @@ module Geminabox
     get '/gems/:gemname' do
       gems = Hash[load_gems.by_name]
       @gem = gems[params[:gemname]]
+      @allow_delete = self.class.allow_delete?
       halt 404 unless @gem
       erb :gem
     end
@@ -147,6 +149,27 @@ module Geminabox
 
     end
 
+    delete '/api/v1/gems/yank' do
+      unless self.class.allow_delete?
+        error_response(403, 'Gem deletion is disabled')
+      end
+
+      halt 400 unless request.form_data?
+
+      serialize_update do
+        gems = load_gems.select { |gem| request['gem_name'] == gem.name and
+                                  request['version'] == gem.number.version }
+        halt 404, 'Gem not found' if gems.size == 0
+        gems.each do |gem|
+          gem_path = File.expand_path(File.join(Geminabox.data, 'gems',
+                                                "#{gem.gemfile_name}.gem"))
+          File.delete gem_path if File.exists? gem_path
+        end
+        self.class.reindex(:force_rebuild)
+        return 200, 'Yanked gem and reindexed'
+      end
+    end
+
     post '/upload' do
       unless self.class.allow_upload?
         error_response(403, 'Gem uploading is disabled')
@@ -197,6 +220,12 @@ module Geminabox
         error_response error.code, error.reason
       end
 
+      begin
+        Geminabox.on_gem_received.call(gem) if Geminabox.on_gem_received
+      rescue
+        # ignore errors which occur within the hook
+      end
+
       if api_request?
         "Gem #{gem.name} received and indexed."
       else
@@ -237,7 +266,7 @@ HTML
     def all_gems_with_duplicates
       specs_files_paths.map do |specs_file_path|
         if File.exist?(specs_file_path)
-          Marshal.load(Gem.gunzip(Gem.read_binary(specs_file_path)))
+          Marshal.load(Gem::Util.gunzip(Gem.read_binary(specs_file_path)))
         else
           []
         end
@@ -283,7 +312,7 @@ HTML
     end
 
     def combined_gem_list
-      GemListMerge.from(local_gem_list, remote_gem_list)
+      GemListMerge.merge(local_gem_list, remote_gem_list, strategy: Geminabox.rubygems_proxy_merge_strategy)
     end
 
     helpers do
@@ -305,7 +334,7 @@ HTML
         spec_file = File.join(Geminabox.data, "quick", "Marshal.#{Gem.marshal_version}", "#{filename.join("-")}.gemspec.rz")
         File::open(spec_file, 'r') do |unzipped_spec_file|
           unzipped_spec_file.binmode
-          Marshal.load(Gem.inflate(unzipped_spec_file.read))
+          Marshal.load(Gem::Util.inflate(unzipped_spec_file.read))
         end if File.exist? spec_file
       end
 

data/lib/geminabox/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Tom Lea
 - Jack Foy
 - Rob Nichols
 - Naotoshi Seo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -149,7 +149,7 @@ licenses:
 - MIT-LICENSE
 metadata:
   source_code_uri: https://github.com/geminabox/geminabox
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -166,9 +166,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.14
+signing_key:
 specification_version: 4
 summary: Really simple rubygem hosting
 test_files: []