convox_installer 1.0.7 → 2.0.0

data/lib/convox/client.rb

@@ -1,40 +1,77 @@
 # frozen_string_literal: true
 
-require "logger"
-require "json"
-require "fileutils"
+require 'logger'
+require 'json'
+require 'fileutils'
+require 'rubygems'
 
 module Convox
   class Client
-    CONVOX_DIR = File.expand_path("~/.convox").freeze
-    AUTH_FILE = File.join(CONVOX_DIR, "auth")
-    HOST_FILE = File.join(CONVOX_DIR, "host")
+    CONVOX_DIR = File.expand_path('~/.convox').freeze
+    AUTH_FILE = File.join(CONVOX_DIR, 'auth')
+    HOST_FILE = File.join(CONVOX_DIR, 'host')
 
     attr_accessor :logger, :config
 
+    def cli_version_string
+      return @cli_version_string if @cli_version_string
+
+      cli_version_string ||= `convox --version`
+      return unless $CHILD_STATUS.success?
+
+      @cli_version_string = cli_version_string.chomp
+    end
+
+    def cli_version
+      return unless cli_version_string.is_a?(String)
+
+      if cli_version_string.match?(/^\d+\.\d+\.\d+/)
+        @cli_version ||= Gem::Version.new(version_string)
+      end
+      @cli_version
+    end
+
+    def convox_2_cli?
+      return false unless cli_version_string.is_a?(String)
+
+      cli_version_string.match?(/^20\d+$/)
+    end
+
+    def convox_3_cli?
+      return false if !cli_version_string.is_a?(String) ||
+                      convox_2_cli? ||
+                      !cli_version_string.match?(/^\d+\.\d+\.\d+/)
+
+      cli_version = Gem::Version.new(cli_version_string)
+      cli_version >= Gem::Version.new('3.0.0') &&
+        cli_version < Gem::Version.new('4.0.0')
+    end
+
     def auth
       load_auth_from_file
     end
 
     def initialize(options = {})
-      @logger = Logger.new(STDOUT)
+      @logger = Logger.new($stdout)
       logger.level = options[:log_level] || Logger::INFO
       @config = options[:config] || {}
     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)
-          bak_file = "#{path}.bak"
-          logger.info "Moving existing #{path} to #{bak_file}..."
-          FileUtils.mv(path, bak_file)
-        end
+        next unless File.exist?(path)
+
+        bak_file = "#{path}.bak"
+        logger.info "Moving existing #{path} to #{bak_file}..."
+        FileUtils.mv(path, bak_file)
       end
     end
 
     def install_convox
-      require_config(%i[ aws_region stack_name ])
+      require_config(%i[aws_region stack_name])
       region = config.fetch(:aws_region)
       stack_name = config.fetch(:stack_name)
 
@@ -45,39 +82,37 @@ module Convox
       end
 
       require_config(%i[
-        aws_region
-        aws_access_key_id
-        aws_secret_access_key
-        stack_name
-        instance_type
-      ])
+                       aws_region
+                       aws_access_key_id
+                       aws_secret_access_key
+                       stack_name
+                       instance_type
+                     ])
 
       logger.info "Installing Convox (#{stack_name})..."
 
       env = {
-        "AWS_REGION" => region,
-        "AWS_ACCESS_KEY_ID" => config.fetch(:aws_access_key_id),
-        "AWS_SECRET_ACCESS_KEY" => config.fetch(:aws_secret_access_key),
+        'AWS_REGION' => region,
+        'AWS_ACCESS_KEY_ID' => config.fetch(:aws_access_key_id),
+        'AWS_SECRET_ACCESS_KEY' => config.fetch(:aws_secret_access_key)
       }
-      command = %Q{rack install aws \
+      command = %(rack install aws \
 --name "#{config.fetch(:stack_name)}" \
 "InstanceType=#{config.fetch(:instance_type)}" \
-"BuildInstance="}
+"BuildInstance=")
 
       run_convox_command!(command, env)
     end
 
     def rack_already_installed?
-      require_config(%i[ aws_region stack_name ])
+      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)
 
