convox_installer 1.0.4 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c61afa4dfbb14346d5dc9c07eb23eca17eb1e612c8fe659c74d78fc154810479
-  data.tar.gz: b85f7bf5513cad08955f4a7ebc8c66f35ef0995d1d481bb2779af069a2980d0b
+  metadata.gz: ae064bb3fa4954c0edd52b0d97127477ed73f0059c36b6c71f0f091b5b93608e
+  data.tar.gz: 8cadcac34a2eeaf4b68f323b5e9c2dd9ec528be4cf14a5fe2b9145cb0cb9d8cd
 SHA512:
-  metadata.gz: f4878d00fbe6b6111a8c316f6eb6c691f11ee5b5846628b46e1dde39eea2f2b6c510951f924e1ca51002808cdaba9662af70cd2be618627d25af94e1cb8a1a67
-  data.tar.gz: 9340387ce40c3ee1d41823ccc5c959638172944161c3f6ea3c74f8048d5d53706770bffcdf08f3fc464dac5543abd8f4c3f79584555da2be2f4d684fe5f083a3
+  metadata.gz: b4ba638e5dffe9ab773f4b5f5bad934fc112c2cdc2cede74ca7e8ae2351bf900d33a7681ec20e9bbcbd7813e62e1e4b927aa78ba30041ec0cc3644bd2a753f4e
+  data.tar.gz: a1e4ef7404bf7da3d425c0d5ac0192d035949bf3467a28fee45b244316e07473cff3dcfe361768f7f638984ac1949c5ccdc68d5cb9ddcfc16c1da1bcb9c19186

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`
@@ -250,7 +250,7 @@ Checks the list of registries to see if `docker_registry_url` has already been a
 
 Parses the rack router ELB name and region, and returns the default `convox.site` domain for your default service. (You can visit this URL in the browser to access your app.)
 
-Example: `myapp-web.rackname-Route-ABCDFE123456-123456789.us-west-2.convox.site`
+Example: `myapp-web.rackname-route-abcdfe123456-123456789.us-west-2.convox.site`
 
 Set a default service in your config prompts (e.g. `web`):
 

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)
@@ -375,7 +375,8 @@ module Convox
         app = config.fetch(:convox_app_name)
         service = config.fetch(:default_service)
 
-        "#{app}-#{service}.#{elb_name_and_region}.convox.site"
+        # Need to return downcase host so that `config.hosts` works with Rails applications
+        "#{app}-#{service}.#{elb_name_and_region}.convox.site".downcase
       end
     end
 

data/lib/convox_installer/config.rb

@@ -7,8 +7,8 @@ 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
 
     DEFAULT_PROMPTS = [
@@ -129,7 +129,7 @@ module ConvoxInstaller
         return if config[key]
 
         default = prompt[:value]
-        config[key] = default.is_a?(Proc) ? default.call : default
+        config[key] = default.is_a?(Proc) ? default.call(config) : default
         save_config_to_file
         return
       end
@@ -154,7 +154,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
@@ -169,9 +169,9 @@ module ConvoxInstaller
     end
 
     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)
+      # FileUtils.mkdir_p File.expand_path("~/.convox")
+      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.4"
+  VERSION = "1.0.8"
 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.4
+  version: 1.0.8
 platform: ruby
 authors:
 - Form Applications Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-11-12 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