uffizzi-cli 0.5.2 → 0.7.3

data/lib/uffizzi/config_file.rb

@@ -5,11 +5,11 @@ require 'fileutils'
 
 module Uffizzi
   class ConfigFile
-    CONFIG_PATH = "#{Dir.home}/.uffizzi/config.json"
+    CONFIG_PATH = "#{Dir.home}/.config/uffizzi/config_default.json"
 
     class << self
-      def create(account_id, cookie, hostname)
-        data = prepare_config_data(account_id, cookie, hostname)
+      def create(account_id, cookie, server)
+        data = prepare_config_data(account_id, cookie, server)
         data.each_pair { |key, value| write_option(key, value) }
       end
 
@@ -28,11 +28,11 @@ module Uffizzi
         data[option]
       end
 
-      def option_exists?(option)
+      def option_has_value?(option)
         data = read
-        return false unless data.is_a?(Hash)
+        return false if !data.is_a?(Hash) || !option_exists?(option)
 
-        data.key?(option)
+        !data[option].empty?
       end
 
       def write_option(key, value)
@@ -40,15 +40,15 @@ module Uffizzi
         return nil unless data.is_a?(Hash)
 
         data[key] = value
-        write(data.to_json)
+        write(data)
       end
 
-      def delete_option(key)
+      def unset_option(key)
         data = read
-        return nil unless data.is_a?(Hash)
+        return nil unless data.is_a?(Hash) || !option_exists?(key)
 
-        new_data = data.except(key)
-        write(new_data.to_json)
+        data[key] = ''
+        write(data)
       end
 
       def rewrite_cookie(cookie)
@@ -61,7 +61,7 @@ module Uffizzi
 
         content = data.reduce('') do |acc, pair|
           property, value = pair
-          "#{acc}#{property} - #{value}\n"
+          "#{acc}#{property} = #{value}\n"
         end
 
         Uffizzi.ui.say(content)
@@ -71,26 +71,42 @@ module Uffizzi
 
       private
 
+      def option_exists?(option)
+        data = read
+        return false unless data.is_a?(Hash)
+
+        data.key?(option)
+      end
+
       def read
-        JSON.parse(File.read(CONFIG_PATH), symbolize_names: true)
+        data = File.read(CONFIG_PATH)
+        options = data.split("\n")
+        options.reduce({}) do |acc, option|
+          key, value = option.split('=', 2)
+          acc.merge({ key.strip.to_sym => value.strip })
+        end
       rescue Errno::ENOENT => e
         Uffizzi.ui.say(e)
-        nil
-      rescue JSON::ParserError
-        Uffizzi.ui.say('Config file is in incorrect format')
-        nil
       end
 
       def write(data)
         file = create_file
-        file.write(data)
+        prepared_data = prepare_data(data)
+        file.write(prepared_data)
         file.close
       end
 
-      def prepare_config_data(account_id, cookie, hostname)
+      def prepare_data(data)
+        data.reduce('') do |acc, option|
+          key, value = option
+          "#{acc}#{key} = #{value}\n"
+        end
+      end
+
+      def prepare_config_data(account_id, cookie, server)
         {
           account_id: account_id,
-          hostname: hostname,
+          server: server,
           cookie: cookie,
         }
       end

data/lib/uffizzi/date_helper.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'time'
+
+module Uffizzi
+  module DateHelper
+    TWO_MINUTES = 120
+    TWO_HOURS = 120
+    TWO_DAYS = 48
+    TWO_WEEKS = 14
+    TWO_MONTHS = (365 / 12 * 2)
+    TWO_YEARS = 730
+
+    class << self
+      def count_distanse(now, previous_date)
+        seconds = (now - previous_date).round
+        return convert_to_words(seconds, 'seconds') if seconds < TWO_MINUTES
+
+        minutes = seconds / 60
+        return convert_to_words(minutes, 'minutes') if minutes < TWO_HOURS
+
+        hours = minutes / 60
+        return convert_to_words(hours, 'hours') if hours < TWO_DAYS
+
+        days = hours / 24
+        return convert_to_words(days, 'days') if days < TWO_WEEKS
+
+        weeks = days / 7
+        return convert_to_words(weeks, 'weeks') if days < TWO_MONTHS
+
+        months = (days / (365 / 12)).round
+        return convert_to_words(months, 'months') if days < TWO_YEARS
+
+        years = days / 365
+        convert_to_words(years, 'years')
+      end
+
+      private
+
+      def convert_to_words(value, unit)
+        "#{value} #{unit} ago"
+      end
+    end
+  end
+end