-      auth.each do |host, password|
+      auth.each do |host, _password|
         if host.match?(/^#{stack_name}-\d+\.#{region}\.elb\.amazonaws\.com$/)
           return true
         end
@@ -85,8 +120,8 @@ module Convox
       false
     end
 
-    def validate_convox_auth_and_set_host!
-      require_config(%i[ aws_region stack_name ])
+    def validate_convox_auth_and_write_host!
+      require_config(%i[aws_region stack_name])
 
       unless File.exist?(AUTH_FILE)
         raise "Could not find auth file at #{AUTH_FILE}!"
@@ -97,7 +132,7 @@ module Convox
 
       match_count = 0
       matching_host = nil
-      auth.each do |host, password|
+      auth.each do |host, _password|
         if host.match?(/^#{stack}-\d+\.#{region}\.elb\.amazonaws\.com$/)
           matching_host = host
           match_count += 1
@@ -105,36 +140,36 @@ module Convox
       end
 
       if match_count == 1
-        set_host(matching_host)
+        write_host(matching_host)
         return matching_host
       end
 
-      if match_count > 1
-        error_message = "Found multiple matching hosts for "
-      else
-        error_message = "Could not find matching authentication for "
-      end
+      error_message = if match_count > 1
+                        'Found multiple matching hosts for '
+                      else
+                        'Could not find matching authentication for '
+                      end
       error_message += "region: #{region}, stack: #{stack}"
       raise error_message
     end
 
-    def set_host(host)
+    def write_host(host)
       logger.debug "Setting convox host to #{host} (in #{HOST_FILE})..."
-      File.open(HOST_FILE, "w") { |f| f.puts host }
+      File.open(HOST_FILE, 'w') { |f| f.puts host }
     end
 
     def validate_convox_rack!
       require_config(%i[
-        aws_region
-        stack_name
-        instance_type
-      ])
-      logger.debug "Validating that convox rack has the correct attributes..."
+                       aws_region
+                       stack_name
+                       instance_type
+                     ])
+      logger.debug 'Validating that convox rack has the correct attributes...'
       {
-        provider: "aws",
+        provider: 'aws',
         region: config.fetch(:aws_region),
         type: config.fetch(:instance_type),
-        name: config.fetch(:stack_name),
+        name: config.fetch(:stack_name)
       }.each do |k, v|
         convox_value = convox_rack_data[k.to_s]
         if convox_value != v
@@ -142,15 +177,16 @@ module Convox
                 "but was: '#{convox_value}'"
         end
       end
-      logger.debug "=> Convox rack has the correct attributes."
+      logger.debug '=> Convox rack has the correct attributes.'
       true
     end
 
     def convox_rack_data
       @convox_rack_data ||= begin
-        logger.debug "Fetching convox rack attributes..."
+        logger.debug 'Fetching convox rack attributes...'
         convox_output = `convox api get /system`
-        raise "convox command failed!" unless $?.success?
+        raise 'convox command failed!' unless $CHILD_STATUS.success?
+
         JSON.parse(convox_output)
       end
     end
@@ -162,17 +198,18 @@ module Convox
       app_name = config.fetch(:convox_app_name)
 
       logger.info "Creating app: #{app_name}..."
-      logger.info "=> Documentation: " \
-                  "https://docs.convox.com/deployment/creating-an-application"
+      logger.info '=> Documentation: ' \
+                  'https://docs.convox.com/deployment/creating-an-application'
 
       run_convox_command! "apps create #{app_name} --wait"
 
       retries = 0
       loop do
         break if convox_app_exists?
+
         if retries > 5
           raise "Something went wrong while creating the #{app_name} app! " \
-                "(Please wait a few moments and then restart the installation script.)"
+                '(Please wait a few moments and then restart the installation script.)'
         end
         logger.info "Waiting for #{app_name} to be ready..."
         sleep 3
@@ -183,9 +220,9 @@ module Convox
     end
 
     def set_default_app_for_directory!
-      logger.info "Setting default app in ./.convox/app..."
-      FileUtils.mkdir_p File.expand_path("./.convox")
-      File.open(File.expand_path("./.convox/app"), "w") do |f|
+      logger.info 'Setting default app in ./.convox/app...'
+      FileUtils.mkdir_p File.expand_path('./.convox')
+      File.open(File.expand_path('./.convox/app'), 'w') do |f|
         f.puts config.fetch(:convox_app_name)
       end
     end
