envirobly 0.10.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1502f5b98c25be6da48fbdd5ebf525723d8985d4e45eef5693611a0aea9db82a
-  data.tar.gz: 5684ae39ecb8f3f7006979e849a9746d17bb33dd849f8173836d2b9afa1cc6cb
+  metadata.gz: 4069ab1f0da67a7bc06444c1d32cef454c23924f125925f1bc00bcd56419b94f
+  data.tar.gz: e5f5628338e7b9deda59a6c26f6e95b967f8ecbbfa0a1b41994aa3834f92a77a
 SHA512:
-  metadata.gz: 8273cfe4dddd1f1da589add660066d5bd2b3c70f1ff0df92f0461f9b4c0b416f99276cb1a69ea1e1f13529ab6e18aca9f3720bb5e3896f8403251ee58e935bfd
-  data.tar.gz: a9e26055d4d0de16d449aec2ddc23921d61496969eb2ebd5812dc0279a8d2a1848c5e9ea074bfe5ea7c1f35c89af69162510ecfc88c5b8f7fa137c0241120c76
+  metadata.gz: de515ea959bef33ba5a1e89ffa6862d3a8f116a8f4cab2249b97042e7a92e19020daeba4c5a93babbee793656f1f34b86850924cf97cb22b17f0a739333de4a1
+  data.tar.gz: af5c4e4b6d08d1c08a06be9089a9e0f0d790915efafbf0cf0694a0e0ff90c68fbfdebdcb78c2921a3f7dd571561132968839832c0c5c5cb8be7a5b13b59afba0

data/lib/envirobly/access_token.rb

@@ -2,35 +2,86 @@ require "fileutils"
 require "pathname"
 
 class Envirobly::AccessToken
-  def initialize(token = ENV.fetch("ENVIROBLY_ACCESS_TOKEN", nil))
-    if token.nil? && File.exist?(access_token_path)
-      @token = File.read(access_token_path)
+  include Envirobly::Colorize
+
+  attr_reader :shell
+
+  class << self
+    def destroy
+      if File.exist?(path)
+        FileUtils.rm path
+      end
+    end
+
+    def dir
+      if ENV["XDG_CONFIG_HOME"]
+        Pathname.new(ENV["XDG_CONFIG_HOME"]).join("envirobly")
+      else
+        Pathname.new(Dir.home).join(".envirobly")
+      end
+    end
+
+    def path
+      dir.join "access_token"
+    end
+  end
+
+  def initialize(token = ENV["ENVIROBLY_ACCESS_TOKEN"].presence, shell: nil)
+    @shell = shell
+
+    if token.blank? && File.exist?(self.class.path)
+      @token = File.read(self.class.path)
     else
       @token = token
     end
   end
 
   def save
-    FileUtils.mkdir_p config_root
-    File.write access_token_path, @token
-    File.chmod 0600, access_token_path
-    puts "Access token saved to #{access_token_path}"
+    FileUtils.mkdir_p self.class.dir
+    File.write self.class.path, @token
+    File.chmod 0600, self.class.path
   end
 
   def as_http_bearer
     "Bearer #{@token}"
   end
 
-  private
-    def config_root
-      if ENV["XDG_CONFIG_HOME"]
-        Pathname.new(ENV["XDG_CONFIG_HOME"]).join("envirobly")
-      else
-        Pathname.new(Dir.home).join(".envirobly")
+  def require!
+    return if @token.present?
+
+    shell.say "This action requires you to be signed in."
+    shell.say "Please visit https://on.envirobly.com/profile/access_tokens"
+    shell.say "to generate an access token and then paste it in here."
+    shell.say
+
+    set
+  end
+
+  def set
+    @token = nil
+
+    while @token.blank?
+      begin
+        @token = shell.ask("Access Token:", echo: false)
+      rescue Interrupt
+        shell.say
+        shell.say_error "Cancelled"
+        exit
       end
-    end
 
