envirobly 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ef94e7e6db204bc73126d41dae8d3417e4ea7ac35e7cbecd5d496dcee842ee3
-  data.tar.gz: 32f53215e81d8e3d984cd7caf58fc0944c9636ba587e59dbd4573bfcd04f8a08
+  metadata.gz: 58cece10b3dc2908e0bce6a78f509463c8261fa34d54c9a45059b95205c494d3
+  data.tar.gz: 71b06913da6f29967a5f779c62a76423f30242474daeda744b34be44f7ba494a
 SHA512:
-  metadata.gz: ef5d512c3dab84e7f4cc5ce45804d30cce526b61c83407895952536a45a901715aee2ceb39b71e5b8d68d8e477f20b4628f9f94df41a932f603a511e3d9fface
-  data.tar.gz: d5444e2eb995be568dcc57e7df33145d2b17792f212c9ed605a3c456d511f0e2b80968d4900642c3483d9eb01afb550e1b0071f212877706a8e7a9e265d87a9e
+  metadata.gz: d67d5afc046a25396f822f86d17d584172468e277ff5626efbb1d11fadffdad86e821118b2d8dc0ee89f33b9d316d999fce182f5001be7e7029977aeb3a9604c
+  data.tar.gz: 224f58f13842244a423fbef3ab69540a97969a15c168e09a090f8a8c255340ec65657db6bf680d6c384d2dbda804d51708dc2bc99928ac03785495e00341837f

data/lib/envirobly/access_token.rb

@@ -69,7 +69,7 @@ class Envirobly::AccessToken
         exit
       end
 
-      api = Envirobly::Api.new(access_token: self)
+      api = Envirobly::Api.new(access_token: self, exit_on_error: false)
 
       # TODO: Eventually replace with custom `whoami` API that returns name, email...
       if api.list_accounts.success?

data/lib/envirobly/api.rb

@@ -8,7 +8,8 @@ class Envirobly::Api
   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, exit_on_error: true)
+    @exit_on_error = exit_on_error
     @access_token = access_token
   end
 
@@ -33,6 +34,10 @@ class Envirobly::Api
     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 = 30
   SHORT_RETRY_INTERVAL = 2.seconds
   LONG_RETRY_INTERVAL = 6.seconds
@@ -89,8 +94,12 @@ class Envirobly::Api
       api_url_for "v1/regions"
     end
 
-    def api_url_for(path)
-      URI::HTTPS.build(host: HOST, path: "/api/#{path}")
+    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: {})
@@ -109,11 +118,18 @@ class Envirobly::Api
       http.request(request).tap do |response|
         def response.object
           @json_parsed_body ||= JSON.parse(body)
+        rescue
+          @json_parsed_body = { error_message: body }
         end
 
         def response.success?
           (200..299).include?(code.to_i)
         end
+
+        if @exit_on_error && !response.success? && response.object[:error_message].present?
+          puts response.object[:error_message] # TODO: Replace with shell.say_error
+          exit 1
+        end
       end
     end
 

data/lib/envirobly/cli/main.rb

@@ -53,6 +53,26 @@ class Envirobly::Cli::Main < Envirobly::Base
     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 environ identified by name.
     Name can contain letters, numbers, dashes or underscores.
@@ -60,7 +80,8 @@ class Envirobly::Cli::Main < Envirobly::Base
   TXT
   method_option :account_id, type: :numeric
   method_option :region, type: :string
-  method_option :project, type: :string
+  method_option :project_id, type: :numeric
+  method_option :project_name, type: :string
   method_option :commit, type: :string, default: "HEAD"
   method_option :dry_run, type: :boolean, default: false
   def deploy(environ_name = nil)
@@ -73,31 +94,19 @@ class Envirobly::Cli::Main < Envirobly::Base
 
     Envirobly::AccessToken.new(shell:).require!
 
-    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:,
+      project_id: options.project_id,
+      project_name: options.project_name,
+      environ_name: environ_name.presence || commit.current_branch,
       commit:,
       shell:
     )
     deployment.perform(dry_run: options.dry_run)
   end
 
-  desc "pull", "Download build context"
+  desc "pull [REGION] [BUCKET] [REF] [PATH]", "Download build context. Used by Envirobly builders."
   def pull(region, bucket, ref, path)
     Envirobly::Duration.measure("Build context download took %s") do
       s3 = Envirobly::Aws::S3.new(region:, bucket:)

data/lib/envirobly/config.rb

@@ -29,7 +29,7 @@ class Envirobly::Config
     end
 
     def env_vars
-      Dotenv.parse @dir.join(ENV_VARS)
+      Dotenv.parse @dir.join(ENV_VARS), overwrite: true
     end
 
     def config_file?(file)

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 = "1.0.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Robert Starsi
@@ -178,6 +178,7 @@ files:
 - 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:
@@ -197,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Envirobly command line interface
 test_files: []