getv 1.4.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03d655407021c76e4df2c9ece13fb42e6447f597f9492d240901e49442144e43
-  data.tar.gz: 6f48191ff06387bfea424457ee41fd5f514cda257c1341ecba87eb82c7237279
+  metadata.gz: 853e816de90adcfaac9c59f8b12819af4abf2d12db77bf43c3cc4fd74033ae34
+  data.tar.gz: e99c28ae47b5d735c35d01b4d057d9dff33e67d767d4eab1af0611b3ea8431c4
 SHA512:
-  metadata.gz: 56d72bdde2f6f8aceb8d0844e30fda53e428efebe748ea8bb98848943f5bad319ff566f2d8d6fde7b71812dbf40bb13b29094d00f6296fb6d88e7910e37b7bd5
-  data.tar.gz: ecd3ee651658cf63c659a4195dc5f0e7e5d113d963d82f68f1ead2f9ad74cdb76c75f65f6b7c3578da40e96bae39fc296f6db9b6953650044d4ea8b15d86c719
+  metadata.gz: c87577b970b42e41c006f36ecf9ad9b1bec1b21838eb2daecf189502ccd5eda7f659544488f5f8613bd95bf59c939d595b2353a01cdd22890aae47525e012576
+  data.tar.gz: c1227dddae53f9f8352ba70e5a3aa5bd5a157a1dd35e0c5c92803d63aedf1f72e035a301aa3702d8475f9ac4f4837d6557454be30e351dff55c57cf32e8e6129

data/README.md

@@ -39,7 +39,7 @@ SYNOPSIS
 
 
 VERSION
-    1.3.0
+    1.5.0
 
 
 
@@ -55,9 +55,9 @@ COMMANDS
     docker         - Get package versions from a Docker or OCI container image registry
     gem            - Get package versions from RubyGems.org
     get            - Get package versions from text file URL
-    github_commit  - Get package versions from GitHub commits. Set environment variable $GITHUB_TOKEN to avoid GitHub API limit.
-    github_release - Get package versions from GitHub releases. Set environment variable $GITHUB_TOKEN to avoid GitHub API limit.
-    github_tag     - Get package versions from GitHub tags. Set environment variable $GITHUB_TOKEN to avoid GitHub API limit.
+    github_commit  - Get package versions from GitHub commits
+    github_release - Get package versions from GitHub releases
+    github_tag     - Get package versions from GitHub tags
     help           - Shows a list of commands or help for one command
     index          - Get package versions from web page of links
     npm            - Get package versions from npm at registry.npmjs.org
@@ -70,7 +70,7 @@ Show the latest available version of the `getv` gem:
 
 ```console
 $ getv --latest gem getv
-1.3.0
+1.5.0
 ```
 
 Show all `dep` GitHub release versions in JSON:

data/exe/getv

@@ -34,10 +34,11 @@ class App # rubocop:disable Metrics/ClassLength
 
   switch %i[l latest], desc: 'Latest version', negatable: false
   switch %i[j json], desc: 'Output in json', negatable: false
+  flag %i[p proxy], desc: 'Web proxy', default_value: nil
 
-  desc 'Get package versions from a Docker or OCI container image registry. Set environment variables $DOCKER_PROXY, $DOCKER_USER and $DOCKER_PASSWORD if required.' # rubocop:disable Layout/LineLength
+  desc 'Get package versions from a Docker or OCI container image registry'
   arg_name 'package_name'
-  command :docker do |c|
+  command :docker do |c| # rubocop:disable Metrics/BlockLength
     defaults = (Getv::Package.new 'name', type: c.name.to_s).opts
     c.flag %i[select_search], desc: 'Regex version selection search', default_value: defaults[:select_search]
     c.flag %i[select_replace], desc: 'Regex version selection replace', default_value: defaults[:select_replace]
@@ -46,16 +47,19 @@ class App # rubocop:disable Metrics/ClassLength
     c.flag %i[semantic_select], desc: 'Semantic version selection (comma delimited)',
                                 default_value: defaults[:semantic_select]
     c.flag %i[owner], desc: 'Repository owner',
-                      default_value: "'<owner>' if package_name is in format '<owner>/<repo>', otherwise just package_name" # rubocop:disable Layout/LineLength
+                      default_value: "'<owner>' if package_name is in format '<registry>/<owner>/<repo>' or '<owner>/<repo>', otherwise just package_name" # rubocop:disable Layout/LineLength
     c.flag %i[repo], desc: 'Repository name',