data/lib/uffizzi/response_helper.rb

@@ -28,22 +28,26 @@ module Uffizzi
       end
 
       def handle_failed_response(response)
-        print_errors(response[:body][:errors])
+        prepared_errors = prepare_errors(response[:body][:errors])
+        raise Uffizzi::Error.new(prepared_errors)
       end
 
       def handle_invalid_compose_response(response)
-        print_errors(response[:body][:compose_file][:payload][:errors])
+        prepared_errors = prepare_errors(response[:body][:compose_file][:payload][:errors])
+        raise Uffizzi::Error.new(prepared_errors)
       end
 
       private
 
-      def print_errors(errors)
-        errors.each_key do |key|
-          if errors[key].is_a?(Array)
-            errors[key].each { |error_message| Uffizzi.ui.say(error_message) }
+      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" }
           else
-            Uffizzi.ui.say(errors[key])
+            acc = "#{acc}#{error_messages}\n"
           end
+
+          acc
         end
       end
     end

data/lib/uffizzi/services/command_service.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class CommandService
+  class << self
+    def project_set?(options)
+      !options[:project].nil? || (Uffizzi::ConfigFile.exists? && Uffizzi::ConfigFile.option_has_value?(:project))
+    end
+  end
+end

data/lib/uffizzi/services/compose_file_service.rb

@@ -29,6 +29,9 @@ class ComposeFileService
           content: Base64.encode64(dependency_file_data),
         }
       end
+    rescue Errno::ENOENT => e
+      dependency_path = e.message.split('- ').last
+      raise Uffizzi::Error.new("The config file #{dependency_path} does not exist")
     end
 
     def fetch_configs(configs_data)

data/lib/uffizzi/services/preview_service.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+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
@@ -11,5 +14,111 @@ class PreviewService
 
       deployment_id
     end
+
+    def start_deploy_containers(project_slug, deployment, success_message)
+      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
+        Uffizzi::ResponseHelper.handle_failed_response(response)
+      end
+    end
+
+    private
+
+    def create_deployment(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])
+        handle_activity_items_response(response, spinner)
+        activity_items = response[:body][:activity_items]
+        break if activity_items.count == deployment[:containers].count
+
+        sleep(5)
+      end
+
+      spinner.success
+
+      Uffizzi.ui.say('Done')
+
+      display_containers_deploying_status(deployment, project_slug, activity_items)
+    end
+
+    def display_containers_deploying_status(deployment, project_slug, activity_items)
+      spinner = TTY::Spinner::Multi.new('[:spinner] Deploying preview...', format: :dots, style: {
+                                          middle: '  ',
+                                          bottom: '  ',
+                                        })
+
+      containers_spinners = create_containers_spinners(activity_items, spinner)
+
+      loop do
+        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)
+        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
+    end
+
+    def create_containers_spinners(activity_items, spinner)
+      activity_items.map do |activity_item|
+        container_spinner = spinner.register("[:spinner] #{activity_item[:name]}")
+        container_spinner.auto_spin
+        {
+          name: activity_item[:name],
+          spinner: container_spinner,
+        }
+      end
+    end
+
+    def check_activity_items_state(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]
+        case activity_item[:state]
+        when 'deployed'
+          spinner.success
+        when 'failed'
+          spinner.error
+        end
+      end
+    end
+
+    def handle_activity_items_response(response, spinner)
+      unless Uffizzi::ResponseHelper.ok?(response)
+        spinner.error
+        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/shell.rb

@@ -15,10 +15,6 @@ module Uffizzi
         @shell.say(message)
       end
 
-      def ask(msg, *args)
-        @shell.ask(msg, *args)
-      end
-
       def print_in_columns(messages)
         @shell.print_in_columns(messages)
       end
@@ -27,6 +23,13 @@ module Uffizzi
         @shell.print_table(table_data)
       end
 
+      def ask(message, *args)
+        answer = @shell.ask(message, *args)
+        options = args.last.is_a?(Hash) ? args.pop : {}
+        say("\n") unless options.fetch(:echo, true)
+        answer
+      end
+
       def last_message
         @shell.send(:stdout).string.strip
       end

data/lib/uffizzi/version.rb

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

data/man/uffizzi-config