-    def access_token_path
-      config_root.join "access_token"
+      api = Envirobly::Api.new(access_token: self)
+
+      # TODO: Eventually replace with custom `whoami` API that returns name, email...
+      if api.list_accounts.success?
+        save
+        shell.say
+        shell.say "Successfully signed in "
+        shell.say green_check
+      else
+        shell.say
+        shell.say_error "This token is invalid. Please try again"
+        @token = nil
+      end
     end
+  end
 end

data/lib/envirobly/api.rb

@@ -4,17 +4,17 @@ require "socket"
 require "uri"
 
 class Envirobly::Api
-  HOST = ENV["ENVIROBLY_API_HOST"] || "envirobly.com"
+  HOST = ENV["ENVIROBLY_API_HOST"].presence || "on.envirobly.com"
   USER_AGENT = "Envirobly CLI v#{Envirobly::VERSION}"
   CONTENT_TYPE = "application/json"
 
-  def initialize
-    @access_token = Envirobly::AccessToken.new
+  def initialize(access_token: Envirobly::AccessToken.new)
+    @access_token = access_token
   end
 
   def validate_shape(params)
     post_as_json(api_v1_shape_validations_url, params:, headers: authorization_headers).tap do |response|
-      unless successful_response?(response)
+      unless response.success?
         $stderr.puts "Validation request responded with #{response.code}. Aborting."
         exit 1
       end
@@ -22,29 +22,40 @@ class Envirobly::Api
   end
 
   def create_deployment(params)
-    post_as_json(api_v1_deployments_url, params:, headers: authorization_headers).tap do |response|
-      unless successful_response?(response)
-        $stderr.puts "Deployment creation request responded with #{response.code}. Aborting."
-        # TODO: render 422 validation failed nicely
-        $stderr.puts response.object
-        exit 1
-      end
-    end
+    post_as_json(api_v1_deployments_url, params:, headers: authorization_headers)
+  end
+
+  def list_accounts
+    get_as_json api_v1_accounts_url, headers: authorization_headers
+  end
+
+  def list_regions
+    get_as_json api_v1_regions_url, headers: authorization_headers
+  end
+
+  def list_instance_types(region)
+    get_as_json api_v1_instance_types_url(region), headers: authorization_headers
   end
 
-  MAX_RETRIES = 20
-  RETRY_INTERVAL_SECONDS = 2
+  MAX_RETRIES = 30
+  SHORT_RETRY_INTERVAL = 2.seconds
+  LONG_RETRY_INTERVAL = 6.seconds
   def get_deployment_with_delay_and_retry(url, tries = 1)
-    sleep RETRY_INTERVAL_SECONDS * tries
+    sleep SHORT_RETRY_INTERVAL * tries
     response = get_as_json URI(url)
 
-    if successful_response?(response)
+    if response.success?
       response
     elsif MAX_RETRIES <= tries
       $stderr.puts "Max retries exhausted while waiting for deployment credentials. Aborting."
       exit 1
     else
-      sleep RETRY_INTERVAL_SECONDS * tries
+      if tries > 3
+        sleep LONG_RETRY_INTERVAL
+      else
+        sleep SHORT_RETRY_INTERVAL
+      end
+
       get_deployment_with_delay_and_retry(url, tries + 1)
     end
   end
@@ -67,11 +78,27 @@ class Envirobly::Api
 
   private
     def api_v1_shape_validations_url
-      URI::HTTPS.build(host: HOST, path: "/api/v1/shape_validations")
+      api_url_for "v1/shape_validations"
     end
 
     def api_v1_deployments_url
-      URI::HTTPS.build(host: HOST, path: "/api/v1/deployments")
+      api_url_for "v1/deployments"
+    end
+
+    def api_v1_accounts_url
+      api_url_for "v1/accounts"
+    end
+
+    def api_v1_regions_url
+      api_url_for "v1/regions"
+    end
+
+    def api_v1_instance_types_url(region)
+      api_url_for "v1/instance_types", query: "region=#{region}"
+    end
+
+    def api_url_for(path, query: nil)
+      URI::HTTPS.build(host: HOST, path: "/api/#{path}", query:)
     end
 
     def request(url, type:, headers: {})