@@ -196,11 +233,11 @@ module Convox
 
       logger.debug "Looking for existing #{app_name} app..."
       convox_output = `convox api get /apps`
-      raise "convox command failed!" unless $?.success?
+      raise 'convox command failed!' unless $CHILD_STATUS.success?
 
       apps = JSON.parse(convox_output)
       apps.each do |app|
-        if app["name"] == app_name
+        if app['name'] == app_name
           logger.debug "=> Found #{app_name} app."
           return true
         end
@@ -217,9 +254,9 @@ module Convox
         logger.info "#{bucket_name} S3 bucket already exists!"
       else
         logger.info "Creating S3 bucket resource (#{bucket_name})..."
-        run_convox_command! "rack resources create s3 " \
+        run_convox_command! 'rack resources create s3 ' \
                             "--name \"#{bucket_name}\" " \
-                            "--wait"
+                            '--wait'
 
         retries = 0
         loop do
@@ -227,14 +264,14 @@ module Convox
 
           if retries > 10
             raise "Something went wrong while creating the #{bucket_name} S3 bucket! " \
-                  "(Please wait a few moments and then restart the installation script.)"
+                  '(Please wait a few moments and then restart the installation script.)'
           end
-          logger.debug "Waiting for S3 bucket to be ready..."
+          logger.debug 'Waiting for S3 bucket to be ready...'
           sleep 3
           retries += 1
         end
 
-        logger.debug "=> S3 bucket created!"
+        logger.debug '=> S3 bucket created!'
       end
 
       set_s3_bucket_cors_policy
@@ -245,7 +282,7 @@ module Convox
       bucket_name = config.fetch(:s3_bucket_name)
       logger.debug "Looking up S3 bucket resource: #{bucket_name}"
       `convox api get /resources/#{bucket_name} 2>/dev/null`
-      $?.success?
+      $CHILD_STATUS.success?
     end
 
     def s3_bucket_details
@@ -255,12 +292,12 @@ module Convox
         logger.debug "Fetching S3 bucket resource details for #{bucket_name}..."
 
         response = `convox api get /resources/#{bucket_name}`
-        raise "convox command failed!" unless $?.success?
+        raise 'convox command failed!' unless $CHILD_STATUS.success?
 
         bucket_data = JSON.parse(response)