@@ -0,0 +1,65 @@
+.\" generated with Ronn-NG/v0.9.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.9.1
+.TH "CONFIG" "" "April 2022" ""
+.SH "NAME"
+\fBconfig\fR \- configure the Uffizzi command\-line interface (CLI)
+.SH "SYNOPSIS"
+.nf
+uffizzi config COMMAND [UFFIZZI_WIDE_FLAG \|\.\|\.\|\.]
+.fi
+.SH "DESCRIPTION"
+.nf
+The uffizzi config command lets you configure this command\-line application\.
+If COMMAND is not specified, uffizzi config launches an interactive set up
+guide\.
+
+For more information on configuration options, see:
+https://docs\.uffizzi\.com/references/cli
+.fi
+.SH "UFFIZZI WIDE FLAGS"
+.nf
+These flags are available to all commands: \-\-project\. Run $ uffizzi
+help for details\.
+.fi
+.SH "COMMANDS"
+.nf
+COMMAND is one of the following:
+
+ get\-value OPTION
+    Displays the value of the specified option\.
+
+ list
+    Lists all options and their values from the config file\.
+
+ set OPTION VALUE
+    Sets the value of the specified option\.
+
+ unset OPTION
+    Deletes the value of the specified option\.
+.fi
+.SH "OPTIONS"
+.nf
+ OPTION is one of the following:
+
+ server
+    The server of the Uffizzi API service you want to access\. Defaults to
+    app\.uffizzi\.com\.
+
+ name
+    Your name\.
+
+ project
+    The current active project\. This project is used as the default unless
+    \-\-project is pass as an argument\.
+.fi
+.SH "EXAMPLES"
+.nf
+To list the uffizzi configuration options, run:
+
+    $ uffizzi config list
+
+To set a new current active project for uffizzi, run:
+
+    $ uffizzi config set project my\-project
+.fi
+

data/man/uffizzi-config.html

