uffizzi-cli 0.11.0 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a77480fa0ba3272d145f85b529890db26cbe746a1c24e4ab06bdd5722440a97
-  data.tar.gz: 81490020eded539424fc962df0513fab070948bf8ed11a4e4cb5e11eb9be48ea
+  metadata.gz: 180b017f63db77067a36ac80286e244bed3c363e9c884c6c65e7f0157c5342dd
+  data.tar.gz: 024ad78f5e85209b2970324f68b8017f1a9fb919e3c9b7dcfbc31ef903dad548
 SHA512:
-  metadata.gz: 1deeb99a694ad314a86980bbd2d320234f893824cad9c325077145e05d586bff507e2b881ccd1990926dc7bbf94c60babe8008ad58c06b4f8da82df66a89737b
-  data.tar.gz: 3bbe1123c922b6117a1794e81fa93d4059581c15b5de3f8d15bc76b5ec52df43d4f0f86c662ef196bb98ce0b80a4434114533a23f51a7cdb95213204666ba1c1
+  metadata.gz: d2c0eb580b2b290b03bbbab9069020b150929cdeb3eeca9ec10bd238b9325a48c77716b19f30e638435ad00c9c406a6d0d4bfa7049aa63afc7861233700d71a3
+  data.tar.gz: 39bc279bb44a2ed422220d517fe104942efb17ccbcc0a7ee58bb0698b923aea2396d3cc493303cadc92cc723cba8114dde62bc3a9c4564e7e6e3b53ff17ac7d2

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

@@ -15,7 +15,7 @@ module Uffizzi
     end
 
     def run
-      Uffizzi.ui.say('Login to Uffizzi to view and manage your previews.')
+      Uffizzi.ui.say('Login to Uffizzi server.')
       server = set_server
 
       username = set_username
@@ -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
@@ -68,6 +69,8 @@ module Uffizzi
       ConfigFile.write_option(:cookie, response[:headers])
       ConfigFile.write_option(:account_id, account[:id])
 
+      Uffizzi.ui.say('Login successfull')
+
       default_project = ConfigFile.read_option(:project)
       return unless default_project
 

data/lib/uffizzi/cli/preview/service.rb

@@ -68,7 +68,7 @@ module Uffizzi
 
     def handle_succeed_logs_response(response, container_name)
       logs = response[:body][:logs] || []
-      return Uffizzi.ui.say("The service #{container_name} has no logs") if logs.empty?
+      return Uffizzi.ui.say("The service '#{container_name}' has no logs") if logs.empty?
 
       logs.each do |log|
         Uffizzi.ui.say(log)

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/config_file.rb

@@ -92,10 +92,9 @@ module Uffizzi
       end
 
       def write(data)
-        file = create_file
         prepared_data = prepare_data(data)
-        file.write(prepared_data)
-        file.close
+
+        lock(config_path) { atomic_write(config_path, "#{config_path}.tmp", prepared_data) }
       end
 
       def prepare_data(data)
@@ -105,12 +104,18 @@ module Uffizzi
         end
       end
 
-      def create_file
-        dir = File.dirname(config_path)
+      def atomic_write(path, temp_path, content)
+        File.open(temp_path, 'w') { |f| f.write(content) }
+        FileUtils.mv(temp_path, path)
+      end
 
+      def lock(path)
+        dir = File.dirname(path)
         FileUtils.mkdir_p(dir) unless File.directory?(dir)
 
-        File.new(config_path, 'w')
+        File.open(path).flock(File::LOCK_EX) if File.exist?(path)
+        yield
+        File.open(path).flock(File::LOCK_UN)
       end
     end
   end

data/lib/uffizzi/response_helper.rb

@@ -42,14 +42,18 @@ module Uffizzi
       def prepare_errors(errors)
         errors.values.reduce('') do |acc, error_messages|
           if error_messages.is_a?(Array)
-            error_messages.each { |error_message| acc = "#{acc}#{error_message}\n" }
+            error_messages.each { |error_message| acc = "#{acc}#{prepare_error_message(error_message)}\n" }
           else
-            acc = "#{acc}#{error_messages}\n"
+            acc = "#{acc}#{prepare_error_message(error_message)}\n"
           end
 
           acc
         end
       end
+
+      def prepare_error_message(error_message)
+        error_message.split('::').last
+      end
     end
   end
 end

data/lib/uffizzi/services/preview_service.rb

@@ -20,7 +20,7 @@ class PreviewService
       deployment_id = deployment[:id]
       params = { id: deployment_id }
 
-      response = deploy_containers(Uffizzi::ConfigFile.read_option(:server), project_slug, deployment_id, params)
+      response = deploy_containers(server_url, project_slug, deployment_id, params)
 
       if !Uffizzi::ResponseHelper.no_content?(response)
         Uffizzi::ResponseHelper.handle_failed_response(response)
@@ -32,13 +32,17 @@ class PreviewService
 
     private
 
+    def server_url
+      @server_url ||= Uffizzi::ConfigFile.read_option(:server)
+    end
+
     def wait_containers_creation(deployment, project_slug)
       spinner = TTY::Spinner.new('[:spinner] Creating containers...', format: :dots)
       spinner.auto_spin
 
       activity_items = []
       loop do
-        response = get_activity_items(Uffizzi::ConfigFile.read_option(:server), project_slug, deployment[:id])
+        response = get_activity_items(server_url, project_slug, deployment[:id])
         handle_activity_items_response(response, spinner)
         activity_items = response[:body][:activity_items]
         break if activity_items.count == deployment[:containers].count
@@ -62,7 +66,7 @@ class PreviewService
       containers_spinners = create_containers_spinners(activity_items, spinner)
 
       loop do
-        response = get_activity_items(Uffizzi::ConfigFile.read_option(:server), project_slug, deployment[:id])
+        response = get_activity_items(server_url, project_slug, deployment[:id])
         handle_activity_items_response(response, spinner)
         activity_items = response[:body][:activity_items]
         update_containers_spinners!(activity_items, containers_spinners)

data/lib/uffizzi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uffizzi
-  VERSION = '0.11.0'
+  VERSION = '0.11.3'
 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.0
+  version: 0.11.3
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print