gemstash 2.3.2 → 2.5.0

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

@@ -1,58 +1,38 @@
 <!-- Automatically generated by Pandoc -->
-.\" Automatically generated by Pandoc 3.1.6.2
+.\" Automatically generated by Pandoc 3.1.8
 .\"
-.\" 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-setup" "1" "October 9, 2015" "" ""
-.hy
 .SH Name
-.PP
 gemstash-setup - Customize your Gemstash configuration interactively
 .SH Synopsis
-.PP
-\f[V]gemstash setup [--redo] [--debug] [--config-file FILE]\f[R]
+\f[CR]gemstash setup [--redo] [--debug] [--config-file FILE]\f[R]
 .SH Description
-.PP
 Customize your Gemstash configuration interactively.
 This will save your config file, but only if a few checks pass after
 you\[cq]ve provided your answers.
 .SS Usage
 .IP
-.nf
-\f[C]
+.EX
 gemstash setup
 gemstash setup --redo
 gemstash setup --config-file <file>
-\f[R]
-.fi
+.EE
 .SH Options
 .IP \[bu] 2
-\f[V]--redo\f[R]: Redo the configuration.
-This does nothing the first time \f[V]gemstash setup\f[R] is run.
-If you want to change your configuration using \f[V]gemstash setup\f[R]
+\f[CR]--redo\f[R]: Redo the configuration.
+This does nothing the first time \f[CR]gemstash setup\f[R] is run.
+If you want to change your configuration using \f[CR]gemstash setup\f[R]
 after you\[cq]ve run it before, you must provide this option, otherwise
 Gemstash will simply indicate your setup is complete.
 .IP \[bu] 2
-\f[V]--debug\f[R]: Output additional information if one of the checks at
-the end of setup fails.
+\f[CR]--debug\f[R]: Output additional information if one of the checks
+at the end of setup fails.
 This will do nothing if all checks pass.
 .IP \[bu] 2
-\f[V]--config-file FILE\f[R]: Specify the config file to write to.
+\f[CR]--config-file FILE\f[R]: Specify the config file to write to.
 Without this option, your configuration will be written to
-\f[V]\[ti]/.gemstash/config.yml\f[R].
+\f[CR]\[ti]/.gemstash/config.yml\f[R].
 If you write to a custom location, you will need to pass the
-\f[V]--config-file\f[R] option to all Gemstash commands.
+\f[CR]--config-file\f[R] option to all Gemstash commands.
 If you plan to use ERB in your config file, you might want to use
-\f[V]\[ti]/.gemstash/config.yml.erb\f[R].
+\f[CR]\[ti]/.gemstash/config.yml.erb\f[R].

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

@@ -6,7 +6,7 @@
        gemstash-setup - Customize your Gemstash configuration interactively
 
 1mSynopsis0m
-       1mgemstash setup [--redo] [--debug] [--config-file FILE]0m
+       gemstash setup [--redo] [--debug] [--config-file FILE]
 
 1mDescription0m
        Customize  your	Gemstash  configuration interactively.	This will save
@@ -19,20 +19,20 @@
 	      gemstash setup --config-file <file>
 
 1mOptions0m
-       o 1m--redo22m:  Redo  the  configuration.   This does nothing the first time
-	 1mgemstash setup 22mis run.  If you want to change your configuration	us-
-	 ing  1mgemstash setup 22mafter you've run it before, you must provide this
+       o --redo:  Redo	the  configuration.   This does nothing the first time
+	 gemstash setup is run.  If you want to change your configuration  us-
+	 ing  gemstash setup after you've run it before, you must provide this
 	 option, otherwise Gemstash will simply indicate your  setup  is  com-
 	 plete.
 
-       o 1m--debug22m:	Output	additional  information if one of the checks at the
+       o --debug:  Output  additional  information if one of the checks at the
 	 end of setup fails.  This will do nothing if all checks pass.
 
-       o 1m--config-file FILE22m: Specify the config file  to  write  to.   Without
-	 this  option,	your configuration will be written to 1m~/.gemstash/con-0m
-	 1mfig.yml22m.	If you write to a custom location, you will  need  to  pass
-	 the  1m--config-file  22moption  to all Gemstash commands.  If you plan to
-	 use ERB in your config file, you might want to  use  1m~/.gemstash/con-0m
-	 1mfig.yml.erb22m.
+       o --config-file FILE: Specify the config file  to  write  to.   Without
+	 this  option,	your configuration will be written to ~/.gemstash/con-
+	 fig.yml.  If you write to a custom location, you will	need  to  pass
+	 the  --config-file  option  to all Gemstash commands.	If you plan to
+	 use ERB in your config file, you might want to  use  ~/.gemstash/con-
+	 fig.yml.erb.
 
 				October 9, 2015 	     4mgemstash-setup24m(1)

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