-                     default_value: "'<repo>' if package_name is in format '<owner>/<repo>', otherwise just package_name" # rubocop:disable Layout/LineLength
-    c.flag %i[url], desc: 'URL', default_value: defaults[:url]
+                     default_value: "'<repo>' if package_name is in format '<registry>/<owner>/<repo>' or <owner>/<repo>, otherwise just package_name" # rubocop:disable Layout/LineLength
+    c.flag %i[url], desc: 'URL',
+                    default_value: "'https://<registry>' if package_name is in format '<registry>/<owner>/<repo>', otherwise #{defaults[:url]}" # rubocop:disable Layout/LineLength
+    c.flag %i[user], desc: 'Username', default_value: defaults[:user]
+    c.flag %i[password], desc: 'Password', default_value: defaults[:password]
     c.action do |global_options, options, args|
       help_now! unless args.size == 1
 
       opts = global_options.merge(options)
       opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select, :owner, :repo,
-                        :url
+                        :url, :user, :password, :proxy
       opts = opts.delete_if { |k, v| v.nil? || v == c.flags[k].default_value }
       opts[:semantic_only] = !options[:invalid_versions]
       opts[:semantic_select] = opts[:semantic_select].split(',') unless opts.fetch(:semantic_select, nil).nil?
@@ -78,7 +82,7 @@ class App # rubocop:disable Metrics/ClassLength
       help_now! unless args.size == 1
 
       opts = global_options.merge(options)
-      opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select
+      opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select, :proxy
       opts = opts.delete_if { |k, v| v.nil? || v == c.flags[k].default_value }
       opts[:semantic_only] = !options[:invalid_versions]
       opts[:semantic_select] = opts[:semantic_select].split(',') unless opts.fetch(:semantic_select, nil).nil?
@@ -101,7 +105,7 @@ class App # rubocop:disable Metrics/ClassLength
     c.action do |global_options, options, args|
       help_now! unless args.size == 1
 
-      opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select, :url
+      opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select, :url, :proxy
       opts = opts.delete_if { |k, v| v.nil? || v == c.flags[k].default_value }
       opts[:semantic_only] = !options[:invalid_versions]
       opts[:semantic_select] = opts[:semantic_select].split(',') unless opts.fetch(:semantic_select, nil).nil?
@@ -110,7 +114,7 @@ class App # rubocop:disable Metrics/ClassLength
     end
   end
 
-  desc 'Get package versions from GitHub commits. Set environment variable $GITHUB_TOKEN to avoid GitHub API limit.'
+  desc 'Get package versions from GitHub commits'
   arg_name 'package_name'
   command :github_commit do |c|
     defaults = (Getv::Package.new 'name', type: c.name.to_s).opts
@@ -122,18 +126,19 @@ class App # rubocop:disable Metrics/ClassLength
     c.flag %i[repo], desc: 'Repository name',
                      default_value: "'<repo>' if package_name is in format '<owner>/<repo>', otherwise just package_name" # rubocop:disable Layout/LineLength
     c.flag %i[branch], desc: 'Repository branch', default_value: defaults[:branch]
+    c.flag %i[token], desc: 'Token', default_value: defaults[:token]
     c.action do |global_options, options, args|
       help_now! unless args.size == 1
 
       opts = global_options.merge(options)
-      opts = opts.slice :select_search, :select_replace, :reject, :owner, :repo, :branch
+      opts = opts.slice :select_search, :select_replace, :reject, :owner, :repo, :branch, :token, :proxy
       opts = opts.delete_if { |k, v| v.nil? || v == c.flags[k].default_value }
       package = Getv::Package.new args[0], { type: c.name.to_s }.merge(opts)
       Getv::Cli.output(package, latest: global_options[:latest], json: global_options[:json])
     end
   end
 
-  desc 'Get package versions from GitHub releases. Set environment variable $GITHUB_TOKEN to avoid GitHub API limit.'
+  desc 'Get package versions from GitHub releases'
   arg_name 'package_name'
   command :github_release do |c|
     defaults = (Getv::Package.new 'name', type: c.name.to_s).opts
@@ -147,11 +152,13 @@ class App # rubocop:disable Metrics/ClassLength
                       default_value: "'<owner>' if package_name is in format '<owner>/<repo>', otherwise just package_name" # rubocop:disable Layout/LineLength
     c.flag %i[repo], desc: 'Repository name',
                      default_value: "'<repo>' if package_name is in format '<owner>/<repo>', otherwise just package_name" # rubocop:disable Layout/LineLength
+    c.flag %i[token], desc: 'Token', default_value: defaults[:token]
     c.action do |global_options, options, args|
       help_now! unless args.size == 1
 
       opts = global_options.merge(options)
-      opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select, :owner, :repo
+      opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select, :owner, :repo,
+                        :token, :proxy
       opts = opts.delete_if { |k, v| v.nil? || v == c.flags[k].default_value }
       opts[:semantic_only] = !options[:invalid_versions]
       opts[:semantic_select] = opts[:semantic_select].split(',') unless opts.fetch(:semantic_select, nil).nil?
