gemstash 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28d034f028f3c57f42d3caa7eb9ac6d49e03d5004c327897b025df04502ed72c
-  data.tar.gz: e9773d54c789184da719c94585cf28e832bc064866c5a53c78ecfa0071705c04
+  metadata.gz: 8f80b73d078f2392411200b75d9996704f7bbaea178db429992e74fa96b681a7
+  data.tar.gz: 21cac95f93c8cb94853ba20864b601d6d72abbc6e54df3f1eaae9d0bec1a9bab
 SHA512:
-  metadata.gz: a14333d426e19d86375607d5127320a8675bc4f5112806a5f4c1ad5fcd27bb5e89e9588d2fbe91e1c13cf8681efd6769bf48cdfc8c472a499b7a518f5a930e0d
-  data.tar.gz: 7bdd6cb9c797a47048371f66dac3cc23fd627cf72742c76ef36df373eb8e1c3a8aaccc6799d21c622fd9aead2262ffc5752210c645478b749bad0c9e1ec7405c
+  metadata.gz: 4beb40f63f25653547bef5e5518ff56e49a2d5eee97d69403775b0a9b95f3bbd472188eb0d5ec7ac5f3486d10f6f780afa363c9e66d9f825ecf650bc15b547f8
+  data.tar.gz: fc24ed09963daa42ac8e4224d1995e1ed5beb75c97b970c37cdafce0cf5ff9f3c26734c17d0e640dbd63b77f5cb2b5926139ca05b3cbb56c874066367bcc74c4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.7.1 (2023-10-12)
+
+### Fixes
+
+  - Reinstate NOOP --daemonize and --no-daemonize that warn about them doing nothing. ([#381](https://github.com/rubygems/gemstash/pull/381) [@olleolleolle](https://github.com/olleolleolle))
+
 ## 2.7.0 (2023-10-08)
 
 ### Fixes

data/lib/gemstash/cache.rb

@@ -101,9 +101,10 @@ module Gemstash
     end
 
     def get_multi(keys)
-      @cache.mget(*keys).each do |k, v|
+      @cache.mget(*keys).each_with_index do |v, idx|
         next if v.nil?
 
+        k = keys[idx]
         yield(k, YAML.load(v))
       end
     end

data/lib/gemstash/cli/info.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "gemstash"
+require "puma/control_cli"
+
+module Gemstash
+  class CLI
+    # This implements the command line info task:
+    #  $ gemstash info
+    class Info < Gemstash::CLI::Base
+      include Gemstash::Env::Helper
+      def run
+        prepare
+        list_config
+      end
+
+    private
+
+      def list_config
+        config = gemstash_env.config
+        config_str = +""
+        config.keys.map do |key|
+          config_str << "#{key}: #{config[key]}\n"
+        end
+        config_str
+      end
+    end
+  end
+end

data/lib/gemstash/cli/setup.rb

@@ -25,7 +25,8 @@ module Gemstash
         ask_cache
         ask_database
         ask_protected_fetch
-        ask_timeout
+        ask_fetch_timeout
+        ask_open_timeout
         check_cache
         check_storage
         check_database
@@ -123,13 +124,20 @@ module Gemstash
         @config[:protected_fetch] = value
       end
 
-      def ask_timeout
+      def ask_fetch_timeout
         say_current_config(:fetch_timeout, "Fetch timeout")
-        timeout = @cli.ask "How many seconds to wait when fetching a gem? [20]"
+        timeout = @cli.ask "How many seconds to wait for fetching a gem to complete? [20]"
         timeout = Gemstash::Configuration::DEFAULTS[:fetch_timeout] if timeout.to_i < 1
         @config[:fetch_timeout] = timeout.to_i
       end
 
+      def ask_open_timeout
+        say_current_config(:open_timeout, "Open timeout")
+        timeout = @cli.ask "How many seconds to wait for connection to upstream gem server to be established? [2]"
+        timeout = Gemstash::Configuration::DEFAULTS[:open_timeout] if timeout.to_i < 1
+        @config[:open_timeout] = timeout.to_i
+      end
+
       def check_cache
         try("cache") { gemstash_env.cache_client.alive! }
       end

data/lib/gemstash/cli/start.rb

@@ -11,6 +11,10 @@ module Gemstash
       def run
         prepare
         @cli.say("Starting gemstash!", :green)
+        case @cli.options[:daemonize]
+        when false then warn "The --no-daemonize option was removed and has no effect."
+        when true then warn "The --daemonize option was removed and has no effect."
+        end
         Puma::CLI.new(args, Gemstash::Logging::StreamLogger.puma_events).run
       end
 

data/lib/gemstash/cli.rb

@@ -13,6 +13,7 @@ module Gemstash
     autoload :Start,     "gemstash/cli/start"
     autoload :Status,    "gemstash/cli/status"
     autoload :Stop,      "gemstash/cli/stop"
+    autoload :Info,      "gemstash/cli/info"
 
     # Thor::Error for the CLI, which colors the message red.
     class Error < Thor::Error
@@ -75,6 +76,8 @@ module Gemstash
     end
 
     desc "start", "Starts your gemstash server"
+    method_option :daemonize, :type => :boolean, :default => nil, :desc =>
+       "No effect - functionality removed, option kept for compatibility"
     method_option :config_file, :type => :string, :desc =>
       "Config file to load when starting"
     def start
@@ -101,6 +104,11 @@ module Gemstash
     end
     map %w[-v --version] => :version
 
+    desc "info", "Check current gemstash instance info"
+    def info
+      say Gemstash::CLI::Info.new(self).run
+    end
+
   private
 
     def manpage(command)

data/lib/gemstash/config.ru

@@ -4,9 +4,10 @@ require "gemstash"
 require "puma/commonlogger"
 
 use Rack::Deflater
-use Gemstash::Logging::RackMiddleware
 
 use Gemstash::Env::RackMiddleware, Gemstash::Env.current
+use Gemstash::Logging::RackMiddleware
+
 use Gemstash::GemSource::RackMiddleware
 use Gemstash::Health::RackMiddleware
 run Gemstash::Web.new(gemstash_env: Gemstash::Env.current)

data/lib/gemstash/configuration.rb

@@ -15,6 +15,7 @@ module Gemstash
       ignore_gemfile_source: false,
       protected_fetch: false,
       fetch_timeout: 20,
+      open_timeout: 2,
       # Actual default for db_connection_options is dynamic based on the adapter
       db_connection_options: {},
       puma_threads: 16,
@@ -60,6 +61,10 @@ module Gemstash
       @config[key]
     end
 
+    def keys
+      @config.keys
+    end
+
     # @return [Hash] Sequel connection configuration hash
     def database_connection_config
       case self[:db_adapter]

data/lib/gemstash/db/version.rb

@@ -16,11 +16,6 @@ module Gemstash
         update(indexed: true)
       end
 
-      # This converts to the format used by /private/specs.4.8.gz
-      def to_spec
-        [rubygem.name, Gem::Version.new(number), platform]
-      end
-
       def self.slug(params)
         version = params[:version]
         platform = params[:platform]

data/lib/gemstash/env.rb

@@ -129,10 +129,13 @@ module Gemstash
           db = if RUBY_PLATFORM == "java"
             Sequel.connect("jdbc:sqlite:#{db_path}", config.database_connection_config)
           else
-            Sequel.connect("sqlite://#{CGI.escape(db_path)}", config.database_connection_config)
+            Sequel.connect("sqlite://#{db_path}", config.database_connection_config)
           end
         when "postgres", "mysql", "mysql2"
-          db = Sequel.connect(config[:db_url], config.database_connection_config)
+          db_url = config[:db_url]
+          raise "Missing DB URL" unless db_url
+
+          db = Sequel.connect(db_url, config.database_connection_config)
         else
           raise "Unsupported DB adapter: '#{config[:db_adapter]}'"
         end

data/lib/gemstash/http_client.rb

@@ -25,6 +25,7 @@ module Gemstash
   # :nodoc:
   class HTTPClient
     extend Gemstash::Env::Helper
+    include Gemstash::Env::Helper
     include Gemstash::Logging
 
     DEFAULT_USER_AGENT = "Gemstash/#{Gemstash::VERSION}"
@@ -55,7 +56,7 @@ module Gemstash
       response = with_retries do
         @client.get(path) do |req|
           req.headers["User-Agent"] = @user_agent
-          req.options.open_timeout = 2
+          req.options.open_timeout = gemstash_env.config[:open_timeout]
         end
       end
 

data/lib/gemstash/logging.rb

@@ -12,6 +12,8 @@ end
 module Gemstash
   # :nodoc:
   module Logging
+    extend Gemstash::Env::Helper
+
     LEVELS = {
       debug: Logger::DEBUG,
       info: Logger::INFO,
@@ -45,7 +47,7 @@ module Gemstash
     end
 
     def self.logger
-      @logger ||= setup_logger($stdout)
+      @logger ||= setup_logger(gemstash_env.log_file)
     end
 
     def self.reset
@@ -61,6 +63,7 @@ module Gemstash
 
       def call(env)
         env["rack.logger"] = Gemstash::Logging.logger
+        env["rack.errors"] = Gemstash::Env.current.log_file
         @app.call(env)
       end
     end

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

@@ -1,54 +1,73 @@
-<!-- Automatically generated by Pandoc -->
-.\" Automatically generated by Pandoc 3.1.8
+.\" Automatically generated by Pandoc 3.1.3
 .\"
+.\" 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-authorize" "1" "October 9, 2015" "" ""
+.hy
 .SH Name
+.PP
 gemstash-authorize - Adds or removes authorization to interact with
 privately stored gems
 .SH Synopsis
-\f[CR]gemstash authorize [permissions] [--remove] [--list] [--key SECURE_KEY] [--name NAME] [--config-file FILE]\f[R]
+.PP
+\f[V]gemstash authorize [permissions] [--remove] [--list] [--key SECURE_KEY] [--name NAME] [--config-file FILE]\f[R]
 .SH Description
+.PP
 Adds or removes authorization to interact with privately stored gems.
 .PP
 Any arguments will be used as specific permissions.
-Valid permissions include \f[CR]push\f[R], \f[CR]yank\f[R], and
-\f[CR]fetch\f[R].
+Valid permissions include \f[V]push\f[R], \f[V]yank\f[R], and
+\f[V]fetch\f[R].
 If no permissions are provided, then all permissions will be granted
 (including any that may be added in future versions of Gemstash).
 .SS Usage
 .IP
-.EX
+.nf
+\f[C]
 gemstash authorize
 gemstash authorize push yank
 gemstash authorize push --name my-auth
 gemstash authorize yank --key <secure-key>
 gemstash authorize --remove --key <secure-key>
 gemstash authorize --list
-.EE
+\f[R]
+.fi
 .SH Options
 .IP \[bu] 2
-\f[CR]--config-file FILE\f[R]: Specify the config file to use.
+\f[V]--config-file FILE\f[R]: Specify the config file to use.
 If you aren\[cq]t using the default config file at
-\f[CR]\[ti]/.gemstash/config.yml\f[R] or
-\f[CR]\[ti]/.gemstash/config.yml.erb\f[R], then you must specify the
+\f[V]\[ti]/.gemstash/config.yml\f[R] or
+\f[V]\[ti]/.gemstash/config.yml.erb\f[R], then you must specify the
 config file via this option.
 .IP \[bu] 2
-\f[CR]--key SECURE_KEY\f[R]: Specify the API key to affect.
+\f[V]--key SECURE_KEY\f[R]: Specify the API key to affect.
 This should be the actual key value, not a name.
-This option is required when using \f[CR]--remove\f[R] but is optional
+This option is required when using \f[V]--remove\f[R] but is optional
 otherwise.
 If adding an authorization, using this will either create or update the
 permissions for the specified API key.
 If missing, a new API key will always be generated.
 Note that a key can only have a maximum length of 255 chars.
 .IP \[bu] 2
-\f[CR]--name\f[R]: Name of the authorization.
+\f[V]--name\f[R]: Name of the authorization.
 Purely for ease of identification, not required.
 .IP \[bu] 2
-\f[CR]--remove\f[R]: Remove an authorization rather than add or update
+\f[V]--remove\f[R]: Remove an authorization rather than add or update
 one.
 When removing, permission values are not allowed.
-The \f[CR]--key <secure-key>\f[R] option is required.
+The \f[V]--key <secure-key>\f[R] option is required.
 .IP \[bu] 2
-\f[CR]--list\f[R]: List current authorizations.
-Provide \f[CR]--name\f[R] or \f[CR]--key\f[R] to show only one result.
+\f[V]--list\f[R]: List current authorizations.
+Provide \f[V]--name\f[R] or \f[V]--key\f[R] to show only one result.

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

@@ -1,20 +1,18 @@
 4mgemstash-authorize24m(1)				      4mgemstash-authorize24m(1)
 
-<!-- Automatically generated by Pandoc -->
-
 1mName0m
        gemstash-authorize  -  Adds  or	removes authorization to interact with
        privately stored gems
 
 1mSynopsis0m
-       gemstash authorize [permissions] [--remove] [--list] [--key SECURE_KEY]
-       [--name NAME] [--config-file FILE]
+       1mgemstash authorize [permissions] [--remove] [--list] [--key SECURE_KEY]0m
+       1m[--name NAME] [--config-file FILE]0m
 
 1mDescription0m
        Adds or removes authorization to interact with privately stored gems.
 
        Any arguments will be used as specific permissions.  Valid  permissions
-       include	push,  yank,  and fetch.  If no permissions are provided, then
+       include	1mpush22m,  1myank22m,	and 1mfetch22m.	 If no permissions are provided, then
        all permissions will be granted (including any that may be added in fu-
        ture versions of Gemstash).
 
@@ -27,26 +25,26 @@
 	      gemstash authorize --list
 
 1mOptions0m
-       o --config-file FILE: Specify the config file to use.   If  you	aren't
-	 using	the  default  config file at ~/.gemstash/config.yml or ~/.gem-
-	 stash/config.yml.erb, then you must specify the config file via  this
+       o 1m--config-file FILE22m: Specify the config file to use.   If	you  aren't
+	 using	the  default  config file at 1m~/.gemstash/config.yml 22mor 1m~/.gem-0m
+	 1mstash/config.yml.erb22m, then you must specify the config file via  this
 	 option.
 
-       o --key	SECURE_KEY: Specify the API key to affect.  This should be the
-	 actual key value, not a name.	This option  is  required  when  using
-	 --remove  but is optional otherwise.  If adding an authorization, us-
+       o 1m--key  SECURE_KEY22m: Specify the API key to affect.	 This should be the
+	 actual key value, not a name.	This option  is	 required  when	 using
+	 1m--remove  22mbut is optional otherwise.  If adding an authorization, us-
 	 ing this will either create or update the permissions for the	speci-
 	 fied  API  key.   If missing, a new API key will always be generated.
 	 Note that a key can only have a maximum length of 255 chars.
 
-       o --name: Name of the authorization.  Purely for  ease  of  identifica-
+       o 1m--name22m: Name of the authorization.  Purely for  ease  of	identifica-
 	 tion, not required.
 
-       o --remove:  Remove  an	authorization  rather  than add or update one.
-	 When removing, permission values are not allowed.  The --key <secure-
-	 key> option is required.
+       o 1m--remove22m:	 Remove	 an  authorization  rather  than add or update one.
+	 When removing, permission values are not allowed.  The 1m--key <secure-0m
+	 1mkey> 22moption is required.
 
-       o --list: List current authorizations.  Provide --name or --key to show
+       o 1m--list22m: List current authorizations.  Provide 1m--name 22mor 1m--key 22mto show
 	 only one result.
 
-				October 9, 2015 	 4mgemstash-authorize24m(1)
+				October 9, 2015		 4mgemstash-authorize24m(1)