@@ -91,6 +118,10 @@ class Envirobly::Api
         def response.object
           @json_parsed_body ||= JSON.parse(body)
         end
+
+        def response.success?
+          (200..299).include?(code.to_i)
+        end
       end
     end
 
@@ -101,8 +132,4 @@ class Envirobly::Api
     def authorization_headers
       { "Authorization" => @access_token.as_http_bearer }
     end
-
-    def successful_response?(response)
-      (200..299).include?(response.code.to_i)
-    end
 end

data/lib/envirobly/cli/main.rb

@@ -1,4 +1,6 @@
 class Envirobly::Cli::Main < Envirobly::Base
+  include Envirobly::Colorize
+
   desc "version", "Show Envirobly CLI version"
   method_option :pure, type: :boolean, default: false
   def version
@@ -9,104 +11,117 @@ class Envirobly::Cli::Main < Envirobly::Base
     end
   end
 
+  desc "signin", "Set access token generated at Envirobly"
+  def signin
+    access_token = Envirobly::AccessToken.new(shell:)
+    access_token.set
+  end
+
+  desc "signout", "Sign out"
+  def signout
+    Envirobly::AccessToken.destroy
+    say "You've signed out."
+    say "This didn't delete the access token itself."
+    say "You can sign in again with `envirobly signin`."
+  end
+
+  desc "set_default_account", "Choose default account to deploy the current project to"
+  def set_default_account
+    Envirobly::Defaults::Account.new(shell:).require_id
+  end
+
+  desc "set_default_region", "Set default region for the current project when deploying for the first time"
+  def set_default_region
+    Envirobly::Defaults::Region.new(shell:).require_id
+  end
+
   desc "validate", "Validates config"
   def validate
-    configs = Envirobly::Configs.new
+    Envirobly::AccessToken.new(shell:).require!
+
+    configs = Envirobly::Config.new
     api = Envirobly::Api.new
 
     params = { validation: configs.to_params }
     response = api.validate_shape params
 
     if response.object.fetch("valid")
-      puts "All checks pass."
+      puts "Config is valid #{green_check}"
     else
-      response.object.fetch("errors").each do |config_path, messages|
-        puts "#{config_path}:"
-        puts
-        messages.each_with_index do |message, index|
-          puts "    #{message}"
-          puts
-        end
-      end
-
+      display_config_errors response.object.fetch("errors")
       exit 1
     end
   end
 
+  desc "instance_types [region]", "List instance types in a given region, including price and performance characteristics."
+  def instance_types(region = nil)
+    default_region = Envirobly::Defaults::Region.new(shell:)
+    region = region.presence || default_region.require_if_none
+
+    api = Envirobly::Api.new
+    table_data = api.list_instance_types(region).object.map do |item|
+      [
+        item["code"],
+        item["vcpu"],
+        Envirobly::Numeric.new(item["memory"], short: true),
+        Envirobly::Numeric.new(item["monthly_price"]),
+        item["group"]
+      ]
+    end
+
+    print_table [ [ "Name", "vCPU", "Memory (GB)", "Monthly price ($)", "Group" ] ] +
+      table_data, borders: true
+  end
+
   desc "deploy [ENVIRON_NAME]", <<~TXT
-    Deploy to environment identified by name.
-    When name is empty, current git branch name is used.
+    Deploy to environ identified by name.
+    Name can contain letters, numbers, dashes or underscores.
+    If environ name is left blank, current git branch name is used.
   TXT
+  method_option :account_id, type: :numeric
+  method_option :region, type: :string
+  method_option :project, type: :string
   method_option :commit, type: :string, default: "HEAD"
   method_option :dry_run, type: :boolean, default: false
