envirobly 1.6.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73fb2eec2c2353e9584132a4d7cbe59761314f94d6bc3df2bc81030d8c75ceb5
-  data.tar.gz: 23f6e62c0ee46930bdd39e4749864b0a1968eba791caa9ba7eb8147120e99708
+  metadata.gz: 3e6005245f891cfc1cee6078dfd201ba7662f1beff0d462452e09b5b406eb7f8
+  data.tar.gz: e1ebac83b39461529d6eb06d8b92f4d275bb8225b4868bd97e41104a085dcd67
 SHA512:
-  metadata.gz: 73b344b931fefaa33ab49271d924f87183367c2916e6c90ed9420ef5af8f06bdf9bf77cb758190623c53fe7f0cdf312bf943c4b85ea34745e1da27c48be0bb6a
-  data.tar.gz: 2f383325832731c49410870f8a25e88fe4ddfd8aae4ef7b73e681e45594a8a8e1be117964903e875901be5611ad3fbecf533015b99eb9b49f788b0c76d372508
+  metadata.gz: 696c939aff4ab4047f2eea626d23f381ea364992220a96533a9282946aa3c1ef30915a218ee64776137c7cf4897f723d86476448ef26c8fe9392f6e491ec593e
+  data.tar.gz: 81fcd2a06ce9a82a28a98eebf07f5ed40caa37415cbbaf94103d8fc65e6724950f7a06ed0c27e5a691d1b43777d64fb71170b043fefb0135641573f6039c0422

data/lib/envirobly/access_token.rb

@@ -3,86 +3,98 @@
 require "fileutils"
 require "pathname"
 
-class Envirobly::AccessToken
-  include Envirobly::Colorize
+module Envirobly
+  class AccessToken
+    include Colorize
 
-  attr_reader :shell
+    APP_NAME = "envirobly"
 
-  class << self
-    def destroy
-      if File.exist?(path)
-        FileUtils.rm path
-      end
-    end
+    attr_reader :shell
 
-    def dir
-      if ENV["XDG_CONFIG_HOME"]
-        Pathname.new(ENV["XDG_CONFIG_HOME"]).join("envirobly")
-      else
-        Pathname.new(Dir.home).join(".envirobly")
+    class << self
+      def destroy
+        if File.exist?(path)
+          FileUtils.rm path
+        end
       end
-    end
 
-    def path
-      dir.join "access_token"
-    end
-  end
+      def storage_base_dir
+        if dir = ENV["ENVIROBLY_CLI_DATA_HOME"].presence
+          return dir
+        end
 
-  def initialize(token = ENV["ENVIROBLY_ACCESS_TOKEN"].presence, shell: nil)
-    @shell = shell
+        if Gem.win_platform?
+          ENV["APPDATA"] || File.join(Dir.home, "AppData", "Roaming")
+        else
+          ENV["XDG_DATA_HOME"] || File.join(Dir.home, ".local", "share")
+        end
+      end
 
-    if token.blank? && File.exist?(self.class.path)
-      @token = File.read(self.class.path)
-    else
-      @token = token
-    end
-  end
+      def storage_dir
+        File.join(storage_base_dir, APP_NAME)
+      end
 
-  def save
-    FileUtils.mkdir_p self.class.dir
-    File.write self.class.path, @token
-    File.chmod 0600, self.class.path
-  end
+      def path
+        Pathname.new(storage_dir).join "access_token"
+      end
+    end
 
-  def as_http_bearer
-    "Bearer #{@token}"
-  end
+    def initialize(token = ENV["ENVIROBLY_ACCESS_TOKEN"].presence, shell: nil)
+      @shell = shell
 
-  def require!
-    return if @token.present?
+      if token.blank? && File.exist?(self.class.path)
+        @token = File.read(self.class.path)
+      else
+        @token = token
+      end
+    end
 
-    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
+    def save
+      FileUtils.mkdir_p self.class.storage_dir
+      File.write self.class.path, @token
+      File.chmod 0600, self.class.path
+    end
 
-    set
-  end
+    def as_http_bearer
+      "Bearer #{@token}"
+    end
 
-  def set
-    @token = nil
+    def require!
+      return if @token.present?
 
-    while @token.blank?
-      begin
-        @token = shell.ask("Access Token:", echo: false)
-      rescue Interrupt
-        shell.say
-        shell.say_error "Cancelled"
-        exit
-      end
+      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
 
-      api = Envirobly::Api.new(access_token: self, exit_on_error: false)
+      set
+    end
 
-      # 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
+    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
+
+        api = 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?
+          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

@@ -6,6 +6,8 @@ require "socket"
 require "uri"
 
 class Envirobly::Api
+  include Envirobly::Colorize
+
   HOST = ENV["ENVIROBLY_API_HOST"].presence || "on.envirobly.com"
   USER_AGENT = "Envirobly CLI v#{Envirobly::VERSION}"
   CONTENT_TYPE = "application/json"
@@ -16,12 +18,7 @@ class Envirobly::Api
   end
 
   def validate_shape(params)