@@ -1,41 +1,23 @@
 <!-- Automatically generated by Pandoc -->
-.\" Automatically generated by Pandoc 3.1.6.2
+.\" Automatically generated by Pandoc 3.1.8
 .\"
-.\" 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-start" "1" "October 9, 2015" "" ""
-.hy
 .SH Name
-.PP
 gemstash-start - Starts the Gemstash server
 .SH Synopsis
-.PP
-\f[V]gemstash start [--no-daemonize] [--config-file FILE]\f[R]
+\f[CR]gemstash start [--no-daemonize] [--config-file FILE]\f[R]
 .SH Description
-.PP
 Starts the Gemstash server.
 .SH Options
 .IP \[bu] 2
-\f[V]--config-file FILE\f[R]: Specify the config file to use.
+\f[CR]--config-file FILE\f[R]: Specify the config file to use.
 If you aren\[cq]t using the default config file at
-\f[V]\[ti]/.gemstash/config.yml\f[R] or
-\f[V]\[ti]/.gemstash/config.yml.erb\f[R], then you must specify the
+\f[CR]\[ti]/.gemstash/config.yml\f[R] or
+\f[CR]\[ti]/.gemstash/config.yml.erb\f[R], then you must specify the
 config file via this option.
 .IP \[bu] 2
-\f[V]--no-daemonize\f[R]: The Gemstash server daemonizes itself by
+\f[CR]--no-daemonize\f[R]: The Gemstash server daemonizes itself by
 default.
-Provide this option to instead run the server until \f[V]Ctrl-C\f[R] is
+Provide this option to instead run the server until \f[CR]Ctrl-C\f[R] is
 typed.
 When not daemonized, the log will be output to standard out.

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

@@ -6,19 +6,19 @@
        gemstash-start - Starts the Gemstash server
 
 1mSynopsis0m
-       1mgemstash start [--no-daemonize] [--config-file FILE]0m
+       gemstash start [--no-daemonize] [--config-file FILE]
 
 1mDescription0m
        Starts the Gemstash server.
 
 1mOptions0m
-       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
+       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
 	 option.
 
-       o 1m--no-daemonize22m: The Gemstash server  daemonizes  itself  by  default.
-	 Provide  this option to instead run the server until 1mCtrl-C 22mis typed.
+       o --no-daemonize: The Gemstash server  daemonizes  itself  by  default.
+	 Provide  this option to instead run the server until Ctrl-C is typed.
 	 When not daemonized, the log will be output to standard out.
 
 				October 9, 2015 	     4mgemstash-start24m(1)

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

@@ -1,35 +1,17 @@
 <!-- Automatically generated by Pandoc -->
-.\" Automatically generated by Pandoc 3.1.6.2
+.\" Automatically generated by Pandoc 3.1.8
 .\"
-.\" 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-status" "1" "October 28, 2015" "" ""
-.hy
 .SH Name
-.PP
 gemstash-status - Checks status of the Gemstash server
 .SH Synopsis
-.PP
-\f[V]gemstash status [--config-file FILE]\f[R]
+\f[CR]gemstash status [--config-file FILE]\f[R]
 .SH Description
-.PP
 Checks status of the Gemstash server.
 .SH Options
 .IP \[bu] 2
-\f[V]--config-file FILE\f[R]: Specify the config file to use.
+\f[CR]--config-file FILE\f[R]: Specify the config file to use.
 If you aren\[cq]t using the default config file at
-\f[V]\[ti]/.gemstash/config.yml\f[R] or
-\f[V]\[ti]/.gemstash/config.yml.erb\f[R], then you must specify the
+\f[CR]\[ti]/.gemstash/config.yml\f[R] or
+\f[CR]\[ti]/.gemstash/config.yml.erb\f[R], then you must specify the
 config file via this option.

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

@@ -6,15 +6,15 @@
        gemstash-status - Checks status of the Gemstash server
 
 1mSynopsis0m
-       1mgemstash status [--config-file FILE]0m
+       gemstash status [--config-file FILE]
 
 1mDescription0m
        Checks status of the Gemstash server.
 
 1mOptions0m
-       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
+       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
 	 option.
 
 			       October 28, 2015 	    4mgemstash-status24m(1)

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

@@ -1,35 +1,17 @@
 <!-- Automatically generated by Pandoc -->
-.\" Automatically generated by Pandoc 3.1.6.2
+.\" Automatically generated by Pandoc 3.1.8
 .\"
-.\" 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-stop" "1" "October 9, 2015" "" ""
-.hy
 .SH Name
-.PP
 gemstash-stop - Stops the Gemstash server
 .SH Synopsis