-  method_option :account_id, type: :numeric
-  method_option :project_name, type: :string
-  method_option :project_region, type: :string
-  def deploy(environ_name = Envirobly::Git.new.current_branch)
-    deployment = Envirobly::Deployment.new(
-      environ_name:,
-      commit_ref: options.commit,
-      account_id: options.account_id,
-      project_name: options.project_name,
-      project_region: options.project_region
-    )
-    deployment.perform(dry_run: options.dry_run)
-  end
-
-  desc "set_access_token TOKEN", "Save and use an access token generated at Envirobly"
-  def set_access_token
-    token = ask("Access Token:", echo: false).strip
+  def deploy(environ_name = nil)
+    commit = Envirobly::Git::Commit.new options.commit
 
-    if token.blank?
-      $stderr.puts
-      $stderr.puts "Token can't be empty."
+    unless commit.exists?
+      say_error "Commit '#{commit.ref}' doesn't exist in this repository. Aborting."
       exit 1
     end
 
-    Envirobly::AccessToken.new(token).save
-  end
+    Envirobly::AccessToken.new(shell:).require!
 
-  desc "push", "Push commit manifest and blobs to S3"
-  def push(region, bucket, ref = "HEAD")
-    commit = Envirobly::Git::Commit.new ref
-    s3 = Envirobly::Aws::S3.new(region:, bucket:)
-    s3.push commit
+    environ_name = environ_name.presence || commit.current_branch
+    project_name = nil
+    project_id = nil
+
+    if options.project.present?
+      if options.project =~ Envirobly::Defaults::Project.regexp
+        project_id = $1.to_i
+      else
+        project_name = options.project
+      end
+    end
+
+    deployment = Envirobly::Deployment.new(
+      account_id: options.account_id,
+      region: options.region,
+      project_name:,
+      environ_name:,
+      project_id:,
+      commit:,
+      shell:
+    )
+    deployment.perform(dry_run: options.dry_run)
   end
 
-  desc "pull", "Download working copy from S3"
+  desc "pull", "Download build context"
   def pull(region, bucket, ref, path)
     Envirobly::Duration.measure("Build context download took %s") do
       s3 = Envirobly::Aws::S3.new(region:, bucket:)
       s3.pull ref, path
     end
   end
-
-  desc "object_tree", "Show object tree used for deployments"
-  method_option :commit, type: :string, default: "HEAD"
-  def object_tree
-    commit = Envirobly::Git::Commit.new options.commit
-    puts "Commit: #{commit.ref}"
-    pp commit.object_tree
-    puts "SHA256: #{commit.object_tree_checksum}"
-  end
-
-  desc "measure", "POC of Envirobly::Duration"
-  def measure
-    Envirobly::Duration.measure do
-      print "Doing something for 2s"
-      sleep 2
-    end
-
-    Envirobly::Duration.measure do
-      print "Doing something else for 100ms"
-      sleep 0.1
-    end
-
-    Envirobly::Duration.measure("Custom message, took %s") do
-      puts "Sleeping 2.5s with custom message"
-      sleep 2.5
-    end
-
-    puts "Done."
-  end
 end

data/lib/envirobly/colorize.rb

@@ -11,6 +11,10 @@ module Envirobly::Colorize
     [ FAINT, text, RESET ].join
   end
 
+  def bold(text)
+    [ BOLD, text, RESET ].join
+  end
+
   def green(text)
     [ GREEN, text, RESET ].join
   end
@@ -18,4 +22,33 @@ module Envirobly::Colorize
   def yellow(text)
     [ YELLOW, text, RESET ].join
   end
+
+  def red(text)
+    [ RED, text, RESET ].join
+  end
+
+  def green_check
+    green("✔")
+  end
+
+  def downwards_arrow_to_right
+    "↳"
+  end
+
+  def cross
+    "✖"
+  end
+
+  def display_config_errors(errors)
+    puts "#{red(cross)} Config contains the following issues:"
+
+    errors.each do |error|
+      puts
+      puts "  #{error["message"]}"
+
+      if error["path"]
+        puts faint("  #{downwards_arrow_to_right} #{error["path"]}")
+      end
+    end
+  end
 end

