gemstash 2.0.0 → 2.2.0

data/lib/gemstash/man/gemstash-multiple-sources.7.txt

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

data/lib/gemstash/man/gemstash-private-gems.7.txt

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

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

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

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

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

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

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

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

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

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

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

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

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

data/lib/gemstash/migrations/01_gem_dependencies.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Sequel.migration do
   change do
     create_table :rubygems do

data/lib/gemstash/migrations/02_authorizations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Sequel.migration do
   change do
     create_table :authorizations do

data/lib/gemstash/migrations/03_cached_gems.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Sequel.migration do
   change do
     create_table :upstreams do

data/lib/gemstash/migrations/04_health_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Sequel.migration do
   change do
     create_table :health_tests do

data/lib/gemstash/puma.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 
 threads 0, Gemstash::Env.current.config[:puma_threads].to_i

data/lib/gemstash/rack_env_rewriter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "forwardable"
 
@@ -33,8 +35,15 @@ module Gemstash
       def rewrite
         check_match
         log_start = "Rewriting '#{@rack_env["REQUEST_URI"]}'"
-        @rack_env["REQUEST_URI"][@request_uri_match.begin(0)...@request_uri_match.end(0)] = ""
-        @rack_env["PATH_INFO"][@path_info_match.begin(0)...@path_info_match.end(0)] = ""
+
+        new_request_uri = @rack_env["REQUEST_URI"].dup
+        new_request_uri[@request_uri_match.begin(0)...@request_uri_match.end(0)] = ""
+
+        new_path_info = @rack_env["PATH_INFO"].dup
+        new_path_info[@path_info_match.begin(0)...@path_info_match.end(0)] = ""
+
+        @rack_env["REQUEST_URI"] = new_request_uri
+        @rack_env["PATH_INFO"]   = new_path_info
         log.info "#{log_start} to '#{@rack_env["REQUEST_URI"]}'"
       end
 

data/lib/gemstash/specs_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "stringio"
 require "zlib"
@@ -33,6 +35,7 @@ module Gemstash
       check_auth if gemstash_env.config[:protected_fetch]
       fetch_from_storage
       return result if result
+
       fetch_versions
       marshal
       gzip
@@ -59,8 +62,9 @@ module Gemstash
     def fetch_from_storage
       specs = fetch_resource
       return unless specs.exist?(:specs)
+
       @result = specs.load(:specs).content(:specs)
-    rescue
+    rescue StandardError
       # On the off-chance of a race condition between specs.exist? and specs.load
       @result = nil
     end

data/lib/gemstash/storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "digest"
 require "fileutils"
@@ -66,7 +68,7 @@ module Gemstash
         end
       end
 
-      YAML.load_file(file)
+      YAML.safe_load_file(file, permitted_classes: [Symbol])
     end
 
   private
@@ -74,12 +76,14 @@ module Gemstash
     def check_storage_version
       version = Gemstash::Storage.metadata[:storage_version]
       return if version <= Gemstash::Storage::VERSION
+
       raise Gemstash::Storage::VersionTooNew.new(@folder, version)
     end
 
     def path_valid?(path)
       return false if path.nil?
       return false unless File.writable?(path)
+
       true
     end
   end
@@ -90,6 +94,7 @@ module Gemstash
     include Gemstash::Env::Helper
     include Gemstash::Logging
     attr_reader :name, :folder
+
     VERSION = 1
 
     # If the storage engine detects a resource was originally saved from a newer
@@ -191,7 +196,7 @@ module Gemstash
     # @param props [Hash] the properties to add
     # @return [Gemstash::Resource] self for chaining purposes
     def update_properties(props)
-      load_properties(true)
+      load_properties(force: true)
 
       deep_merge = proc do |_, old_value, new_value|
         if old_value.is_a?(Hash) && new_value.is_a?(Hash)
@@ -247,17 +252,17 @@ module Gemstash
 
       begin
         File.delete(content_filename(key))
-      rescue => e
+      rescue StandardError => e
         log_error "Failed to delete stored content at #{content_filename(key)}", e, level: :warn
       end
 
       begin
         File.delete(properties_filename) unless content?
-      rescue => e
+      rescue StandardError => e
         log_error "Failed to delete stored properties at #{properties_filename}", e, level: :warn
       end
 
-      return self
+      self
     ensure
       reset
     end
@@ -266,21 +271,24 @@ module Gemstash
 
     def load(key)
       raise "Resource #{@name} has no #{key.inspect} content to load" unless exist?(key)
+
       load_properties # Ensures storage version is checked
       @content ||= {}
       @content[key] = read_file(content_filename(key))
     end
 
-    def load_properties(force = false)
+    def load_properties(force: false)
       return if @properties && !force
       return unless File.exist?(properties_filename)
-      @properties = YAML.load_file(properties_filename) || {}
+
+      @properties = YAML.safe_load_file(properties_filename, permitted_classes: [Symbol]) || {}
       check_resource_version
     end
 
     def check_resource_version
       version = @properties[:gemstash_resource_version]
       return if version <= Gemstash::Resource::VERSION
+
       reset
       raise Gemstash::Resource::VersionTooNew.new(name, folder, version)
     end
@@ -292,6 +300,7 @@ module Gemstash
 
     def content?
       return false unless Dir.exist?(@folder)
+
       entries = Dir.entries(@folder).reject {|file| file =~ /\A\.\.?\z/ || file == "properties.yaml" }
       !entries.empty?
     end
@@ -330,6 +339,7 @@ module Gemstash
     def content_filename(key)
       name = sanitize(key.to_s)
       raise "Invalid content key #{key.inspect}" if name.empty?
+
       File.join(@folder, name)
     end