adamantite 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ad70c4e3eaae15d88f12b94ea91ede1a0710aaee9089f4c7aac4ec83410b63b
-  data.tar.gz: a2168814dc00987f060a6217c6dce9894a52d9cf6f7cfd8701d12bc5ae679991
+  metadata.gz: 9f7cf1f6c53600d5d0c68d944098a7a98d3ae2715ed7aa48f54df72516c3722b
+  data.tar.gz: df595ee6fba2497f98ce2ac8446133207475861e6ea9681992e6e36f6b125fb8
 SHA512:
-  metadata.gz: e3d37de14a8f78a437d1dc94e530810b7efb7fb0f8313161720da7b70f9aba82febf324a48da06798e6e32387fcec8700dd43180d0e0dd2d364e3894e4adacb1
-  data.tar.gz: 919b7b1266be6e3b9a81ad643b2453434d1888d79f33a7e7296b80d8f3ada2950d8fa3b80eaf8d2c97aef67ee42be81879636d550a3e1e8c4375e75ccbd69d59
+  metadata.gz: 52b8593789453bbbcfa7a5fc9e75a166a0da8e14dbb6f639d08d5438b8acd7a977f7ca1929245f2a0ad5a31f7c10462f7d1b4f76b46bf551053c91c23a257eb9
+  data.tar.gz: 897783faaf123f26f8076b7cd25deb1c37e41138f53b0e660252077e433e22dcaae75d0487d4deccdffcf571cc7b79f3bf74278c7157f1bd8f34a2b20b493070

data/lib/adamantite.rb

@@ -51,7 +51,7 @@ module Adamantite
     menu('About') do
       menu_item('Software Information') do
         on_clicked do
-          msg_box('For more information please visit https://jakebruemmer.github.io/adamantite-info/')
+          msg_box('For more information please visit https://jakebruemmer.github.io/adamantite/')
         end
       end
       menu_item('Author') do
@@ -147,15 +147,18 @@ module Adamantite
             end
             horizontal_box do
               stretchy false
-
-              label('This is valid Adamantite installation.')
+              free_or_paid = @adamantite.free_tier ? 'free' : 'paid'
+              label_text = <<-TEXT
+                This is valid Adamantite installation on a #{free_or_paid} license.
+              TEXT
+              label(label_text)
             end
           end
         else
           vertical_box do
             license_label = <<-TEXT
               No license detected. Please add one to start using Adamantite.
-              If you need one, visit https://jakebruemmer.github.io/adamantite-info/
+              If you need one, visit https://jakebruemmer.github.io/adamantite/
               for more information.
             TEXT
             label(license_label)

data/lib/base/adamantite.rb

@@ -12,7 +12,7 @@ module Adamantite
       include AdamantiteFileUtils
 
       attr_reader :authenticated, :master_password, :master_password_salt, :stored_passwords,
-                  :master_license_key
+                  :master_license_key, :free_tier
 
       OPSLIMIT = 2**20
       MEMLIMIT = 2**24
@@ -50,22 +50,11 @@ module Adamantite
       def activate_license!(master_license_key)
         return unless authenticated?
 
-        headers = {
-          'Content-Type': 'application/vnd.api+json',
-          'Accept': 'application/vnd.api+json'
-        }
-        body = {
-          'meta': {
-            'key': master_license_key,
-            'scope': {
-              'product': 'bb6542ab-7d74-44d0-b4f5-1fbc39cdeb99'
-            }
-          }
-        }
-        res = HTTParty.post(LICENSE_ACTIVATION_URL, headers: headers, body: body.to_json)
+        res = get_license_info(master_license_key)
 
         if res['meta']['valid']
           @master_license_key = master_license_key
+          @free_tier = res['data']['attributes']['name'] == 'Adamantite Free'
           write_to_file(password_file('master_license_key'), @vault.encrypt(@master_license_key), true)
           true
         end
@@ -192,6 +181,24 @@ module Adamantite
         return unless authenticated?
 
         @master_license_key = @vault.decrypt(get_license_key)
+        res = get_license_info(@master_license_key)
+        @free_tier = res['data']['attributes']['name'] == 'Adamantite Free'
+      end
+
+      def get_license_info(license_key)
+        headers = {
+          'Content-Type': 'application/vnd.api+json',
+          'Accept': 'application/vnd.api+json'
+        }
+        body = {
+          'meta': {
+            'key': license_key,
+            'scope': {
+              'product': 'bb6542ab-7d74-44d0-b4f5-1fbc39cdeb99'
+            }
+          }
+        }
+        HTTParty.post(LICENSE_ACTIVATION_URL, headers: headers, body: body.to_json)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adamantite
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Jake Bruemmer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-18 00:00:00.000000000 Z
+date: 2023-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-libui
@@ -77,13 +77,13 @@ files:
 - lib/gui/screen/set_master_password_screen.rb
 - lib/gui/screen/show_screen.rb
 - lib/gui/screen/update_master_password_screen.rb
-homepage: https://jakebruemmer.github.io/adamantite-info/
+homepage: https://jakebruemmer.github.io/adamantite/
 licenses:
 - MIT
 metadata: {}
 post_install_message: |2
       Thank you for installing Adamantite. Please visit the project's
-      homepage https://jakebruemmer.github.io/adamantite-info/ if you
+      homepage https://jakebruemmer.github.io/adamantite/ if you
       run into any issues when installing or running the gem.
 
       You can run the gem by running 'adamantite' in your terminal.