-.PP
-\f[V]gemstash stop [--config-file FILE]\f[R]
+\f[CR]gemstash stop [--config-file FILE]\f[R]
 .SH Description
-.PP
 Stops the Gemstash server.
 .SH Options
 .IP \[bu] 2
-\f[V]--config-file FILE\f[R]: Specify the config file to use.
+\f[CR]--config-file FILE\f[R]: Specify the config file to use.
 If you aren\[cq]t using the default config file at
-\f[V]\[ti]/.gemstash/config.yml\f[R] or
-\f[V]\[ti]/.gemstash/config.yml.erb\f[R], then you must specify the
+\f[CR]\[ti]/.gemstash/config.yml\f[R] or
+\f[CR]\[ti]/.gemstash/config.yml.erb\f[R], then you must specify the
 config file via this option.

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

@@ -6,15 +6,15 @@
        gemstash-stop - Stops the Gemstash server
 
 1mSynopsis0m
-       1mgemstash stop [--config-file FILE]0m
+       gemstash stop [--config-file FILE]
 
 1mDescription0m
        Stops the Gemstash server.
 
 1mOptions0m
-       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
+       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
 	 option.
 
 				October 9, 2015 	      4mgemstash-stop24m(1)

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

@@ -1,37 +1,17 @@
 <!-- Automatically generated by Pandoc -->
-.\" Automatically generated by Pandoc 3.1.6.2
+.\" Automatically generated by Pandoc 3.1.8
 .\"
-.\" 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
-.PP
 gemstash-version - Show what version of Gemstash you are using
 .SH Synopsis
-.PP
-\f[V]gemstash version\f[R]
+\f[CR]gemstash version\f[R]
 .SH Description
-.PP
 Show what version of Gemstash you are using.
 .SS Usage
 .IP
-.nf
-\f[C]
+.EX
 gemstash version
 gemstash --version
 gemstash -v
-\f[R]
-.fi
+.EE

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

@@ -6,7 +6,7 @@
        gemstash-version - Show what version of Gemstash you are using
 
 1mSynopsis0m
-       1mgemstash version0m
+       gemstash version
 
 1mDescription0m
        Show what version of Gemstash you are using.

data/lib/gemstash/migrations/05_authorization_names.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+Sequel.migration do
+  change do
+    alter_table :authorizations do
+      add_column :name, String, :size => 191
+      add_index [:name], :unique => true
+    end
+  end
+end

data/lib/gemstash/upstream.rb

@@ -11,10 +11,12 @@ module Gemstash
 
     attr_reader :user_agent, :uri
 
-    def_delegators :@uri, :scheme, :host, :user, :password, :to_s
+    def_delegators :@uri, :scheme, :host, :to_s
 
     def initialize(upstream, user_agent: nil)
-      @uri = URI(CGI.unescape(upstream.to_s))
+      url = CGI.unescape(upstream.to_s)
+      url = "https://#{url}" unless %r{^https?://}.match?(url)
+      @uri = URI(url)
       @user_agent = user_agent
       raise "URL '#{@uri}' is not valid!" unless @uri.to_s&.match?(URI::DEFAULT_PARSER.make_regexp)
     end
@@ -40,12 +42,41 @@ module Gemstash
       @host_id ||= "#{host}_#{hash}"
     end
 
+    def user
+      env_auth_user || @uri.user
+    end
+
+    def password
+      env_auth_pass || @uri.password
+    end
+
   private
 
     def hash
       Digest::MD5.hexdigest(to_s)
     end
 
+    def env_auth_user
+      return unless env_auth
+
+      env_auth.split(":", 2).first
+    end
+
+    def env_auth_pass
+      return unless env_auth
+      return unless env_auth.include?(":")
+
+      env_auth.split(":", 2).last
+    end
+
+    def env_auth
+      @env_auth ||= ENV["GEMSTASH_#{host_for_env}"]
+    end
+
+    def host_for_env
+      host.upcase.gsub(".", "__").gsub("-", "___")
+    end
+
     # :nodoc:
     class GemName
       def initialize(upstream, gem_name)

data/lib/gemstash/version.rb

@@ -2,5 +2,5 @@
 
 # :nodoc:
 module Gemstash
-  VERSION = "2.3.2"
+  VERSION = "2.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemstash
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Andre Arko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2023-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -174,6 +174,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -281,6 +295,7 @@ files:
 - lib/gemstash/migrations/02_authorizations.rb
 - lib/gemstash/migrations/03_cached_gems.rb
 - lib/gemstash/migrations/04_health_tests.rb
+- lib/gemstash/migrations/05_authorization_names.rb
 - lib/gemstash/puma.rb
 - lib/gemstash/rack_env_rewriter.rb
 - lib/gemstash/specs_builder.rb
@@ -307,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: A place to stash gems you'll need