-    post_as_json(api_v1_shape_validations_url, params:, headers: authorization_headers).tap do |response|
-      unless response.success?
-        $stderr.puts "Validation request responded with #{response.code}. Aborting."
-        exit 1
-      end
-    end
+    post_as_json(api_v1_shape_validations_url, params:, headers: authorization_headers)
   end
 
   def create_deployment(params)
@@ -49,7 +46,7 @@ class Envirobly::Api
   LONG_RETRY_INTERVAL = 6.seconds
   def get_deployment_with_delay_and_retry(url, tries = 1)
     sleep SHORT_RETRY_INTERVAL * tries
-    response = get_as_json URI(url)
+    response = get_as_json URI(url), retriable: true
 
     if response.success?
       response
@@ -67,8 +64,8 @@ class Envirobly::Api
     end
   end
 
-  def get_as_json(url, headers: {})
-    request(url, type: Net::HTTP::Get, headers:)
+  def get_as_json(url, headers: {}, retriable: false)
+    request(url, type: Net::HTTP::Get, headers:, retriable:)
   end
 
   def post_as_json(url, params: {}, headers: {})
@@ -112,7 +109,11 @@ class Envirobly::Api
       URI::HTTPS.build(host: HOST, path: "/api/#{path}", query:)
     end
 
-    def request(url, type:, headers: {})
+    def request(url, type:, headers: {}, retriable: false)
+      if ENV["ENVIROBLY_CLI_LOG_LEVEL"] == "debug"
+        puts "[Envirobly::Api] request #{url} #{type} #{headers}"
+      end
+
       uri = URI(url)
       http = Net::HTTP.new uri.host, uri.port
       http.use_ssl = true
@@ -126,18 +127,41 @@ class Envirobly::Api
       yield request if block_given?
 
       http.request(request).tap do |response|
+        if ENV["ENVIROBLY_CLI_LOG_LEVEL"] == "debug"
+          puts "[Envirobly::Api] response #{response.code} => #{response.body}"
+        end
+
         def response.object
           @json_parsed_body ||= JSON.parse(body)
         rescue
-          @json_parsed_body = { error_message: body }
+          @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
+        if !retriable && @exit_on_error && !response.success?
+          informed = false
+
+          if response.object.try(:key?, "error_message")
+            puts response.object["error_message"]
+            informed = true
+          end
+
+          if response.object.try(:key?, "config_errors")
+            display_config_errors response.object["config_errors"]
+            informed = true
+          end
+
+          unless informed
+            puts red("Error response (#{response.code}) from the API")
+          end
+
+          if response.code.to_i == 401
+            puts "Run `envirobly signin` to ensure you're signed in with a valid access token"
+          end
+
           exit 1
         end
       end
@@ -150,4 +174,17 @@ class Envirobly::Api
     def authorization_headers
       { "Authorization" => @access_token.as_http_bearer }
     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/cli/main.rb

@@ -22,9 +22,8 @@ class Envirobly::Cli::Main < Envirobly::Base
   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`."
+    say "You've signed out"
+    say "You can sign in again with `envirobly signin`"
   end
 
   desc "set_default_account", "Choose default account to deploy the current project to"
@@ -45,14 +44,9 @@ class Envirobly::Cli::Main < Envirobly::Base
     api = Envirobly::Api.new
 
     params = { validation: configs.to_params }
-    response = api.validate_shape params
+    api.validate_shape params
 
-    if response.object.fetch("valid")
-      puts "Config is valid #{green_check}"
-    else
-      display_config_errors response.object.fetch("errors")
-      exit 1
-    end
+    say "Config is valid #{green_check}"
   end
 
   desc "instance_types [REGION]", "List instance types in the given region, including price and performance characteristics."

data/lib/envirobly/colorize.rb

@@ -40,17 +40,4 @@ module Envirobly::Colorize
   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/deployment.rb

@@ -9,12 +9,12 @@ module Envirobly
     attr_reader :params
 
     def initialize(environ_name:, commit:, account_id:, project_name:, project_id:, region:, shell:)
-      @environ_name = environ_name
       @commit = commit
       @config = Config.new
       @default_account = Defaults::Account.new(shell:)
       @default_project = Defaults::Project.new(shell:)
       @default_region = Defaults::Region.new(shell:)
+      @shell = shell
 
       target = Target.new(
         default_account_id: @default_account.value,
@@ -41,6 +41,7 @@ module Envirobly
         shell.say "--#{param.to_s.parameterize} ignored, due to other arguments overriding it"
       end
 
+      @environ_name = target.environ_name
       @params = {
         account_id: target.account_id,
         project_id: target.project_id,
@@ -74,11 +75,6 @@ module Envirobly
       Duration.measure do
         response = api.create_deployment @params
 
-        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_id")

data/lib/envirobly/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Envirobly
-  VERSION = "1.6.2"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.8.0
 platform: ruby
 authors:
 - Robert Starsi
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Envirobly command line interface
 test_files: []