-        s3_url = bucket_data["url"]
+        s3_url = bucket_data['url']
         matches = s3_url.match(
-          /^s3:\/\/(?<access_key_id>[^:]*):(?<secret_access_key>[^@]*)@(?<bucket_name>.*)$/
+          %r{^s3://(?<access_key_id>[^:]*):(?<secret_access_key>[^@]*)@(?<bucket_name>.*)$}
         )
 
         match_keys = %i[access_key_id secret_access_key bucket_name]
@@ -271,7 +308,7 @@ module Convox
         {
           access_key_id: matches[:access_key_id],
           secret_access_key: matches[:secret_access_key],
-          name: matches[:bucket_name],
+          name: matches[:bucket_name]
         }
       end
     end
@@ -282,7 +319,7 @@ module Convox
       secret_access_key = config.fetch(:aws_secret_access_key)
 
       unless config.key? :s3_bucket_cors_policy
-        logger.debug "No CORS policy provided in config: s3_bucket_cors_policy"
+        logger.debug 'No CORS policy provided in config: s3_bucket_cors_policy'
         return
       end
       cors_policy_string = config.fetch(:s3_bucket_cors_policy)
@@ -294,17 +331,17 @@ module Convox
         `AWS_ACCESS_KEY_ID=#{access_key_id} \
         AWS_SECRET_ACCESS_KEY=#{secret_access_key} \
         aws s3api get-bucket-cors --bucket #{bucket_name} 2>/dev/null`
-      if $?.success? && existing_cors_policy_string.present?
+      if $CHILD_STATUS.success? && existing_cors_policy_string.present?
         # Sort all the nested arrays so that the equality operator works
         existing_cors_policy = JSON.parse(existing_cors_policy_string)
         cors_policy_json = JSON.parse(cors_policy_string)
         [existing_cors_policy, cors_policy_json].each do |policy_json|
-          if policy_json.is_a?(Hash) && policy_json["CORSRules"]
-            policy_json["CORSRules"].each do |rule|
-              rule["AllowedHeaders"].sort! if rule["AllowedHeaders"]
-              rule["AllowedMethods"].sort! if rule["AllowedMethods"]
-              rule["AllowedOrigins"].sort! if rule["AllowedOrigins"]
-            end
+          next unless policy_json.is_a?(Hash) && policy_json['CORSRules']
+
+          policy_json['CORSRules'].each do |rule|
+            rule['AllowedHeaders']&.sort!
+            rule['AllowedMethods']&.sort!
+            rule['AllowedOrigins']&.sort!
           end
         end
 
@@ -317,19 +354,20 @@ module Convox
       begin
         logger.info "Setting CORS policy for #{bucket_name}..."
 
-        File.open("cors-policy.json", "w") { |f| f.puts cors_policy_string }
+        File.open('cors-policy.json', 'w') { |f| f.puts cors_policy_string }
 
         `AWS_ACCESS_KEY_ID=#{access_key_id} \
         AWS_SECRET_ACCESS_KEY=#{secret_access_key} \
           aws s3api put-bucket-cors \
           --bucket #{bucket_name} \
           --cors-configuration "file://cors-policy.json"`
-        unless $?.success?
-          raise "Something went wrong while setting the S3 bucket CORS policy!"
+        unless $CHILD_STATUS.success?
+          raise 'Something went wrong while setting the S3 bucket CORS policy!'
         end
+
         logger.info "=> Successfully set CORS policy for #{bucket_name}."
       ensure
-        FileUtils.rm_f "cors-policy.json"
+        FileUtils.rm_f 'cors-policy.json'
       end
     end
 
@@ -338,38 +376,39 @@ module Convox
 
       registry_url = config.fetch(:docker_registry_url)
 
-      logger.debug "Looking up existing Docker registries..."
+      logger.debug 'Looking up existing Docker registries...'
       registries_response = `convox api get /registries`
-      unless $?.success?
-        raise "Something went wrong while fetching the list of registries!"
+      unless $CHILD_STATUS.success?
+        raise 'Something went wrong while fetching the list of registries!'
       end
+
       registries = JSON.parse(registries_response)
 
-      if registries.any? { |r| r["server"] == registry_url }
+      if registries.any? { |r| r['server'] == registry_url }
         logger.debug "=> Docker Registry already exists: #{registry_url}"
         return true
       end
 
       logger.info "Adding Docker Registry: #{registry_url}..."
-      logger.info "=> Documentation: " \
-                  "https://docs.convox.com/deployment/private-registries"
+      logger.info '=> Documentation: ' \
+                  'https://docs.convox.com/deployment/private-registries'
 
       `convox registries add "#{registry_url}" \
         "#{config.fetch(:docker_registry_username)}" \
         "#{config.fetch(:docker_registry_password)}"`
-      unless $?.success?
-        raise "Something went wrong while adding the #{registry_url} registry!"
-      end
+      return if $CHILD_STATUS.success?
+
+      raise "Something went wrong while adding the #{registry_url} registry!"
     end
 
     def default_service_domain_name
       require_config(%i[convox_app_name default_service])
 
       @default_service_domain_name ||= begin
-        convox_domain = convox_rack_data["domain"]
-        elb_name_and_region = convox_domain[/([^\.]*\.[^\.]*)\..*/, 1]
+        convox_domain = convox_rack_data['domain']
+        elb_name_and_region = convox_domain[/([^.]*\.[^.]*)\..*/, 1]
         unless elb_name_and_region.present?
-          raise "Something went wrong while parsing the ELB name and region! " \
+          raise 'Something went wrong while parsing the ELB name and region! ' \
                 "(#{elb_name_and_region})"
         end
         app = config.fetch(:convox_app_name)
@@ -383,7 +422,7 @@ module Convox
     def run_convox_command!(cmd, env = {})
       command = "convox #{cmd}"
       system env, command
-      raise "Error running: #{command}" unless $?.success?
+      raise "Error running: #{command}" unless $CHILD_STATUS.success?
     end
 
     private
@@ -393,7 +432,7 @@ module Convox
 
       begin
         JSON.parse(File.read(AUTH_FILE))
-      rescue
+      rescue StandardError
         {}
       end
     end

data/lib/convox.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require "convox/client"
+require 'convox/client'

data/lib/convox_installer/config.rb

@@ -1,48 +1,48 @@
 # frozen_string_literal: true
 
-require "highline"
-require "fileutils"
-require "json"
-require "securerandom"
+require 'highline'
+require 'fileutils'
+require 'json'
+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 = [
       {
         key: :stack_name,
-        title: "Convox Stack Name",
-        prompt: "Please enter a name for your Convox installation",
-        default: "convox",
+        title: 'Convox Stack Name',
+        prompt: 'Please enter a name for your Convox installation',
+        default: 'convox'
       },
       {
         key: :aws_region,
-        title: "AWS Region",
-        default: "us-east-1",
+        title: 'AWS Region',
+        default: 'us-east-1'
       },
       {
         key: :instance_type,
-        title: "EC2 Instance Type",
-        default: "t3.medium",
+        title: 'EC2 Instance Type',
+        default: 't3.medium'
       },
       {
-        section: "Admin AWS Credentials",
+        section: 'Admin AWS Credentials'
       },
       {
         key: :aws_access_key_id,
-        title: "AWS Access Key ID",
+        title: 'AWS Access Key ID'
       },
       {
         key: :aws_secret_access_key,
-        title: "AWS Secret Access Key",
-      },
+        title: 'AWS Secret Access Key'
+      }
     ].freeze
 
     def initialize(options = {})
