gemstash 2.1.0 → 2.2.1

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

@@ -1,22 +1,37 @@
-.\" Automatically generated by Pandoc 2.5
+<!-- Automatically generated by Pandoc -->
+.\" Automatically generated by Pandoc 3.0.1
 .\"
-.TH "gemstash\-version" "1" "December 14, 2015" "" ""
+.\" Define V font for inline verbatim, using C font in formats
+.\" that render this, and otherwise B font.
+.ie "\f[CB]x\f[]"x" \{\
+. ftr V B
+. ftr VI BI
+. ftr VB B
+. ftr VBI BI
+.\}
+.el \{\
+. ftr V CR
+. ftr VI CI
+. ftr VB CB
+. ftr VBI CBI
+.\}
+.TH "gemstash-version" "1" "December 14, 2015" "" ""
 .hy
-.SH NAME
+.SH Name
 .PP
-gemstash\-version \- Show what version of Gemstash you are using
-.SH SYNOPSIS
+gemstash-version - Show what version of Gemstash you are using
+.SH Synopsis
 .PP
-\f[C]gemstash version\f[R]
-.SH DESCRIPTION
+\f[V]gemstash version\f[R]
+.SH Description
 .PP
 Show what version of Gemstash you are using.
-.SS USAGE
+.SS Usage
 .IP
 .nf
 \f[C]
 gemstash version
-gemstash \-\-version
-gemstash \-v
+gemstash --version
+gemstash -v
 \f[R]
 .fi

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

@@ -2,16 +2,18 @@ gemstash-version(1)					   gemstash-version(1)
 
 
 
-1mNAME0m
+<!-- Automatically generated by Pandoc -->
+
+1mName0m
        gemstash-version - Show what version of Gemstash you are using
 
-1mSYNOPSIS0m
-       gemstash version
+1mSynopsis0m
+       1mgemstash version0m
 
-1mDESCRIPTION0m
+1mDescription0m
        Show what version of Gemstash you are using.
 
-   1mUSAGE0m
+   1mUsage0m
 	      gemstash version
 	      gemstash --version
 	      gemstash -v

data/lib/gemstash/storage.rb

@@ -68,7 +68,7 @@ module Gemstash
         end
       end
 
-      YAML.load_file(file)
+      YAML.safe_load_file(file, permitted_classes: [Symbol])
     end
 
   private
@@ -94,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
@@ -195,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)
@@ -276,11 +277,11 @@ module Gemstash
       @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
 

data/lib/gemstash/upstream.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 require "digest"
+require "forwardable"
 require "uri"
 
 module Gemstash
-  #:nodoc:
+  # :nodoc:
   class Upstream
     extend Forwardable
 
@@ -15,7 +16,7 @@ module Gemstash
     def initialize(upstream, user_agent: nil)
       @uri = URI(CGI.unescape(upstream.to_s))
       @user_agent = user_agent
-      raise "URL '#{@uri}' is not valid!" unless @uri.to_s =~ URI::DEFAULT_PARSER.make_regexp
+      raise "URL '#{@uri}' is not valid!" unless @uri.to_s&.match?(URI::DEFAULT_PARSER.make_regexp)
     end
 
     def url(path = nil, params = nil)
@@ -23,7 +24,7 @@ module Gemstash
 
       unless path.to_s.empty?
         base = "#{base}/" unless base.end_with?("/")
-        path = path[1..-1] if path.to_s.start_with?("/")
+        path = path[1..] if path.to_s.start_with?("/")
       end
 
       params = "?#{params}" if !params.nil? && !params.empty?
@@ -31,7 +32,7 @@ module Gemstash
     end
 
     def auth?
-      !user.to_s.empty? && !password.to_s.empty?
+      !user.to_s.empty? || !password.to_s.empty?
     end
 
     # Utilized as the parent directory for cached gems
@@ -45,7 +46,7 @@ module Gemstash
       Digest::MD5.hexdigest(to_s)
     end
 
-    #:nodoc:
+    # :nodoc:
     class GemName
       def initialize(upstream, gem_name)
         @upstream = upstream

data/lib/gemstash/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-#:nodoc:
+# :nodoc:
 module Gemstash
-  VERSION = "2.1.0"
+  VERSION = "2.2.1"
 end

data/lib/gemstash/web.rb

@@ -5,11 +5,13 @@ require "json"
 require "gemstash"
 
 module Gemstash
-  #:nodoc:
+  # :nodoc:
   class Web < Sinatra::Base
-    def initialize(gemstash_env: nil, http_client_builder: nil)
-      @gemstash_env = gemstash_env || Gemstash::Env.new
-      @http_client_builder = http_client_builder || Gemstash::HTTPClient
+    ruby2_keywords def initialize(options = {})
+      raise ArgumentError unless options.is_a?(Hash)
+
+      @gemstash_env = options[:gemstash_env] || Gemstash::Env.new
+      @http_client_builder = options[:http_client_builder] || Gemstash::HTTPClient
       Gemstash::Env.current = @gemstash_env
       super()
     end

data/lib/gemstash.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-#:nodoc:
+# :nodoc:
 module Gemstash
   autoload :ApiKeyAuthorization, "gemstash/api_key_authorization"
   autoload :Authorization,       "gemstash/authorization"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemstash
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Andre Arko
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -34,16 +34,22 @@ dependencies:
   name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 3.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +92,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -176,152 +196,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.11'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.11'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: citrus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: octokit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: pandoc_object_filters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.67.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.67.2
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 description: Gemstash acts as a local RubyGems server, caching copies of gems from
   RubyGems.org automatically, and eventually letting you push your own private gems
   as well.
@@ -412,7 +286,7 @@ homepage: https://github.com/rubygems/gemstash
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -420,15 +294,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.4.3
+signing_key:
 specification_version: 4
 summary: A place to stash gems you'll need
 test_files: []