geminabox 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 77b89503a829fdd9920415b1ef7a814ed83c7c41c00bbb2923abb5b906d5bbff
-  data.tar.gz: a4a597b442efdb2b33dc4cc85f99465e8d23092bdd0775b75a634d8cca3912ef
+SHA1:
+  metadata.gz: 58341b99ae23a2be5f634b571d4f2d95f7c3824b
+  data.tar.gz: d5dab4aa7155ca48994f6bac27902072f3fead85
 SHA512:
-  metadata.gz: 9a29e0c9c9d7f60bb39c961a0c040451c709eab18bc676d1e7bb4bc8349ecd2e90b794bba87d948079eda2726aca20ec4a295d32a66cc0696bfece508bc46a8b
-  data.tar.gz: 2f818ce266be7f996ab7cd8094df2bc4a0d14f5e1d3aa9d7bca581a89aaa3a94e3ab1aa1e50b3e833da418cf8572b60f4cd1c6c3e470c58f881b0c2150997362
+  metadata.gz: 52a5d0c2190743b85fe4f588e80a0283725ca2e00f11216747cfc2f8e200eb0621789223e859804480ffe6e03b7f282e2fcfe3768d217e33fbd200ed5cb595b8
+  data.tar.gz: bf43c59a32f80f9ba739ed632a2529acf71f052f5842f4ce0fdc44210d6671a1fbb722c3a3bd1f98ec60c059c2a9c0238dbe1e4fe5d284c91fc8fbce6d7d85f1

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,
@@ -73,23 +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,
-    on_gem_received:       nil
+    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/server.rb

@@ -312,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

data/lib/geminabox/version.rb

@@ -1,3 +1,3 @@
 module Geminabox
-  VERSION = '1.2.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.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Tom Lea
 - Jack Foy
 - Rob Nichols
 - Naotoshi Seo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-04 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,8 +166,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.14
+signing_key:
 specification_version: 4
 summary: Really simple rubygem hosting
 test_files: []