uffizzi-cli 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac2d58dae4db13ed788532732a92f9d4a317780cb4b80ef07d185f899d10749d
-  data.tar.gz: a1b4b37db41936eabb930febe701186027a80d0684ca371ed442168caecea779
+  metadata.gz: 88f0a01cdfea0ed8e8d4ad54d776f517f84d74c424f2db15569fb788e7fe3868
+  data.tar.gz: e690fe7b2552ae4215687aac32420cb4b39e3cd2dd4b1d4fcf723538e49b213c
 SHA512:
-  metadata.gz: c2420a93b4b17a5efb2de11ed5a998070da7eb2f8f22a2d09bf2598b4eb88841f428f0a87cf7de7c5b49e289f12f2d85413aa96600ca3726b71b5ec962e6b68c
-  data.tar.gz: 2dff8bd8e614d8ffaad6a2b42f528844c5a6d1232c2327bcb756c8ae6d4b014e3b310965f01fd86dc2d6eb40cb9aaab10755ef707a0dc808538620581b1f09cb
+  metadata.gz: 77198a935bf13d106bd191e017094ecc431cc09e307608a4f23ccd3bbd5591b7d12def5f4c3eff77f0389acfe6384f2a80ad63389d7ce8b7f51b9768d8bd0d09
+  data.tar.gz: c945bf73973d7a55fae9e3cf9502a1cfacafc65671b292913333c61f644fe0ca9c5402e7ae7ce54ae88bd08de117e016614d72e9474634ff725581828ea288bb

data/lib/uffizzi/cli/preview.rb

@@ -15,7 +15,7 @@ module Uffizzi
 
     desc 'list', 'List all previews'
     method_option :filter, required: false, type: :string, aliases: '-f'
-    method_option :output, required: false, type: :string, aliases: '-o', enum: ['json']
+    method_option :output, required: false, type: :string, aliases: '-o', enum: ['json', 'pretty-json']
     def list
       run('list')
     end
@@ -87,6 +87,7 @@ module Uffizzi
 
     def handle_create_command(file_path, project_slug, labels)
       Uffizzi.ui.disable_stdout unless options[:output].nil?
+
       params = prepare_params(file_path, labels)
 
       response = create_deployment(ConfigFile.read_option(:server), project_slug, params)
@@ -145,7 +146,8 @@ module Uffizzi
     end
 
     def handle_succeed_events_response(response)
-      Uffizzi.ui.pretty_say(response[:body][:events])
+      Uffizzi.ui.output_format = Uffizzi::UI::Shell::PRETTY_JSON
+      Uffizzi.ui.say(response[:body][:events])
     end
 
     def handle_delete_command(deployment_name, project_slug)
@@ -180,13 +182,12 @@ module Uffizzi
       deployments = response[:body][:deployments] || []
       raise Uffizzi::Error.new('The project has no active deployments') if deployments.empty?
 
-      deployments.each do |deployment|
-        if Uffizzi.ui.output_format.nil?
-          Uffizzi.ui.say("deployment-#{deployment[:id]}")
-        else
-          Uffizzi.ui.pretty_say(deployment)
-        end
+      if Uffizzi.ui.output_format.nil?
+        deployments = deployments.reduce('') do |acc, deployment|
+          "#{acc}deployment-#{deployment[:id]}\n"
+        end.strip
       end
+      Uffizzi.ui.say(deployments)
     end
 
     def handle_succeed_delete_response(deployment_id)
@@ -202,9 +203,8 @@ module Uffizzi
 
         container
       end
-      deployment.each_key do |key|
-        Uffizzi.ui.say("#{key}: #{deployment[key]}")
-      end
+      deployment_data = deployment.reduce('') { |acc, (key, value)| "#{acc}#{key}: #{value}\n" }.strip
+      Uffizzi.ui.say(deployment_data)
     end
 
     def hide_secrets(secret_variables)
