convox_installer 1.0.6 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a1bcd87ec2ab1bd0c720397964e8e641ad70017b582e8f72b3ea1c019f33cfc
-  data.tar.gz: ccc5bdfc3a20b4107d2fca2712b0d1268ce86ae40946a11bc4ed38f71b2a7021
+  metadata.gz: 8e3e80d423ba3cf14865e0b541207471286dcfa32956bfbc22c3fd4ff0818413
+  data.tar.gz: 031f35af824c717ee140a281d22e4793c06b83a05182709a1803c60a23692ad6
 SHA512:
-  metadata.gz: 8f68b7a76cdc88e96b7cc4e2d24f02c28e95701481f4c33b58a72e2ef691295045fec93bdc39261827ffe510fdadf9c4e7faa0ad832ba31d5eb81fffc0288263
-  data.tar.gz: 0f6743f60a94e60ab3e82e94daa853ce5c624cf8f67d508a18e5fa0428748d8798c86487be87b17f9a5b7471c822eb9e5998b9eefa59cb209a1551f36dc99fa4
+  metadata.gz: a96d285b7778b693394fd5bb7c5f7157aa74513e6302337bbfab2b9714d4b1b425f1b2033cb0fdf488625cfb9c835c09ea7a05f7426a47ab2c681ded07c3cc55
+  data.tar.gz: 368b58ededb07344ecd232838ba6229bbf93d4d3da345f5292eb4dfd213514b0b13138ea334857c54b53887eebf83b251938f5ff942bda410e7cb49ee0e46033

data/README.md