data/lib/envirobly/config.rb

@@ -0,0 +1,38 @@
+require "dotenv"
+
+class Envirobly::Config
+  DIR = ".envirobly"
+  BASE = "deploy.yml"
+  ENV_VARS = "env"
+  OVERRIDES_PATTERN = /deploy\.([a-z0-9\-_]+)\.yml/i
+
+  def initialize(dir = DIR)
+    @dir = Pathname.new dir
+  end
+
+  def to_params
+    {
+      configs:,
+      env_vars:
+    }
+  end
+
+  private
+    def configs
+      Dir.entries(@dir).map do |file|
+        path = File.join(@dir, file)
+
+        next unless File.file?(path) && config_file?(file)
+
+        [ "#{DIR}/#{file}", File.read(path) ]
+      end.compact.to_h
+    end
+
+    def env_vars
+      Dotenv.parse @dir.join(ENV_VARS), overwrite: true
+    end
+
+    def config_file?(file)
+      file == BASE || file.match?(OVERRIDES_PATTERN)
+    end
+end

data/lib/envirobly/default.rb

@@ -0,0 +1,47 @@
+class Envirobly::Default
+  attr_accessor :shell
+
+  def self.key = "url"
+
+  def initialize(shell: nil)
+    @path = File.join Envirobly::Config::DIR, "defaults", self.class.file
+    @shell = shell
+  end
+
+  def id
+    if File.exist?(@path)
+      content = YAML.safe_load_file(@path)
+
+      if content[self.class.key] =~ self.class.regexp
+        return cast_id($1)
+      end
+    end
+
+    nil
+  end
+
+  def save(url)
+    unless url =~ self.class.regexp
+      raise ArgumentError, "'#{url}' must match #{self.class.regexp}"
+    end
+
+    FileUtils.mkdir_p(File.dirname(@path))
+    content = YAML.dump({ self.class.key => url })
+    File.write(@path, content)
+  end
+
+  def save_if_none(url)
+    return if id.present?
+
+    save(url)
+  end
+
+  def require_if_none
+    id || require_id
+  end
+
+  private
+    def cast_id(value)
+      value.to_i
+    end
+end

data/lib/envirobly/defaults/account.rb

@@ -0,0 +1,46 @@
+class Envirobly::Defaults::Account < Envirobly::Default
+  include Envirobly::Colorize
+
+  def self.file = "account.yml"
+  def self.regexp = /accounts\/(\d+)/
+
+  def require_id
+    api = Envirobly::Api.new
+    accounts = api.list_accounts
+
+    if accounts.object.blank?
+      shell.say_error "Please connect an AWS account to your Envirobly account first."
+      exit 1
+    end
+
+    account = accounts.object.first
+    id = account["id"]
+
+    if accounts.object.size > 1
+      puts "Choose default account to deploy this project to:"
+
+      data = [ [ "ID", "Name", "AWS number", "URL" ] ] +
+        accounts.object.pluck("id", "name", "aws_id", "url")
+
+      shell.print_table data, borders: true
+
+      limited_to = accounts.object.pluck("id").map(&:to_s)
+
+      begin
+        id = shell.ask("Type in the account ID:", limited_to:).to_i
+      rescue Interrupt
+        shell.say_error "Cancelled"
+        exit
+      end
+
+      account = accounts.object.find { |a| a["id"] == id }
+    end
+
+    save account["url"]
+
+    shell.say "Account ##{id} set as project default "
+    shell.say green_check
+
+    id
+  end
+end

data/lib/envirobly/defaults/project.rb

@@ -0,0 +1,4 @@
+class Envirobly::Defaults::Project < Envirobly::Default
+  def self.file = "project.yml"
+  def self.regexp = /projects\/(\d+)/
+end

