gemstash 2.0.0 → 2.2.0

data/lib/gemstash/gem_fetcher.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "set"
 
 module Gemstash
-  #:nodoc:
+  # :nodoc:
   class GemFetcher
     def initialize(http_client)
       @http_client = http_client
-      @valid_headers = Set.new(["etag", "content-type", "content-length", "last-modified"])
+      @valid_headers = Set.new(%w[etag content-type content-length last-modified])
     end
 
     def fetch(gem_id, type, &block)

data/lib/gemstash/gem_pusher.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "rubygems/package"
 require "stringio"
 
-#:nodoc:
+# :nodoc:
 module Gemstash
   # Class that supports pushing a new gem to the private repository of gems.
   class GemPusher
@@ -56,9 +58,7 @@ module Gemstash
       resource_exist = storage.resource(full_name).exist?
       resource_is_indexed = storage.resource(full_name).properties[:indexed] if resource_exist
 
-      if resource_exist && resource_is_indexed
-        raise ExistingVersionError, "Cannot push to an existing version!"
-      end
+      raise ExistingVersionError, "Cannot push to an existing version!" if resource_exist && resource_is_indexed
 
       storage.resource(full_name).save({ gem: @content }, indexed: true)
     end
@@ -78,6 +78,7 @@ module Gemstash
         existing = Gemstash::DB::Version.find_by_spec(gem_id, spec)
         raise ExistingVersionError, "Cannot push to an existing version!" if existing && existing.indexed
         raise YankedVersionError, "Cannot push to a yanked version!" if existing && !existing.indexed
+
         version_id = Gemstash::DB::Version.insert_by_spec(gem_id, spec)
         Gemstash::DB::Dependency.insert_by_spec(version_id, spec)
       end
@@ -120,11 +121,12 @@ module Gemstash
 
       def cleanup
         return unless @tempfile
+
         @tempfile.close
         @tempfile.unlink
       end
     end
 
-    GemPusher.send(:include, LegacyRubyGemsSupport)
+    GemPusher.include LegacyRubyGemsSupport
   end
 end

data/lib/gemstash/gem_source/dependency_caching.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemstash
   module GemSource
     # Module for caching dependencies in a GemSource.
@@ -7,9 +9,7 @@ module Gemstash
       def serve_dependencies
         gems = gems_from_params
 
-        if gems.length > API_REQUEST_LIMIT
-          halt 422, "Too many gems (use --full-index instead)"
-        end
+        halt 422, "Too many gems (use --full-index instead)" if gems.length > API_REQUEST_LIMIT
 
         content_type "application/octet-stream"
         Marshal.dump dependencies.fetch(gems)
@@ -21,7 +21,7 @@ module Gemstash
         if gems.length > API_REQUEST_LIMIT
           halt 422, {
             "error" => "Too many gems (use --full-index instead)",
-            "code"  => 422
+            "code" => 422
           }.to_json
         end
 

data/lib/gemstash/gem_source/private_source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 
 module Gemstash
@@ -15,6 +17,7 @@ module Gemstash
       def self.matches?(env)
         rewriter = rack_env_rewriter.for(env)
         return false unless rewriter.matches?
+
         rewriter.rewrite
         true
       end
@@ -44,7 +47,7 @@ module Gemstash
       end
 
       def serve_versions
-        halt 403, "Not yet supported"
+        halt 404, "Not yet supported"
       end
 
       def serve_info(name)
@@ -54,7 +57,7 @@ module Gemstash
       def serve_marshal(id)
         authorization.protect(self) do
           auth.check("fetch") if gemstash_env.config[:protected_fetch]
-          gem_full_name = id.sub(/\.gemspec\.rz\z/, "")
+          gem_full_name = id.delete_suffix(".gemspec.rz")
           gem = fetch_gem(gem_full_name)
           halt 404 unless gem.exist?(:spec)
           content_type "application/octet-stream"
@@ -69,7 +72,7 @@ module Gemstash
       def serve_gem(id)
         authorization.protect(self) do
           auth.check("fetch") if gemstash_env.config[:protected_fetch]
-          gem_full_name = id.sub(/\.gem\z/, "")
+          gem_full_name = id.delete_suffix(".gem")
           gem = fetch_gem(gem_full_name)
           content_type "application/octet-stream"
           gem.content(:gem)

data/lib/gemstash/gem_source/rack_middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 
 module Gemstash
@@ -11,6 +13,7 @@ module Gemstash
       def call(env)
         Gemstash::GemSource.sources.each do |source|
           next unless source.matches?(env)
+
           env["gemstash.gem_source"] = source
           break
         end

data/lib/gemstash/gem_source/upstream_source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "cgi"
 
@@ -12,6 +14,7 @@ module Gemstash
       def self.matches?(env)
         rewriter = rack_env_rewriter.for(env)
         return false unless rewriter.matches?
+
         rewriter.rewrite
         env["gemstash.upstream"] = rewriter.captures["upstream_url"]
         capture_user_agent(env)
@@ -90,8 +93,10 @@ module Gemstash
     private
 
       def upstream
