getv 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '089dcf7c1b77a594ef0d7362f8d64f9f1df0ac6a8642947c3448299bc21e6680'
-  data.tar.gz: f890fce6a6fe69416ddfee40cda03a1cf28ee4c70c88c04352712f8d9d373422
+  metadata.gz: 98a04bab50075d670df75705579e743dcfa11f8348333ff05071294355303860
+  data.tar.gz: e55cc07d8d7167176f3557a1eecf8f99f9c6f6908922fbf4901d97dd10951d70
 SHA512:
-  metadata.gz: 4d282b8cf6471125466a80e024e47b4346d2a2be3dc80a7c0ff7e31e60fc25f0efbfc32d2068ed58dabb2f3da862ede4519217b83f2603eb78bedd7367bb4f51
-  data.tar.gz: 1dc7d16a64011dca99f288001ff787c99efe82ee4b096955fd5f44913b6a5c669817bceab5e001acf94bacdaea19db356f36ec9536232a19dd2d053c9ca3134f
+  metadata.gz: 5b93e911ecd136a22555e97fcd0c62986a862adc4809b37a5c1cd1d047a8bdfd1f663fb7159548b2d4bb3f9558fcd9643831e4b91791b696a90313aa81af8388
+  data.tar.gz: 0a3a86b63ff5250f3b07bd419d5ecbafca05fe0f63384e12178675411d9ab0fb25f4c56a614d39cb34058d967b09b4b6414ef277a05e565930cc36e7f0bc440a

data/exe/getv

@@ -38,7 +38,7 @@ class App # rubocop:disable Metrics/ClassLength
 
   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]
@@ -47,10 +47,11 @@ 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|

data/lib/getv/package.rb

@@ -33,17 +33,29 @@ module Getv
         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', user: nil,
-                 password: nil }.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, token: nil }.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'

data/lib/getv/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getv
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - harbottle