@@ -50,7 +50,7 @@ You can see a complete example in [`examples/full_installation.rb`](./examples/f
 ## Config
 
 Config is loaded from ENV vars, or from saved JSON data at
-`./.installer_config`. The script will save all of the user's responses into `./.installer_config` (in the current directory).
+`./.installer_config.json`. The script will save all of the user's responses into `./.installer_config.json` (in the current directory).
 
 ## Customize the Config Prompts
 
@@ -135,7 +135,7 @@ Makes sure that the `convox` and `aws` CLI tools are installed on this system. I
 
 #### `prompt_for_config`
 
-Loads config from ENV vars, or from saved config at `./.installer_config`.
+Loads config from ENV vars, or from saved config at `./.installer_config.json`.
 If any config settings are missing, it prompts the user for input. Finally, it shows a summary of the config, and asks the user if they want to proceed with the installation. If the user enters `y` (or `yes`), the `prompt_for_config` method completes. If they enter `n` (or `no`), we loop over every setting and let them press "enter" to keep the current value, or provide a new value to correct any mistakes.
 
 #### `backup_convox_host_and_rack`

data/lib/convox/client.rb

@@ -23,6 +23,8 @@ module Convox
     end
 
     def backup_convox_host_and_rack
+      FileUtils.mkdir_p CONVOX_DIR
+
       %w[host rack].each do |f|
         path = File.join(CONVOX_DIR, f)
         if File.exist?(path)
@@ -70,9 +72,7 @@ module Convox
     def rack_already_installed?
       require_config(%i[ aws_region stack_name ])
 
-      unless File.exist?(AUTH_FILE)
-        raise "Could not find auth file at #{AUTH_FILE}!"
-      end
+      return unless File.exist?(AUTH_FILE)
 
       region = config.fetch(:aws_region)
       stack_name = config.fetch(:stack_name)

data/lib/convox_installer/config.rb

@@ -7,7 +7,7 @@ require "securerandom"
 
 module ConvoxInstaller
   class Config
-    CONFIG_FILE = File.expand_path("./.installer_config").freeze
+    CONFIG_FILE = File.expand_path("./.installer_config.json").freeze
 
     attr_accessor :logger, :config, :prompts, :highline
 
@@ -129,7 +129,11 @@ module ConvoxInstaller
         return if config[key]
 
         default = prompt[:value]
-        config[key] = default.is_a?(Proc) ? default.call(config) : default
+        config[key] = if default.is_a?(Proc)
+          default.arity == 0 ? default.call : default.call(config)
+        else
+          default
+        end
         save_config_to_file
         return
       end
@@ -154,7 +158,7 @@ module ConvoxInstaller
       logger.debug "Loading saved config from #{CONFIG_FILE}..."
 
       loaded_config = JSON.parse(Config.read_config_file)["config"].symbolize_keys
-      self.config = config.merge(loaded_config).slice(*config_keys)
+      self.config = config.merge(loaded_config)
     end
 
     def load_config_from_env
@@ -170,8 +174,8 @@ module ConvoxInstaller
 
     def save_config_to_file
       # FileUtils.mkdir_p File.expand_path("~/.convox")
-      File.open(CONFIG_FILE, "w") do |f|
-        f.puts({ config: config }.to_json)
+      File.open(CONFIG_FILE, 'w') do |f|
+        f.puts(JSON.pretty_generate(config: config))
       end
     end
 

data/lib/convox_installer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ConvoxInstaller
-  VERSION = "1.0.6"
+  VERSION = '1.0.9'.freeze
 end

data/spec/lib/convox_installer/config_spec.rb

@@ -5,7 +5,7 @@ require "securerandom"
 
 RSpec.describe ConvoxInstaller::Config do
   before(:each) do
-    stub_const('ConvoxInstaller::Config::CONFIG_FILE', '/path/to/.installer_config')
+    stub_const('ConvoxInstaller::Config::CONFIG_FILE', '/path/to/.installer_config.json')
   end
 
   after(:each) do
@@ -13,7 +13,7 @@ RSpec.describe ConvoxInstaller::Config do
     ENV.delete "AWS_ACCESS_KEY_ID"
   end
 
-  it "loads the saved config from ./.installer_config" do
+  it "loads the saved config from ./.installer_config.json" do
     expect(described_class).to receive(:config_file_exists?).and_return(true)
     expect(described_class).to receive(:read_config_file).and_return(
       '{ "config": { "aws_region": "us-west-2", "aws_access_key_id": "1234" } }'
@@ -92,7 +92,7 @@ Please enter your AWS Access Key ID: Please enter your AWS Secret Access Key:
     AWS Access Key ID:       asdf
     AWS Secret Access Key:   xkcd
 
-We've saved your configuration to: /path/to/.installer_config
+We've saved your configuration to: /path/to/.installer_config.json
 If anything goes wrong during the installation, you can restart the script to reload the config and continue.
 
 Please double check all of these configuration details.
@@ -114,7 +114,7 @@ Please enter your AWS Access Key ID: |asdf| Please enter your AWS Secret Access
     AWS Access Key ID:       sdfg
     AWS Secret Access Key:   xkcd
 
-We've saved your configuration to: /path/to/.installer_config
+We've saved your configuration to: /path/to/.installer_config.json
 If anything goes wrong during the installation, you can restart the script to reload the config and continue.
 
 Please double check all of these configuration details.
@@ -157,7 +157,7 @@ EOS
       {
         key: :admin_password,
         title: "Admin Password",
-        value: -> () { SecureRandom.hex(8) },
+        value: -> (c) { SecureRandom.hex(8) },
       },
     ]
 
@@ -222,7 +222,7 @@ Please enter your Docker Registry Access Key ID: Please enter your Docker Regist
     Admin Email:                         admin@test.com
     Admin Password:                      99a6f67de0c7a117
 
-We've saved your configuration to: /path/to/.installer_config
+We've saved your configuration to: /path/to/.installer_config.json
 If anything goes wrong during the installation, you can restart the script to reload the config and continue.
 
 Please double check all of these configuration details.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convox_installer
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.9
 platform: ruby
 authors:
 - Form Applications Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.11
 signing_key:
 specification_version: 4
 summary: Build a Convox installation workflow