-      @logger = Logger.new(STDOUT)
+      @logger = Logger.new($stdout)
       logger.level = options[:log_level] || Logger::INFO
 
       self.prompts = options[:prompts] || DEFAULT_PROMPTS
@@ -74,13 +74,14 @@ module ConvoxInstaller
 
         @completed_prompt = true
 
-        highline.say "Please double check all of these configuration details."
+        highline.say 'Please double check all of these configuration details.'
 
         agree = highline.agree(
-          "Would you like to start the Convox installation?" \
+          'Would you like to start the Convox installation?' \
           " (press 'n' to correct any settings)"
         )
         break if agree
+
         highline.say "\n"
       end
 
@@ -89,7 +90,7 @@ module ConvoxInstaller
 
     def show_config_summary
       highline.say "\n============================================"
-      highline.say "                 SUMMARY"
+      highline.say '                 SUMMARY'
       highline.say "============================================\n\n"
 
       config_titles = prompts.map do |prompt|
@@ -106,10 +107,18 @@ module ConvoxInstaller
         highline.say "    #{padded_key} #{value}"
       end
       highline.say "\nWe've saved your configuration to: #{CONFIG_FILE}"
-      highline.say "If anything goes wrong during the installation, " \
+      highline.say 'If anything goes wrong during the installation, ' \
                    "you can restart the script to reload the config and continue.\n\n"
     end
 
+    def self.config_file_exists?
+      File.exist?(CONFIG_FILE)
+    end
+
+    def self.read_config_file
+      File.read(CONFIG_FILE)
+    end
+
     private
 
     def ask_prompt(prompt)
@@ -129,7 +138,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.zero? ? default.call : default.call(config)
+                      else
+                        default
+                      end
         save_config_to_file
         return
       end
@@ -153,7 +166,7 @@ module ConvoxInstaller
 
       logger.debug "Loading saved config from #{CONFIG_FILE}..."
 
-      loaded_config = JSON.parse(Config.read_config_file)["config"].symbolize_keys
+      loaded_config = JSON.parse(Config.read_config_file)['config'].symbolize_keys
       self.config = config.merge(loaded_config)
     end
 
@@ -170,17 +183,9 @@ 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
-
-    def self.config_file_exists?
-      File.exist?(CONFIG_FILE)
-    end
-
-    def self.read_config_file
-      File.read(CONFIG_FILE)
-    end
   end
 end