uffizzi-cli 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 989c225e4940286c4f59590bb5c7141a8dc3f599f3f1a42db6bc90142a0bc68e
-  data.tar.gz: 3fb2ef986ac257598cd09f5353fe9361a9d06ad8c0b8f665e4c911c40fb63ddc
+  metadata.gz: 17ac6475e11de6c24b044f64e19541587683aaad4bd3b72cafbc5160b92364a8
+  data.tar.gz: 228b5a14b359af42f9698eba6bd98c94155dfd05791b55378dfc99cf6ffe365d
 SHA512:
-  metadata.gz: 95b249607598f13d887b701516fcd83990a7aeec69ffcf0c04a80a59e61ee5496a9b56e0768123b81fa521e12424d71eb0b240d83cca2add2039aa7741f97b2b
-  data.tar.gz: 367ca2486d780e9d1c864f730e66f024cfef2f0c3ccb0886d6e9572a4aa39c6c9677e4a6e6049c48ada72e5ecccea42ea23d86f2d93d810b80240b5c1e4caaa2
+  metadata.gz: 4d9e8d2f99a297d2fac8452bc03e180c71f7b1e05d71ac333704b2e1649fffdfd2bb4f6b86ffb0d186e441629cb809b2d5c450984b2a36af49080b9b08fab700
+  data.tar.gz: ce3cdb192caa7ab39a7edec3b5d01788505cae7a4a2d5f440b99ef203f86f18d67c22ec5c07ef67603dc6ebb35871857f3f536ac71720b4634c46579f8e771d6

data/README.md

@@ -177,3 +177,9 @@ Supported credential types - `docker-hub`, `acr`, `ecr`, `gcr`
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/UffizziCloud/uffizzi_cli. See `CONTRIBUTING.md` in this repository.
+
+## License
+
+This project is licensed under the terms of the Apache-2.0 license.
+
+See this license at [`LICENSE`](LICENSE).

data/lib/uffizzi/cli/preview.rb

@@ -23,7 +23,7 @@ module Uffizzi
       run('create', file_path: file_path)
     end
 
-    desc 'uffizzi preview update [DEPLOYMENT_ID] [COMPOSE_FILE]', 'create'
+    desc 'uffizzi preview update [DEPLOYMENT_ID] [COMPOSE_FILE]', 'Update a preview'
     method_option :output, required: false, type: :string, aliases: '-o', enum: ['json', 'github-action']
     def update(deployment_name, file_path)
       run('update', deployment_name: deployment_name, file_path: file_path)
@@ -86,33 +86,39 @@ module Uffizzi
       params = file_path.nil? ? {} : prepare_params(file_path)
       response = create_deployment(ConfigFile.read_option(:server), project_slug, params)
 
-      if ResponseHelper.created?(response)
-        deployment = response[:body][:deployment]
-        success_message = "Preview created with name deployment-#{deployment[:id]}"
-        PreviewService.start_deploy_containers(project_slug, deployment, success_message)
-      else
+      if !ResponseHelper.created?(response)
         ResponseHelper.handle_failed_response(response)
       end
+
+      deployment = response[:body][:deployment]
+      Uffizzi.ui.say("Preview created with name deployment-#{deployment[:id]}")
+
+      success = PreviewService.run_containers_deploy(project_slug, deployment)
+
+      display_deployment_data(deployment, success)
     rescue SystemExit, Interrupt, SocketError
       deployment_id = response[:body][:deployment][:id]
-      handle_preview_interruption(deployment_id, hostname, project_slug)
+      handle_preview_interruption(deployment_id, ConfigFile.read_option(:server), project_slug)
     end
 
     def handle_update_command(deployment_name, file_path, project_slug)
       deployment_id = PreviewService.read_deployment_id(deployment_name)
 
-      return Uffizzi.ui.say("Preview should be specified in 'deployment-PREVIEW_ID' format") if deployment_id.nil?
+      raise Uffizzi::Error.new("Preview should be specified in 'deployment-PREVIEW_ID' format") if deployment_id.nil?
 
       params = prepare_params(file_path)
       response = update_deployment(ConfigFile.read_option(:server), project_slug, deployment_id, params)
 
-      if ResponseHelper.ok?(response)
-        deployment = response[:body][:deployment]
-        success_message = "Preview with ID deployment-#{deployment_id} was successfully updated."
-        PreviewService.start_deploy_containers(project_slug, deployment, success_message)
-      else
+      if !ResponseHelper.ok?(response)
         ResponseHelper.handle_failed_response(response)
       end
+
+      deployment = response[:body][:deployment]
+      Uffizzi.ui.say("Preview with ID deployment-#{deployment_id} was successfully updated.")
+
+      success = PreviewService.run_containers_deploy(project_slug, deployment)
+
+      display_deployment_data(deployment, success)
     end
 
     def handle_events_command(deployment_name, project_slug)
@@ -218,8 +224,8 @@ module Uffizzi
       }
     end
 
-    def handle_preview_interruption(deployment_id, hostname, project_slug)
-      deletion_response = delete_deployment(hostname, project_slug, deployment_id)
+    def handle_preview_interruption(deployment_id, server, project_slug)
+      deletion_response = delete_deployment(server, project_slug, deployment_id)
       deployment_name = "deployment-#{deployment_id}"
       preview_deletion_message = if ResponseHelper.no_content?(deletion_response)
         "The preview #{deployment_name} has been disabled."
@@ -229,5 +235,23 @@ module Uffizzi
 
       raise Uffizzi::Error.new("The preview creation was interrupted. #{preview_deletion_message}")
     end