@@ -160,7 +167,7 @@ class App # rubocop:disable Metrics/ClassLength
     end
   end
 
-  desc 'Get package versions from GitHub tags. Set environment variable $GITHUB_TOKEN to avoid GitHub API limit.'
+  desc 'Get package versions from GitHub tags'
   arg_name 'package_name'
   command :github_tag do |c|
     defaults = (Getv::Package.new 'name', type: c.name.to_s).opts
@@ -174,11 +181,13 @@ class App # rubocop:disable Metrics/ClassLength
                       default_value: "'<owner>' if package_name is in format '<owner>/<repo>', otherwise just package_name" # rubocop:disable Layout/LineLength
     c.flag %i[repo], desc: 'Repository name',
                      default_value: "'<repo>' if package_name is in format '<owner>/<repo>', otherwise just package_name" # rubocop:disable Layout/LineLength
+    c.flag %i[token], desc: 'Token', default_value: defaults[:token]
     c.action do |global_options, options, args|
       help_now! unless args.size == 1
 
       opts = global_options.merge(options)
-      opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select, :owner, :repo
+      opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select, :owner, :repo,
+                        :token, :proxy
       opts = opts.delete_if { |k, v| v.nil? || v == c.flags[k].default_value }
       opts[:semantic_only] = !options[:invalid_versions]
       opts[:semantic_select] = opts[:semantic_select].split(',') unless opts.fetch(:semantic_select, nil).nil?
@@ -204,7 +213,7 @@ class App # rubocop:disable Metrics/ClassLength
       help_now! unless args.size == 1
 
       opts = global_options.merge(options)
-      opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select, :url
+      opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select, :url, :proxy
       opts = opts.delete_if { |k, v| v.nil? || v == c.flags[k].default_value }
       opts[:link] == 'value' if options[:link_value]
       opts[:semantic_only] = !options[:invalid_versions]
@@ -228,7 +237,7 @@ class App # rubocop:disable Metrics/ClassLength
       help_now! unless args.size == 1
 
       opts = global_options.merge(options)
-      opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select
+      opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select, :proxy
       opts = opts.delete_if { |k, v| v.nil? || v == c.flags[k].default_value }
       opts[:semantic_only] = !options[:invalid_versions]
       opts[:semantic_select] = opts[:semantic_select].split(',') unless opts.fetch(:semantic_select, nil).nil?
@@ -251,7 +260,7 @@ class App # rubocop:disable Metrics/ClassLength
       help_now! unless args.size == 1
 
       opts = global_options.merge(options)
-      opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select
+      opts = opts.slice :select_search, :select_replace, :reject, :semantic_only, :semantic_select, :proxy
       opts = opts.delete_if { |k, v| v.nil? || v == c.flags[k].default_value }
       opts[:semantic_only] = !options[:invalid_versions]
       opts[:semantic_select] = opts[:semantic_select].split(',') unless opts.fetch(:semantic_select, nil).nil?

data/lib/getv/package.rb

@@ -9,11 +9,11 @@ module Getv
       @name = name
       case name
       when /rubygem-.*/
-        opts = { 'type' => 'gem' }.merge(opts)
+        opts = { type: 'gem' }.merge(opts)
       when /nodejs-.*/
-        opts = { 'type' => 'npm' }.merge(opts)
+        opts = { type: 'npm' }.merge(opts)
       when /python.*-.*/
-        opts = { 'type' => 'pypi' }.merge(opts)
+        opts = { type: 'pypi' }.merge(opts)
       end
       if opts[:type] == 'github_commit'
         opts = {
@@ -29,25 +29,39 @@ module Getv
         reject: nil,
         semantic_only: true,
         semantic_select: ['*'],
+        proxy: nil,
         versions: nil,
         latest_version: nil
       }.merge(opts)
-      if (opts[:type] == 'docker' || opts[:type] =~ /github.*/) && (name.count('/') == 1)
-        opts = { owner: name.split('/')[0], repo: name.split('/')[1] }.merge(opts)
-      end
       case opts[:type]
       when 'docker'
-        opts = { owner: 'library', repo: name, url: 'https://registry.hub.docker.com' }.merge(opts)
+        opts = { user: nil, password: nil }.merge(opts)
+        opts = case name.count('/')
+               when 0
+                 { owner: 'library', repo: name, url: 'https://registry.hub.docker.com' }.merge(opts)
+               when 1
+                 { owner: name.split('/')[0], repo: name.split('/')[1],
+                   url: 'https://registry.hub.docker.com' }.merge(opts)
+               else
+                 { owner: name.split('/')[1], repo: name.split('/')[2..-1].join('/'),
+                   url: "https://#{name.split('/')[0]}" }.merge(opts)
+               end
       when 'gem'
         opts = { gem: name[/rubygem-(.*)/, 1] || name }.merge(opts)
       when /github.*/
