envirobly 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49c3237a5570bb1839a02b5cbdfb3c70725c6e200841a09b7299b46e62efb3c2
-  data.tar.gz: b90bcd5afcf383bfdac23320870c3c420cf30b842f1ec67dba152f94a9382ef3
+  metadata.gz: 89cfd488c2765b1d8bc3205d34cf6d4e49230f4eb3a371cdb05b6785d690c955
+  data.tar.gz: f52f5be5eaf21eb35273f3d5d9da22af91ca2d6078faedcd1e875ebbcdab13e1
 SHA512:
-  metadata.gz: c57b8f6e3e791afc1d392db80f501e1ee10cc7229465b3c3e10e300fe3f786ace269b79660b624ef099b2e0e1eddc8c9d4e03e8ac05d20b73f824f896223b6b9
-  data.tar.gz: 448da4b7847e9d067e722bbfcb1b011e3573259225a0ff2bf0114b8c757195d9b4d78096c47fccd137aade3d5508acafb19fba73a00a55b14454618b882c6ef7
+  metadata.gz: 9f8e1e766e47c1a7765cf96c0b893ab8cec55a16feb1916423f944396bdf9c1c17c215b4ed7f415217ccc8bb4c559331b687e3c91e71b698ea9ed34d81ec2c48
+  data.tar.gz: 2c0d7c929da365fa21c4a946049da551c6ab5eb6c6492babf138b64a01d0f7f43f5c99693989c65bb260ac7ebbc1a0ed47d7bccea633df6ecbedcd2afe4ad0ed

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.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: []