data/lib/envirobly/defaults/region.rb

@@ -0,0 +1,45 @@
+class Envirobly::Defaults::Region < Envirobly::Default
+  include Envirobly::Colorize
+
+  def self.file = "region.yml"
+  def self.regexp = /([a-z0-9\-)]+)/
+  def self.key = "code"
+
+  def require_id
+    api = Envirobly::Api.new
+    response = api.list_regions
+
+    shell.say "Choose default project region to deploy to:"
+    shell.print_table [ [ "Name", "Location", "Group" ] ] +
+      response.object.pluck("code", "title", "group_title"), borders: true
+
+    code = nil
+    limited_to = response.object.pluck("code")
+
+    while code.nil?
+      begin
+        code = shell.ask("Type in the region name:", default: "us-east-1")
+      rescue Interrupt
+        shell.say_error "Cancelled"
+        exit
+      end
+
+      unless code.in?(limited_to)
+        shell.say_error "'#{code}' is not a supported region, please try again"
+        code = nil
+      end
+    end
+
+    save code
+
+    shell.say "Region '#{id}' set as project default "
+    shell.say green_check
+
+    id
+  end
+
+  private
+    def cast_id(value)
+      value
+    end
+end

data/lib/envirobly/defaults.rb

@@ -0,0 +1,2 @@
+module Envirobly::Defaults
+end

data/lib/envirobly/deployment.rb

@@ -3,24 +3,28 @@ require "yaml"
 class Envirobly::Deployment
   include Envirobly::Colorize
 
-  def initialize(environ_name:, commit_ref:, account_id:, project_name:, project_region:)
+  def initialize(environ_name:, commit:, account_id:, project_name:, project_id:, region:, shell:)
     @environ_name = environ_name
-    @commit = Envirobly::Git::Commit.new commit_ref
-
-    unless @commit.exists?
-      $stderr.puts "Commit #{commit_ref} doesn't exist in this repository. Aborting."
-      exit 1
+    @commit = commit
+    @config = Envirobly::Config.new
+    @default_account = Envirobly::Defaults::Account.new(shell:)
+    @default_project = Envirobly::Defaults::Project.new(shell:)
+    @default_region = Envirobly::Defaults::Region.new(shell:)
+
+    if account_id.blank?
+      account_id = @default_account.require_if_none
     end
 
-    @configs = Envirobly::Configs.new
+    if project_id.blank? && project_name.blank?
+      project_id = @default_project.id
 
-    if account_id.nil?
-      account_id = @configs.default_account_id
+      if project_id.nil?
+        project_name = File.basename(Dir.pwd)
+      end
     end
 
-    project_id = nil
-    if project_name.nil?
-      project_id = @configs.default_project_id
+    if region.blank?
+      region = @default_region.require_if_none
     end
 
     @params = {
@@ -30,7 +34,7 @@ class Envirobly::Deployment
       project: {
         id: project_id,
         name: project_name,
-        region: project_region
+        region:
       },
       deployment: {
         environ_name:,
@@ -38,7 +42,7 @@ class Envirobly::Deployment
         commit_time: @commit.time,
         commit_message: @commit.message,
         object_tree_checksum: @commit.object_tree_checksum,
-        **@configs.to_params
+        **@config.to_params
       }
     }
   end
@@ -58,11 +62,18 @@ class Envirobly::Deployment
     api = Envirobly::Api.new
 
     Envirobly::Duration.measure do
-      print "Preparing project..."
       response = api.create_deployment @params
 
-      @configs.save_default_account(response.object.fetch("account_url"))
-      @configs.save_default_project(response.object.fetch("project_url"))
+      unless response.success?
+        display_config_errors response.object.fetch("errors")
+        exit 1
+      end
+
+      print "Preparing project..."
+
+      @default_account.save_if_none response.object.fetch("account_url")
+      @default_project.save_if_none response.object.fetch("project_url")
+      @default_region.save_if_none response.object.fetch("region")
 
       # Fetch credentials for build context upload
       @deployment_url = response.object.fetch("url")