-        opts = { owner: name, repo: name }.merge(opts)
+        opts = { token: nil }.merge(opts)
+        opts = case name.count('/')
+               when 1
+                 { owner: name.split('/')[0], repo: name.split('/')[1] }.merge(opts)
+               else
+                 { owner: name, repo: name }.merge(opts)
+               end
       when 'index'
         opts = { link: 'content' }.merge(opts)
       when 'npm'
         opts = { npm: name[/nodejs-(.*)/, 1] || name }.merge(opts)
       when 'pypi'
-        opts = { npm: name[/python.*-(.*)/, 1] || name }.merge(opts)
+        opts = { pypi: name[/python.*-(.*)/, 1] || name }.merge(opts)
       end
       @opts = opts
     end
@@ -89,43 +103,47 @@ module Getv
 
     private
 
-    def versions_using_docker # rubocop:disable Metrics/AbcSize
+    def get(url)
+      require 'rest-client'
+      RestClient::Request.execute(method: :get, url: url, proxy: opts[:proxy]).body
+    end
+
+    def versions_using_docker # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       require 'docker_registry2'
       docker_opts = {}
-      docker_opts[:http_options] = { proxy: ENV['DOCKER_PROXY'] } if ENV['DOCKER_PROXY']
-      if ENV['DOCKER_USER'] && ENV['DOCKER_PASSWORD']
-        docker_opts[:user] = ENV['DOCKER_USER']
-        docker_opts[:password] = ENV['DOCKER_PASSWORD']
+      docker_opts[:http_options] = { proxy: opts[:proxy] } unless opts[:proxy].nil?
+      if opts[:user] && opts[:password]
+        docker_opts[:user] = opts[:user]
+        docker_opts[:password] = opts[:password]
       end
       docker = DockerRegistry2.connect(opts[:url], docker_opts)
       docker.tags("#{opts[:owner]}/#{opts[:repo]}")['tags']
+    rescue DockerRegistry2::NotFound
+      []
     end
 
     def versions_using_gem
       require 'json'
-      require 'open-uri'
-      require 'net/http'
-      JSON.parse(Net::HTTP.get(URI("https://rubygems.org/api/v1/versions/#{opts[:gem]}.json"))).map do |v|
+      JSON.parse(get("https://rubygems.org/api/v1/versions/#{opts[:gem]}.json")).map do |v|
         v['number']
       end
     end
 
     def versions_using_get
-      require 'open-uri'
-      require 'net/http'
-      Net::HTTP.get(URI(opts[:url])).split("\n")
+      get(opts[:url]).split("\n")
     end
 
-    def github
+    def github # rubocop:disable Metrics/MethodLength
       require 'octokit'
-      if ENV['GITHUB_TOKEN']
-        github = Octokit::Client.new(access_token: ENV['GITHUB_TOKEN'])
+      if opts[:token]
+        github = Octokit::Client.new(access_token: opts[:token])
         user = github.user
         user.login
       else
         github = Octokit::Client.new
       end
       github.auto_paginate = true
+      github.proxy = opts[:proxy]
       github
     end
 
@@ -143,11 +161,8 @@ module Getv
     end
 
     def versions_using_index
-      require 'open-uri'
-      require 'net/http'
       require 'nokogiri'
-
-      Nokogiri::HTML(URI.open(opts[:url])).css('a').map do |a| # rubocop:disable Security/Open
+      Nokogiri::HTML(get(opts[:url])).css('a').map do |a|
         if opts[:link] == 'value'
           a.values[0]
         else
@@ -158,16 +173,12 @@ module Getv
 
     def versions_using_npm
       require 'json'
-      require 'open-uri'
-      require 'net/http'
-      JSON.parse(Net::HTTP.get(URI("https://registry.npmjs.org/#{opts[:npm]}")))['versions'].keys
+      JSON.parse(get("https://registry.npmjs.org/#{opts[:npm]}"))['versions'].keys
     end
 
     def versions_using_pypi
       require 'json'
-      require 'open-uri'
-      require 'net/http'
-      JSON.parse(Net::HTTP.get(URI("https://pypi.org/pypi/#{opts[:pypi]}/json")))['releases'].keys
+      JSON.parse(get("https://pypi.org/pypi/#{opts[:pypi]}/json"))['releases'].keys
     end
   end
 end

data/lib/getv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Getv
-  VERSION = '1.4.0'
+  VERSION = '1.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: getv
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.1
 platform: ruby
 authors:
 - harbottle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -90,6 +90,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Pull package version numbers from the web in various ways.