-        @upstream ||= Gemstash::Upstream.new(env["gemstash.upstream"],
-          user_agent: env["gemstash.user-agent"])
+        @upstream ||= Gemstash::Upstream.new(
+          env["gemstash.upstream"],
+          user_agent: env["gemstash.user-agent"]
+        )
       end
 
       def index_upstream
@@ -135,6 +140,7 @@ module Gemstash
 
       def set_gem_headers(gem, resource_type)
         return unless gem.property?(:headers, resource_type)
+
         gem_headers = gem.properties[:headers][resource_type]
         headers["Content-Type"] = gem_headers["content-type"] if gem_headers.include?("content-type")
         headers["Last-Modified"] = gem_headers["last-modified"] if gem_headers.include?("last-modified")
@@ -192,7 +198,7 @@ module Gemstash
     # default upstream).
     class RubygemsSource < Gemstash::GemSource::UpstreamSource
       def self.matches?(env)
-        env["gemstash.upstream"] = if env["HTTP_X_GEMFILE_SOURCE"].to_s.empty?
+        env["gemstash.upstream"] = if env["gemstash.env"].config[:ignore_gemfile_source] || env["HTTP_X_GEMFILE_SOURCE"].to_s.empty?
           env["gemstash.env"].config[:rubygems_url]
         else
           env["HTTP_X_GEMFILE_SOURCE"]

data/lib/gemstash/gem_source.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "forwardable"
 
 module Gemstash
-  #:nodoc:
+  # :nodoc:
   module GemSource
     autoload :DependencyCaching, "gemstash/gem_source/dependency_caching"
     autoload :PrivateSource,     "gemstash/gem_source/private_source"
@@ -27,7 +29,7 @@ module Gemstash
       include Gemstash::Logging
 
       def_delegators :@app, :cache_control, :content_type, :env, :halt,
-        :headers, :http_client_for, :params, :redirect, :request
+                     :headers, :http_client_for, :params, :redirect, :request
 
       def initialize(app)
         @app = app

data/lib/gemstash/gem_yanker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 
 module Gemstash
@@ -52,9 +54,11 @@ module Gemstash
     def update_database
       gemstash_env.db.transaction do
         raise UnknownGemError, "Cannot yank an unknown gem!" unless Gemstash::DB::Rubygem[name: @gem_name]
+
         version = Gemstash::DB::Version.find_by_full_name(full_name)
         raise UnknownVersionError, "Cannot yank an unknown version!" unless version
         raise YankedVersionError, "Cannot yank an already yanked version!" unless version.indexed
+
         version.deindex
         storage.resource(version.storage_id).update_properties(indexed: false)
       end

data/lib/gemstash/health.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "date"
 require "server_health_check_rack"

data/lib/gemstash/http_client.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "faraday"
 require "faraday_middleware"
 
 module Gemstash
-  #:nodoc:
+  # :nodoc:
   class WebError < StandardError
     attr_reader :code
 
@@ -13,19 +15,19 @@ module Gemstash
     end
   end
 
-  #:nodoc:
+  # :nodoc:
   class ConnectionError < WebError
     def initialize(message)
       super(message, 502) # Bad Gateway
     end
   end
 
-  #:nodoc:
+  # :nodoc:
   class HTTPClient
     extend Gemstash::Env::Helper
     include Gemstash::Logging
 
-    DEFAULT_USER_AGENT = "Gemstash/#{Gemstash::VERSION}".freeze
+    DEFAULT_USER_AGENT = "Gemstash/#{Gemstash::VERSION}"
 
     def self.for(upstream)
       client = Faraday.new(upstream.to_s) do |config|
@@ -33,12 +35,17 @@ module Gemstash
         config.adapter :net_http
         config.options.timeout = gemstash_env.config[:fetch_timeout]
       end
+
+      client.basic_auth(upstream.user, upstream.password) if upstream.auth?
+
       user_agent = "#{upstream.user_agent} " unless upstream.user_agent.to_s.empty?
       user_agent = user_agent.to_s + DEFAULT_USER_AGENT
 
       new(client, user_agent: user_agent)
     end
 
+    attr_reader :client
+
     def initialize(client = nil, user_agent: nil)
       @client = client
       @user_agent = user_agent || DEFAULT_USER_AGENT
@@ -71,6 +78,7 @@ module Gemstash
         rescue Faraday::ConnectionFailed => e
           log_error("Connection failure", e)
           raise(ConnectionError, e.message) unless times > 0
+
           log.info "retrying... #{times} more times"
         end
       end

data/lib/gemstash/logging.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require "logger"
 require "puma/events"
 
 module Gemstash
-  #:nodoc:
+  # :nodoc:
   module Logging
     LEVELS = {
       debug: Logger::DEBUG,

data/lib/gemstash/man/gemstash-authorize.1.txt

@@ -1,66 +1 @@
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

data/lib/gemstash/man/gemstash-configuration.5.txt

@@ -1,66 +1 @@
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

data/lib/gemstash/man/gemstash-customize.7.txt

@@ -1,66 +1 @@
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

data/lib/gemstash/man/gemstash-debugging.7.txt

@@ -1,66 +1 @@
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

data/lib/gemstash/man/gemstash-deploy.7.txt

@@ -1,66 +1 @@
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

data/lib/gemstash/man/gemstash-mirror.7.txt

@@ -1,66 +1 @@
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-