+
+    def display_deployment_data(deployment, success)
+      if Uffizzi.ui.output_format.nil?
+        Uffizzi.ui.say('Done')
+        preview_url = "https://#{deployment[:preview_url]}"
+        Uffizzi.ui.say(preview_url) if success
+      else
+        deployment_data = build_deployment_data(deployment)
+        Uffizzi.ui.output(deployment_data)
+      end
+    end
+
+    def build_deployment_data(deployment)
+      {
+        id: "deployment-#{deployment[:id]}",
+        url: "https://#{deployment[:preview_url]}",
+      }
+    end
   end
 end

data/lib/uffizzi/config_file.rb

@@ -8,17 +8,21 @@ module Uffizzi
     CONFIG_PATH = "#{Dir.home}/.config/uffizzi/config_default.json"
 
     class << self
+      def config_path
+        CONFIG_PATH
+      end
+
       def create(account_id, cookie, server)
         data = prepare_config_data(account_id, cookie, server)
         data.each_pair { |key, value| write_option(key, value) }
       end
 
       def delete
-        File.delete(CONFIG_PATH) if exists?
+        File.delete(config_path) if exists?
       end
 
       def exists?
-        File.exist?(CONFIG_PATH)
+        File.exist?(config_path)
       end
 
       def read_option(option)
@@ -79,7 +83,7 @@ module Uffizzi
       end
 
       def read
-        data = File.read(CONFIG_PATH)
+        data = File.read(config_path)
         options = data.split("\n")
         options.reduce({}) do |acc, option|
           key, value = option.split('=', 2)
@@ -112,11 +116,11 @@ module Uffizzi
       end
 
       def create_file
-        dir = File.dirname(CONFIG_PATH)
+        dir = File.dirname(config_path)
 
         FileUtils.mkdir_p(dir) unless File.directory?(dir)
 
-        File.new(CONFIG_PATH, 'w')
+        File.new(config_path, 'w')
       end
     end
   end

data/lib/uffizzi/services/preview_service.rb

@@ -5,6 +5,7 @@ require 'uffizzi/clients/api/api_client'
 class PreviewService
   class << self
     include ApiClient
+
     def read_deployment_id(deployment_name)
       return nil unless deployment_name.start_with?('deployment-')
       return nil unless deployment_name.split('-').size == 2
@@ -15,23 +16,23 @@ class PreviewService
       deployment_id
     end
 
-    def start_deploy_containers(project_slug, deployment, success_message)
+    def run_containers_deploy(project_slug, deployment)
       deployment_id = deployment[:id]
       params = { id: deployment_id }
 
       response = deploy_containers(Uffizzi::ConfigFile.read_option(:server), project_slug, deployment_id, params)
 
-      if Uffizzi::ResponseHelper.no_content?(response)
-        Uffizzi.ui.say(success_message)
-        create_deployment(deployment, project_slug)
-      else
+      if !Uffizzi::ResponseHelper.no_content?(response)
         Uffizzi::ResponseHelper.handle_failed_response(response)
       end
+
+      activity_items = wait_containers_creation(deployment, project_slug)
+      wait_containers_deploy(deployment, project_slug, activity_items)
     end
 
     private
 
-    def create_deployment(deployment, project_slug)
+    def wait_containers_creation(deployment, project_slug)
       spinner = TTY::Spinner.new('[:spinner] Creating containers...', format: :dots)
       spinner.auto_spin
 
@@ -49,10 +50,10 @@ class PreviewService
 
       Uffizzi.ui.say('Done')
 
-      display_containers_deploying_status(deployment, project_slug, activity_items)
+      activity_items
     end
 
-    def display_containers_deploying_status(deployment, project_slug, activity_items)
+    def wait_containers_deploy(deployment, project_slug, activity_items)
       spinner = TTY::Spinner::Multi.new('[:spinner] Deploying preview...', format: :dots, style: {
                                           middle: '  ',
                                           bottom: '  ',
@@ -64,20 +65,13 @@ class PreviewService
         response = get_activity_items(Uffizzi::ConfigFile.read_option(:server), project_slug, deployment[:id])
         handle_activity_items_response(response, spinner)
         activity_items = response[:body][:activity_items]
-        check_activity_items_state(activity_items, containers_spinners)
+        update_containers_spinners!(activity_items, containers_spinners)
         break if activity_items.all? { |activity_item| activity_item[:state] == 'deployed' || activity_item[:state] == 'failed' }
 
         sleep(5)
       end
 
-      if Uffizzi.ui.output_format.nil?
-        Uffizzi.ui.say('Done')
-        preview_url = "https://#{deployment[:preview_url]}"
-        Uffizzi.ui.say(preview_url) if spinner.success?
-      else
-        output_data = build_output_data(deployment)
-        Uffizzi.ui.output(output_data)
-      end
+      spinner.success?
     end
 
     def create_containers_spinners(activity_items, spinner)
@@ -91,10 +85,11 @@ class PreviewService
       end
     end
 
-    def check_activity_items_state(activity_items, containers_spinners)
+    def update_containers_spinners!(activity_items, containers_spinners)
       finished_activity_items = activity_items.filter do |activity_item|
         activity_item[:state] == 'deployed' || activity_item[:state] == 'failed'
       end
+
       finished_activity_items.each do |activity_item|
         container_spinner = containers_spinners.detect { |spinner| spinner[:name] == activity_item[:name] }
         spinner = container_spinner[:spinner]
@@ -113,12 +108,5 @@ class PreviewService
         Uffizzi::ResponseHelper.handle_failed_response(response)
       end
     end
-
-    def build_output_data(output_data)
-      {
-        id: "deployment-#{output_data[:id]}",
-        url: "https://#{output_data[:preview_url]}",
-      }
-    end
   end
 end

data/lib/uffizzi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print