data/lib/envirobly/duration.rb

@@ -12,7 +12,7 @@ class Envirobly::Duration
       duration = format_duration(measurement)
 
       if message.nil?
-        puts [ "", green("✔"), faint(duration) ].join(" ")
+        puts [ "", green_check, faint(duration) ].join(" ")
       else
         puts sprintf(message, duration)
       end

data/lib/envirobly/git/commit.rb

@@ -53,7 +53,7 @@ class Envirobly::Git::Commit < Envirobly::Git
       git(%(ls-tree -r #{ref}), chdir:).stdout.lines.each do |line|
         mode, type, object_hash, path = line.split(/\s+/)
 
-        next if path.start_with?("#{Envirobly::Configs::DIR}/")
+        next if path.start_with?("#{Envirobly::Config::DIR}/")
 
         if type == "commit"
           objects.merge! object_tree(ref: object_hash, chdir: File.join(chdir, path))
@@ -74,6 +74,6 @@ class Envirobly::Git::Commit < Envirobly::Git
   # @deprecated
   def objects_with_checksum_at(path)
     git(%{ls-tree #{@ref} --format='%(objectname) %(path)' #{path}}).stdout.lines.map(&:chomp).
-      reject { _1.split(" ").last == Envirobly::Configs::DIR }
+      reject { _1.split(" ").last == Envirobly::Config::DIR }
   end
 end

data/lib/envirobly/numeric.rb

@@ -0,0 +1,14 @@
+class Envirobly::Numeric < Numeric
+  def initialize(value, short: false)
+    @value = value
+    @short = short
+  end
+
+  def to_s
+    if @short
+      @value.to_s.delete_suffix(".0")
+    else
+      "%.2f" % @value
+    end
+  end
+end

data/lib/envirobly/version.rb

@@ -1,3 +1,3 @@
 module Envirobly
-  VERSION = "0.10.0"
+  VERSION = "1.1.0"
 end

data/lib/envirobly.rb

@@ -1,10 +1,10 @@
 module Envirobly
 end
 
+require "active_support"
+require "active_support/core_ext"
 require "zeitwerk"
-require "core_ext"
 
 loader = Zeitwerk::Loader.for_gem
-loader.ignore("#{__dir__}/core_ext.rb")
 loader.setup
 loader.eager_load

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Robert Starsi
@@ -37,20 +37,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: ostruct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -94,75 +80,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: debug
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '8.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.25'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '8.0'
 email: klevo@klevo.sk
 executables:
 - envirobly
@@ -171,7 +157,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - bin/envirobly
-- lib/core_ext.rb
 - lib/envirobly.rb
 - lib/envirobly/access_token.rb
 - lib/envirobly/api.rb
@@ -182,12 +167,18 @@ files:
 - lib/envirobly/cli.rb
 - lib/envirobly/cli/main.rb
 - lib/envirobly/colorize.rb
-- lib/envirobly/configs.rb
+- lib/envirobly/config.rb
+- lib/envirobly/default.rb
+- lib/envirobly/defaults.rb
+- lib/envirobly/defaults/account.rb
+- lib/envirobly/defaults/project.rb
+- lib/envirobly/defaults/region.rb
 - lib/envirobly/deployment.rb
 - lib/envirobly/duration.rb
 - lib/envirobly/git.rb
 - lib/envirobly/git/commit.rb
 - lib/envirobly/git/unstaged.rb
+- lib/envirobly/numeric.rb
 - lib/envirobly/version.rb
 homepage: https://github.com/envirobly/envirobly-cli
 licenses:
@@ -200,14 +191,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Envirobly command line interface
 test_files: []

data/lib/core_ext.rb

@@ -1,113 +0,0 @@
-class Array
-  alias_method :blank?, :empty?
-
-  def present?
-    !empty?
-  end
-
-  def second
-    self[1]
-  end
-
-  def third
-    self[2]
-  end
-
-  def fourth
-    self[3]
-  end
-
-  def fifth
-    self[4]
-  end
-end
-
-class Object
-  def blank?
-    respond_to?(:empty?) ? !!empty? : false
-  end
-
-  def present?
-    !blank?
-  end
-
-  def presence
-    self if present?
-  end
-end
-
-class NilClass
-  def blank?
-    true
-  end
-
-  def present?
-    false
-  end
-end
-
-class FalseClass
-  def blank?
-    true
-  end
-
-  def present?
-    false
-  end
-end
-
-class TrueClass
-  def blank?
-    false
-  end
-
-  def present?
-    true
-  end
-end
-
-class Hash
-  alias_method :blank?, :empty?
-
-  def present?
-    !empty?
-  end
-end
-
-class Symbol
-  alias_method :blank?, :empty?
-
-  def present?
-    !empty?
-  end
-end
-
-class String
-  def blank?
-    strip.empty?
-  end
-
-  def present?
-    !blank?
-  end
-end
-
-class Numeric
-  def blank?
-    false
-  end
-
-  def present?
-    true
-  end
-end
-
-class Time
-  def blank?
-    false
-  end
-
-  def present?
-    true
-  end
-end

data/lib/envirobly/configs.rb

@@ -1,79 +0,0 @@
-require "dotenv"
-
-class Envirobly::Configs
-  DIR = ".envirobly"
-  ENV = "env"
-  BASE = "deploy.yml"
-  OVERRIDES_PATTERN = /deploy\.([a-z0-9\-_]+)\.yml/i
-  DEFAULTS_DIR = File.join DIR, "defaults"
-  DEFAULT_ACCOUNT_PATH = File.join(DEFAULTS_DIR, "account.yml")
-  DEFAULT_PROJECT_PATH = File.join(DEFAULTS_DIR, "project.yml")
-
-  def initialize(dir = DIR)
-    @dir = Pathname.new dir
-  end
-
-  def to_params
-    {
-      configs:,
-      env_vars:
-    }
-  end
-
-  def default_project_id
-    if File.exist?(DEFAULT_PROJECT_PATH)
-      content = YAML.safe_load_file(DEFAULT_PROJECT_PATH)
-      if content["url"] =~ /projects\/(\d+)/
-        return $1.to_i
-      end
-    end
-
-    nil
-  end
-
-  def default_account_id
-    if File.exist?(DEFAULT_ACCOUNT_PATH)
-      content = YAML.safe_load_file(DEFAULT_ACCOUNT_PATH)
-      if content["url"] =~ /accounts\/(\d+)/
-        return $1.to_i
-      end
-    end
-
-    nil
-  end
-
-  def save_default_account(url)
-    return if File.exist?(DEFAULT_ACCOUNT_PATH)
-
-    FileUtils.mkdir_p(DEFAULTS_DIR)
-    content = YAML.dump({ "url" => url })
-    File.write(DEFAULT_ACCOUNT_PATH, content)
-  end
-
-  def save_default_project(url)
-    return if File.exist?(DEFAULT_PROJECT_PATH)
-
-    FileUtils.mkdir_p(DEFAULTS_DIR)
-    content = YAML.dump({ "url" => url })
-    File.write(DEFAULT_PROJECT_PATH, content)
-  end
-
-  private
-    def configs
-      Dir.entries(@dir).map do |file|
-        path = File.join(@dir, file)
-
-        next unless File.file?(path) && config_file?(file)
-
-        [ "#{DIR}/#{file}", File.read(path) ]
-      end.compact.to_h
-    end
-
-    def env_vars
-      Dotenv.parse @dir.join(ENV)
-    end
-
-    def config_file?(file)
-      file == BASE || file.match?(OVERRIDES_PATTERN)
-    end
-end