uffizzi-cli 0.11.1 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 692eb8af782d78cc92d06d6a0eda07e6d481019a81f44144791bf211ab6438c0
-  data.tar.gz: a0db18ffc332806c013647c0706294c3db9486b42777a8f622fea9ca46552062
+  metadata.gz: e92bf221528510c670cb020826d6449a4c200dcdacb6b6c42cea9344f1aac12b
+  data.tar.gz: d95b2e8069051b7450d099add663104da159756913ca977d303f673805d8d0cb
 SHA512:
-  metadata.gz: 97e7dd627b0edfbfb500003480dc0e30e3497f36c263f6ebb2e3a79dced658444432e13182a5b2d3149e41982543283190255118e4eeec393f6c01aaed4dc9d5
-  data.tar.gz: 942031954c139f313f20ae22f47b894131101e32f41b9b5a3001e35fde31b2f45b5b08a6e8791bf8584b8982234274c6295a71c9aa13fceb369495498810cdfb
+  metadata.gz: a3da65fe42dd24ddca4c3c5fb7b15349e1daeef00689c421b0556d1d58eb34169de7c8bb4474ff1594fc5e526a1a5d8bd89124b649fb2606f10172440236613d
+  data.tar.gz: f68cba8bbbf8591dfb5310606f7322b312171d1110587fd80969453fccaa82d2f31aab560731d962122e82524f7a4ac20283e5f2d2b8965b0e027bae370e3746

data/lib/uffizzi/cli/connect.rb

@@ -126,12 +126,14 @@ module Uffizzi
     desc 'ghcr', 'Connect to GitHub Container Registry (ghcr.io)'
     method_option :skip_raise_existence_error, type: :boolean, default: false,
                                                desc: 'Skip raising an error within check the credential'
+    method_option :username, type: :string, aliases: :u
+    method_option :token, type: :string, aliases: :t
     def ghcr
       type = Uffizzi.configuration.credential_types[:github_registry]
       check_credential_existence(type, 'ghcr')
 
