manageiq-appliance_console 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce6e154b0eedf8258d81d045881f2fa43de53b72c548809b8d9e8a0714cc4ec0
-  data.tar.gz: a89730c58fe0e5887815c1ff49565f99e85cb5a9c4eba5d53e5f8db2f02b29b7
+  metadata.gz: 1778c8d617691aa881a998d7d106d8062d6f6e1ae21f64286f5cc6e784366eb4
+  data.tar.gz: feed3c1a56f14984c3f062591c6275f4ba687b0c77b3a7a10c9e25b8e4da5c5d
 SHA512:
-  metadata.gz: 718b6480550e954f797ab9df1731c7873101dddb779309183cc31c80ec188c39c48226850caeb715e4cf6a4c61b52c341857ddf8a0c251c162bfe4c8cd5d7be1
-  data.tar.gz: 5f78670f199ea6cb3619d93175db591d99f9aedee885c798e7ddf1afdb4f12a3099975be589e2f03847768c238d15d5b069b100e4cc72ba1f582ed7b098474db
+  metadata.gz: 7e3d29649b362700a9d9f94083e51f0531e99efc6aae2fc67af2286692d267e1fb5c9e031c9050e08311f4f207a52098843a0d5fbf7ec0b9451a621a5b2343b1
+  data.tar.gz: 7073df17678575318c597b655ab657d5927d4492bd71eda802df52a6f065b0fd8c57083ddd415a615e9a687f7f3886911f8ed80aed6b72b42ebaba63c45731a1

data/lib/manageiq/appliance_console/cli.rb

@@ -10,6 +10,8 @@ end
 
 module ManageIQ
 module ApplianceConsole
+  class CliError < StandardError; end
+
   class Cli
     attr_accessor :options
 
@@ -178,6 +180,10 @@ module ApplianceConsole
       install_certs if certs?
       extauth_opts if extauth_opts?
       set_server_state if set_server_state?
+    rescue CliError => e
+      say(e.message)
+      say("")
+      exit(1)
     rescue AwesomeSpawn::CommandResultError => e
       say e.result.output
       say e.result.error
@@ -216,16 +222,12 @@ module ApplianceConsole
       # initdb, relabel log directory for selinux, update configs,
       # start pg, create user, create db update the rails configuration,
       # verify, set up the database with region. activate does it all!
-      unless config.activate
-        say "Failed to configure internal database"
-        return
-      end
+      raise CliError, "Failed to configure internal database" unless config.activate
 
       # enable/start related services
       config.post_activation
     rescue RuntimeError => e
-      say e.message
-      say "Failed to configure internal database"
+      raise CliError, "Failed to configure internal database #{e.message}"
     end
 
     def set_external_db
@@ -241,10 +243,7 @@ module ApplianceConsole
       }.delete_if { |_n, v| v.nil? })
 
       # call create_or_join_region (depends on region value)
-      unless config.activate
-        say "Failed to configure external database"
-        return
-      end
+      raise CliError, "Failed to configure external database" unless config.activate
 
       # enable/start related services
       config.post_activation

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '3.3.2'.freeze
+    VERSION = '3.3.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -301,8 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ManageIQ Appliance Console