@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv='content-type' content='text/html;charset=utf8'>
+  <meta name='generator' content='Ronn-NG/v0.9.1 (http://github.com/apjanke/ronn-ng/tree/0.9.1)'>
+  <title>configure the Uffizzi command-line interface (CLI)</title>
+  <style type='text/css' media='all'>
+  /* style: man */
+  body#manpage {margin:0}
+  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
+  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
+  .mp h2 {margin:10px 0 0 0}
+  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
+  .mp h3 {margin:0 0 0 4ex}
+  .mp dt {margin:0;clear:left}
+  .mp dt.flush {float:left;width:8ex}
+  .mp dd {margin:0 0 0 9ex}
+  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
+  .mp pre {margin-bottom:20px}
+  .mp pre+h2,.mp pre+h3 {margin-top:22px}
+  .mp h2+pre,.mp h3+pre {margin-top:5px}
+  .mp img {display:block;margin:auto}
+  .mp h1.man-title {display:none}
+  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
+  .mp h2 {font-size:16px;line-height:1.25}
+  .mp h1 {font-size:20px;line-height:2}
+  .mp {text-align:justify;background:#fff}
+  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
+  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
+  .mp u {text-decoration:underline}
+  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
+  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
+  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
+  .mp b.man-ref {font-weight:normal;color:#434241}
+  .mp pre {padding:0 4ex}
+  .mp pre code {font-weight:normal;color:#434241}
+  .mp h2+pre,h3+pre {padding-left:0}
+  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
+  ol.man-decor {width:100%}
+  ol.man-decor li.tl {text-align:left}
+  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
+  ol.man-decor li.tr {text-align:right;float:right}
+  </style>
+</head>
+<!--
+  The following styles are deprecated and will be removed at some point:
+  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
+
+  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
+  .man-navigation should be used instead.
+-->
+<body id='manpage'>
+  <div class='mp' id='man'>
+
+  <div class='man-navigation' style='display:none'>
+    <a href="#NAME">NAME</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#UFFIZZI-WIDE-FLAGS">UFFIZZI WIDE FLAGS</a>
+    <a href="#COMMANDS">COMMANDS</a>
+    <a href="#OPTIONS">OPTIONS</a>
+    <a href="#EXAMPLES">EXAMPLES</a>
+  </div>
+
+  <ol class='man-decor man-head man head'>
+    <li class='tl'>config</li>
+    <li class='tc'></li>
+    <li class='tr'>config</li>
+  </ol>
+
+  
+
+<h2 id="NAME">NAME</h2>
+<p class="man-name">
+  <code>config</code> - <span class="man-whatis">configure the Uffizzi command-line interface (CLI)</span>
+</p>
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
+<pre><code>uffizzi config COMMAND [UFFIZZI_WIDE_FLAG ...]
+</code></pre>
+
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+<pre><code>The uffizzi config command lets you configure this command-line application.
+If COMMAND is not specified, uffizzi config launches an interactive set up
+guide.
+
+For more information on configuration options, see:
+https://docs.uffizzi.com/references/cli
+</code></pre>
+
+<h2 id="UFFIZZI-WIDE-FLAGS">UFFIZZI WIDE FLAGS</h2>
+<pre><code>These flags are available to all commands: --project. Run $ uffizzi 
+help for details.
+</code></pre>
+
+<h2 id="COMMANDS">COMMANDS</h2>
+<pre><code>COMMAND is one of the following:
+
+ get-value OPTION
+    Displays the value of the specified option.  
+
+ list
+    Lists all options and their values from the config file.
+
+ set OPTION VALUE
+    Sets the value of the specified option.
+
+ unset OPTION
+    Deletes the value of the specified option.    
+</code></pre>
+
+<h2 id="OPTIONS">OPTIONS</h2>
+<pre><code> OPTION is one of the following: 
+ 
+  server
+    The server of the Uffizzi API service you want to access. Defaults to 
+    app.uffizzi.com.
+
+ name
+    Your name.
+
+ project
+    The current active project. This project is used as the default unless 
+    --project is pass as an argument.
+</code></pre>
+
+<h2 id="EXAMPLES">EXAMPLES</h2>
+<pre><code>To list the uffizzi configuration options, run:
+
+    $ uffizzi config list
+
+To set a new current active project for uffizzi, run:
+
+    $ uffizzi config set project my-project
+</code></pre>
+
+  <ol class='man-decor man-foot man foot'>
+    <li class='tl'></li>
+    <li class='tc'>April 2022</li>
+    <li class='tr'>config</li>
+  </ol>
+
+  </div>
+</body>
+</html>

data/man/uffizzi-config.ronn

@@ -0,0 +1,55 @@
+uffizzi config - configure the Uffizzi command-line interface (CLI)
+================================================================
+
+## SYNOPSIS
+    uffizzi config COMMAND [UFFIZZI_WIDE_FLAG ...]
+
+## DESCRIPTION
+    The uffizzi config command lets you configure this command-line application.
+    If COMMAND is not specified, uffizzi config launches an interactive set up
+    guide.
+
+    For more information on configuration options, see:
+    https://docs.uffizzi.com/references/cli
+
+## UFFIZZI WIDE FLAGS
+    These flags are available to all commands: --project. Run $ uffizzi 
+    help for details.
+
+## COMMANDS
+    COMMAND is one of the following:
+
+     get-value OPTION
+        Displays the value of the specified option.  
+
+     list
+        Lists all options and their values from the config file.
+
+     set OPTION VALUE
+        Sets the value of the specified option.
+
+     unset OPTION
+        Deletes the value of the specified option.    
+
+## OPTIONS
+     OPTION is one of the following: 
+     
+     server
+        The server of the Uffizzi API service you want to access. Defaults to 
+        app.uffizzi.com.
+
+     name
+        Your name.
+
+     project
+        The current active project. This project is used as the default unless 
+        --project is pass as an argument.
+
+## EXAMPLES
+    To list the uffizzi configuration options, run:
+
+        $ uffizzi config list
+
+    To set a new current active project for uffizzi, run:
+
+        $ uffizzi config set project my-project

data/man/uffizzi-connect

@@ -0,0 +1,37 @@
+.\" generated with Ronn-NG/v0.9.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.9.1
+.TH "UFFIZZI\-CONNECT" "" "April 2022" ""
+.SH "NAME"
+\fBuffizzi\-connect\fR \- grant a Uffizzi user account access to external services
+.SH "SYNOPSIS"
+.nf
+uffizzi connect COMMAND
+.fi
+.SH "DESCRIPTION"
+.nf
+Grants a Uffizzi user account access to external services
+
+For more information on connecting to external services, see:
+https://docs\.uffizzi\.com/cli
+.fi
+.SH "COMMANDS"
+.nf
+COMMAND is one of the following:
+
+acr
+    Connect to Azure Container Registry (azurecr\.io)\.
+
+docker\-hub
+    Connect to Docker Hub (hub\.docker\.com)\.
+
+ecr
+    Connect to Amazon Elastic Container Registry (amazonaws\.com)\.
+
+gcr
+    Connect to Google Container Registry (gcr\.io)\.
+
+gchr
+    Connect to GitHub Container Registry (ghcr\.io)\.
+.fi
+.P
+Run \'uffizzi connect COMMAND \-\-help\' for more information on a command\.