uffizzi-cli 0.10.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad4e300e1250ee113d65b436b58045b368c707c5840bc26375918a33c894a5a
-  data.tar.gz: 711dc99c47c9d073405da14ce9409e2bfe99eaca6028143da0eccb7961ba8426
+  metadata.gz: 7c1515d3dbc2f3e8cdf08d18602248f6059aede5e63c702600f0cca97efa19d8
+  data.tar.gz: 7945ef89453d07a194f61102ab72484a24b5b4a44ebc834cb7bbfac06393e1bb
 SHA512:
-  metadata.gz: aebda9657557027599278995e7a97bef373b118cdf4a8055d17706f418ffbd7b6a126703dfa5901833ab2c7198f91d91c5f07da5c836b0b602382a6fe860c235
-  data.tar.gz: 951c78b92cbee8f70a5b41231fa56cd9ea0cf3ec278c174b703a065567eb1d4ddfca18484396c5db208ea85d6fd1ad8f59c8c9a8a8c29ebbbc5fbe8b308e0ff8
+  metadata.gz: 0deb98fdefb88dd09a65f1991c7980fe253eea34325f0cc044433823fe4ef2408d3dd2002078a141e94830ea8e3db4aa938dda9bfcf17b51f9526900ac04ba75
+  data.tar.gz: bc4b3deeae31d244aa8d2b76e3ab00ca671af015df70f328c9a843ffd27270275d098bdbe20fa5421db242e9311c93e2854be04063863086207180dae2a1fd4d

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.10.1'
+  VERSION = '0.11.2'
 end

metadata

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