@@ -240,7 +240,8 @@ module Uffizzi
         Uffizzi.ui.say(preview_url) if success
       else
         deployment_data = build_deployment_data(deployment)
-        Uffizzi.ui.output(deployment_data)
+        Uffizzi.ui.enable_stdout
+        Uffizzi.ui.say(deployment_data)
       end
     end
 

data/lib/uffizzi/shell.rb

@@ -7,12 +7,26 @@ module Uffizzi
     class Shell
       attr_accessor :output_format
 
+      PRETTY_JSON = 'pretty-json'
+      REGULAR_JSON = 'json'
+      GITHUB_ACTION = 'github-action'
+
       def initialize
         @shell = Thor::Shell::Basic.new
       end
 
       def say(message)
-        @shell.say(message)
+        formatted_message = case output_format
+                            when PRETTY_JSON
+                              format_to_pretty_json(message)
+                            when REGULAR_JSON
+                              format_to_json(message)
+                            when GITHUB_ACTION
+                              format_to_github_action(message)
+                            else
+                              message
+        end
+        @shell.say(formatted_message)
       end
 
       def print_in_columns(messages)
@@ -34,33 +48,28 @@ module Uffizzi
         @shell.send(:stdout).string.strip
       end
 
-      def pretty_say(collection, index = true)
-        ap(collection, { index: index })
-      end
-
       def disable_stdout
         $stdout = StringIO.new
       end
 
-      def output(data)
+      def enable_stdout
         $stdout = IO.new(1, 'w')
-        json_format? ? output_in_json(data) : output_in_github_format(data)
       end
 
       private
 
-      def json_format?
-        output_format == 'json'
+      def format_to_json(data)
+        data.to_json
       end
 
-      def output_in_json(data)
-        say(data.to_json)
+      def format_to_pretty_json(data)
+        JSON.pretty_generate(data)
       end
 
-      def output_in_github_format(data)
-        data.each_key do |key|
-          say("::set-output name=#{key}::#{data[key]}")
-        end
+      def format_to_github_action(data)
+        return '' unless data.is_a?(Hash)
+
+        data.reduce('') { |acc, (key, value)| "#{acc}::set-output name=#{key}::#{value}\n" }
       end
     end
   end

data/lib/uffizzi/version.rb

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

data/man/uffizzi-preview-list

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.9.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.9.1
-.TH "UFFIZZI\-PREVIEW\-LIST" "" "August 2022" ""
+.TH "UFFIZZI\-PREVIEW\-LIST" "" "September 2022" ""
 .SH "NAME"
 \fBuffizzi\-preview\-list\fR \- list previews in a project
 .SH "SYNOPSIS"
@@ -20,7 +20,7 @@ https://github\.com/UffizziCloud/uffizzi_cli
 \-\-filter=METADATA
     Metadata to filtering list of deployments\.
 
-\-\-output=json
+\-\-output=pretty\-json
     Use this option for a more detailed description of listed
     deployments\.
 .fi
@@ -41,7 +41,7 @@ To list all previews in a project with name my_project, run:
 
 To list all previews in json format, run:
 
-    $ uffizzi preview list \-\-output="json"
+    $ uffizzi preview list \-\-output="pretty\-json"
 
 To list all previews filtered by metadata using single
 label, run:

data/man/uffizzi-preview-list.ronn

@@ -15,7 +15,7 @@ uffizzi-preview-list - list previews in a project
     --filter=METADATA
         Metadata to filtering list of deployments.
 
-    --output=json
+    --output=pretty-json
         Use this option for a more detailed description of listed
         deployments.
 
@@ -34,7 +34,7 @@ uffizzi-preview-list - list previews in a project
 
     To list all previews in json format, run:
 
-        $ uffizzi preview list --output="json"
+        $ uffizzi preview list --output="pretty-json"
 
     To list all previews filtered by metadata using single
     label, run:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print