-      username = ENV['GITHUB_USERNAME'] || Uffizzi.ui.ask('Github Username: ')
-      password = ENV['GITHUB_ACCESS_TOKEN'] || Uffizzi.ui.ask('Access Token: ', echo: false)
+      username = options[:username] || ENV['GITHUB_USERNAME'] || Uffizzi.ui.ask('Github Username:')
+      password = options[:token] || ENV['GITHUB_ACCESS_TOKEN'] || Uffizzi.ui.ask('Access Token:', echo: false)
 
       params = {
         username: username,

data/lib/uffizzi/cli/login.rb

@@ -34,7 +34,8 @@ module Uffizzi
 
     def set_server
       config_server = ConfigFile.exists? ? read_option_from_config(:server) : nil
-      @options[:server] || config_server || Uffizzi.ui.ask('Server: ')
+      server_address = @options[:server] || config_server || Uffizzi.ui.ask('Server: ')
+      server_address.start_with?('http:', 'https:') ? server_address : "https://#{server_address}"
     end
 
     def set_username

data/lib/uffizzi/cli.rb

@@ -64,8 +64,8 @@ module Uffizzi
         super
       rescue Interrupt
         raise Uffizzi::Error.new('The command was interrupted')
-      rescue SocketError
-        raise Uffizzi::Error.new('A request was not sent to Uffizzi app')
+      rescue StandardError => e
+        raise Uffizzi::Error.new(e.message)
       end
 
       private

data/lib/uffizzi/services/compose_file_service.rb

@@ -92,7 +92,7 @@ class ComposeFileService
 
     def parse_compose_content_to_object(compose_content)
       begin
-        compose_data = Psych.safe_load(compose_content)
+        compose_data = Psych.safe_load(compose_content, aliases: true)
       rescue Psych::SyntaxError
         Uffizzi.ui.say('Invalid compose file')
       end

data/lib/uffizzi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uffizzi
-  VERSION = '0.11.1'
+  VERSION = '0.11.4'
 end

data/man/uffizzi-connect

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.9.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.9.1
-.TH "UFFIZZI\-CONNECT" "" "May 2022" ""
+.TH "UFFIZZI\-CONNECT" "" "July 2022" ""
 .SH "NAME"
 \fBuffizzi\-connect\fR \- grant a Uffizzi user account access to external services
 .SH "SYNOPSIS"
@@ -30,7 +30,7 @@ ecr
 gcr
     Connect to Google Container Registry (gcr\.io)\.
 
-gchr
+ghcr
     Connect to GitHub Container Registry (ghcr\.io)\.
 .fi
 .P

data/man/uffizzi-connect-ghcr

@@ -1,16 +1,20 @@
 .\" generated with Ronn-NG/v0.9.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.9.1
-.TH "UFFIZZI\-CONNECT\-ECR" "" "May 2022" ""
+.TH "UFFIZZI\-CONNECT\-GHCR" "" "July 2022" ""
 .SH "NAME"
-\fBuffizzi\-connect\-ecr\fR \- grant a Uffizzi user account access to a private GitHub Container Registry (GHCR)
+\fBuffizzi\-connect\-ghcr\fR \- grant a Uffizzi user account access to a private GitHub Container Registry (GHCR)
 .SH "SYNOPSIS"
 .nf
-uffizzi connect ecr
+uffizzi connect ghcr [OPTION]\|\.\|\.\|\.
 .fi
 .SH "DESCRIPTION"
 .nf
 Given valid credentials, grants a Uffizzi user account access
-to a private GitHub Container Registry
+to a private GitHub Container Registry\.
+
+Credentials can be provided interactively or non\-interactively
+via command options or environment variables:
+GITHUB_USERNAME, GITHUB_ACCESS_TOKEN
 
 This command can fail for the following reasons:
     \- The active user does not have permission to connect
@@ -24,12 +28,17 @@ For detailed instructions on configuring webhooks to send push
 notifications to Uffizzi, see
 https://docs\.uffizzi\.com/guides/container\-registry\-integrations
 .fi
+.SH "OPTIONS"
+.nf
+\-u, \-\-username        GitHub username
+\-t, \-\-token           Personal access token from GitHub
+.fi
 .SH "EXAMPLES"
 .nf
 The following command will prompt the user to enter GHCR
 credentials, including GitHub account name and
-personal access key (PAT):
+personal access token (PAT):
 
-    $ uffizzi connect ecr
+uffizzi connect ghcr
 .fi
 

data/man/uffizzi-connect-ghcr.ronn

@@ -1,15 +1,19 @@
-uffizzi-connect-ecr - grant a Uffizzi user account access to a private GitHub Container Registry (GHCR)
+uffizzi-connect-ghcr - grant a Uffizzi user account access to a private GitHub Container Registry (GHCR)
 ================================================================
 
 ## SYNOPSIS
-    uffizzi connect ecr
+    uffizzi connect ghcr [OPTION]...
 
 ## DESCRIPTION
-    Given valid credentials, grants a Uffizzi user account access 
-    to a private GitHub Container Registry
+    Given valid credentials, grants a Uffizzi user account access
+    to a private GitHub Container Registry.
+
+    Credentials can be provided interactively or non-interactively
+    via command options or environment variables:
+    GITHUB_USERNAME, GITHUB_ACCESS_TOKEN
 
     This command can fail for the following reasons:
-        - The active user does not have permission to connect 
+        - The active user does not have permission to connect
           external services.
         - The given credentials are invalid.
 
@@ -17,12 +21,16 @@ uffizzi-connect-ecr - grant a Uffizzi user account access to a private GitHub Co
     https://github.com/UffizziCloud/uffizzi_cli
 
     For detailed instructions on configuring webhooks to send push
-    notifications to Uffizzi, see 
+    notifications to Uffizzi, see
     https://docs.uffizzi.com/guides/container-registry-integrations
 
+## OPTIONS
+    -u, --username        GitHub username
+    -t, --token           Personal access token from GitHub
+
 ## EXAMPLES
-    The following command will prompt the user to enter GHCR 
-    credentials, including GitHub account name and 
-    personal access key (PAT):
-          
-        $ uffizzi connect ecr
+    The following command will prompt the user to enter GHCR
+    credentials, including GitHub account name and
+    personal access token (PAT):
+
+    uffizzi connect ghcr

data/man/uffizzi-connect.ronn

@@ -24,8 +24,8 @@ uffizzi-connect - grant a Uffizzi user account access to external services
 
     gcr
         Connect to Google Container Registry (gcr.io).
-    
-    gchr
+
+    ghcr
         Connect to GitHub Container Registry (ghcr.io).
 
 Run 'uffizzi connect COMMAND --help' for more information on a command.

data/man/uffizzi-disconnect

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.9.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.9.1
-.TH "UFFIZZI\-DISCONNECT" "" "May 2022" ""
+.TH "UFFIZZI\-DISCONNECT" "" "July 2022" ""
 .SH "NAME"
 \fBuffizzi\-disconnect\fR \- revoke a Uffizzi user account access to external services
 .SH "SYNOPSIS"
@@ -30,7 +30,7 @@ ecr
 gcr
     Disonnect from Google Container Registry (gcr\.io)\.
 
-gchr
+ghcr
     Disonnect from GitHub Container Registry (ghcr\.io)\.
 .fi
 .P

data/man/uffizzi-disconnect.ronn

@@ -24,8 +24,8 @@ uffizzi-disconnect - revoke a Uffizzi user account access to external services
 
     gcr
         Disonnect from Google Container Registry (gcr.io).
-    
-    gchr
+
+    ghcr
         Disonnect from GitHub Container Registry (ghcr.io).
 
 Run 'uffizzi disconnect COMMAND --help' for more information on a command.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.4
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print